diff -Nru banshee-1.8.0/aclocal.m4 banshee-1.8.1/aclocal.m4 --- banshee-1.8.0/aclocal.m4 2010-09-28 16:30:03.000000000 +0000 +++ banshee-1.8.1/aclocal.m4 2011-01-28 21:25:19.000000000 +0000 @@ -9916,6 +9916,14 @@ ]) # _AM_PROG_TAR m4_include([build/m4/shave/shave.m4]) +m4_include([build/m4/shamrock/expansions.m4]) +m4_include([build/m4/shamrock/gnome-doc.m4]) +m4_include([build/m4/shamrock/i18n.m4]) +m4_include([build/m4/shamrock/mono.m4]) +m4_include([build/m4/shamrock/monodoc.m4]) +m4_include([build/m4/shamrock/nunit.m4]) +m4_include([build/m4/shamrock/programs.m4]) +m4_include([build/m4/shamrock/util.m4]) m4_include([build/m4/banshee/bnpx11.m4]) m4_include([build/m4/banshee/boo.m4]) m4_include([build/m4/banshee/daap.m4]) @@ -9942,11 +9950,3 @@ m4_include([build/m4/banshee/taglib.m4]) m4_include([build/m4/banshee/torrent.m4]) m4_include([build/m4/banshee/youtube.m4]) -m4_include([build/m4/shamrock/expansions.m4]) -m4_include([build/m4/shamrock/gnome-doc.m4]) -m4_include([build/m4/shamrock/i18n.m4]) -m4_include([build/m4/shamrock/mono.m4]) -m4_include([build/m4/shamrock/monodoc.m4]) -m4_include([build/m4/shamrock/nunit.m4]) -m4_include([build/m4/shamrock/programs.m4]) -m4_include([build/m4/shamrock/util.m4]) diff -Nru banshee-1.8.0/AUTHORS banshee-1.8.1/AUTHORS --- banshee-1.8.0/AUTHORS 2010-09-28 16:23:22.000000000 +0000 +++ banshee-1.8.1/AUTHORS 2011-01-28 21:23:30.000000000 +0000 @@ -19,6 +19,7 @@ Andrew Conkling Andrés G. Aragoneses Andy Midgette + Aran Cox Arthur Carli Arun Raghavan Aurélien Mino @@ -54,6 +55,7 @@ David Spreen David Stone Diego E. Pettenò + Dougal Stanton Eitan Isaacson Elena Grassi Eoin Hennessy @@ -92,6 +94,7 @@ Julien Moutte Juri Pakaste Ken Vandine + kentaro KAZUHAMA Kevin Duffus Konstantin Oshiyko Larry Ewing @@ -134,6 +137,8 @@ Scott Peterson Sebastian Dröge Shaun McCance + Sjoerd Simons + Tim Fisken Tim Yamin Tobias Mueller Todd Berman diff -Nru banshee-1.8.0/build/m4/banshee/dap-karma.m4 banshee-1.8.1/build/m4/banshee/dap-karma.m4 --- banshee-1.8.0/build/m4/banshee/dap-karma.m4 2010-05-26 02:11:23.000000000 +0000 +++ banshee-1.8.1/build/m4/banshee/dap-karma.m4 2011-01-13 18:54:04.000000000 +0000 @@ -12,7 +12,12 @@ enable_karmasharp="$enable_karmasharp", enable_karmasharp=no) if test "x$enable_karmasharp" = "xyes"; then - KARMASHARP_ASSEMBLIES="`$PKG_CONFIG --variable=Libraries karma-sharp`" + asms="`$PKG_CONFIG --variable=Libraries karma-sharp`" + for asm in $asms; do + KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm" + [[ -r "$asm.config" ]] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.config" + [[ -r "$asm.mdb" ]] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.mdb" + done AC_SUBST(KARMASHARP_ASSEMBLIES) AC_SUBST(KARMASHARP_LIBS) fi diff -Nru banshee-1.8.0/build/m4/Makefile.in banshee-1.8.1/build/m4/Makefile.in --- banshee-1.8.0/build/m4/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/build/m4/Makefile.in 2011-01-28 21:25:22.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -138,6 +138,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/build/Makefile.in banshee-1.8.1/build/Makefile.in --- banshee-1.8.0/build/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/build/Makefile.in 2011-01-28 21:25:22.000000000 +0000 @@ -37,6 +37,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -63,14 +71,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -155,6 +155,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/build/pkg-config/Makefile.in banshee-1.8.1/build/pkg-config/Makefile.in --- banshee-1.8.0/build/pkg-config/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/build/pkg-config/Makefile.in 2011-01-28 21:25:22.000000000 +0000 @@ -36,6 +36,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -62,14 +70,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -148,6 +148,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/ChangeLog banshee-1.8.1/ChangeLog --- banshee-1.8.0/ChangeLog 2010-09-29 20:46:54.000000000 +0000 +++ banshee-1.8.1/ChangeLog 2011-01-28 21:38:03.000000000 +0000 @@ -1,6 +1,6 @@ -2010-09-29 The Banshee Project +2011-01-28 The Banshee Project - Banshee 1.8.0 + Banshee 1.8.1 You probably are looking for the useful change summary detailed in the NEWS file, perfect for downstream maintainers. diff -Nru banshee-1.8.0/configure banshee-1.8.1/configure --- banshee-1.8.0/configure 2010-09-28 16:30:05.000000000 +0000 +++ banshee-1.8.1/configure 2011-01-28 21:25:21.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for banshee-1 1.8.0. +# Generated by GNU Autoconf 2.63 for banshee-1 1.8.1. # # Report bugs to . # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='banshee-1' PACKAGE_TARNAME='banshee-1' -PACKAGE_VERSION='1.8.0' -PACKAGE_STRING='banshee-1 1.8.0' +PACKAGE_VERSION='1.8.1' +PACKAGE_STRING='banshee-1 1.8.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=banshee' # Factoring default headers for most tests. @@ -954,6 +954,10 @@ NDESK_DBUS_CFLAGS NDESK_DBUS_GLIB_LIBS NDESK_DBUS_GLIB_CFLAGS +HAVE_GDK_2_22_FALSE +HAVE_GDK_2_22_TRUE +GDK_2_22_LIBS +GDK_2_22_CFLAGS BANSHEE_DESKTOP_NAME MEEGO_PANEL_LIBS MEEGO_PANEL_CFLAGS @@ -1247,6 +1251,8 @@ GNOME_2_28_LIBS MEEGO_PANEL_CFLAGS MEEGO_PANEL_LIBS +GDK_2_22_CFLAGS +GDK_2_22_LIBS NDESK_DBUS_GLIB_CFLAGS NDESK_DBUS_GLIB_LIBS NDESK_DBUS_CFLAGS @@ -1863,7 +1869,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures banshee-1 1.8.0 to adapt to many kinds of systems. +\`configure' configures banshee-1 1.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1937,7 +1943,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of banshee-1 1.8.0:";; + short | recursive ) echo "Configuration of banshee-1 1.8.1:";; esac cat <<\_ACEOF @@ -2066,6 +2072,10 @@ C compiler flags for MEEGO_PANEL, overriding pkg-config MEEGO_PANEL_LIBS linker flags for MEEGO_PANEL, overriding pkg-config + GDK_2_22_CFLAGS + C compiler flags for GDK_2_22, overriding pkg-config + GDK_2_22_LIBS + linker flags for GDK_2_22, overriding pkg-config NDESK_DBUS_GLIB_CFLAGS C compiler flags for NDESK_DBUS_GLIB, overriding pkg-config NDESK_DBUS_GLIB_LIBS @@ -2256,7 +2266,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -banshee-1 configure 1.8.0 +banshee-1 configure 1.8.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2270,7 +2280,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by banshee-1 $as_me 1.8.0, which was +It was created by banshee-1 $as_me 1.8.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2987,7 +2997,7 @@ # Define the identity of the package. PACKAGE='banshee-1' - VERSION='1.8.0' + VERSION='1.8.1' cat >>confdefs.h <<_ACEOF @@ -5648,13 +5658,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5651: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5661: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5654: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5664: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5657: output\"" >&5) + (eval echo "\"\$as_me:5667: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6859,7 +6869,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6862 "configure"' > conftest.$ac_ext + echo '#line 6872 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8712,11 +8722,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8715: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8725: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8719: \$? = $ac_status" >&5 + echo "$as_me:8729: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9051,11 +9061,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9054: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9064: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9058: \$? = $ac_status" >&5 + echo "$as_me:9068: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9156,11 +9166,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9159: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9169: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9163: \$? = $ac_status" >&5 + echo "$as_me:9173: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9211,11 +9221,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9214: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9224: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9218: \$? = $ac_status" >&5 + echo "$as_me:9228: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12011,7 +12021,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12014 "configure" +#line 12024 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12107,7 +12117,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12110 "configure" +#line 12120 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12435,7 +12445,7 @@ ASM_VERSION=1.8.0.0 -DISPLAY_VERSION="1.8.0" +DISPLAY_VERSION="1.8.1" @@ -16022,6 +16032,82 @@ +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for GDK_2_22" >&5 +$as_echo_n "checking for GDK_2_22... " >&6; } + +if test -n "$GDK_2_22_CFLAGS"; then + pkg_cv_GDK_2_22_CFLAGS="$GDK_2_22_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-x11-2.0 >= 2.22\"") >&5 + ($PKG_CONFIG --exists --print-errors "gdk-x11-2.0 >= 2.22") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GDK_2_22_CFLAGS=`$PKG_CONFIG --cflags "gdk-x11-2.0 >= 2.22" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GDK_2_22_LIBS"; then + pkg_cv_GDK_2_22_LIBS="$GDK_2_22_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-x11-2.0 >= 2.22\"") >&5 + ($PKG_CONFIG --exists --print-errors "gdk-x11-2.0 >= 2.22") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GDK_2_22_LIBS=`$PKG_CONFIG --libs "gdk-x11-2.0 >= 2.22" 2>/dev/null` +else + pkg_failed=yes +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 + GDK_2_22_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-x11-2.0 >= 2.22" 2>&1` + else + GDK_2_22_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-x11-2.0 >= 2.22" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GDK_2_22_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + have_gdk_2_22=no +elif test $pkg_failed = untried; then + have_gdk_2_22=no +else + GDK_2_22_CFLAGS=$pkg_cv_GDK_2_22_CFLAGS + GDK_2_22_LIBS=$pkg_cv_GDK_2_22_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + have_gdk_2_22=yes +fi + if test "x$have_gdk_2_22" = "xyes"; then + HAVE_GDK_2_22_TRUE= + HAVE_GDK_2_22_FALSE='#' +else + HAVE_GDK_2_22_TRUE='#' + HAVE_GDK_2_22_FALSE= +fi + + + pkg_failed=no { $as_echo "$as_me:$LINENO: checking for NDESK_DBUS_GLIB" >&5 @@ -20100,7 +20186,12 @@ fi if test "x$enable_karmasharp" = "xyes"; then - KARMASHARP_ASSEMBLIES="`$PKG_CONFIG --variable=Libraries karma-sharp`" + asms="`$PKG_CONFIG --variable=Libraries karma-sharp`" + for asm in $asms; do + KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm" + [ -r "$asm.config" ] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.config" + [ -r "$asm.mdb" ] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.mdb" + done fi @@ -22641,6 +22732,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_GDK_2_22_TRUE}" && test -z "${HAVE_GDK_2_22_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GDK_2_22\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"HAVE_GDK_2_22\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${EXTERNAL_NOTIFY_SHARP_TRUE}" && test -z "${EXTERNAL_NOTIFY_SHARP_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23313,7 +23411,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by banshee-1 $as_me 1.8.0, which was +This file was extended by banshee-1 $as_me 1.8.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23376,7 +23474,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -banshee-1 config.status 1.8.0 +banshee-1 config.status 1.8.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru banshee-1.8.0/configure.ac banshee-1.8.1/configure.ac --- banshee-1.8.0/configure.ac 2010-09-28 16:29:19.000000000 +0000 +++ banshee-1.8.1/configure.ac 2011-01-28 21:24:06.000000000 +0000 @@ -2,10 +2,10 @@ dnl Remember to also update the Display Version m4_define([banshee_version_major], [1]) m4_define([banshee_version_minor], [8]) -m4_define([banshee_version_micro], [0]) +m4_define([banshee_version_micro], [1]) dnl this can sometimes differ manually -m4_define([banshee_display_version], ["1.8.0"]) +m4_define([banshee_display_version], ["1.8.1"]) dnl set to 0 when doing an official release m4_define([banshee_version_pre_release], [0]) @@ -99,6 +99,10 @@ fi AC_SUBST(BANSHEE_DESKTOP_NAME) +dnl Check for gdk-x11 >= 2.22 for NotificationArea extension, bgo#638477 +PKG_CHECK_MODULES(GDK_2_22, gdk-x11-2.0 >= 2.22, have_gdk_2_22=yes, have_gdk_2_22=no) +AM_CONDITIONAL(HAVE_GDK_2_22, test "x$have_gdk_2_22" = "xyes") + dnl NDesk DBus libraries BANSHEE_CHECK_NDESK_DBUS diff -Nru banshee-1.8.0/data/audio-profiles/Makefile.in banshee-1.8.1/data/audio-profiles/Makefile.in --- banshee-1.8.0/data/audio-profiles/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/data/audio-profiles/Makefile.in 2011-01-28 21:25:22.000000000 +0000 @@ -36,6 +36,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -62,14 +70,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -148,6 +148,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/data/desktop-files/Makefile.in banshee-1.8.1/data/desktop-files/Makefile.in --- banshee-1.8.0/data/desktop-files/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/data/desktop-files/Makefile.in 2011-01-28 21:25:22.000000000 +0000 @@ -37,6 +37,14 @@ $(srcdir)/common.desktop.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -63,14 +71,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -149,6 +149,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/data/icon-theme-hicolor/Makefile.in banshee-1.8.1/data/icon-theme-hicolor/Makefile.in --- banshee-1.8.0/data/icon-theme-hicolor/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/data/icon-theme-hicolor/Makefile.in 2011-01-28 21:25:22.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -138,6 +138,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/data/Makefile.in banshee-1.8.1/data/Makefile.in --- banshee-1.8.0/data/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/data/Makefile.in 2011-01-28 21:25:22.000000000 +0000 @@ -38,6 +38,14 @@ $(srcdir)/org.bansheeproject.CollectionIndexer.service.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -64,14 +72,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -163,6 +163,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/debian/changelog banshee-1.8.1/debian/changelog --- banshee-1.8.0/debian/changelog 2010-11-25 04:05:49.000000000 +0000 +++ banshee-1.8.1/debian/changelog 2011-01-29 18:42:27.000000000 +0000 @@ -1,3 +1,58 @@ +banshee (1.8.1-0ubuntu1) maverick-proposed; urgency=low + + * [338f8fe] New upstream bugfix release: + + Sync dialog would sometimes be displayed forever + + Nereid: Always grab search entry focus on ctrl+f + + Lastfm: Fix NRE in LastfmRequest when the request times out + + bgo#486543: Playlists: Fix parsing when started from root directory + (LP: #674116) + + bgo#540394: AudioCdRipper: Don't overwrite existing files when + ripping (LP: #348502) + + bgo#540525: TrackActions: Stop when the playing track is deleted + (LP: #366893) + + bgo#587936: AppleDevice: Sync the Sort+ fields + + bgo#609463: Equalizer: Fix distortion by using floating math + + bgo#620010: Fix displaying random image for "All Albums" + + bgo#623441: DatabaseImportManager: Fix duplicates on import + + bgo#624734: InternetRadio: Allow editing stations again + + bgo#629005: FullscreenWindow: Fix full-screen on multi-head displays + + bgo#630209: AppleDevice: Fix podcast flag for video podcasts + + bgo#631172: AppleDevice: Fix podcast support + + bgo#631961: Gio: Fix InvalidCastException + + bgo#632114: Fix hang when replaying video + + bgo#632196: AlbumListView: Fix MissingIntPtrCtorException + + bgo#632246: ThickClient: Fix IntPtr ctor issue in SourceComboBox + (LP: #669857) + + bgo#632420: Booter: Use the MeeGo client if appropriate + + bgo#632715: Bookmarks: Fix UI not getting loaded + + bgo#633764: Dap: Fix not transcoding some files when we should + + bgo#633841: StreamTagger: Recognize webm as video (LP: #669682) + + bgo#634652: AppleDevice: Remove invalid tracks before syncing + + bgo#634686: Streaming: Fix streaming broken after first play + + bgo#635453: Importing: Fix regression with importing mkv + + bgo#635776: build: Ensure karma-sharp's DLLmap is copied in the + build + + bgo#635791: Metrics: Fix translation of the preference label + + bgo#637303: FileChooserDialog: Fix error message on first launch + (LP: #687402) + + bgo#637627: FullscreenWindow: Keep fullscreen when showing volume + osd + + bgo#637991: SourceRowRenderer: Fix vertical alignment calculation + + bgo#638477: X11NotificationArea: Enhance check for RGBA visual + (LP: #689505) + + bgo#638755: Dap.MassStorage: Add support for Xperia X10 mini pro + + bgo#638989: Dap.MassStorage: Add support for Nexus S + + bgo#635088: Dap.MassStorage: Add support for the LG Ally phone + + bgo#633551: Dap.MassStorage: Add support for Huawei Ideos Android + phones + + bgo#631687: Dap.MassStorage: Fix extensionless files + + bgo#639603: PlayerEngine: Fix NRE when current track doesn't have a + Uri + + bnc#642505: Fix insecure LD_LIBRARY_PATH + * [7fd9862] Drop patch for bgo#623441 (applied upstream) + + -- Chow Loong Jin Sun, 30 Jan 2011 02:42:20 +0800 + banshee (1.8.0-2ubuntu1~maverick2) maverick-proposed; urgency=low * debian/rules: Fix gettext domain (LP: #677173) diff -Nru banshee-1.8.0/debian/gbp.conf banshee-1.8.1/debian/gbp.conf --- banshee-1.8.0/debian/gbp.conf 2010-11-25 04:05:49.000000000 +0000 +++ banshee-1.8.1/debian/gbp.conf 2011-01-29 18:42:27.000000000 +0000 @@ -1,6 +1,3 @@ [DEFAULT] debian-branch = ubuntu/maverick -upstream-branch = upstream-experimental - -[git-buildpackage] -compression = bzip2 +upstream-branch = upstream diff -Nru banshee-1.8.0/debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch banshee-1.8.1/debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch --- banshee-1.8.0/debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch 2010-11-25 04:05:49.000000000 +0000 +++ banshee-1.8.1/debian/patches/0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From aa40b95bf04ce2c89be391d34c19aec0850bba1e Mon Sep 17 00:00:00 2001 -From: Alexander Kojevnikov -Date: Mon, 18 Oct 2010 17:52:12 +1100 -Subject: [PATCH] DatabaseImportManager: Fix duplicates on import (bgo#623441) - ---- - .../DatabaseImportManager.cs | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs -index 60526c7..75b7a52 100644 ---- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs -+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs -@@ -175,11 +175,11 @@ namespace Banshee.Collection.Database - ServiceManager.DbConnection.BeginTransaction (); - try { - track = new DatabaseTrackInfo (); -- track.Uri = uri; - using (var file = StreamTagger.ProcessUri (uri)) { - StreamTagger.TrackInfoMerge (track, file, false, true); - } - -+ track.Uri = uri; - track.PrimarySource = trackPrimarySourceChooser (track); - - bool save_track = true; --- -1.7.1 - diff -Nru banshee-1.8.0/debian/patches/series banshee-1.8.1/debian/patches/series --- banshee-1.8.0/debian/patches/series 2010-11-25 04:05:49.000000000 +0000 +++ banshee-1.8.1/debian/patches/series 2011-01-29 18:42:27.000000000 +0000 @@ -7,5 +7,4 @@ 07_enable-library-watch-by-default.patch 08_remove_unrelevant_media.patch 0001-Don-t-copy-duplicate-libraries.patch -0001-DatabaseImportManager-Fix-duplicates-on-import-bgo-6.patch 99_ltmain_as-needed.patch diff -Nru banshee-1.8.0/docs/Banshee/Makefile.in banshee-1.8.1/docs/Banshee/Makefile.in --- banshee-1.8.0/docs/Banshee/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/docs/Banshee/Makefile.in 2011-01-28 21:25:22.000000000 +0000 @@ -37,6 +37,14 @@ subdir = docs/Banshee ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -63,14 +71,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -149,6 +149,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/docs/Hyena/Makefile.in banshee-1.8.1/docs/Hyena/Makefile.in --- banshee-1.8.0/docs/Hyena/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/docs/Hyena/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -37,6 +37,14 @@ subdir = docs/Hyena ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -63,14 +71,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -149,6 +149,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/docs/Makefile.in banshee-1.8.1/docs/Makefile.in --- banshee-1.8.0/docs/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/docs/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/extras/Makefile.in banshee-1.8.1/extras/Makefile.in --- banshee-1.8.0/extras/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/extras/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -36,6 +36,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -62,14 +70,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/extras/metrics/Makefile.in banshee-1.8.1/extras/metrics/Makefile.in --- banshee-1.8.0/extras/metrics/Makefile.in 2010-09-28 16:30:06.000000000 +0000 +++ banshee-1.8.1/extras/metrics/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -40,6 +40,14 @@ subdir = extras/metrics ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/gstreamer/equalizer/gstiirequalizer.c banshee-1.8.1/gstreamer/equalizer/gstiirequalizer.c --- banshee-1.8.0/gstreamer/equalizer/gstiirequalizer.c 2010-05-26 02:11:23.000000000 +0000 +++ banshee-1.8.1/gstreamer/equalizer/gstiirequalizer.c 2010-11-14 08:43:35.000000000 +0000 @@ -396,9 +396,9 @@ gain = arg_to_scale (band->gain); - if (band->freq / GST_AUDIO_FILTER (equ)->format.rate > 0.5) + if (band->freq / GST_AUDIO_FILTER (equ)->format.rate >= 0.5) omega = M_PI; - else if (band->freq < 0.0) + else if (band->freq <= 0.0) omega = 0.0; else omega = 2.0 * M_PI * (band->freq / GST_AUDIO_FILTER (equ)->format.rate); @@ -553,9 +553,9 @@ SecondOrderHistory ## TYPE *history, BIG_TYPE input) \ { \ /* calculate output */ \ - BIG_TYPE output = floor (filter->a0 * input + \ + BIG_TYPE output = (filter->a0 * input + \ filter->a1 * history->x1 + filter->a2 * history->x2 + \ - filter->b1 * history->y1 + filter->b2 * history->y2 + 0.5); \ + filter->b1 * history->y1 + filter->b2 * history->y2); \ /* update history */ \ history->y2 = history->y1; \ history->y1 = output; \ @@ -587,7 +587,7 @@ history++; \ } \ cur = CLAMP (cur, MIN_VAL, MAX_VAL); \ - *((TYPE *) data) = (TYPE) cur; \ + *((TYPE *) data) = (TYPE) floor (cur); \ data += sizeof (TYPE); \ } \ } \ @@ -643,7 +643,7 @@ } \ } -CREATE_OPTIMIZED_FUNCTIONS_INT (gint16, gint32, -32768, 32767); +CREATE_OPTIMIZED_FUNCTIONS_INT (gint16, gdouble, -32768.0, 32767.0); CREATE_OPTIMIZED_FUNCTIONS (gfloat); CREATE_OPTIMIZED_FUNCTIONS (gdouble); diff -Nru banshee-1.8.0/gstreamer/equalizer/Makefile.in banshee-1.8.1/gstreamer/equalizer/Makefile.in --- banshee-1.8.0/gstreamer/equalizer/Makefile.in 2010-09-28 16:30:07.000000000 +0000 +++ banshee-1.8.1/gstreamer/equalizer/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -38,6 +38,14 @@ subdir = gstreamer/equalizer ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -64,14 +72,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -174,6 +174,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/gstreamer/Makefile.in banshee-1.8.1/gstreamer/Makefile.in --- banshee-1.8.0/gstreamer/Makefile.in 2010-09-28 16:30:07.000000000 +0000 +++ banshee-1.8.1/gstreamer/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/help/C/add-radio.page banshee-1.8.1/help/C/add-radio.page --- banshee-1.8.0/help/C/add-radio.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/add-radio.page 2011-01-28 21:37:55.000000000 +0000 @@ -31,7 +31,7 @@

Internet radio stations are similar to regular radio stations, allowing an individual or organization to stream music live over the internet. Internet radio stations can be a simultaneous stream of a regular radio station, - an amateur broadasting their own station, or commercial + an amateur broadcasting their own station, or commercial internet radio stations that include live DJs and even commercials.

diff -Nru banshee-1.8.0/help/C/amazon.page banshee-1.8.1/help/C/amazon.page --- banshee-1.8.0/help/C/amazon.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/amazon.page 2011-01-28 21:37:55.000000000 +0000 @@ -54,7 +54,7 @@ Amazon MP3 Store from the Banshee menu on the left. This will load the Amazon MP3 Store just as if you were in a web browser. You can search Amazon for the music you wish to buy and after logging in to Amazon, buy - music with one click. Banshee will automatically download and import the + music with one click. Banshee will automatically download and import your purchase into the library.

diff -Nru banshee-1.8.0/help/C/import.page banshee-1.8.1/help/C/import.page --- banshee-1.8.0/help/C/import.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/import.page 2011-01-28 21:37:56.000000000 +0000 @@ -52,7 +52,7 @@ <gui>Videos From Photos Folder</gui> -

Many digital cameras can take short vidoes, and photo-management +

Many digital cameras can take short videos, and photo-management applications often download these videos directly into your Photos folder. Choose this option to import any videos that have been stored in your Photos folder.

diff -Nru banshee-1.8.0/help/C/introduction.page banshee-1.8.1/help/C/introduction.page --- banshee-1.8.0/help/C/introduction.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/introduction.page 2011-01-28 21:37:56.000000000 +0000 @@ -25,7 +25,7 @@

Banshee is a media player that allows you to play your music, - videos, and other media media as well sync it with portable devices to take your media + videos, and other media as well sync it with portable devices to take your media on the go.

diff -Nru banshee-1.8.0/help/C/lastfm.page banshee-1.8.1/help/C/lastfm.page --- banshee-1.8.0/help/C/lastfm.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/lastfm.page 2011-01-28 21:37:56.000000000 +0000 @@ -26,7 +26,7 @@

Last.fm is a popular online service that offers both free and paid versions. Last.fm offers information on music artists and albums and if you create a user profile Last.fm allows you to track the music you listen to - in Banshee for free. If you suscribe as a paying member, you can also listen + in Banshee for free. If you subscribe as a paying member, you can also listen to streaming music from Last.fm in various music clients, including Banshee. Last.fm offers multiple channels to stream, including recommended music for you based on your listening habits, your favorites and more.

@@ -77,8 +77,8 @@ music you've loved or tagged.

-

In Banshee's context menu onthe left hand side, you will now have a - Last.fm section, including your Lat.fm radio stations. You will need an +

In Banshee's context menu on the left hand side, you will now have a + Last.fm section, including your Last.fm radio stations. You will need an active internet connection to listen to Last.fm radio. Choose the radio station you wish to listen to and Banshee will communicate with Last.fm to populate songs for that radio station. Press the Play button diff -Nru banshee-1.8.0/help/C/manage-playlists.page banshee-1.8.1/help/C/manage-playlists.page --- banshee-1.8.0/help/C/manage-playlists.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/manage-playlists.page 2011-01-28 21:37:56.000000000 +0000 @@ -44,7 +44,7 @@ New Playlist or by selecing the track(s) you would like to add to the playlist. Select the track(s), right click them, and choose Add to PlaylistNew Playlist. - You can also drag and drop them to a new playlist by selcting the track(s) + You can also drag and drop them to a new playlist by selecting the track(s) and dragging them to the left hand window pane over Music. As you drag it over Music, a new option New Playlist will appear and you can drop diff -Nru banshee-1.8.0/help/C/play.page banshee-1.8.1/help/C/play.page --- banshee-1.8.0/help/C/play.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/play.page 2011-01-28 21:37:56.000000000 +0000 @@ -40,7 +40,7 @@

You can also start playing an album by choosing the album in the album - browser and pressing use your mouse to double click the song name, + browser and using your mouse to double click the song name, press the Spacebar, or choose Playback Play from the Banshee menu.

diff -Nru banshee-1.8.0/help/C/search.page banshee-1.8.1/help/C/search.page --- banshee-1.8.0/help/C/search.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/search.page 2011-01-28 21:37:56.000000000 +0000 @@ -36,7 +36,7 @@ dave matthews. By entering dave matthews in the search box, Banshee will search all metatdata fields including Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata includes dave - and matthews will be returned. Search terms are case, meaningyou don't have to capitalize. dave, Dave, and DAVE + and matthews will be returned. Search terms are case, meaning you don't have to capitalize. dave, Dave, and DAVE all mean the same thing when searching.

@@ -71,7 +71,7 @@

NOT, not,-

- Do not display search results with any search team that follows the + Do not display search results with any search term that follows the operator of NOT, not,-.

diff -Nru banshee-1.8.0/help/C/sort.page banshee-1.8.1/help/C/sort.page --- banshee-1.8.0/help/C/sort.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/sort.page 2011-01-28 21:37:56.000000000 +0000 @@ -47,7 +47,7 @@

You can sort your library by using your mouse to click on any of the columns displayed in library view. If you wish to sort your music library by Artist, click the Artist column header and Banshee will - automically sort that column alphabetically. Clicking the + automatically sort that column alphabetically. Clicking the Artist column again will sort the column in reverse alphabetical order.

diff -Nru banshee-1.8.0/help/C/sync.page banshee-1.8.1/help/C/sync.page --- banshee-1.8.0/help/C/sync.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/sync.page 2011-01-28 21:37:56.000000000 +0000 @@ -139,7 +139,7 @@ menu choose EditDelete.

-

Deleting files from your portable music will permanently remove +

Deleting files from your portable music player will permanently remove the files and you will not be able to recover them.

diff -Nru banshee-1.8.0/help/C/ui.page banshee-1.8.1/help/C/ui.page --- banshee-1.8.0/help/C/ui.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/C/ui.page 2011-01-28 21:37:56.000000000 +0000 @@ -65,7 +65,7 @@

To change Now Playing to hide the Banshee user interface and use the full screen mode, you can press the F, press the Fullscreen button in the upper right hand corner of Banshee, or choose - ViewFullscreen to start Fullscreen + ViewFullscreen to start Fullscreen mode.

diff -Nru banshee-1.8.0/help/de/add-radio.page banshee-1.8.1/help/de/add-radio.page --- banshee-1.8.0/help/de/add-radio.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/add-radio.page 2011-01-28 21:37:56.000000000 +0000 @@ -26,7 +26,11 @@
Was ist Internet-Radio? -

Internet-Radiostationen ähneln herkömmlichen Radiosendern. Sie ermöglichen Einzelpersonen oder Organisationen die Verbreitung von Musik live als Datenstrom über das Internet. Sie können den Datenstrom beispielsweise gleichzeitig mit der Aussendung gewöhnlicher Radiosender verbreiten, Amateuren den Betrieb ihres eigenen Radiosenders ermöglichen oder auch kommerziell mit Live-Moderatoren und sogar Werbespots betrieben werden.

+

Internet radio stations are similar to regular radio stations, allowing + an individual or organization to stream music live over the internet. + Internet radio stations can be a simultaneous stream of a regular radio station, + an amateur broadcasting their own station, or commercial + internet radio stations that include live DJs and even commercials.

diff -Nru banshee-1.8.0/help/de/amazon.page banshee-1.8.1/help/de/amazon.page --- banshee-1.8.0/help/de/amazon.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/amazon.page 2011-01-28 21:37:56.000000000 +0000 @@ -36,7 +36,13 @@
MP3s von Amazon in Banshee kaufen -

Sie können auch mittels Banshee nach Musik bei Amazon suchen. Wählen Sie links im Banshee-Menü den Amazon MP3-Musikladen aus. Daraufhin wird der Amazon MP3-Musikladen geladen, so als ob Sie sich in einem Webbrowser befänden. Sie können Amazon nach der Musik durchsuchen, die Sie kaufen wollen und den Kauf mit einem Klick einleiten. Banshee lädt Ihren Kauf automatisch herunter und importiert ihn in die Bibliothek.

+

You can also search for songs on Amazon within Banshee. Choose the + Amazon MP3 Store from the Banshee menu on the left. This will load the + Amazon MP3 Store just as if you were in a web browser. You can search + Amazon for the music you wish to buy and after logging in to Amazon, buy + music with one click. Banshee will automatically download and import + your purchase into the library. +

diff -Nru banshee-1.8.0/help/de/import.page banshee-1.8.1/help/de/import.page --- banshee-1.8.0/help/de/import.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/import.page 2011-01-28 21:37:56.000000000 +0000 @@ -42,7 +42,10 @@ <gui>Videos aus dem Foto-Ordner</gui> -

Viele Digitalkameras können kurze Videos aufnehmen, und Anwendungen zur Fotoverwaltung können diese Videos direkt in Ihren Foto-Ordner übertragen. Wählen Sie diese Option, um jegliche in Ihrem Foto-Ordner gespeicherten Videos zu importieren.

+

Many digital cameras can take short videos, and photo-management + applications often download these videos directly into your Photos + folder. Choose this option to import any videos that have been + stored in your Photos folder.

 diff -Nru banshee-1.8.0/help/de/introduction.page banshee-1.8.1/help/de/introduction.page --- banshee-1.8.0/help/de/introduction.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/introduction.page 2011-01-28 21:37:56.000000000 +0000 @@ -20,7 +20,11 @@ Einführung -

Banshee ist ein Medien-Wiedergabeprogramm zum Abspielen Ihrer Musik und Videos sowie anderer Medien. Es unterstützt außerdem den Abgleich mit tragbaren Geräten, um Ihre Musik überall hin mitnehmen zu können.

+

+ Banshee is a media player that allows you to play your music, + videos, and other media as well sync it with portable devices to take your media + on the go. +

Banshee verfügt über Funktionsmerkmale zum Importieren von Medien, Verwalten von Metadaten und Wiedergeben Ihrer Musik und Videos.

Banshee hilft Ihnen auch beim Abgleich Ihrer Musik mit populären tragbaren Geräten, wie digitalen Audioplayern und Smartphones. Banshee unterstützt bekannte Geräte wie die meisten iPods, MP3-Spieler von Sandisk und Creative sowie auf Android basierende Smartphones.

diff -Nru banshee-1.8.0/help/de/lastfm.page banshee-1.8.1/help/de/lastfm.page --- banshee-1.8.0/help/de/lastfm.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/lastfm.page 2011-01-28 21:37:56.000000000 +0000 @@ -21,7 +21,13 @@ Last.fm -

Last.fm ist ein populärer Onlinedienst, der sowohl freie als auch zu bezahlende Versionen anbietet. Last.fm liefert Informationen über Künstler und Alben. Sobald Sie ein Benutzerprofil in Last.fm angelegt haben, können Sie frei Ihre gehörte Musik in Banshee verfolgen. Wenn Sie sich als zahlendes Mitglied registrieren, können Sie außerdem einen Musik-Datenstrom (Streaming) in verschiedenen Client-Programmen anhören, auch in Banshee. Last.fm bietet mehrere Kanäle für das Streaming an, zum Beispiel für Sie empfehlenswerte Musik, basierend auf Ihren Hörgewohnheiten, Ihren Favoriten und mehr.

+

Last.fm is a popular online service that offers both free and paid + versions. Last.fm offers information on music artists and albums and if you + create a user profile Last.fm allows you to track the music you listen to + in Banshee for free. If you subscribe as a paying member, you can also listen + to streaming music from Last.fm in various music clients, including Banshee. + Last.fm offers multiple channels to stream, including recommended music for + you based on your listening habits, your favorites and more.

Last.fm aktivieren @@ -41,7 +47,16 @@ Abspielen des Last.fm Internet-Radios

Last-fm-Radio ist frei für Bürger der USA, Großbritanniens und Deutschlands. Bürger anderer Staaten müssen für einen Premium-Zugang bezahlen, um mit Last.fm Radio hören zu können. Premium-Mitglieder in allen Ländern kommen auch in den Genuss von Premium-Radiofunktionen: Abspielen von Wiedergabelisten und Sendern, die Sie mögen oder mit entsprechenden Schlagworten markiert haben.

-

Im Kontextmenü von Banshee an der linken Seite wird nun ein Last.fm-Abschnitt mit Ihren Last.fm-Sendern angezeigt. Sie benötigen eine aktive Internetverbindung, um Last.fm-Radio zu hören. Wählen Sie den gewünschten Radiosender aus, woraufhin Banshee eine Verbindung zu Last.fm aufbaut, um die Titel dieses Radiosenders zu übertragen. Klicken Sie auf den Knopf Wiedergabe in Banshee oder drücken Sie die Leertaste, um mit der Übertragung eines Last.fm-Radiosenders zu beginnen. Sie können auch auf den Knopf Weiter in Banshee klicken, auf der Tastatur N drücken oder WiedergabeWeiter wählen, um den nächsten Titel in Ihrer Radiosender-Warteschlange zu hören.

+

In Banshee's context menu on the left hand side, you will now have a + Last.fm section, including your Last.fm radio stations. You will need an + active internet connection to listen to Last.fm radio. Choose the radio + station you wish to listen to and Banshee will communicate with Last.fm + to populate songs for that radio station. Press the Play button + in Banshee or Spacebar to start streaming a Last.fm radio + station. You can also press the Next button in Banshee, + N or choose PlaybackNext + to play the next song in your radio station queue. +

diff -Nru banshee-1.8.0/help/de/manage-playlists.page banshee-1.8.1/help/de/manage-playlists.page --- banshee-1.8.0/help/de/manage-playlists.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/manage-playlists.page 2011-01-28 21:37:56.000000000 +0000 @@ -26,7 +26,19 @@

Eine gewöhnliche Wiedergabeliste ist eine Liste aus Titeln, die Sie selbst hinzugefügt haben und selbst verwalten. Sie erstellen Ihre eigene Titelliste aus Titeln Ihres Lieblingsinterpreten aus verschiedenen Alben, aus Ihren neuesten Lieblingsliedern oder eine Wiedergabeliste für Hintergrundmusik bei sportlichen Übungen.

-

Zum Erstellen einer neuen Wiedergabeliste drücken Sie StrgN oder wählen im Menü MenüNeue Wiedergabeliste. Alternativ können Sie einfach den oder die Titel auswählen, die Sie zur Wiedergabeliste hinzufügen wollen. Klicken Sie anschließend mit der rechten Maustaste darauf und wählen Sie Zur Wiedergabeliste hinzufügenNeue Wiedergabeliste. Sie können die Titel auch auswählen und mit der Maus in die linke Fensterleiste über Musik ziehen. Sobald sich der Mauszeiger über Musik befindet, erscheint eine neue Option Neue Wiedergabeliste. Lassen Sie die Maustaste los, um die Titel zur Wiedergabeliste hinzuzufügen. Sie können diesen Vorgang so lange wiederholen, bis Sie alle gewünschten Titel zur Wiedergabeliste hinzugefügt haben.

+

You can create a new playlist by pressing Control + N, from the menu choosing Menu + New Playlist or by selecing the track(s) you would like + to add to the playlist. Select the track(s), right click them, and choose + Add to PlaylistNew Playlist. + You can also drag and drop them to a new playlist by selecting the track(s) + and dragging them to the left hand + window pane over Music. As you drag it over Music, + a new option New Playlist will appear and you can drop + the track(s) over New Playlist to add them to the + playlist. You can repeat this process until you have added all the tracks + you want in the playlist. +

Um Ihrer Wiedergabeliste einen selbstgewählten Namen zu geben, wählen Sie die Wiedergabeliste aus und klicken Sie dann mit der rechten Maustaste darauf. Wählen Sie anschließend Wiedergabeliste umbenennen im Kontextmenü und geben Sie den Namen Ihrer Wiedergabeliste ein.

diff -Nru banshee-1.8.0/help/de/play.page banshee-1.8.1/help/de/play.page --- banshee-1.8.0/help/de/play.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/play.page 2011-01-28 21:37:56.000000000 +0000 @@ -30,7 +30,11 @@

Um mit der Wiedergabe eines Liedes zu beginnen, klicken Sie mit der Maus doppelt auf den Titelnamen, drücken Sie die Leertaste oder wählen Sie WiedergabeWiedergabe im Banshee-Menü.

-

Sie können auch mit der Wiedergabe eines Albums beginnen, indem Sie das Album im Alben-Browser auswählen und mit der Maus doppelt auf den Titelnamen klicken, die Leertaste drücken oder WiedergabeWiedergabe im Banshee-Menü wählen.

+

You can also start playing an album by choosing the album in the album + browser and using your mouse to double click the song name, + press the Spacebar, or choose Playback + Play from the Banshee menu. +

Um alle Lieder eines Künstlers abzuspielen, wählen Sie den Künstler im Künstler-Browser aus und drücken Sie die Leertaste oder wählen Sie WiedergabeWiedergabe im Banshee-Menü.

diff -Nru banshee-1.8.0/help/de/search.page banshee-1.8.1/help/de/search.page --- banshee-1.8.0/help/de/search.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/search.page 2011-01-28 21:37:56.000000000 +0000 @@ -25,7 +25,12 @@

Um Ihre Medien in Banshee zu durchsuchen, drücken Sie die Taste S oder klicken Sie in das Feld Suchen in der oberen rechten Ecke der Bibliotheksansicht in Banshee.

-

Eine Suchanfrage besteht aus zwei grundlegenden Begriffen, beispielsweise dave matthews. Nach Eingabe von dave matthews im Suchfeld durchsucht Banshee alle Metadaten wie Stücktitel, Albumtitel, Album-Interpret, Jahr usw. Jeder Titel, dessen Metadaten dave und matthews enthalten, wird ausgegeben. In den Suchbegriffen wird die Groß- und Kleinschreibung nicht berücksichtigt, dave, Dave und DAVE sind in der Suche gleichbedeutend.

+

A search query consists of some basic terms, for example, + dave matthews. By entering dave matthews in the search box, + Banshee will search all metatdata fields including Track Title, Album Title, + Album Artist, Year, etc. Any track whose metadata includes dave + and matthews will be returned. Search terms are case, meaning you don't have to capitalize. dave, Dave, and DAVE + all mean the same thing when searching.

Grundlegende Operatoren @@ -50,7 +55,9 @@

OR, or, |, ,

Suchergebnis sind zwei Begriffe mir einem Ergebnis in jedem Feld.

-

NOT, not,-

Keine Suchergebnisse anzeigen, die den Teil des Suchbegriffs enthalten, der dem Operator NOT folgt, -.

+

NOT, not,-

+ Do not display search results with any search term that follows the + operator of NOT, not,-.

diff -Nru banshee-1.8.0/help/de/sort.page banshee-1.8.1/help/de/sort.page --- banshee-1.8.0/help/de/sort.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/sort.page 2011-01-28 21:37:56.000000000 +0000 @@ -33,7 +33,12 @@
Sortieren der Spalten -

Sie können mit der Maus in eine beliebige Spalte in der Bibliotheksansicht klicken, um Ihre Bibliothek zu sortieren. Wenn Sie Ihre Musikbibliothek nach Interpreten sortieren wollen, klicken Sie in die Kopfzeile der Spalte Künstler, und Banshee sortiert diese Spalte alphabetisch nach dem Namen des Künstlers. Klicken Sie erneut in die Kopfzeile der Spalte Künstler, um die Sortierreihenfolge der Spalte umzukehren.

+

You can sort your library by using your mouse to click on any of the + columns displayed in library view. If you wish to sort your music library + by Artist, click the Artist column header and Banshee will + automatically sort that column alphabetically. Clicking the + Artist column again will sort the column in reverse alphabetical + order.

diff -Nru banshee-1.8.0/help/de/sync.page banshee-1.8.1/help/de/sync.page --- banshee-1.8.0/help/de/sync.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/sync.page 2011-01-28 21:37:56.000000000 +0000 @@ -81,7 +81,9 @@

Um auf Ihrem tragbaren Wiedergabegerät gespeicherte Titel zu löschen, wählen Sie Ihr Wiedergabegerät in Banshee aus, um dessen Bibliothek anzuzeigen. Wählen Sie dann die zu entfernenden Titel aus und klicken Sie sie mit der rechten Maustaste an. Wählen Sie anschließend Löschen aus dem Menü oder wählen Sie BearbeitenLöschen.

-

Das Löschen von Dateien auf tragbaren Geräten entfernt die Dateien dauerhaft. Sie werden nicht in der Lage sein, diese wiederherzustellen.

+

Deleting files from your portable music player will permanently remove + the files and you will not be able to recover them. +

diff -Nru banshee-1.8.0/help/de/ui.page banshee-1.8.1/help/de/ui.page --- banshee-1.8.0/help/de/ui.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/de/ui.page 2011-01-28 21:37:56.000000000 +0000 @@ -46,7 +46,11 @@ Die »Jetzt wiedergegeben«-Ansicht

Bei der Benutzung von Banshee im Vollbildmodus könnte hilfreich sein, dass der »Jetzt wiedergegeben«-Modus die Bibliothek verbirgt, um eine vergrößerte Ansicht auf die Musik oder das Video zu gewähren. Beim Musik hören zeigt Ihnen der »Jetzt wiedergegeben«-Modus die Namen des Künstlers, des Albums und das Alben-Cover an, sofern verfügbar. Beim Ansehen eines Videos zeigt Banshee das Video an.

-

Um in den »Jetzt wiedergegeben«-Modus zu wechseln, um die Banshee-Benutzeroberfläche zu verbergen und im Vollbildmodus anzuzeigen, klicken Sie auf den Knopf Vollbild in der oberen rechten Ecke des Banshee-Fensters oder wählen Sie AnsichtVollbild.

+

To change Now Playing to hide the Banshee user interface and use the full + screen mode, you can press the F, press the Fullscreen + button in the upper right hand corner of Banshee, or choose + ViewFullscreen to start Fullscreen + mode.

diff -Nru banshee-1.8.0/help/es/add-podcast.page banshee-1.8.1/help/es/add-podcast.page --- banshee-1.8.0/help/es/add-podcast.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/add-podcast.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,78 @@ + + + + + + + + + Add, remove and play podcasts in Banshee. + + + Paul Cutler + pcutler@gnome.org + + + + + + Podcasts + +
+ What is a Podcast? + +

Podcasts are recorded programs, similar to radio programs, that are + available on the internet and allow you to subscribe. When you subscribe + to a podcast in Banshee, each time a new program is released, Banshee + will automatically download the podcast and allow you to listen to it.

+ +

There are podcasts on almost any subject including music, movies, Linux, + and more. Search the internet using your favorite search engine with a + search term such as "movie podcast" and you will be presented with many + options to choose from.

+ +
+ +
+ Add a Podcast + +

To add a Podcast to Banshee you will first need to visit the podcast's + home page on the internet in your browser. Almost all podcasts will have a + button or link displayed to subscribe to the podcast. Copy the link + to the podcast's subscription. In most web browsers, you can right click + on the link and choose Copy link. +

+ +

In Banshee, press and choose Subscribe to Podcasts in the + upper right hand corner, from the menu choose Media + Subscribe to Podcast or use the keyboard shortcut + ShiftControlF. +

+ +

Banshee will then allow you to choose how you want to download new podcasts + from a drop down menu. Your choices include:

+ + +

Download the Most Recent Episode (This will automatically + download the last episode that was released).

 +

Download All Episodes (This will download all episodes).

 +

Let Me Decide Which Episodes to Download (This will allow you + to choose which episodes you would like to download).

 + + +

After you have added a Podcast feed, Banshee will display:

+ + +

Name: (Name of the specific episode)

 +

Podcast: (Name of the Podcast)

 +

Published (Date the episode was published or released)

 + + +
+ + diff -Nru banshee-1.8.0/help/es/add-radio.page banshee-1.8.1/help/es/add-radio.page --- banshee-1.8.0/help/es/add-radio.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/add-radio.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,69 @@ + + + + + + + + + Add, remove and play internet radio stations in Banshee. + + + Paul Cutler + pcutler@gnome.org + + + + + + Internet Radio + +
+ What is Internet Radio? + +

Internet radio stations are similar to regular radio stations, allowing + an individual or organization to stream music live over the internet. + Internet radio stations can be a simultaneous stream of a regular radio station, + an amateur broadcasting their own station, or commercial + internet radio stations that include live DJs and even commercials.

+ +
+ +
+ + Add Radio Station + +

To add an internet radio station to Banshee, press Add Station + in the upper right hand corner of Banshee or, from the menu, choose + MenuAdd Station. +

+ +

From the internet radio station's webpage, copy the link to their stream + URL in your web browser. In most browsers, you can right click on the link + and press Copy Link. +

+ + +

Banshee will prompt you to enter the Station Genre. + Choose the kind of music the internet radio station plays from the available + drop down selections. You will then need to enter the Station Name. + Enter a name for the radio station. Then press tab or use your mouse to select + the Stream URL: dialog to paste the URL of the radio station. + Using your mouse right click and choose Paste or press + Control+V.

+ +

You can optionally also fill out the fields for + Station Creator, Description, and Rating. +

+ +

Then press Save to save the internet radio station in Banshee. +

+ +
+ + diff -Nru banshee-1.8.0/help/es/advanced.page banshee-1.8.1/help/es/advanced.page --- banshee-1.8.0/help/es/advanced.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/advanced.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,30 @@ + + + + + + Get help for advanced actions. + + + Paul Cutler + pcutler@gnome.org + + + + + + Advanced Options and Help + +
+ + Keyboard Shortcuts + + Keyboard Shortcuts +
+ + diff -Nru banshee-1.8.0/help/es/amazon.page banshee-1.8.1/help/es/amazon.page --- banshee-1.8.0/help/es/amazon.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/amazon.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,81 @@ + + + + + + + Sync and purchase music from the Amazon MP3 Store. + + + Paul Cutler + pcutler@gnome.org + + + + + + Amazon MP3 Store + +

Banshee supports downloading and importing music from the Amazon MP3 store. + You can manually import Amazon music files, purchase music in your web + browser or buy music inside of Banshee. Amazon only offers music for sale + as an MP3 in certain countries and depending on your location, you may + not be able to buy Amazon MP3s. +

+ + +

Banshee uses an Amazon affiliate code for all music purchases. All + money made via this affiliate code is donated to the GNOME Foundation. +

+ + +
+ Purchase Amazon MP3s in your web browser + +

Music purchased from Amazon's MP3 store can be automatically + downloaded and imported into Banshee. Banshee associates itself with + the .amz file Amazon provides for MP3 purchases. When you buy music on + Amazon, your web browser will download the .amz file and Banshee will + automatically open it and begin the download and import the music. +

+
+ +
+ Buy Amazon MP3s in Banshee + +

You can also search for songs on Amazon within Banshee. Choose the + Amazon MP3 Store from the Banshee menu on the left. This will load the + Amazon MP3 Store just as if you were in a web browser. You can search + Amazon for the music you wish to buy and after logging in to Amazon, buy + music with one click. Banshee will automatically download and import + your purchase into the library. +

+
+ +
+ Import Amazon MP3s manually + +

When music is purchased from Amazon in a web browser, a file with the + extension .amz is downloaded and saved to your hard drive. To import + music purchased manually from Amazon, in Banshee choose + Media Import Media from the menu and + select the *.amz file to be imported. Banshee will then open this file and + connect to the Amazon MP3 store to begin the download. +

+ + +

Amazon .amz files are only active for a short time. If you do not + download your music quickly, the file will expire and you cannot download + your music from Amazon. Amazon does not publish how long files are active. + It is recommended you download and import any purchases from Amazon within + an hour of purchase. +

+ +
+ + diff -Nru banshee-1.8.0/help/es/emusic.page banshee-1.8.1/help/es/emusic.page --- banshee-1.8.0/help/es/emusic.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/emusic.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,13 @@ + + + + + + + Import music purchased from eMusic. + + + + Import your eMusic tracks + + diff -Nru banshee-1.8.0/help/es/es.po banshee-1.8.1/help/es/es.po --- banshee-1.8.0/help/es/es.po 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/es.po 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,1689 @@ +# Spanish translation for banshee-help.master +# Copyright (C) 2010 banshee's COPYRIGHT HOLDER +# This file is distributed under the same license as the banshee package. +# Benjamín Valero Espinosa , 2010. +# Jorge González , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: banshee-help.master\n" +"POT-Creation-Date: 2010-09-24 18:29+0000\n" +"PO-Revision-Date: 2010-10-10 22:48+0200\n" +"Last-Translator: Jorge González \n" +"Language-Team: Español \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" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/ui.page:29(None) C/introduction.page:45(None) +msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST" +msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST" + +#: C/ui.page:8(desc) +msgid "An overview of Banshee's user interface." +msgstr "Una vista general de la interfaz de usuario de Banshee." + +#: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name) +#: C/search.page:12(name) C/play.page:12(name) C/play-queue.page:12(name) +#: C/manage-tags.page:13(name) C/manage-playlists.page:13(name) +#: C/manage-coverart.page:12(name) C/lastfm.page:12(name) +#: C/keyboardshortcuts.page:10(name) C/introduction.page:12(name) +#: C/index.page:9(name) C/import.page:11(name) C/extensions.page:11(name) +#: C/amazon.page:12(name) C/advanced.page:11(name) C/add-radio.page:14(name) +#: C/add-podcast.page:14(name) +msgid "Paul Cutler" +msgstr "Paul Cutler" + +#: C/ui.page:13(email) C/sync.page:13(email) C/sort.page:13(email) +#: C/search.page:13(email) C/play.page:13(email) C/play-queue.page:13(email) +#: C/manage-tags.page:14(email) C/manage-playlists.page:14(email) +#: C/manage-coverart.page:13(email) C/lastfm.page:13(email) +#: C/keyboardshortcuts.page:11(email) C/introduction.page:13(email) +#: C/index.page:10(email) C/import.page:12(email) C/extensions.page:12(email) +#: C/amazon.page:13(email) C/advanced.page:12(email) +#: C/add-radio.page:15(email) C/add-podcast.page:15(email) +msgid "pcutler@gnome.org" +msgstr "pcutler@gnome.org" + +#: C/ui.page:24(title) +msgid "Introduction to the Banshee User Interface" +msgstr "Introducción a la interfaz de usuario de Banshee" + +#: C/ui.page:27(title) C/introduction.page:43(title) +msgid "Banshee Media Player window" +msgstr "" + +#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title) +msgid "Banshee Media Player" +msgstr "" + +#: C/ui.page:30(p) C/introduction.page:46(p) +msgid "Banshee library interface" +msgstr "" + +#: C/ui.page:35(title) +msgid "Sources" +msgstr "" + +#: C/ui.page:36(p) +msgid "" +"Your music and video sources are shown on the left in Banshee. The sources " +"give you quick access to your Play Queue, Music, Videos, Amazon, Last.fm, " +"Podcasts and more." +msgstr "" + +#: C/ui.page:42(p) +msgid "" +"The menu choices will change depending on the source you have chosen. For " +"example, to use the menu to import a Podcast, you will need to choose the " +"Podcast source. The menu option for importing a Podcast is not available " +"when viewing the video or music library." +msgstr "" + +#: C/ui.page:50(title) +msgid "Library Browser" +msgstr "" + +#: C/ui.page:51(p) +msgid "" +"When you select a music or video source from Sources, Banshee will display " +"your content in the Library browser. Depending on the source you choose, " +"Banshee can display your music or video library, Podcast subscriptions or " +"even the Amazon Music Store to allow you to buy music." +msgstr "" + +#: C/ui.page:58(title) +msgid "Now Playing View" +msgstr "" + +#: C/ui.page:59(p) +msgid "" +"Helpful when using Banshee in full screen mode, the Now Playing mode hides " +"the library to give you a larger view of the music or video you're watching. " +"When listening to music, the Now Playing view will show you the artist name, " +"album and cover art if available. If you are watching a video, Banshee will " +"display the video." +msgstr "" + +#: C/ui.page:65(p) +msgid "" +"To change Now Playing to hide the Banshee user interface and use the full " +"screen mode, you can press the F, press the Fullscreen " +"button in the upper right hand corner of Banshee, or choose ViewFullscreen to start Fullscreen mode." +msgstr "" + +#: C/ui.page:74(title) +msgid "Library" +msgstr "" + +#: C/ui.page:75(p) +msgid "" +"The Library view in Banshee will change depending on the Source you have " +"chosen. The Music Library will display cover art, artists in your library, " +"and list of songs. The Podcast Library will display your Podcast " +"subscriptions, podcasts that are downloaded or not downloaded, and all, new " +"or old podcasts. Please see each Source's help page for detailed information " +"on managing a source." +msgstr "" + +#: C/sync.page:9(desc) +msgid "Sync your media to a portable media player or smartphone." +msgstr "" + +#: C/sync.page:24(title) +msgid "Sync" +msgstr "" + +#: C/sync.page:26(p) +msgid "" +"Banshee supports syncing your music to portable media players and " +"smartphones. You can add specific music tracks, albums or playlist or allow " +"Banshee to keep your music player in sync with your entire library. After " +"your player is connected to your computer you can also play back the songs " +"on your portable player in Banshee. When syncing music in a lossless format, " +"such as FLAC, Banshee will automatically transcode your music for you to a " +"lossy format such as Ogg Vorbis or MP3, if you have the correct codecs " +"installed." +msgstr "" + +#: C/sync.page:37(title) +msgid "Device Support" +msgstr "" + +#: C/sync.page:38(p) +msgid "" +"Banshee supports almost all modern portable music players and smartphones " +"with the notable exception of the Apple iPhone, iPad and iPod Touch." +msgstr "" + +#: C/sync.page:42(p) +msgid "" +"When you plug your device in, Banshee will display it in the left menu. " +"Pressing the device icon will take you to your device home page in Banshee " +"displaying your sync preferences." +msgstr "" + +#: C/sync.page:50(title) +msgid "Sync Your Music" +msgstr "" + +#: C/sync.page:51(p) +msgid "" +"You can choose to manage the media on your portable music by having Banshee " +"automatically sync it or manage your music and media manually." +msgstr "" + +#: C/sync.page:56(p) +msgid "" +"Choose your device from the Banshee menu and then choose how you want to " +"sync your media, including:" +msgstr "" + +#: C/sync.page:60(p) +msgid "Music" +msgstr "" + +#: C/sync.page:61(p) +msgid "Audiobooks" +msgstr "" + +#: C/sync.page:62(p) +msgid "Videos" +msgstr "" + +#: C/sync.page:63(p) +msgid "Podcast" +msgstr "" + +#: C/sync.page:66(p) +msgid "From the dropdown menu next to each of the media, choose from:" +msgstr "" + +#: C/sync.page:69(p) +msgid "Manage manually" +msgstr "" + +#: C/sync.page:70(p) +msgid "Sync entire library" +msgstr "" + +#: C/sync.page:74(p) +msgid "" +"If you choose to sync your entire library automatically with your portable " +"media player make sure your portable media player has enough storage space. " +"If your library is larger than the space on your portable media player, " +"Banshee will sync media until your player is full and then stop." +msgstr "" + +#: C/sync.page:82(p) +msgid "" +"If you have created playlists or smart playlists in your music library, they " +"will also be displayed as a sync option for Music. This can be helpful when " +"creating smart playlists, as smart playlists will automatically update as " +"new content is added based on the playlist rules, and Banshee will sync the " +"new playlist to your device every time you plug it in." +msgstr "" + +#: C/sync.page:89(p) +msgid "" +"Banshee will display the total hard drive space of your portable music " +"player in a graph in the bottom center of Banshee. The graph will show you " +"how much space is taken by audio files, video, other and free space. " +"Directly below that Banshee will show you how many total items are stored on " +"your portable music player, how many hours or days of listening that is " +"equal to, and total space used." +msgstr "" + +#: C/sync.page:100(title) +msgid "Sync Your Entire Library" +msgstr "" + +#: C/sync.page:101(p) +msgid "" +"You can drag and drop media to your portable music player form Banshee. " +"Select the file or files you want to copy to your portable media player and " +"then press and hold your right mouse button and drag the file(s) to your " +"portable media player icon in Banshee. This will copy the files to your " +"device." +msgstr "" + +#: C/sync.page:108(p) +msgid "" +"If your music library is encoded in a format that your portable media player " +"does not support, such as OGG or FLAC, and you have the necessary codecs " +"installed, Banshee can automatically transcode these files to MP3 when " +"transferring to your portable media player. Check with your Linux " +"distribution for the necessary codecs as it is outside the scope of this " +"help and varies by distribution." +msgstr "" + +#: C/sync.page:117(p) +msgid "" +"You may need to eject your device to load the files correctly on your " +"portable music player. To eject your device in Banshee, using your mouse " +"right click the device in the Banshee menu and press Disconnect." +msgstr "" + +#: C/sync.page:127(title) +msgid "Play Music From Your Portable Music Player" +msgstr "" + +#: C/sync.page:128(p) +msgid "" +"You can play music stored on your portable music player directly in Banshee. " +"Choose your player in the Banshee menu on the left and your portable music " +"player's library will be displayed. You can then play music in Banshee just " +"as you would music in your own library." +msgstr "" + +#: C/sync.page:135(title) +msgid "Remove Music From your Portable Music Player" +msgstr "" + +#: C/sync.page:136(p) +msgid "" +"To remove songs stored on your portable music player, choose your player in " +"Banshee to view its library. Then choose the tracks you would like to remove " +"and right click the tracks and choose \"Delete\" or from the menu choose " +"EditDelete." +msgstr "" + +#: C/sync.page:142(p) +msgid "" +"Deleting files from your portable music will permanently remove the files " +"and you will not be able to recover them." +msgstr "" + +#: C/sort.page:9(desc) +msgid "Sort your media and add additional columns." +msgstr "" + +#: C/sort.page:24(title) +msgid "Sort your media" +msgstr "" + +#: C/sort.page:28(title) +msgid "Adding Columns" +msgstr "" + +#: C/sort.page:30(p) +msgid "" +"As your library grows, you may want to sort your library view to play search " +"or view certain songs, artists, or albums." +msgstr "" + +#: C/sort.page:34(p) +msgid "" +"You can add additional columns to the library view in Banshee to " +"give you more information about the songs and also allow you to sort by. By " +"default, Banshee displays columns for songs including Name, " +"Artist, Album and Time. To add additional " +"columns, using your mouse right click on any of the columns and Banshee will " +"display all available column to choose from. Click the checkbox next to the " +"name of the column you wish to add to the library view." +msgstr "" + +#: C/sort.page:46(title) +msgid "Sorting Columns" +msgstr "" + +#: C/sort.page:47(p) +msgid "" +"You can sort your library by using your mouse to click on any of the columns " +"displayed in library view. If you wish to sort your music library by Artist, " +"click the Artist column header and Banshee will automically sort " +"that column alphabetically. Clicking the Artist column again will " +"sort the column in reverse alphabetical order." +msgstr "" + +#: C/search.page:9(desc) +msgid "Search your media and perfom basic queries." +msgstr "" + +#: C/search.page:24(title) +msgid "Searching your Banshee Library" +msgstr "" + +#: C/search.page:26(p) +msgid "" +"Banshee features a powerful search language. You can search your library " +"quickly and easily with basic search terms or perform detailed searches with " +"Banshee's advanced search terminology." +msgstr "" + +#: C/search.page:30(p) +msgid "" +"To perform a search of your media in Banshee, press the S or " +"click the Search box in the upper right hand corner of the " +"Library view in Banshee." +msgstr "" + +#: C/search.page:35(p) +msgid "" +"A search query consists of some basic terms, for example, dave matthews. By entering dave matthews in the search box, Banshee will " +"search all metatdata fields including Track Title, Album Title, Album " +"Artist, Year, etc. Any track whose metadata includes dave and " +"matthews will be returned. Search terms are case, meaningyou don't " +"have to capitalize. dave, Dave, and DAVE all mean " +"the same thing when searching." +msgstr "" + +#: C/search.page:43(title) +msgid "Basic Operators" +msgstr "" + +#: C/search.page:44(p) +msgid "" +"Operators can be placed between any two search words or placed before a " +"search word. The default operation is AND and is used when no " +"other operators are used between two search terms. Because it is the " +"default, there is no explicit AND operator." +msgstr "" + +#: C/search.page:49(p) +msgid "" +"Other basic operators include OR and NOT. Together, " +"these three operations can yield very powerful queries to help you search " +"your media." +msgstr "" + +#: C/search.page:56(title) +msgid "Logical Operators and Examples" +msgstr "" + +#: C/search.page:57(p) +msgid "" +"The following is a list of logical operators and examples of the search " +"results when searching using them." +msgstr "" + +#: C/search.page:62(gui) +msgid "Operator" +msgstr "" + +#: C/search.page:62(gui) C/search.page:84(gui) +msgid "Description" +msgstr "" + +#: C/search.page:65(p) +msgid "default, white space" +msgstr "" + +#: C/search.page:65(p) +msgid "Search for two terms with a space between the two words or terms." +msgstr "" + +#: C/search.page:69(p) +msgid "OR, or, |, ," +msgstr "" + +#: C/search.page:69(p) +msgid "Search results will be two terms with either result in any field." +msgstr "" + +#: C/search.page:73(p) +msgid "NOT, not,-" +msgstr "" + +#: C/search.page:73(p) +msgid "" +"Do not display search results with any search team that follows the operator " +"of NOT, not,-." +msgstr "" + +#: C/search.page:80(p) +msgid "Examples of logical operations include:" +msgstr "" + +#: C/search.page:84(gui) +msgid "Query" +msgstr "" + +#: C/search.page:87(p) +msgid "dave matthews" +msgstr "" + +#: C/search.page:87(p) +msgid "" +"Matches any fields in a track containing both dave and " +"matthews." +msgstr "" + +#: C/search.page:92(p) +msgid "dave, matthews" +msgstr "" + +#: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p) +msgid "" +"Matches any fields in a track containing both dave or matthews." +msgstr "" + +#: C/search.page:97(p) +msgid "dave or matthews" +msgstr "" + +#: C/search.page:102(p) +msgid "dave | matthews" +msgstr "" + +#: C/search.page:107(p) +msgid "-\"dave matthews\"" +msgstr "" + +#: C/search.page:107(p) +msgid "" +"Displays all tracks whose fields do not containt dave matthews." +msgstr "" + +#: C/search.page:114(p) +msgid "" +"For more information on performing more complex search queries, see the " +" page." +msgstr "" + +#: C/rb-import.page:8(desc) +msgid "" +"Import music and categorizations from the Rhythmbox music player." +msgstr "" + +#: C/rb-import.page:12(title) +msgid "Import your Rhythmbox library" +msgstr "" + +#: C/play.page:9(desc) +msgid "Play your videos and music files." +msgstr "" + +#: C/play.page:24(title) +msgid "Play Your Media" +msgstr "Reproducir su contenido multimedia" + +#: C/play.page:27(title) +msgid "Play your music" +msgstr "Reproducir su música" + +#: C/play.page:29(p) +msgid "" +"To play music in Banshee, choose the Music source. The music library will " +"show you all artists in your music library, cover art for each album, and a " +"list of all songs in your library." +msgstr "" +"Para reproducir música en Banshee, elija la fuente Música. La colección de " +"música mostrará todos los artistas, la portada de cada álbum y una lista con " +"todas las canciones de su colección." + +#: C/play.page:33(p) +msgid "" +"Choose the album or song you wish to play from the list of artists, albums " +"or use the search bar in the upper right hand corner of Banshee." +msgstr "" +"Elija el álbum o canción que desea reproducir desde la lista de artistas o " +"álbumes, o use la barra de búsqueda de la esquina superior derecha de " +"Banshee." + +#: C/play.page:37(p) +msgid "" +"To start playing a song, use your mouse to double click the song name, press " +"the Spacebar, or choose PlaybackPlay from the Banshee menu." +msgstr "" +"Para empezar a reproducir una canción, pulse dos veces en el nombre de la " +"canción, pulse la barra espaciadora o elija " +"ReproducirReproducir desde el menú de " +"Banshee." + +#: C/play.page:42(p) +msgid "" +"You can also start playing an album by choosing the album in the album " +"browser and pressing use your mouse to double click the song name, press the " +"Spacebar, or choose PlaybackPlay from the Banshee menu." +msgstr "" + +#: C/play.page:48(p) +msgid "" +"To play all songs by one artist, choose the artist in the artist browser and " +"press the Spacebar, or choose PlaybackPlay from the Banshee menu." +msgstr "" +"Para reproducir todas las canciones de un artista, elija el artista en el " +"explorador de artistas y pulse la barra espaciadora, o elija " +"ReproducirReproducir desde el menú de " +"Banshee." + +#: C/play.page:53(p) +msgid "" +"Banshee also displays your Favorite albums (those you play the most), Recent " +"Favorites, Recently Added and Unheard music. Choose the one you wish to " +"listen to and you can play songs from each." +msgstr "" + +#: C/play.page:61(title) +msgid "Play a video" +msgstr "Reproducir un vídeo" + +#: C/play.page:63(p) +msgid "" +"Your imported videos are listed alphabetically. To play a video, choose the " +"video you wish to play from the list and press the Spacebar, or " +"choose PlaybackPlay from the Banshee " +"menu." +msgstr "" +"Los vídeos importados se listan alfabéticamente. Para reproducir un vídeo, " +"escoja el vídeo que desee de la lista y pulse la barra espaciadora, o escoja ReproducirReproducir " +"desde el menú de Banshee." + +#: C/play.page:68(p) +msgid "" +"Banshee also shows your Favorite videos (those you watch the most) and " +"Unwatched videos. Choose one and you can play a video from the list." +msgstr "" + +#: C/play.page:74(title) +msgid "Play a Podcast" +msgstr "" + +#: C/play.page:76(p) +msgid "" +"Podcasts shows you all Podcasts you're subscribed too, all Podcast shows " +"available, and the Podcast browser lists all Podcasts in order of newest " +"first." +msgstr "" + +#: C/play.page:80(p) +msgid "" +"To play a Podcast, choose the Podcast you wish to play from the list and " +"press the Spacebar, or choose PlaybackPlay from the Banshee menu." +msgstr "" + +#: C/play.page:88(title) +msgid "Play an internet radio station" +msgstr "" + +#: C/play.page:90(p) +msgid "" +"The Radio source shows you all internet radio stations you have added to " +"Banshee alphabetically." +msgstr "" + +#: C/play.page:94(p) +msgid "" +"To play an internet radio station, choose the radio station you wish to play " +"from the list and press the Spacebar, or choose " +"PlaybackPlay from the Banshee menu." +msgstr "" + +#: C/play-queue.page:9(desc) +msgid "Add media to your play queue." +msgstr "" + +#: C/play-queue.page:18(title) +msgid "Play Queue" +msgstr "" + +#: C/play-queue.page:20(p) +msgid "" +"The Play Queue allows you to add music to play in a sequential " +"order. You can add many tracks to let you listen to hours of music non-stop. " +"You can add individual tracks or entire albums, and sort or re-order them." +msgstr "" + +#: C/play-queue.page:26(title) +msgid "Add Music to the Play Queue" +msgstr "" + +#: C/play-queue.page:28(p) +msgid "" +"From your music library, you will need to select the music tracks or albums " +"you want to add to the play queue." +msgstr "" + +#: C/play-queue.page:32(p) +msgid "" +"To add an entire album to the Play Queue, using your mouse press and hold " +"the album and drag the album over Play Queue in the far left " +"window pane." +msgstr "" + +#: C/play-queue.page:37(p) +msgid "" +"You can add music tracks to the Play Queue individually or as a group. To " +"add an individual file, drag and drop it over the Play Queue in " +"the far left window pane, or right click the track and choose Add to " +"Play Queue." +msgstr "" + +#: C/play-queue.page:43(p) +msgid "" +"You can select multiple files by using your mouse and pressing Control and choosing each file with your mouse or select a range of files by " +"pressing Shift twice to select that range of files. You can then " +"drag and drop it over the Play Queue in the far left window pane " +"or right click the tracks and choose Add to Play Queue." +msgstr "" + +#: C/play-queue.page:56(title) +msgid "Organize Your Play Queue" +msgstr "" + +#: C/play-queue.page:58(p) +msgid "" +"Your Play Queue is organized in the order of the tracks you added. The first " +"tracks or albums you added to the queue will be the first to be played. You " +"can re-order your Play Queue by using your mouse and dragging and dropping a " +"track or group of tracks in the list. Choose the track(s) you wish to re-" +"order with your mouse and release your mouse over the number or place in the " +"list you wish those files to be in the queue." +msgstr "" + +#: C/play-queue.page:70(title) +msgid "Removing Tracks from the Play Queue" +msgstr "" + +#: C/play-queue.page:72(p) +msgid "" +"You can remove an individual track, a group of tracks, or clear your entire " +"play queue." +msgstr "" + +#: C/play-queue.page:76(p) +msgid "" +"To remove an individual track or group of tracks, select the track with your " +"mouse and then press Delete." +msgstr "" + +#: C/play-queue.page:80(p) +msgid "" +"To clear your entire Play Queue, press the Clear button in the " +"upper right hand corner of the Play Queue." +msgstr "" + +#: C/manage-tags.page:10(desc) +msgid "Edit and change music tags and metadata." +msgstr "" + +#: C/manage-tags.page:25(title) +msgid "Music Metadata" +msgstr "" + +#: C/manage-tags.page:29(title) +msgid "Music metadata" +msgstr "" + +#: C/manage-tags.page:31(p) +msgid "" +"Digital music contains metadata that stores information in the music file " +"including the artist, album, year recorded, genre, and more. Almost all " +"music purchased over the internet will have the metadata already embedded " +"and if you import music from CDs, Banshee will include the metadata when " +"ripping the CD if available. For more information on ripping CDs and " +"including the metadata see the ." +msgstr "" + +#: C/manage-tags.page:39(p) +msgid "" +"Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis " +"comments for OGG Vorbis files." +msgstr "" + +#: C/manage-tags.page:42(p) +msgid "" +"If you have imported songs that do not contain metadata, Banshee " +"will display Unknown for most fields in the library." +msgstr "" + +#: C/manage-tags.page:50(title) +msgid "Edit Your Metadata" +msgstr "" + +#: C/manage-tags.page:52(p) +msgid "" +"You can change and edit the metadata of your songs. Select the song or songs " +"you want to update and hit the E, choose EditEdit Track Information from the menu, or use your " +"mouse and right click on the files and select Edit Track Information." +msgstr "" + +#: C/manage-tags.page:59(p) +msgid "" +"A dialog box will appear that shows the song's metadata and allow you to " +"change or update it. The default fields displayed include:" +msgstr "" + +#: C/manage-tags.page:63(gui) +msgid "Track Title:" +msgstr "" + +#: C/manage-tags.page:64(gui) +msgid "Track Artist" +msgstr "" + +#: C/manage-tags.page:65(gui) +msgid "Album Title" +msgstr "" + +#: C/manage-tags.page:66(gui) +msgid "Genre" +msgstr "" + +#: C/manage-tags.page:67(gui) +msgid "Track Number" +msgstr "" + +#: C/manage-tags.page:68(gui) +msgid "Disc Number" +msgstr "" + +#: C/manage-tags.page:69(gui) C/manage-playlists.page:109(gui) +msgid "Year" +msgstr "" + +#: C/manage-tags.page:72(p) +msgid "" +"Update the song's information. If you have selected multiple songs to edit " +"press the right arrow icon to the right of the Track Title field " +"or press the Forward button at the bottom of the dialog when " +"finished with each song. When you have completed editing all metadata, press " +"Save." +msgstr "" + +#: C/manage-playlists.page:10(desc) +msgid "Create and manage playlists." +msgstr "" + +#: C/manage-playlists.page:19(title) +msgid "Playlists" +msgstr "" + +#: C/manage-playlists.page:21(p) +msgid "" +"Playlists allow you to create and save a list of music tracks to be played " +"in a specific order. Playlists are convenient to create a list of your " +"favorite songs or to split your library into smaller lists that are easy to " +"browse through. Some portable media players even allow you to transfer the " +"playlist so you can take it with you on the go." +msgstr "" + +#: C/manage-playlists.page:28(p) +msgid "" +"Banshee supports normal playlists, which include songs you add to the " +"playlist, as well as smart playlists. Smart Playlists are automatically " +"generated playlists based on your listening habits, favorite music, or more." +msgstr "" + +#: C/manage-playlists.page:34(title) +msgid "Normal Playlists" +msgstr "" + +#: C/manage-playlists.page:36(p) +msgid "" +"A normal playlist is a list of songs that you add and manage. You might want " +"to create your own list of songs by your favorite artist from multiple " +"albums, your latest favorite songs, or an upbeat playlist to listen to while " +"you exercise." +msgstr "" + +#: C/manage-playlists.page:42(p) +msgid "" +"You can create a new playlist by pressing ControlN, from the menu choosing MenuNew " +"Playlist or by selecing the track(s) you would like to add to " +"the playlist. Select the track(s), right click them, and choose " +"Add to PlaylistNew Playlist. You can " +"also drag and drop them to a new playlist by selcting the track(s) and " +"dragging them to the left hand window pane over Music. As you " +"drag it over Music, a new option New Playlist " +"will appear and you can drop the track(s) over New Playlist to add them to the playlist. You can repeat this process until you have " +"added all the tracks you want in the playlist." +msgstr "" + +#: C/manage-playlists.page:56(p) +msgid "" +"To give your playlist its own name, select the playlist and right click on " +"the playlist and press Rename Playlist and enter the name of your " +"playlist." +msgstr "" + +#: C/manage-playlists.page:61(p) +msgid "" +"You can change the order of the playlist by dragging and dropping the song " +"to the new position in the playlist. Songs can only be re-ordered in the " +"playlist when none of the columns are sorted. To unsort a column, press the " +"column until the up or down arrow is no longer showing and the column is " +"blank and then re-order the playlist." +msgstr "" + +#: C/manage-playlists.page:68(p) +msgid "" +"To remove a track from the playlist, select the track(s) you wish to remove. " +"Press the Delete, from the menu choose EditRemove from Playlist or right click the track(s) " +"with your mouse and press Remove from Playlist." +msgstr "" + +#: C/manage-playlists.page:76(title) +msgid "Smart Playlist" +msgstr "" + +#: C/manage-playlists.page:78(p) +msgid "" +"Smart Playlists allow you to quickly generate a dynamic playlist based on a " +"number of pre-set variables. You can quickly create a new playlist based on " +"a specific artist, favorites or more." +msgstr "" + +#: C/manage-playlists.page:83(p) +msgid "" +"To create a new Smart Playlist, from the menu choose MediaNew Smart Playlist. You will be presented with a " +"dialog to create a new Smart Playlist. Enter the name of your playlist and " +"then choose the criteria your playlist should be based on. You can choose " +"from any field included in the song's meatadata, such as Album, Artist or " +"Year. Choose the criteria and then choose from one of the following:" +msgstr "" + +#: C/manage-playlists.page:93(p) C/manage-playlists.page:109(gui) +#: C/manage-playlists.page:113(gui) +msgid "is" +msgstr "" + +#: C/manage-playlists.page:94(p) +msgid "is not" +msgstr "" + +#: C/manage-playlists.page:95(p) +msgid "less than" +msgstr "" + +#: C/manage-playlists.page:96(p) +msgid "more than" +msgstr "" + +#: C/manage-playlists.page:97(p) +msgid "at most" +msgstr "" + +#: C/manage-playlists.page:98(p) +msgid "at least" +msgstr "" + +#: C/manage-playlists.page:101(p) +msgid "" +"You can also press the + button to add an addition query to the " +"Smart Playlist. For example, you could create a smart playlist that includes " +"all songs from 2010 that you rated 5 stars. To create this playlist you " +"would choose:" +msgstr "" + +#: C/manage-playlists.page:110(gui) +msgid "2010" +msgstr "" + +#: C/manage-playlists.page:113(gui) +msgid "Rating" +msgstr "" + +#: C/manage-playlists.page:114(p) +msgid "5 stars" +msgstr "" + +#: C/manage-playlists.page:118(p) +msgid "" +"You can then optionally select how many songs are included by pressing the " +"Limit to checkbox and choosing the number of songs to be included." +msgstr "" + +#: C/manage-playlists.page:123(p) +msgid "" +"Banshee also includes smart playlists already created for you. Press the " +"Open in editor button to view how the playlist created was or to " +"modify it. If you press Create and save the playlist will be " +"automatically generated and saved for you. The following playlists are " +"included:" +msgstr "" + +#: C/manage-playlists.page:131(title) +msgid "Banshee Smart Playlists" +msgstr "" + +#: C/manage-playlists.page:132(p) +msgid "Favorites (Songs rated four and five stars)" +msgstr "" + +#: C/manage-playlists.page:133(p) +msgid "Recent Favorites (Songs listened to often in the past week)" +msgstr "" + +#: C/manage-playlists.page:135(p) +msgid "Recently Added (Songs imported within the last week" +msgstr "" + +#: C/manage-playlists.page:136(p) +msgid "Unheard (Songs that have not been played or skipped)" +msgstr "" + +#: C/manage-playlists.page:137(p) +msgid "Neglected Favorites (Favorites not played in over two months)" +msgstr "" + +#: C/manage-playlists.page:139(p) +msgid "700 MB of Favorites (A data CD worth of favorite songs)" +msgstr "" + +#: C/manage-playlists.page:140(p) +msgid "80 Minutes of Favorites (An audio CD worth of favorite songs)" +msgstr "" + +#: C/manage-playlists.page:142(p) +msgid "Unrated (Songs that haven't been rated)" +msgstr "" + +#: C/manage-coverart.page:9(desc) +msgid "Manage or change your albums cover art." +msgstr "" + +#: C/manage-coverart.page:24(title) +msgid "Cover art" +msgstr "" + +#: C/lastfm.page:9(desc) +msgid "Enable Last.fm, song reporting and Last.fm radio." +msgstr "" + +#: C/lastfm.page:24(title) +msgid "Last.fm" +msgstr "" + +#: C/lastfm.page:26(p) +msgid "" +"Last.fm is a popular online service that offers both free and paid versions. " +"Last.fm offers information on music artists and albums and if you create a " +"user profile Last.fm allows you to track the music you listen to in Banshee " +"for free. If you suscribe as a paying member, you can also listen to " +"streaming music from Last.fm in various music clients, including Banshee. " +"Last.fm offers multiple channels to stream, including recommended music for " +"you based on your listening habits, your favorites and more." +msgstr "" + +#: C/lastfm.page:35(title) +msgid "Enable Last.fm" +msgstr "" + +#: C/lastfm.page:36(p) +msgid "" +"To get the most out of Last.fm, you will want to create a Last.fm profile. " +"Visit http://www.last.fm/join " +"to create an account or choose EditPreferences from the Banshee menu. Then press the Source Specific tab and press the Source drop down menu and choose Last." +"fm and select the Sign up for Last.fm link." +msgstr "" + +#: C/lastfm.page:45(p) +msgid "" +"To enable Banshee to report the songs you play on your computer to Last.fm, " +"sign in to Last.fm in Banshee in the Source Specific preferences. " +"Enter your username and press the Log in to Last.fm button. You " +"will be directed to a Last.fm webpage in your browser to grant Banshee " +"access. Press the Yes, allow access link in your browser and you " +"will be redirected to a webpage that displays a message that Banshee now has " +"access to Last.fm. Return to Banshee and press the Finish Logging In button to complete the process." +msgstr "" + +#: C/lastfm.page:58(title) +msgid "Enable Last.fm Song Reporting" +msgstr "" + +#: C/lastfm.page:59(p) +msgid "" +"After you have successfully linked Banshee to your Last.fm profile, to " +"enable Banshee to report the songs to your Last.fm profile, in the " +"Source Specific tab in Banshee's preferences, press the " +"Enable Song Reporting checkbox. If you have an active internet " +"connection, Banshee will now send Last.fm information regarding the songs " +"you play. To view your play history, visit your profile on the Last.fm " +"website. Last.fm will automatically update your music metadata if any of " +"your artist, song title or album information is incorrect." +msgstr "" + +#: C/lastfm.page:72(title) +msgid "Listen to Last.fm Radio" +msgstr "" + +#: C/lastfm.page:73(p) +msgid "" +"Last.fm radio is free for residents of the United States, United Kingdom and " +"Germany. Residents of other countries will have to pay for a premium account " +"with Last.fm to listen to radio. Premium members, in all countries, also " +"receive premium radio features: listening to playlists and stations of music " +"you've loved or tagged." +msgstr "" + +#: C/lastfm.page:80(p) +msgid "" +"In Banshee's context menu onthe left hand side, you will now have a Last.fm " +"section, including your Lat.fm radio stations. You will need an active " +"internet connection to listen to Last.fm radio. Choose the radio station you " +"wish to listen to and Banshee will communicate with Last.fm to populate " +"songs for that radio station. Press the Play button in Banshee or " +"Spacebar to start streaming a Last.fm radio station. You can also " +"press the Next button in Banshee, N or choose " +"PlaybackNext to play the next song in " +"your radio station queue." +msgstr "" + +#: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title) +#: C/advanced.page:29(title) +msgid "Keyboard Shortcuts" +msgstr "" + +#: C/keyboardshortcuts.page:24(title) +msgid "Control Banshee using Keyboard Shortcuts" +msgstr "" + +#: C/keyboardshortcuts.page:28(title) +msgid "Playback Control" +msgstr "" + +#: C/keyboardshortcuts.page:32(gui) C/keyboardshortcuts.page:53(gui) +#: C/keyboardshortcuts.page:73(gui) C/keyboardshortcuts.page:90(gui) +#: C/keyboardshortcuts.page:107(gui) +msgid "Key" +msgstr "" + +#: C/keyboardshortcuts.page:32(gui) C/keyboardshortcuts.page:53(gui) +#: C/keyboardshortcuts.page:73(gui) C/keyboardshortcuts.page:90(gui) +#: C/keyboardshortcuts.page:107(gui) +msgid "Action" +msgstr "" + +#: C/keyboardshortcuts.page:35(p) +msgid "Space Bar" +msgstr "" + +#: C/keyboardshortcuts.page:35(p) +msgid "Play or Pause the current song" +msgstr "" + +#: C/keyboardshortcuts.page:38(p) C/keyboardshortcuts.page:76(key) +msgid "N" +msgstr "" + +#: C/keyboardshortcuts.page:38(p) +msgid "Play the next song" +msgstr "" + +#: C/keyboardshortcuts.page:41(p) +msgid "B" +msgstr "" + +#: C/keyboardshortcuts.page:41(p) +msgid "Play the previous song" +msgstr "" + +#: C/keyboardshortcuts.page:49(title) C/keyboardshortcuts.page:69(title) +msgid "Library Interaction" +msgstr "" + +#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:76(key) +#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key) +#: C/keyboardshortcuts.page:123(key) C/keyboardshortcuts.page:127(key) +#: C/keyboardshortcuts.page:132(key) C/keyboardshortcuts.page:137(key) +msgid "Control" +msgstr "" + +#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:110(key) +msgid "F" +msgstr "" + +#: C/keyboardshortcuts.page:56(p) +msgid "Move the focus to the search box" +msgstr "" + +#: C/keyboardshortcuts.page:60(p) +msgid "/, ControlF" +msgstr "" + +#: C/keyboardshortcuts.page:61(p) +msgid "Open import media dialog" +msgstr "" + +#: C/keyboardshortcuts.page:76(p) +msgid "Create New Playlist" +msgstr "" + +#: C/keyboardshortcuts.page:86(title) C/add-podcast.page:26(title) +msgid "Podcasts" +msgstr "" + +#: C/keyboardshortcuts.page:93(key) +msgid "Y" +msgstr "" + +#: C/keyboardshortcuts.page:93(p) +msgid "Mark the selected episodes as old" +msgstr "" + +#: C/keyboardshortcuts.page:103(title) +msgid "Interface" +msgstr "" + +#: C/keyboardshortcuts.page:110(p) +msgid "Toggle full-screen mode" +msgstr "" + +#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key) +msgid "A" +msgstr "" + +#: C/keyboardshortcuts.page:114(p) +msgid "Select all songs in playlist view" +msgstr "" + +#: C/keyboardshortcuts.page:118(key) +msgid "Shift" +msgstr "" + +#: C/keyboardshortcuts.page:119(p) +msgid "Unselect all songs in playlist view" +msgstr "" + +#: C/keyboardshortcuts.page:123(key) +msgid "W" +msgstr "" + +#: C/keyboardshortcuts.page:123(p) +msgid "Hide Banshee Window (Requires Notification Area Plug-in Enabled" +msgstr "" + +#: C/keyboardshortcuts.page:127(key) +msgid "Left Mouse Button" +msgstr "" + +#: C/keyboardshortcuts.page:128(p) +msgid "Play Previous Song (Requires Notification Area Plug-in Enabled" +msgstr "" + +#: C/keyboardshortcuts.page:132(key) +msgid "Right Mouse Button" +msgstr "" + +#: C/keyboardshortcuts.page:133(p) +msgid "Play Next Song (Requires Notification Area Plug-in Enabled" +msgstr "" + +#: C/keyboardshortcuts.page:137(key) +msgid "Middle Mouse Button" +msgstr "" + +#: C/keyboardshortcuts.page:138(p) +msgid "Toggle Play / Pause (Requires Notification Area Plug-in Enabled" +msgstr "" + +#: C/itunes-import.page:8(desc) +msgid "" +"Import music and categorizations from the iTunes media player." +msgstr "" + +#: C/itunes-import.page:12(title) +msgid "Import your iTunes library" +msgstr "" + +#: C/introduction.page:8(desc) +msgid "Introduction to the Banshee Media Player." +msgstr "" + +#: C/introduction.page:24(title) +msgid "Introduction" +msgstr "" + +#: C/introduction.page:26(p) +msgid "" +"Banshee is a media player that allows you to play your music, " +"videos, and other media media as well sync it with portable devices to take " +"your media on the go." +msgstr "" + +#: C/introduction.page:31(p) +msgid "" +"Banshee includes features to import your media, manage its " +"metadata, and play your music and videos." +msgstr "" + +#: C/introduction.page:35(p) +msgid "" +"Banshee also helps you sync your music and videos to popular portable " +"devices, such as digital audio players and smartphones. Banshee supports " +"popular devices including most iPods, Sandisk and Creative MP3 players, and " +"Android powered phones." +msgstr "" + +#: C/index.page:24(title) +msgid "Add, Remove & Play" +msgstr "Añadir, quitar y reproducir" + +#: C/index.page:28(title) +msgid "Manage & Sort" +msgstr "" + +#: C/index.page:32(title) +msgid "Sync your media with a portable music player" +msgstr "" + +#: C/index.page:36(title) +msgid "Add additional functionality to Banshee" +msgstr "" + +#: C/index.page:40(title) +msgid "Advanced options and help" +msgstr "" + +#: C/index.page:44(title) +msgid "Common Problems" +msgstr "" + +#: C/import.page:8(desc) +msgid "Add music and videos from your computer to your Banshee library." +msgstr "Añadir música y vídeos de su equipo a su colección de Banshee." + +#: C/import.page:15(name) +msgid "Shaun McCance" +msgstr "" + +#: C/import.page:16(email) +msgid "shaunm@gnome.org" +msgstr "" + +#: C/import.page:21(title) +msgid "Import music & videos" +msgstr "Importar música y vídeos" + +#: C/import.page:23(p) +msgid "" +"You can import music and videos stored on your computer into Banshee. " +"Imported files appear in your sources and can be edited and managed like any " +"other media in Banshee." +msgstr "" +"Puede importar música y vídeos guardados en su equipo en Banshee. Los " +"archivos importados aparecen en sus fuentes y pueden editarse y gestionarse " +"como cualquier otro archivo multimedia de Banshee." + +#: C/import.page:27(p) +msgid "" +"To import music or video files on your computer, choose MediaImport Media. A dialog will appear with a number of " +"choices." +msgstr "" +"Para importar archivos de música o vídeo desde su equipo, seleccione " +"MultimediaImportar contenido multimedia. Aparecerá un diálogo con varias opciones." + +#: C/import.page:31(p) +msgid "" +"Plugins may add additional import choices. See " +"below." +msgstr "" +"Los complementos pueden añadir opciones adicionales de importación. Consulte " +"la abajo." + +#: C/import.page:37(gui) +msgid "Local Folders" +msgstr "Carpetas locales" + +#: C/import.page:38(p) +msgid "" +"Choose this option to import all music and video files within a specified " +"folder, including all subfolders. You will be prompted with a dialog to " +"choose a folder to import from." +msgstr "" +"Elija esta opción para importar todos los archivos de música y vídeo de una " +"carpeta específica, incluyendo todas las subcarpetas. Se le presentará un " +"diálogo desde el que escoger la carpeta de la que importar." + +#: C/import.page:43(gui) +msgid "Local Files" +msgstr "Archivos locales" + +#: C/import.page:44(p) +msgid "" +"Choose this option to import only the specific file or files you select. You " +"will be prompted with a dialog to choose the file or files to import." +msgstr "" + +#: C/import.page:49(gui) +msgid "Home Folder" +msgstr "Carpeta de inicio" + +#: C/import.page:50(p) +msgid "" +"Choose this option to import all music and video files in your entire home " +"folder, including files in any subfolders." +msgstr "" + +#: C/import.page:54(gui) +msgid "Videos From Photos Folder" +msgstr "Vídeos de la carpeta de Imágenes" + +#: C/import.page:55(p) +msgid "" +"Many digital cameras can take short vidoes, and photo-management " +"applications often download these videos directly into your Photos folder. " +"Choose this option to import any videos that have been stored in your Photos " +"folder." +msgstr "" +"Muchas cámaras digitales pueden tomar vídeos cortos, y las aplicaciones de " +"gestión de fotografías a menudo descargan esos vídeos directamente en la " +"carpeta de Imágenes. Elija esta opción para importar cualquier vídeo que se " +"haya guardado en la carpeta de Imágenes." + +#: C/import.page:63(p) +msgid "" +"You can safely import from a folder you have already imported from without " +"worrying about duplicate entries in your library." +msgstr "" +"Puede importar con seguridad desde una carpeta desde la que ya haya " +"importado sin preocuparse por entradas duplicadas en su colección." + +#: C/import.page:68(title) +msgid "Import from a Playlist" +msgstr "Importar desde una lista de reproducción" + +#: C/import.page:69(p) +msgid "" +"You can also import music from playlists. Most playlist files end in " +"m3u. To import from a playlist, from the Banshee menu choose " +"MediaImport Playlist and locate the " +"playlist file in your folder, select it and press Import." +msgstr "" +"También puede importar música desde listas de reproducción. La mayoría de " +"los archivos de listas de reproducción acaban en m3u. Para importar " +"una lista de reproducción, desde el menú de Banshee seleccione " +"MultimediaImportar lista de reproducción y localice el archivo de la lista de reproducción en su carpeta, " +"selecciónelo y pulse Importar." + +#: C/import.page:78(title) +msgid "Additional Import Sources" +msgstr "Fuentes de importación adicionales" + +#: C/import.page:79(p) +msgid "" +"Plugins may add additional import choices. The following additional sources " +"will be available if the appropriate plugins are enabled:" +msgstr "" +"Los complementos pueden añadir opciones adicionales de importación. Las " +"siguiente fuentes adicionales estarán disponibles si se activan los " +"complementos adecuados:" + +#: C/extensions.page:8(desc) +msgid "Add additional functionality to Banshee." +msgstr "" + +#: C/extensions.page:23(title) +msgid "Banshee Extensions" +msgstr "" + +#: C/extensions.page:27(title) +msgid "Official Banshee Extensions" +msgstr "" + +#: C/extensions.page:29(title) +msgid "Manage extensions for Banshee" +msgstr "" + +#: C/extensions.page:34(title) +msgid "Community Banshee Extensions" +msgstr "" + +#: C/extensions.page:36(title) +msgid "Add community built extensions for Banshee" +msgstr "" + +#: C/emusic.page:8(desc) +msgid "Import music purchased from eMusic." +msgstr "" + +#: C/emusic.page:12(title) +msgid "Import your eMusic tracks" +msgstr "" + +#: C/amazon.page:9(desc) +msgid "Sync and purchase music from the Amazon MP3 Store." +msgstr "" + +#: C/amazon.page:24(title) +msgid "Amazon MP3 Store" +msgstr "" + +#: C/amazon.page:26(p) +msgid "" +"Banshee supports downloading and importing music from the Amazon MP3 store. " +"You can manually import Amazon music files, purchase music in your web " +"browser or buy music inside of Banshee. Amazon only offers music for sale as " +"an MP3 in certain countries and depending on your location, you may not be " +"able to buy Amazon MP3s." +msgstr "" + +#: C/amazon.page:34(p) +msgid "" +"Banshee uses an Amazon affiliate code for all music purchases. All money " +"made via this affiliate code is donated to the GNOME Foundation." +msgstr "" + +#: C/amazon.page:40(title) +msgid "Purchase Amazon MP3s in your web browser" +msgstr "" + +#: C/amazon.page:42(p) +msgid "" +"Music purchased from Amazon's MP3 store can be automatically downloaded and " +"imported into Banshee. Banshee associates itself with the .amz file Amazon " +"provides for MP3 purchases. When you buy music on Amazon, your web browser " +"will download the .amz file and Banshee will automatically open it and begin " +"the download and import the music." +msgstr "" + +#: C/amazon.page:51(title) +msgid "Buy Amazon MP3s in Banshee" +msgstr "" + +#: C/amazon.page:53(p) +msgid "" +"You can also search for songs on Amazon within Banshee. Choose the Amazon " +"MP3 Store from the Banshee menu on the left. This will load the Amazon MP3 " +"Store just as if you were in a web browser. You can search Amazon for the " +"music you wish to buy and after logging in to Amazon, buy music with one " +"click. Banshee will automatically download and import the your purchase into " +"the library." +msgstr "" + +#: C/amazon.page:63(title) +msgid "Import Amazon MP3s manually" +msgstr "" + +#: C/amazon.page:65(p) +msgid "" +"When music is purchased from Amazon in a web browser, a file with the " +"extension .amz is downloaded and saved to your hard drive. To import music " +"purchased manually from Amazon, in Banshee choose MediaImport Media from the menu and select the *.amz file " +"to be imported. Banshee will then open this file and connect to the Amazon " +"MP3 store to begin the download." +msgstr "" + +#: C/amazon.page:74(p) +msgid "" +"Amazon .amz files are only active for a short time. If you do not download " +"your music quickly, the file will expire and you cannot download your music " +"from Amazon. Amazon does not publish how long files are active. It is " +"recommended you download and import any purchases from Amazon within an hour " +"of purchase." +msgstr "" + +#: C/advanced.page:8(desc) +msgid "Get help for advanced actions." +msgstr "" + +#: C/advanced.page:23(title) +msgid "Advanced Options and Help" +msgstr "" + +#: C/add-radio.page:11(desc) +msgid "Add, remove and play internet radio stations in Banshee." +msgstr "" + +#: C/add-radio.page:26(title) +msgid "Internet Radio" +msgstr "" + +#: C/add-radio.page:29(title) +msgid "What is Internet Radio?" +msgstr "" + +#: C/add-radio.page:31(p) +msgid "" +"Internet radio stations are similar to regular radio stations, allowing an " +"individual or organization to stream music live over the internet. Internet " +"radio stations can be a simultaneous stream of a regular radio station, an " +"amateur broadasting their own station, or commercial internet radio stations " +"that include live DJs and even commercials." +msgstr "" + +#: C/add-radio.page:41(title) +msgid "Add Radio Station" +msgstr "" + +#: C/add-radio.page:43(p) +msgid "" +"To add an internet radio station to Banshee, press Add Station in " +"the upper right hand corner of Banshee or, from the menu, choose " +"MenuAdd Station." +msgstr "" + +#: C/add-radio.page:48(p) +msgid "" +"From the internet radio station's webpage, copy the link to their stream URL " +"in your web browser. In most browsers, you can right click on the link and " +"press Copy Link." +msgstr "" + +#: C/add-radio.page:54(p) +msgid "" +"Banshee will prompt you to enter the Station Genre. Choose the " +"kind of music the internet radio station plays from the available drop down " +"selections. You will then need to enter the Station Name. Enter a " +"name for the radio station. Then press tab or use your mouse to select the " +"Stream URL: dialog to paste the URL of the radio station. Using " +"your mouse right click and choose Paste or press " +"Control+V." +msgstr "" + +#: C/add-radio.page:62(p) +msgid "" +"You can optionally also fill out the fields for Station Creator, " +"Description, and Rating." +msgstr "" + +#: C/add-radio.page:66(p) +msgid "" +"Then press Save to save the internet radio station in Banshee." +msgstr "" + +#: C/add-podcast.page:11(desc) +msgid "Add, remove and play podcasts in Banshee." +msgstr "" + +#: C/add-podcast.page:29(title) +msgid "What is a Podcast?" +msgstr "" + +#: C/add-podcast.page:31(p) +msgid "" +"Podcasts are recorded programs, similar to radio programs, that are " +"available on the internet and allow you to subscribe. When you subscribe to " +"a podcast in Banshee, each time a new program is released, Banshee will " +"automatically download the podcast and allow you to listen to it." +msgstr "" + +#: C/add-podcast.page:36(p) +msgid "" +"There are podcasts on almost any subject including music, movies, Linux, and " +"more. Search the internet using your favorite search engine with a search " +"term such as \"movie podcast\" and you will be presented with many options " +"to choose from." +msgstr "" + +#: C/add-podcast.page:44(title) +msgid "Add a Podcast" +msgstr "" + +#: C/add-podcast.page:46(p) +msgid "" +"To add a Podcast to Banshee you will first need to visit the podcast's home " +"page on the internet in your browser. Almost all podcasts will have a button " +"or link displayed to subscribe to the podcast. Copy the link to the " +"podcast's subscription. In most web browsers, you can right click on the " +"link and choose Copy link." +msgstr "" + +#: C/add-podcast.page:53(p) +msgid "" +"In Banshee, press and choose Subscribe to Podcasts in the upper " +"right hand corner, from the menu choose Media " +"Subscribe to Podcast or use the keyboard shortcut " +"ShiftControlF." +msgstr "" + +#: C/add-podcast.page:59(p) +msgid "" +"Banshee will then allow you to choose how you want to download new podcasts " +"from a drop down menu. Your choices include:" +msgstr "" + +#: C/add-podcast.page:63(p) +msgid "" +"Download the Most Recent Episode (This will automatically download the last " +"episode that was released)." +msgstr "" + +#: C/add-podcast.page:65(p) +msgid "Download All Episodes (This will download all episodes)." +msgstr "" + +#: C/add-podcast.page:66(p) +msgid "" +"Let Me Decide Which Episodes to Download (This will allow you to choose " +"which episodes you would like to download)." +msgstr "" + +#: C/add-podcast.page:70(p) +msgid "After you have added a Podcast feed, Banshee will display:" +msgstr "" + +#: C/add-podcast.page:73(p) +msgid "Name: (Name of the specific episode)" +msgstr "" + +#: C/add-podcast.page:74(p) +msgid "Podcast: (Name of the Podcast)" +msgstr "" + +#: C/add-podcast.page:75(p) +msgid "Published (Date the episode was published or released)" +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/index.page:0(None) +msgid "translator-credits" +msgstr "Benjamín Valero Espinosa , 2010" diff -Nru banshee-1.8.0/help/es/extensions.page banshee-1.8.1/help/es/extensions.page --- banshee-1.8.0/help/es/extensions.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/extensions.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + + Add additional functionality to Banshee. + + + Paul Cutler + pcutler@gnome.org + + + + + + Banshee Extensions + +
+ + Official Banshee Extensions + + Manage extensions for Banshee +
+ +
+ + Community Banshee Extensions + + Add community built extensions for Banshee +
+ + + diff -Nru banshee-1.8.0/help/es/import.page banshee-1.8.1/help/es/import.page --- banshee-1.8.0/help/es/import.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/import.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,69 @@ + + + + + + + Añadir música y vídeos de su equipo a su colección de Banshee. + + + Paul Cutler + pcutler@gnome.org + + + Shaun McCance + shaunm@gnome.org + + + + + Importar música y vídeos + +

Puede importar música y vídeos guardados en su equipo en Banshee. Los archivos importados aparecen en sus fuentes y pueden editarse y gestionarse como cualquier otro archivo multimedia de Banshee.

+ +

Para importar archivos de música o vídeo desde su equipo, seleccione MultimediaImportar contenido multimedia. Aparecerá un diálogo con varias opciones.

+ + +

Los complementos pueden añadir opciones adicionales de importación. Consulte la abajo.

+ + + + + <gui>Carpetas locales</gui> +

Elija esta opción para importar todos los archivos de música y vídeo de una carpeta específica, incluyendo todas las subcarpetas. Se le presentará un diálogo desde el que escoger la carpeta de la que importar.

+ + + <gui>Archivos locales</gui> +

Choose this option to import only the specific file or files + you select. You will be prompted with a dialog to choose the + file or files to import.

+ + + <gui>Carpeta de inicio</gui> +

Choose this option to import all music and video files in your + entire home folder, including files in any subfolders.

+ + + <gui>Vídeos de la carpeta de Imágenes</gui> +

Many digital cameras can take short videos, and photo-management + applications often download these videos directly into your Photos + folder. Choose this option to import any videos that have been + stored in your Photos folder.

+ + + + +

Puede importar con seguridad desde una carpeta desde la que ya haya importado sin preocuparse por entradas duplicadas en su colección.

+ + +
+ Importar desde una lista de reproducción +

También puede importar música desde listas de reproducción. La mayoría de los archivos de listas de reproducción acaban en m3u. Para importar una lista de reproducción, desde el menú de Banshee seleccione MultimediaImportar lista de reproducción y localice el archivo de la lista de reproducción en su carpeta, selecciónelo y pulse Importar.

+
+ +
+ Fuentes de importación adicionales +

Los complementos pueden añadir opciones adicionales de importación. Las siguiente fuentes adicionales estarán disponibles si se activan los complementos adecuados:

+
+ + diff -Nru banshee-1.8.0/help/es/index.page banshee-1.8.1/help/es/index.page --- banshee-1.8.0/help/es/index.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/index.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,45 @@ + + + + + + + Paul Cutler + pcutler@gnome.org + + + + + + Banshee Media Player + +
+ Añadir, quitar y reproducir +
+ +
+ Manage & Sort +
+ +
+ Sync your media with a portable music player +
+ +
+ Add additional functionality to Banshee +
+ +
+ Advanced options and help +
+ +
+ Common Problems +
+ + diff -Nru banshee-1.8.0/help/es/introduction.page banshee-1.8.1/help/es/introduction.page --- banshee-1.8.0/help/es/introduction.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/introduction.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,49 @@ + + + + + + + + Introduction to the Banshee Media Player. + + + Paul Cutler + pcutler@gnome.org + + + + + + Introduction + +

+ Banshee is a media player that allows you to play your music, + videos, and other media as well sync it with portable devices to take your media + on the go. +

+

+ Banshee includes features to import your media, manage its + metadata, and play your music and videos. +

+

+ Banshee also helps you sync your music and videos to popular portable + devices, such as digital audio players and smartphones. Banshee supports + popular devices including most iPods, Sandisk and Creative MP3 players, and + Android powered phones. +

+ +
+ <gui>Banshee Media Player</gui> window + Banshee Media Player + +

Banshee library interface

+ +
+ + diff -Nru banshee-1.8.0/help/es/itunes-import.page banshee-1.8.1/help/es/itunes-import.page --- banshee-1.8.0/help/es/itunes-import.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/itunes-import.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,13 @@ + + + + + + + Import music and categorizations from the iTunes media player. + + + + Import your <app>iTunes</app> library + + diff -Nru banshee-1.8.0/help/es/keyboardshortcuts.page banshee-1.8.1/help/es/keyboardshortcuts.page --- banshee-1.8.0/help/es/keyboardshortcuts.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/keyboardshortcuts.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,144 @@ + + + + + + Keyboard Shortcuts + + + Paul Cutler + pcutler@gnome.org + + + + + + + + Control Banshee using Keyboard Shortcuts + +
+ + Playback Control + + + + + + + + + + + + + + +

Key

Action

Space Bar

Play or Pause the current song

N

Play the next song

B

Play the previous song

+ +
+ +
+ + Library Interaction + + + + + + + + + + + + +

Key

Action

ControlF

+ Move the focus to the search box

/, ControlF

Open import media dialog

+ +
+ +
+ + Library Interaction + + + + + + + + + +

Key

Action

ControlN

+ Create New Playlist

+ +
+ +
+ + Podcasts + + + + + + + + + +

Key

Action

Y

+ Mark the selected episodes as old

+ +
+ +
+ + Interface + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Key

Action

F

+ Toggle full-screen mode

ControlA

+ Select all songs in playlist view

ControlShiftA

+

+ Unselect all songs in playlist view

ControlW

+ Hide Banshee Window (Requires Notification Area Plug-in Enabled

ControlLeft Mouse Button +

+ Play Previous Song (Requires Notification Area Plug-in Enabled

ControlRight Mouse Button +

+ Play Next Song (Requires Notification Area Plug-in Enabled

ControlMiddle Mouse Button +

+ Toggle Play / Pause (Requires Notification Area Plug-in Enabled

+ +
+ diff -Nru banshee-1.8.0/help/es/lastfm.page banshee-1.8.1/help/es/lastfm.page --- banshee-1.8.0/help/es/lastfm.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/lastfm.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,91 @@ + + + + + + + Enable Last.fm, song reporting and Last.fm radio. + + + Paul Cutler + pcutler@gnome.org + + + + + + Last.fm + +

Last.fm is a popular online service that offers both free and paid + versions. Last.fm offers information on music artists and albums and if you + create a user profile Last.fm allows you to track the music you listen to + in Banshee for free. If you subscribe as a paying member, you can also listen + to streaming music from Last.fm in various music clients, including Banshee. + Last.fm offers multiple channels to stream, including recommended music for + you based on your listening habits, your favorites and more.

+ +
+ Enable Last.fm +

To get the most out of Last.fm, you will want to create a Last.fm profile. + Visit http://www.last.fm/join + to create an account or choose + EditPreferences from the Banshee + menu. Then press the Source Specific tab and press the + Source drop down menu and choose Last.fm and select the + Sign up for Last.fm link. +

+ +

To enable Banshee to report the songs you play on your computer to Last.fm, + sign in to Last.fm in Banshee in the Source Specific preferences. + Enter your username and press the Log in to Last.fm button. You + will be directed to a Last.fm webpage in your browser to grant Banshee access. + Press the Yes, allow access link in your browser and you will be + redirected to a webpage that displays a message that Banshee now has access to + Last.fm. Return to Banshee and press the Finish Logging In button + to complete the process. +

+ +
+ +
+ Enable Last.fm Song Reporting +

After you have successfully linked Banshee to your Last.fm profile, to + enable Banshee to report the songs to your Last.fm profile, in the + Source Specific tab in Banshee's preferences, press the + Enable Song Reporting checkbox. If you have an active internet + connection, Banshee will now send Last.fm information regarding the songs + you play. To view your play history, visit your profile on the Last.fm + website. Last.fm will automatically update your music metadata if any of your + artist, song title or album information is incorrect. +

+ +
+ +
+ Listen to Last.fm Radio +

Last.fm radio is free for residents of the United States, United Kingdom + and Germany. Residents of other countries will have to pay for a premium + account with Last.fm to listen to radio. Premium members, in all countries, + also receive premium radio features: listening to playlists and stations of + music you've loved or tagged. +

+ +

In Banshee's context menu on the left hand side, you will now have a + Last.fm section, including your Last.fm radio stations. You will need an + active internet connection to listen to Last.fm radio. Choose the radio + station you wish to listen to and Banshee will communicate with Last.fm + to populate songs for that radio station. Press the Play button + in Banshee or Spacebar to start streaming a Last.fm radio + station. You can also press the Next button in Banshee, + N or choose PlaybackNext + to play the next song in your radio station queue. +

+ +
+ + diff -Nru banshee-1.8.0/help/es/legal.xml banshee-1.8.1/help/es/legal.xml --- banshee-1.8.0/help/es/legal.xml 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/legal.xml 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,9 @@ + + +

This work is licensed under a +Creative Commons +Attribution-Share Alike 3.0 Unported License.

+

As a special exception, the copyright holders give you permission to copy, +modify, and distribute the example code contained in this document under the +terms of your choosing, without restriction.

+ diff -Nru banshee-1.8.0/help/es/manage-coverart.page banshee-1.8.1/help/es/manage-coverart.page --- banshee-1.8.0/help/es/manage-coverart.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/manage-coverart.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,29 @@ + + + + + + + Manage or change your albums cover art. + + + Paul Cutler + pcutler@gnome.org + + + + + + Cover art + +

+ +

+

+ + diff -Nru banshee-1.8.0/help/es/manage-playlists.page banshee-1.8.1/help/es/manage-playlists.page --- banshee-1.8.0/help/es/manage-playlists.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/manage-playlists.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,145 @@ + + + + + + + + Create and manage playlists. + + + Paul Cutler + pcutler@gnome.org + + + + + Playlists + +

Playlists allow you to create and save a list of music tracks to be played + in a specific order. Playlists are convenient to create a list of your + favorite songs or to split your library into smaller lists that are easy + to browse through. Some portable media players even allow you to transfer the + playlist so you can take it with you on the go. +

+ +

Banshee supports normal playlists, which include songs you add to the + playlist, as well as smart playlists. Smart Playlists are automatically + generated playlists based on your listening habits, favorite music, or more.

+ +
+ + Normal Playlists + +

A normal playlist is a list of songs that you add and manage. You might + want to create your own list of songs by your favorite artist from + multiple albums, your latest favorite songs, or an upbeat playlist to listen + to while you exercise. +

+ +

You can create a new playlist by pressing Control + N, from the menu choosing Menu + New Playlist or by selecing the track(s) you would like + to add to the playlist. Select the track(s), right click them, and choose + Add to PlaylistNew Playlist. + You can also drag and drop them to a new playlist by selecting the track(s) + and dragging them to the left hand + window pane over Music. As you drag it over Music, + a new option New Playlist will appear and you can drop + the track(s) over New Playlist to add them to the + playlist. You can repeat this process until you have added all the tracks + you want in the playlist. +

+ +

To give your playlist its own name, select the playlist and right click + on the playlist and press Rename Playlist and enter the name + of your playlist. +

+ +

You can change the order of the playlist by dragging and dropping the + song to the new position in the playlist. Songs can only be re-ordered + in the playlist when none of the columns are sorted. To unsort a column, + press the column until the up or down arrow is no longer showing and + the column is blank and then re-order the playlist. +

+ +

To remove a track from the playlist, select the track(s) you wish to + remove. Press the Delete, from the menu choose + EditRemove from Playlist or right + click the track(s) with your mouse and press Remove from Playlist. +

+
+ +
+ Smart Playlist + +

Smart Playlists allow you to quickly generate a dynamic playlist based + on a number of pre-set variables. You can quickly create a new playlist + based on a specific artist, favorites or more. +

+ +

To create a new Smart Playlist, from the menu choose + MediaNew Smart Playlist. You will be + presented with a dialog to create a new Smart Playlist. Enter + the name of your playlist and then choose the criteria your playlist + should be based on. You can choose from any field included in the song's + meatadata, such as Album, Artist or Year. Choose the criteria and then + choose from one of the following: +

+ + +

is

 +

is not

 +

less than

 +

more than

 +

at most

 +

at least

 + + +

You can also press the + button to add an addition query + to the Smart Playlist. For example, you could create a smart playlist + that includes all songs from 2010 that you rated 5 stars. To create this + playlist you would choose: +

+ + + + + + + + + + +

Year

is

2010

Rating

is

5 stars

+ +

You can then optionally select how many songs are included by pressing + the Limit to checkbox and choosing the number of songs to be + included. +

+ +

Banshee also includes smart playlists already created for + you. Press the Open in editor button to view how the playlist + created was or to modify it. If you press Create and save the + playlist will be automatically generated and saved for you. The following + playlists are included: +

+ + + Banshee Smart Playlists +

Favorites (Songs rated four and five stars)

 +

Recent Favorites (Songs listened to often in the past week) +

+

Recently Added (Songs imported within the last week

 +

Unheard (Songs that have not been played or skipped)

 +

Neglected Favorites (Favorites not played in over two months) +

+

700 MB of Favorites (A data CD worth of favorite songs)

 +

80 Minutes of Favorites (An audio CD worth of favorite songs) +

+

Unrated (Songs that haven't been rated)

 + + +
+ + diff -Nru banshee-1.8.0/help/es/manage-tags.page banshee-1.8.1/help/es/manage-tags.page --- banshee-1.8.0/help/es/manage-tags.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/manage-tags.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,79 @@ + + + + + + + + Edit and change music tags and metadata. + + + Paul Cutler + pcutler@gnome.org + + + + + + Music Metadata + +
+ + Music metadata + +

Digital music contains metadata that stores information in the + music file including the artist, album, year recorded, genre, and more. + Almost all music purchased over the internet will have the metadata + already embedded and if you import music from CDs, Banshee will include + the metadata when ripping the CD if available. For more information + on ripping CDs and including the metadata see the + .

+ +

Popular metadata formats are ID3v1 and ID3v2 for MP3 files and + Vorbis comments for OGG Vorbis files.

+ +

If you have imported songs that do not contain metadata, + Banshee will display Unknown for most fields + in the library.

+ +
+ +
+ + Edit Your Metadata + +

You can change and edit the metadata of your songs. Select the song or + songs you want to update and hit the E, choose + EditEdit Track Information from the menu, or use + your mouse and right click on the files and select + Edit Track Information. +

+ +

A dialog box will appear that shows the song's metadata and allow you to + change or update it. The default fields displayed include:

+ + +

Track Title:

 +

Track Artist

 +

Album Title

 +

Genre

 +

Track Number

 +

Disc Number

 +

Year

 + + +

Update the song's information. If you have selected multiple songs to + edit press the right arrow icon to the right of the Track Title + field or press the Forward button at the bottom of the dialog + when finished with each song. When you have completed editing all metadata, + press Save. +

+ +
+ + diff -Nru banshee-1.8.0/help/es/play.page banshee-1.8.1/help/es/play.page --- banshee-1.8.0/help/es/play.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/play.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,86 @@ + + + + + + + Play your videos and music files. + + + Paul Cutler + pcutler@gnome.org + + + + + + Reproducir su contenido multimedia + +
+ Reproducir su música + +

Para reproducir música en Banshee, elija la fuente Música. La colección de música mostrará todos los artistas, la portada de cada álbum y una lista con todas las canciones de su colección.

+ +

Elija el álbum o canción que desea reproducir desde la lista de artistas o álbumes, o use la barra de búsqueda de la esquina superior derecha de Banshee.

+ +

Para empezar a reproducir una canción, pulse dos veces en el nombre de la canción, pulse la barra espaciadora o elija ReproducirReproducir desde el menú de Banshee.

+ +

You can also start playing an album by choosing the album in the album + browser and using your mouse to double click the song name, + press the Spacebar, or choose Playback + Play from the Banshee menu. +

+ +

Para reproducir todas las canciones de un artista, elija el artista en el explorador de artistas y pulse la barra espaciadora, o elija ReproducirReproducir desde el menú de Banshee.

+ +

Banshee also displays your Favorite albums (those you play the most), + Recent Favorites, Recently Added and Unheard music. Choose the one + you wish to listen to and you can play songs from each. +

+ +
+ +
+ Reproducir un vídeo + +

Los vídeos importados se listan alfabéticamente. Para reproducir un vídeo, escoja el vídeo que desee de la lista y pulse la barra espaciadora, o escoja ReproducirReproducir desde el menú de Banshee.

+ +

Banshee also shows your Favorite videos (those you watch the most) + and Unwatched videos. Choose one and you can play a video from the list.

+ +
+ +
+ Play a Podcast + +

Podcasts shows you all Podcasts you're subscribed too, all Podcast + shows available, and the Podcast browser lists all Podcasts in order of + newest first.

+ +

To play a Podcast, + choose the Podcast you wish to play from the list and + press the Spacebar, or choose Playback + Play from the Banshee menu.

+ +
+ +
+ Play an internet radio station + +

The Radio source shows you all internet radio stations you have added + to Banshee alphabetically. +

+ +

To play an internet radio station, + choose the radio station you wish to play from the list and + press the Spacebar, or choose Playback + Play from the Banshee menu.

+ +
+ + diff -Nru banshee-1.8.0/help/es/play-queue.page banshee-1.8.1/help/es/play-queue.page --- banshee-1.8.0/help/es/play-queue.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/play-queue.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,84 @@ + + + + + + + Add media to your play queue. + + + Paul Cutler + pcutler@gnome.org + + + + + Play Queue + +

The Play Queue allows you to add music to play in a sequential + order. You can add many tracks to let you listen to hours of music non-stop. + You can add individual tracks or entire albums, and sort or re-order them.

+ +
+ + Add Music to the Play Queue + +

From your music library, you will need to select the music tracks or albums + you want to add to the play queue. +

+ +

To add an entire album to the Play Queue, using your mouse press and hold + the album and drag the album over Play Queue in the far left + window pane. +

+ +

You can add music tracks to the Play Queue individually or as a group. + To add an individual file, drag and drop it over the Play Queue + in the far left window pane, or right click the track and choose + Add to Play Queue. +

+ +

You can select multiple files by using your mouse and pressing + Control and choosing each file with your mouse or + select a range of files by + pressing Shift twice to select that range of files. You can then + drag and drop it over the Play Queue + in the far left window pane or right click the tracks and choose + Add to Play Queue. +

+ +
+ +
+ + Organize Your Play Queue + +

Your Play Queue is organized in the order of the tracks you added. The + first tracks or albums you added to the queue will be the first to be played. + You can re-order your Play Queue by using your mouse and dragging and + dropping a track or group of tracks in the list. Choose the track(s) you wish + to re-order with your mouse and release your mouse over the number or place + in the list you wish those files to be in the queue. +

+ +
+ +
+ + Removing Tracks from the Play Queue + +

You can remove an individual track, a group of tracks, or clear your entire + play queue. +

+ +

To remove an individual track or group of tracks, select the track + with your mouse and then press Delete. +

+ +

To clear your entire Play Queue, press the Clear button in the + upper right hand corner of the Play Queue. +

+ +
+ + diff -Nru banshee-1.8.0/help/es/rb-import.page banshee-1.8.1/help/es/rb-import.page --- banshee-1.8.0/help/es/rb-import.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/rb-import.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,13 @@ + + + + + + + Import music and categorizations from the Rhythmbox music player. + + + + Import your <app>Rhythmbox</app> library + + diff -Nru banshee-1.8.0/help/es/search.page banshee-1.8.1/help/es/search.page --- banshee-1.8.0/help/es/search.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/search.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,117 @@ + + + + + + + Search your media and perfom basic queries. + + + Paul Cutler + pcutler@gnome.org + + + + + + Searching your Banshee Library + +

Banshee features a powerful search language. You can search your + library quickly and easily with basic search terms or perform detailed + searches with Banshee's advanced search terminology.

+ +

To perform a search of your media in Banshee, press the S or + click the Search box in the upper right hand corner of the Library + view in Banshee. +

+ +

A search query consists of some basic terms, for example, + dave matthews. By entering dave matthews in the search box, + Banshee will search all metatdata fields including Track Title, Album Title, + Album Artist, Year, etc. Any track whose metadata includes dave + and matthews will be returned. Search terms are case, meaning you don't have to capitalize. dave, Dave, and DAVE + all mean the same thing when searching.

+ +
+ Basic Operators +

Operators can be placed between any two search words or placed before a + search word. The default operation is AND and is used when + no other operators are used between two search terms. Because it is the + default, there is no explicit AND operator.

+ +

Other basic operators include OR and NOT. Together, + these three operations can yield very powerful queries to help you search + your media.

+ +
+ +
+ Logical Operators and Examples +

The following is a list of logical operators and examples of the search + results when searching using them.

+ + + + + + + + + + + + + + + +

Operator

Description

default, white space

+ Search for two terms with a space between the two words or terms.

OR, or, |, ,

+ Search results will be two terms with either result in any field.

NOT, not,-

+ Do not display search results with any search term that follows the + operator of NOT, not,-.

+ +

Examples of logical operations include:

+ + + + + + + + + + + + + + + + + + + + + +

Query

Description

dave matthews

+ Matches any fields in a track containing both dave and + matthews.

dave, matthews

+ Matches any fields in a track containing both dave or + matthews.

dave or matthews

+ Matches any fields in a track containing both dave or + matthews.

dave | matthews

+ Matches any fields in a track containing both dave or + matthews.

-"dave matthews"

+ Displays all tracks whose fields do not containt dave + matthews.

+ +

For more information on performing more complex search queries, + see the page.

+ +
+ + diff -Nru banshee-1.8.0/help/es/sort.page banshee-1.8.1/help/es/sort.page --- banshee-1.8.0/help/es/sort.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/sort.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,53 @@ + + + + + + + Sort your media and add additional columns. + + + Paul Cutler + pcutler@gnome.org + + + + + + Sort your media + +
+ + Adding Columns + +

As your library grows, you may want to sort your library view to play + search or view certain songs, artists, or albums. +

+ +

You can add additional columns to the library view in Banshee + to give you more information about the songs and also allow you to sort + by. By default, Banshee displays columns for songs including + Name, Artist, Album and Time. + To add additional columns, using your mouse right click on any of the columns + and Banshee will display all available column to choose from. Click the + checkbox next to the name of the column you wish to add to the library view. +

+ +
+ +
+ Sorting Columns +

You can sort your library by using your mouse to click on any of the + columns displayed in library view. If you wish to sort your music library + by Artist, click the Artist column header and Banshee will + automatically sort that column alphabetically. Clicking the + Artist column again will sort the column in reverse alphabetical + order.

+
+ + diff -Nru banshee-1.8.0/help/es/sync.page banshee-1.8.1/help/es/sync.page --- banshee-1.8.0/help/es/sync.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/sync.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,148 @@ + + + + + + + Sync your media to a portable media player or smartphone. + + + Paul Cutler + pcutler@gnome.org + + + + + + Sync + +

Banshee supports syncing your music to portable media players and + smartphones. You can add specific music tracks, albums or playlist + or allow Banshee to keep your music player in sync with your entire + library. After your player is connected to your computer you can also + play back the songs on your portable player in Banshee. When syncing + music in a lossless format, such as FLAC, Banshee will automatically + transcode your music for you to a lossy format such as Ogg Vorbis or MP3, + if you have the correct codecs installed. +

+ +
+ Device Support +

Banshee supports almost all modern portable music players and + smartphones with the notable exception of the Apple iPhone, iPad and + iPod Touch.

+ +

When you plug your device in, Banshee will display it in the left menu. + Pressing the device icon will take you to your device home page in Banshee + displaying your sync preferences. +

+ +
+ +
+ Sync Your Music +

You can choose to manage the media on your portable music + by having Banshee automatically sync it or manage your music and media + manually. +

+ +

Choose your device from the Banshee menu and then choose how you want + to sync your media, including: +

+ +

Music

 +

Audiobooks

 +

Videos

 +

Podcast

 + + +

From the dropdown menu next to each of the media, choose from: +

+ +

Manage manually

 +

Sync entire library

 + + + +

If you choose to sync your entire library automatically with your + portable media player make sure your portable media player has enough + storage space. If your library is larger than the space on your + portable media player, Banshee will sync media until your player is + full and then stop. +

+ + +

If you have created playlists or smart playlists in your music library, + they will also be displayed as a sync option for Music. This can be + helpful when creating smart playlists, as smart playlists will automatically + update as new content is added based on the playlist rules, and Banshee + will sync the new playlist to your device every time you plug it in. +

+ +

Banshee will display the total hard drive space of your portable music + player in a graph in the bottom center of Banshee. The graph will show you + how much space is taken by audio files, video, other and free space. + Directly below that Banshee will show you how many total items are stored + on your portable music player, how many hours or days of listening that is + equal to, and total space used. +

+ +
+ +
+ Sync Your Entire Library +

You can drag and drop media to your portable music player form Banshee. + Select the file or files you want to copy to your portable media player + and then press and hold your right mouse button and drag the file(s) to + your portable media player icon in Banshee. This will copy the files to + your device. +

+ +

If your music library is encoded in a format that your portable media + player does not support, such as OGG or FLAC, and you have the necessary + codecs installed, Banshee can automatically transcode these files to MP3 + when transferring to your portable media player. Check with your Linux + distribution for the necessary codecs as it is outside the scope of this + help and varies by distribution. +

+ + +

You may need to eject your device to load the files correctly + on your portable music player. To eject your device in Banshee, + using your mouse right click the device in the Banshee menu and + press Disconnect. +

+ + +
+ +
+ Play Music From Your Portable Music Player +

You can play music stored on your portable music player directly in + Banshee. Choose your player in the Banshee menu on the left and your + portable music player's library will be displayed. You can then play + music in Banshee just as you would music in your own library.

+
+ +
+ Remove Music From your Portable Music Player +

To remove songs stored on your portable music player, choose your + player in Banshee to view its library. Then choose the tracks you would + like to remove and right click the tracks and choose "Delete" or from the + menu choose EditDelete.

+ + +

Deleting files from your portable music player will permanently remove + the files and you will not be able to recover them. +

+ + +
+ + + diff -Nru banshee-1.8.0/help/es/ui.page banshee-1.8.1/help/es/ui.page --- banshee-1.8.0/help/es/ui.page 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/help/es/ui.page 2011-01-28 21:37:56.000000000 +0000 @@ -0,0 +1,82 @@ + + + + + + + Una vista general de la interfaz de usuario de Banshee. + + Paul Cutler + pcutler@gnome.org + + + + + + Introducción a la interfaz de usuario de Banshee + +
+ <gui>Banshee Media Player</gui> window + Banshee Media Player + +

Banshee library interface

+ +
+ +
+ Sources +

Your music and video sources are shown on the left in Banshee. The + sources give you quick access to your Play Queue, Music, Videos, Amazon, + Last.fm, Podcasts and more. +

+ + +

The menu choices will change depending on the source you have chosen. + For example, to use the menu to import a Podcast, you will need to choose + the Podcast source. The menu option for importing a Podcast is not + available when viewing the video or music library.

+ +
+ +
+ Library Browser +

When you select a music or video source from Sources, Banshee will + display your content in the Library browser. Depending on the source + you choose, Banshee can display your music or video library, Podcast + subscriptions or even the Amazon Music Store to allow you to buy music.

+
+ +
+ Now Playing View +

Helpful when using Banshee in full screen mode, the Now Playing mode + hides the library to give you a larger view of the music or video you're + watching. When listening to music, the Now Playing view will show you + the artist name, album and cover art if available. If you are watching + a video, Banshee will display the video.

+ +

To change Now Playing to hide the Banshee user interface and use the full + screen mode, you can press the F, press the Fullscreen + button in the upper right hand corner of Banshee, or choose + ViewFullscreen to start Fullscreen + mode.

+ +
+ +
+ Library +

The Library view in Banshee will change depending on the Source you have + chosen. The Music Library will display cover art, artists in your library, + and list of songs. The Podcast Library will display your Podcast + subscriptions, podcasts that are downloaded or not downloaded, and all, new + or old podcasts. Please see each Source's help page for detailed information + on managing a source. +

+
+ + + diff -Nru banshee-1.8.0/help/gl/add-radio.page banshee-1.8.1/help/gl/add-radio.page --- banshee-1.8.0/help/gl/add-radio.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/add-radio.page 2011-01-28 21:37:56.000000000 +0000 @@ -29,7 +29,7 @@

Internet radio stations are similar to regular radio stations, allowing an individual or organization to stream music live over the internet. Internet radio stations can be a simultaneous stream of a regular radio station, - an amateur broadasting their own station, or commercial + an amateur broadcasting their own station, or commercial internet radio stations that include live DJs and even commercials.

diff -Nru banshee-1.8.0/help/gl/amazon.page banshee-1.8.1/help/gl/amazon.page --- banshee-1.8.0/help/gl/amazon.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/amazon.page 2011-01-28 21:37:56.000000000 +0000 @@ -52,7 +52,7 @@ Amazon MP3 Store from the Banshee menu on the left. This will load the Amazon MP3 Store just as if you were in a web browser. You can search Amazon for the music you wish to buy and after logging in to Amazon, buy - music with one click. Banshee will automatically download and import the + music with one click. Banshee will automatically download and import your purchase into the library.

diff -Nru banshee-1.8.0/help/gl/import.page banshee-1.8.1/help/gl/import.page --- banshee-1.8.0/help/gl/import.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/import.page 2011-01-28 21:37:56.000000000 +0000 @@ -51,7 +51,7 @@ <gui>Vídeos desde o cartafol Fotos</gui> -

Many digital cameras can take short vidoes, and photo-management +

Many digital cameras can take short videos, and photo-management applications often download these videos directly into your Photos folder. Choose this option to import any videos that have been stored in your Photos folder.

diff -Nru banshee-1.8.0/help/gl/introduction.page banshee-1.8.1/help/gl/introduction.page --- banshee-1.8.0/help/gl/introduction.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/introduction.page 2011-01-28 21:37:56.000000000 +0000 @@ -24,7 +24,7 @@

Banshee is a media player that allows you to play your music, - videos, and other media media as well sync it with portable devices to take your media + videos, and other media as well sync it with portable devices to take your media on the go.

diff -Nru banshee-1.8.0/help/gl/lastfm.page banshee-1.8.1/help/gl/lastfm.page --- banshee-1.8.0/help/gl/lastfm.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/lastfm.page 2011-01-28 21:37:56.000000000 +0000 @@ -24,7 +24,7 @@

Last.fm is a popular online service that offers both free and paid versions. Last.fm offers information on music artists and albums and if you create a user profile Last.fm allows you to track the music you listen to - in Banshee for free. If you suscribe as a paying member, you can also listen + in Banshee for free. If you subscribe as a paying member, you can also listen to streaming music from Last.fm in various music clients, including Banshee. Last.fm offers multiple channels to stream, including recommended music for you based on your listening habits, your favorites and more.

@@ -75,8 +75,8 @@ music you've loved or tagged.

-

In Banshee's context menu onthe left hand side, you will now have a - Last.fm section, including your Lat.fm radio stations. You will need an +

In Banshee's context menu on the left hand side, you will now have a + Last.fm section, including your Last.fm radio stations. You will need an active internet connection to listen to Last.fm radio. Choose the radio station you wish to listen to and Banshee will communicate with Last.fm to populate songs for that radio station. Press the Play button diff -Nru banshee-1.8.0/help/gl/manage-playlists.page banshee-1.8.1/help/gl/manage-playlists.page --- banshee-1.8.0/help/gl/manage-playlists.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/manage-playlists.page 2011-01-28 21:37:56.000000000 +0000 @@ -42,7 +42,7 @@ New Playlist or by selecing the track(s) you would like to add to the playlist. Select the track(s), right click them, and choose Add to PlaylistNew Playlist. - You can also drag and drop them to a new playlist by selcting the track(s) + You can also drag and drop them to a new playlist by selecting the track(s) and dragging them to the left hand window pane over Music. As you drag it over Music, a new option New Playlist will appear and you can drop diff -Nru banshee-1.8.0/help/gl/play.page banshee-1.8.1/help/gl/play.page --- banshee-1.8.0/help/gl/play.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/play.page 2011-01-28 21:37:56.000000000 +0000 @@ -38,7 +38,7 @@

You can also start playing an album by choosing the album in the album - browser and pressing use your mouse to double click the song name, + browser and using your mouse to double click the song name, press the Spacebar, or choose Playback Play from the Banshee menu.

diff -Nru banshee-1.8.0/help/gl/search.page banshee-1.8.1/help/gl/search.page --- banshee-1.8.0/help/gl/search.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/search.page 2011-01-28 21:37:56.000000000 +0000 @@ -34,7 +34,7 @@ dave matthews. By entering dave matthews in the search box, Banshee will search all metatdata fields including Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata includes dave - and matthews will be returned. Search terms are case, meaningyou don't have to capitalize. dave, Dave, and DAVE + and matthews will be returned. Search terms are case, meaning you don't have to capitalize. dave, Dave, and DAVE all mean the same thing when searching.

@@ -66,7 +66,7 @@

NOT, not,-

- Do not display search results with any search team that follows the + Do not display search results with any search term that follows the operator of NOT, not,-.

diff -Nru banshee-1.8.0/help/gl/sort.page banshee-1.8.1/help/gl/sort.page --- banshee-1.8.0/help/gl/sort.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/sort.page 2011-01-28 21:37:56.000000000 +0000 @@ -45,7 +45,7 @@

You can sort your library by using your mouse to click on any of the columns displayed in library view. If you wish to sort your music library by Artist, click the Artist column header and Banshee will - automically sort that column alphabetically. Clicking the + automatically sort that column alphabetically. Clicking the Artist column again will sort the column in reverse alphabetical order.

diff -Nru banshee-1.8.0/help/gl/sync.page banshee-1.8.1/help/gl/sync.page --- banshee-1.8.0/help/gl/sync.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/sync.page 2011-01-28 21:37:56.000000000 +0000 @@ -126,7 +126,7 @@ menu choose EditDelete.

-

Deleting files from your portable music will permanently remove +

Deleting files from your portable music player will permanently remove the files and you will not be able to recover them.

diff -Nru banshee-1.8.0/help/gl/ui.page banshee-1.8.1/help/gl/ui.page --- banshee-1.8.0/help/gl/ui.page 2010-09-29 20:46:22.000000000 +0000 +++ banshee-1.8.1/help/gl/ui.page 2011-01-28 21:37:56.000000000 +0000 @@ -64,7 +64,7 @@

To change Now Playing to hide the Banshee user interface and use the full screen mode, you can press the F, press the Fullscreen button in the upper right hand corner of Banshee, or choose - ViewFullscreen to start Fullscreen + ViewFullscreen to start Fullscreen mode.

diff -Nru banshee-1.8.0/help/Makefile.am banshee-1.8.1/help/Makefile.am --- banshee-1.8.0/help/Makefile.am 2010-09-16 12:50:03.000000000 +0000 +++ banshee-1.8.1/help/Makefile.am 2011-01-28 20:56:45.000000000 +0000 @@ -29,7 +29,7 @@ sync.page \ ui.page -DOC_LINGUAS = de gl +DOC_LINGUAS = de es gl dist-hook: doc-dist-hook endif diff -Nru banshee-1.8.0/help/Makefile.in banshee-1.8.1/help/Makefile.in --- banshee-1.8.0/help/Makefile.in 2010-09-28 16:30:07.000000000 +0000 +++ banshee-1.8.1/help/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -60,6 +60,14 @@ subdir = help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -86,14 +94,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -163,6 +163,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ @@ -537,7 +539,7 @@ @HAVE_GNOME_DOC_UTILS_TRUE@ sync.page \ @HAVE_GNOME_DOC_UTILS_TRUE@ ui.page -@HAVE_GNOME_DOC_UTILS_TRUE@DOC_LINGUAS = de gl +@HAVE_GNOME_DOC_UTILS_TRUE@DOC_LINGUAS = de es gl all: all-am .SUFFIXES: diff -Nru banshee-1.8.0/libbanshee/banshee-player-video.c banshee-1.8.1/libbanshee/banshee-player-video.c --- banshee-1.8.0/libbanshee/banshee-player-video.c 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/libbanshee/banshee-player-video.c 2011-01-28 20:56:45.000000000 +0000 @@ -42,17 +42,19 @@ GstElement *video_sink = NULL; GstElement *xoverlay; GstXOverlay *previous_xoverlay; + gboolean found_xoverlay; - previous_xoverlay = player->xoverlay; - g_object_get (player->playbin, "video-sink", &video_sink, NULL); - + + g_mutex_lock (player->video_mutex); + previous_xoverlay = player->xoverlay; + if (video_sink == NULL) { player->xoverlay = NULL; if (previous_xoverlay != NULL) { gst_object_unref (previous_xoverlay); } - + g_mutex_unlock (player->video_mutex); return FALSE; } @@ -79,8 +81,10 @@ } gst_object_unref (video_sink); + found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE; - return player->xoverlay != NULL; + g_mutex_unlock (player->video_mutex); + return found_xoverlay; } #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */ @@ -91,9 +95,7 @@ g_return_if_fail (IS_BANSHEE_PLAYER (player)); #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) - g_mutex_lock (player->video_mutex); bp_video_find_xoverlay (player); - g_mutex_unlock (player->video_mutex); #endif } @@ -110,9 +112,7 @@ return; } - g_mutex_lock (player->video_mutex); found_xoverlay = bp_video_find_xoverlay (player); - g_mutex_unlock (player->video_mutex); if (found_xoverlay) { gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); @@ -318,16 +318,12 @@ gst_x_overlay_expose (player->xoverlay); return; } - - g_mutex_lock (player->video_mutex); - + if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) { - g_mutex_unlock (player->video_mutex); return; } gst_object_ref (player->xoverlay); - g_mutex_unlock (player->video_mutex); gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); gst_x_overlay_expose (player->xoverlay); diff -Nru banshee-1.8.0/libbanshee/Makefile.in banshee-1.8.1/libbanshee/Makefile.in --- banshee-1.8.0/libbanshee/Makefile.in 2010-09-28 16:30:07.000000000 +0000 +++ banshee-1.8.1/libbanshee/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -42,6 +42,14 @@ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -68,14 +76,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -191,6 +191,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/Makefile.in banshee-1.8.1/Makefile.in --- banshee-1.8.0/Makefile.in 2010-09-28 16:30:17.000000000 +0000 +++ banshee-1.8.1/Makefile.in 2011-01-28 21:25:33.000000000 +0000 @@ -40,6 +40,14 @@ install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -167,6 +167,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/NEWS banshee-1.8.1/NEWS --- banshee-1.8.0/NEWS 2010-09-29 18:08:48.000000000 +0000 +++ banshee-1.8.1/NEWS 2011-01-28 21:29:11.000000000 +0000 @@ -1,5 +1,5 @@ =============================================================================== -WELCOME TO BANSHEE 1.8.0 - Released September 29, 2010 +WELCOME TO BANSHEE 1.8.1 - Released January 28, 2011 =============================================================================== * Banshee is a multimedia management and playback application for GNOME. @@ -8,150 +8,55 @@ and video podcasts. Sync your Android, iPod, and other devices. We think you'll love the new Banshee!" - * Learn More: http://banshee.fm/download/archives/1.8.0 + * Learn More: http://banshee.fm/download/archives/1.8.1 =============================================================================== NEW AWESOME FEATURES AND ENHANCEMENTS =============================================================================== - Banshee 1.8 is a stable release, the culmination of six month's work by 67 - programmers, artists, documentation writers, and translators. These - notes aggregate the highlights from the 1.7 development releases. - - New Features Since 1.6: - - * Integrated AmazonMP3 Store - - Browse, search, preview, buy, and download music straight into - your Banshee library from the US, UK, FR, DE, and JP AmazonMP3 - stores. See http://abock.org/2010/07/13/amazon-mp3-store-in-banshee - - * Miro Guide Podcast Directory - - Browse and subscribe to thousands of audio and video podcasts - listed on the non-profit run MiroGuide.com. - - * Improved Apple Device Support - - iPhone, iTouch, iPad, and iPod devices are now supported via the - awesome libgpod library. - - * Revamped Hardware Backend - - Uses the latest Linux hardware stack, a combination of GIO, udev, and - media-player-info files, to provide support for CDs and - digital audio players. - - * Keybinding for Switching Sources - - Typing 'g' activates the source switcher, where you can type the name - of a source to switch to it. You can type its acronym or a substring - as well. As soon as only one source matches, it will be activated. - For example, you can type 'g' and then 'np' to switch to Now Playing. - - * Improved Audiobook Support - - The Audiobooks library is now enabled by default, and audiobook - tracks are now better organized into books. The last position in - each book is automatically saved, so you can resume playing a book - right from where you stopped. - - * User Manual - - Available via Help » Contents menu and F1. Uses the latest - GNOME documentation technology, Mallard. - - * Bulk Metadata Fixer - - New extension for bulk metadata fixing to merge artists, albums, - and genres that vary only by case, '&' vs 'and', etc. - - * MPRIS v2 support (Ubuntu Sound Menu, etc) - - Enhancements: - - * Now Playing simplify mode that declutters the UI - * Play Queue shuffle action - * Improve the downloading and visual refreshing of new cover art - * Many MeeGo specific improvements and fixes - * New preference to have the classic album layout instead of the grid view - * Support for reading and writing MusicBrainz IDs - * Show the TrackEditor fields as read-only mode when they are not editable - * Add metadata-saving support for File System Queue (bgo#609411) - * Decrease the latency in changing playback volume - * Overhaul GNOME proxy support (bmc#1920) - * Refresh podcast feeds when network is reconnected - * Miro Guide teaser in Podcasts - * Podcast errors shown to user - * Improved Last.fm authentication experience - * Last.fm streaming can be disabled separately from the other Last.fm - features. - * Play menu item in track context menu - * Wrap long strings in the Now Playing view - * Add visual separators in the source view between categories of sources - * Culturally format the status bar item count (e.g. in en_US 1,000 - instead of the old 1000) - * Tweak the grid view album artwork hover effect - * Default smart playlists hidden when empty, for new users - * Begin editing the name of newly added playlists - * "Amazon MP3s" Music smart playlist - * Improved device support: - * Droid X, Galaxy Portal, Xperia X10, and DEXT/CLIQ device support - * Improved Maemo device support - * Better MTP device detection - * Put all videos in the video folder on MTP devices - - API Changes: - - * DBus API additions for showing various dialogs - * New Banshee.WebBrowser API for creating embedded WebKit web browsers - and sources: used by the new Amazon MP3 store, Miro Guide, and the - Wikipedia context pane - * New Hyena.Downloader API for performing downloads and easy - HTTP operations: HttpFileDownloader, HttpStringDownloader - - Notable Bugs Fixed (230 fixed since 1.6.0): - - * Fix for fullscreen video under Mutter - * Fix videos playing back in a new window - * Fix crashes related to Gtk.Widget subclassing - * Fix crashes related to a11y - * NotificationArea fixes - * Cover art aspect ratio/scaling fixes - * Fix Youtube playback - * Fix deletion of Podcast metadata during modification - * Fix a crash related to the notification deamon - * Fix fetching cover for albums with several discs - * Several fixes for the N800 device - * Fix various volume-related issues - * bgo#621480: Fix Play Queue when using it with different locales - * bgo#621687: Fix the Internet Archive playback - * bgo#613333: Correct Play Queue track reordering - * bgo#624667: Fix cover art refreshing - * bgo#622826: Fix a slow running query to speed things up - * bgo#602840: Fix importing of compilation albums - * bgo#622028: Fix loading of libbnpx11.so on some distros - * bgo#621955: Wrap instead of elipsize Last.fm titles - * bgo#608382: Escape %20 in filenames for items without embedded metadata - * bgo#624531: Escape Uri value in SQL query - * bgo#588255: Fix notification icon transparency - * bgo#619036: Fix glitchy search entry - * bgo#624569: Fix scrolling Extensions list with keyboard - * bgo#553433: Fix issue that could block song scrobbling - * bgo#600340: Fix subscribing to certain podcasts (eg podbean.com) - * bgo#620826: Fix URIs of tracks synced to iPods - * bmc#1115: Fix a pipeline deadlock evident on MeeGo - * bgo#626786: Prevent crash in search-for-artist when blank - * bgo#628388: Fix overflow bug with MTP playlists - * bgo#625683: Fixup checkboxes now clickable - * bgo#626928: Fetch podcast artwork asap - * bgo#626791: Catch crashes caused by missing extensions - * bgo#528383: Re-enable writing video metadata to file - * bgo#626803: Fix Ogg rating parsing in non-English locales - * bgo#628832: [MTP] Fix MTP-device memory issues breaking Playlists, Albums - * bgo#629095: [MTP] Fix MTP devices being named '???' - * bgo#629373: [MTP] Workaround MTP sigsegv bug + Banshee 1.8.1 is a stable release, a bug-fixes-only update to 1.8.0. + + Notable Bugs Fixed: + + * Sync dialog would sometimes be displayed forever + * Nereid: Always grab search entry focus on ctrl+f + * Lastfm: Fix NRE in LastfmRequest when the request times out + * bgo#486543: Playlists: Fix parsing when started from root directory + * bgo#540394: AudioCdRipper: Don't overwrite existing files when ripping + * bgo#540525: TrackActions: Stop when the playing track is deleted + * bgo#587936: AppleDevice: Sync the Sort* fields + * bgo#609463: Equalizer: Fix distortion by using floating math + * bgo#620010: Fix displaying random image for "All Albums" + * bgo#623441: DatabaseImportManager: Fix duplicates on import + * bgo#624734: InternetRadio: Allow editing stations again + * bgo#629005: FullscreenWindow: Fix full-screen on multi-head displays + * bgo#630209: AppleDevice: Fix podcast flag for video podcasts + * bgo#631172: AppleDevice: Fix podcast support + * bgo#631961: Gio: Fix InvalidCastException + * bgo#632114: Fix hang when replaying video + * bgo#632196: AlbumListView: Fix MissingIntPtrCtorException + * bgo#632246: ThickClient: Fix IntPtr ctor issue in SourceComboBox + * bgo#632420: Booter: Use the MeeGo client if appropriate + * bgo#632715: Bookmarks: Fix UI not getting loaded + * bgo#633764: Dap: Fix not transcoding some files when we should + * bgo#633841: StreamTagger: Recognize webm as video + * bgo#634652: AppleDevice: Remove invalid tracks before syncing + * bgo#634686: Streaming: Fix streaming broken after first play + * bgo#635453: Importing: Fix regression with importing mkv + * bgo#635776: build: Ensure karma-sharp's DLLmap is copied in the build + * bgo#635791: Metrics: Fix translation of the preference label + * bgo#637303: FileChooserDialog: Fix error message on first launch + * bgo#637627: FullscreenWindow: Keep fullscreen when showing volume osd + * bgo#637991: SourceRowRenderer: Fix vertical alignment calculation + * bgo#638477: X11NotificationArea: Enhance check for RGBA visual + * bgo#638755: Dap.MassStorage: Add support for Xperia X10 mini pro + * bgo#638989: Dap.MassStorage: Add support for Nexus S + * bgo#635088: Dap.MassStorage: Add support for the LG Ally phone + * bgo#633551: Dap.MassStorage: Add support for Huawei Ideos Android phones + * bgo#631687: Dap.MassStorage: Fix extensionless files + * bgo#639603: PlayerEngine: Fix NRE when current track doesn't have a Uri + * bnc#642505: Fix insecure LD_LIBRARY_PATH =============================================================================== SOURCES / PACKAGES @@ -160,9 +65,9 @@ Sources ------- - * Banshee 1.8.0 Tarballs: - http://download.banshee.fm/banshee/stable/1.8.0/banshee-1-1.8.0.tar.bz2 - http://download.banshee.fm/banshee/stable/1.8.0/banshee-1-1.8.0.tar.gz + * Banshee 1.8.1 Tarballs: + http://download.banshee.fm/banshee/stable/1.8.1/banshee-1-1.8.1.tar.bz2 + http://download.banshee.fm/banshee/stable/1.8.1/banshee-1-1.8.1.tar.gz Packages -------- @@ -184,8 +89,8 @@ ChangeLogs & Checksums ---------------------- - * http://download.banshee.fm/banshee/stable/1.8.0/banshee-1-1.8.0.changes - * http://download.banshee.fm/banshee/stable/1.8.0/banshee-1-1.8.0.sha256sum + * http://download.banshee.fm/banshee/stable/1.8.1/banshee-1-1.8.1.changes + * http://download.banshee.fm/banshee/stable/1.8.1/banshee-1-1.8.1.sha256sum =============================================================================== @@ -256,7 +161,7 @@ hesitate to file bugs! * http://banshee.fm/contribute/file-bugs - * http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&version=1.8.0 + * http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&version=1.8.1 =============================================================================== @@ -270,63 +175,51 @@ of Banshee. Without their help, there would be no release! Aaron Bockover, Alan McGovern, Alexander Kojevnikov, Alex Launi, - Alex Mauer, Andreas Nilsson, Andrés G. Aragoneses, Aurélien Mino, - Benjamín Valero Espinosa, Bertrand Lorentz, Chow Loong Jin, - Christian Krause, Claude Paroz, David Nielsen, Félix Velasco, - Gabriel Burt, Iain Lane, Ján Sokoly, Jensen Somers, Jeroen Budts, - Jordi Mas, Julien Moutte, Kevin Duffus, Michał Sawicz, Mike Gemünde, - Nicolo' Chieffo, Paul Cutler, Pete Johanson, Robin Stocker, - Ruben Vermeersch, Zhou Ting + Andrés G. Aragoneses, Aran Cox, Bertrand Lorentz, Christian Krause, + Dougal Stanton, Gabriel Burt, kentaro KAZUHAMA, Michał Sawicz, + Olivier Dufour, Sjoerd Simons, Tim Fisken, Zhou Ting The following people contributed updated translations to this release. Without them, our project's reach would be much more limited. - Alexandre Prokoudine, Andrej Žnidaršič, Andre Klapper, António Lima, - Aron Xu, A S Alam, Baris Cicek, Benjamin Valero Espinosa, Bruce Cowan, - Bruno Brouard, Cheng-Chia Tseng, Christian.Kirbach, Claude Paroz, - Daniel Nylander, Daniel S. Koda, Emmanouel Kapernaros, Félix Velasco, - Fran Diéguez, Gabor Kelemen, Gianvito Cavasoli, Hendrik Richter, - Joe Hansen, Jordi Mas, Kentaro KAZUHAMA, Kristjan Schmidt, - Marek Černocký, Mario Blättermann, Maxim V. Dziumanenko, - Michel Recondo, Og B. Maciel, Petr Kovar, Ville-Pekka Vainio, - Wouter Bolsterlee, Xandru Armesto, Žygimantas Beručka, - Βασίλης Κοντογιάννης + Andrej Žnidaršič, Daniel Nylander, Maxim V. Dziumanenko, + Χάρης Κουζινόπουλος Contributors In Past Releases ----------------------------- - Aaron Bockover, Alan McGovern, Alex Bennee, Alex Kloss, Alex Launi, - Alex Mauer, Alexander Hixon, Alexander Kojevnikov, Alexandros Frantzis, - Alp Toker, Anders Petersson, Andrea Cimitan, Andreas Neustifter, - Andreas Nilsson, Andrew Conkling, Andrés G. Aragoneses, Andy Midgette, - Arthur Carli, Arun Raghavan, Aurélien Mino, Aydemir Ulaş Şahin, - Ben Maurer, Benjamín Valero Espinosa, Bertrand Lorentz, Bill Dawson, - Bob Copeland, Bojan Rajkovic, Brad Taylor, Brandon Perry, Brian Lucas, - Brian Nickel, Brian Teague, Chow Loong Jin, Chris Howie, Chris Jones, - Chris Lahey, Chris Toshok, Chris Turchin, Christian Hergert, - Christian Krause, Christoph Burgdorf, Christopher James Halse Rogers, - Claude Paroz, Cody Russell, Cosmin Banu, Dan Wilson, Dan Winship, - Daniel Munkton, Daniel Siegel, David Nielsen, David Spreen, David Stone, - Diego E. Pettenò, Eitan Isaacson, Elena Grassi, Eoin Hennessy, - Eric Butler, Erik Schmidt, Fabian Jost, Felipe Almeida Lessa, - Fernando Casanova, Florent Thoumie, Fredrik Hedberg, Félix Velasco, - Gabriel Burt, Garrett LeSage, Götz Waschk, Haitao Feng, - Hans Petter Jansson, Harold Schreckengost, Iain Lane, - Igor Guerrero Fonseca, Ilya Konstantinov, Ivan N. Zlatev, Jack Deslippe, - Jakub Steiner, James Willcox, Jan Arne Petersen, Jason Conti, Jason Taylor, - Jeff Tickle, Jeff Wheeler, Jensen Somers, Jeroen Budts, Jo Shields, - Johannes Kuhn, John Millikin, Jordi Mas, Jorge Castro, Julien Moutte, - Juri Pakaste, Ján Sokoly, Jérémie Laval, K. Vishnoo Charan Reddy, - Ken Vandine, Kevin Duffus, Konstantin Oshiyko, Larry Ewing, - Lauri Kotilainen, Lukas Lipka, Marijn Ros, Matt Enright, Michael Kaiser, - Michael Martin-Smucker, Michael Monreal, Michael Monreal, Michał Sawicz, - Miguel de Icaza, Mike Gemünde, Mike Urbanski, Moritz Schallaböck, - Nathan Palmer, Neil Loknath, Nicholas Doyle, Nicholas Parker, - Nicolò Chieffo, Nils Naumann, Oben Sonne, Olivier Duff, Oscar Forero, - Pacho Ramos, Patrick van Staveren, Paul Cutler, Paul Lange, Pavel Antonov, - Pepijn van de Geer, Pete Johanson, Peter de Kraker, Pratik Patel, - Przemysław Grzegorczyk, Robin Stocker, Roderich Schupp, Romain Tartière, - Ruben Vermeersch, Ryan Collier, Sandy Armstrong, Scott Peterson, - Sebastian Dröge, Shaun McCance, Tim Yamin, Tobias Mueller, Todd Berman, - Travis Glenn Hansen, Travis Reitter, Trey Ethridge, Valentin Sawadski, - Will Farrington, William Pettersson, Wouter Bolsterlee, Zhou Ting + Aaron Bockover, Alan McGovern, Alex Bennee, Alex Kloss, Alex Launi, + Alex Mauer, Alexander Hixon, Alexander Kojevnikov, Alexandros Frantzis, + Alp Toker, Anders Petersson, Andrea Cimitan, Andreas Neustifter, + Andreas Nilsson, Andrew Conkling, Andrés G. Aragoneses, Andy Midgette, + Arthur Carli, Arun Raghavan, Aurélien Mino, Aydemir Ulaş Şahin, + Ben Maurer, Benjamín Valero Espinosa, Bertrand Lorentz, Bill Dawson, + Bob Copeland, Bojan Rajkovic, Brad Taylor, Brandon Perry, Brian Lucas, + Brian Nickel, Brian Teague, Chow Loong Jin, Chris Howie, Chris Jones, + Chris Lahey, Chris Toshok, Chris Turchin, Christian Hergert, + Christian Krause, Christoph Burgdorf, Christopher James Halse Rogers, + Claude Paroz, Cody Russell, Cosmin Banu, Dan Wilson, Dan Winship, + Daniel Munkton, Daniel Siegel, David Nielsen, David Spreen, David Stone, + Diego E. Pettenò, Eitan Isaacson, Elena Grassi, Eoin Hennessy, + Eric Butler, Erik Schmidt, Fabian Jost, Felipe Almeida Lessa, + Fernando Casanova, Florent Thoumie, Fredrik Hedberg, Félix Velasco, + Gabriel Burt, Garrett LeSage, Götz Waschk, Haitao Feng, + Hans Petter Jansson, Harold Schreckengost, Iain Lane, + Igor Guerrero Fonseca, Ilya Konstantinov, Ivan N. Zlatev, Jack Deslippe, + Jakub Steiner, James Willcox, Jan Arne Petersen, Jason Conti, Jason Taylor, + Jeff Tickle, Jeff Wheeler, Jensen Somers, Jeroen Budts, Jo Shields, + Johannes Kuhn, John Millikin, Jordi Mas, Jorge Castro, Julien Moutte, + Juri Pakaste, Ján Sokoly, Jérémie Laval, K. Vishnoo Charan Reddy, + Ken Vandine, Kevin Duffus, Konstantin Oshiyko, Larry Ewing, + Lauri Kotilainen, Lukas Lipka, Marijn Ros, Matt Enright, Michael Kaiser, + Michael Martin-Smucker, Michael Monreal, Michael Monreal, Michał Sawicz, + Miguel de Icaza, Mike Gemünde, Mike Urbanski, Moritz Schallaböck, + Nathan Palmer, Neil Loknath, Nicholas Doyle, Nicholas Parker, + Nicolò Chieffo, Nils Naumann, Oben Sonne, Olivier Dufour, Oscar Forero, + Pacho Ramos, Patrick van Staveren, Paul Cutler, Paul Lange, Pavel Antonov, + Pepijn van de Geer, Pete Johanson, Peter de Kraker, Pratik Patel, + Przemysław Grzegorczyk, Robin Stocker, Roderich Schupp, Romain Tartière, + Ruben Vermeersch, Ryan Collier, Sandy Armstrong, Scott Peterson, + Sebastian Dröge, Shaun McCance, Tim Yamin, Tobias Mueller, Todd Berman, + Travis Glenn Hansen, Travis Reitter, Trey Ethridge, Valentin Sawadski, + Will Farrington, William Pettersson, Wouter Bolsterlee, Zhou Ting, diff -Nru banshee-1.8.0/po/el.po banshee-1.8.1/po/el.po --- banshee-1.8.0/po/el.po 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/po/el.po 2011-01-28 20:56:46.000000000 +0000 @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: Banshee\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 00:05+0300\n" -"PO-Revision-Date: 2010-08-23 23:50+0200\n" -"Last-Translator: Εμμανουήλ Καπερνάρος \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=banshee&component=general\n" +"POT-Creation-Date: 2010-09-28 06:36+0000\n" +"PO-Revision-Date: 2010-10-01 11:04+0300\n" +"Last-Translator: Χάρης Κουζινόπουλος \n" "Language-Team: Greek Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,11 +81,11 @@ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml #: ../data/addin-xml-strings.cs:41 msgid "Apple device Support" -msgstr "Υποστήριξη Apple Συσκευής" +msgstr "Υποστήριξη Συσκευής Apple" #: ../data/addin-xml-strings.cs:42 msgid "Support for most iPod/iPhone/iPad devices." -msgstr "" +msgstr "Υποστήριξη για τις περισσότερες συσκευές iPod/iPhone/iPad." #: ../data/addin-xml-strings.cs:43 ../data/addin-xml-strings.cs:48 #: ../data/addin-xml-strings.cs:53 ../data/addin-xml-strings.cs:58 @@ -180,7 +181,7 @@ #: ../data/addin-xml-strings.cs:82 ../data/addin-xml-strings.cs:87 #: ../data/addin-xml-strings.cs:117 ../data/addin-xml-strings.cs:132 -#: ../data/addin-xml-strings.cs:185 ../data/addin-xml-strings.cs:190 +#: ../data/addin-xml-strings.cs:190 ../data/addin-xml-strings.cs:195 msgid "Core" msgstr "Πυρήνας" @@ -207,8 +208,8 @@ #: ../data/addin-xml-strings.cs:102 ../data/addin-xml-strings.cs:107 #: ../data/addin-xml-strings.cs:122 ../data/addin-xml-strings.cs:147 #: ../data/addin-xml-strings.cs:156 ../data/addin-xml-strings.cs:166 -#: ../data/addin-xml-strings.cs:171 ../data/addin-xml-strings.cs:180 -#: ../data/addin-xml-strings.cs:209 +#: ../data/addin-xml-strings.cs:171 ../data/addin-xml-strings.cs:176 +#: ../data/addin-xml-strings.cs:185 ../data/addin-xml-strings.cs:214 msgid "Utilities" msgstr "Εφαρμογές" @@ -311,11 +312,11 @@ #. ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml #: ../data/addin-xml-strings.cs:145 msgid "Library Watcher" -msgstr "" +msgstr "Παρακολούθηση Βιβλιοθήκης" #: ../data/addin-xml-strings.cs:146 msgid "Automatically update music and video libraries" -msgstr "Αυτόματη ενημέρωση βιβλιοθήκης μουσικής και βίντεο" +msgstr "Αυτόματη ενημέρωση των βιβλιοθηκών μουσικής και βίντεο" #. ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml #: ../data/addin-xml-strings.cs:150 @@ -347,141 +348,149 @@ msgid "Browse and subscribe to thousands of audio and video podcasts." msgstr "" -#. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml +#. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml #: ../data/addin-xml-strings.cs:164 +msgid "MPRIS D-Bus interface" +msgstr "" + +#: ../data/addin-xml-strings.cs:165 +msgid "Control Banshee using the MPRIS D-Bus interface." +msgstr "" + +#. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml +#: ../data/addin-xml-strings.cs:169 msgid "Multimedia Keys" msgstr "Πλήκτρα Πολυμέσων" -#: ../data/addin-xml-strings.cs:165 +#: ../data/addin-xml-strings.cs:170 msgid "Control playback via the multimedia keys on your keyboard." msgstr "Έλεγχος αναπαραγωγής με τα πλήκτρα πολυμέσων του πληκτρολογίου." #. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml -#: ../data/addin-xml-strings.cs:169 +#: ../data/addin-xml-strings.cs:174 msgid "Notification Area Icon" msgstr "Εικονίδιο Περιοχής Ειδοποιήσεων" -#: ../data/addin-xml-strings.cs:170 +#: ../data/addin-xml-strings.cs:175 msgid "Display an icon in the notification area for controlling Banshee." msgstr "" "Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του " "Banshee." #. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml -#: ../data/addin-xml-strings.cs:174 +#: ../data/addin-xml-strings.cs:179 #: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164 #: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50 msgid "Now Playing" -msgstr "Τώρα Αναπαράγεται" +msgstr "Αναπαράγεται Τώρα" -#: ../data/addin-xml-strings.cs:175 +#: ../data/addin-xml-strings.cs:180 msgid "" "Provides a source that displays embedded video and provides fullscreen video " "playback and controls." msgstr "" #. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml -#: ../data/addin-xml-strings.cs:178 +#: ../data/addin-xml-strings.cs:183 msgid "Importers for Amarok, Rhythmbox and iTunes" msgstr "Εισαγωγείς για Amarok, Rhythmbox και iTunes" -#: ../data/addin-xml-strings.cs:179 +#: ../data/addin-xml-strings.cs:184 msgid "Import your library from Amarok, Rhythmbox or iTunes." msgstr "Εισαγωγή της βιβλιοθήκης σας από Amarok, Rhythmbox ή iTunes." #. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml -#: ../data/addin-xml-strings.cs:183 +#: ../data/addin-xml-strings.cs:188 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:58 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:79 msgid "Play Queue" msgstr "Αναπαραγωγή ουράς" -#: ../data/addin-xml-strings.cs:184 +#: ../data/addin-xml-strings.cs:189 msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over." msgstr "" #. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml -#: ../data/addin-xml-strings.cs:188 +#: ../data/addin-xml-strings.cs:193 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:188 #: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:203 msgid "Podcasts" msgstr "Podcasts" -#: ../data/addin-xml-strings.cs:189 +#: ../data/addin-xml-strings.cs:194 msgid "Subscribe to podcasts and stream or download episodes." msgstr "" #. ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml -#: ../data/addin-xml-strings.cs:193 +#: ../data/addin-xml-strings.cs:198 #, fuzzy msgid "Remote Audio" msgstr "Εισαγωγή ηχητικού ψηφιακού δίσκου" -#: ../data/addin-xml-strings.cs:194 +#: ../data/addin-xml-strings.cs:199 msgid "Provides support for remote speakers like the Airport Express" msgstr "" #. ../src/Extensions/Banshee.Sample/Banshee.Sample.addin.xml -#: ../data/addin-xml-strings.cs:197 +#: ../data/addin-xml-strings.cs:202 #: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40 msgid "Sample" msgstr "Δείγμα" -#: ../data/addin-xml-strings.cs:198 +#: ../data/addin-xml-strings.cs:203 msgid "A sample source useful to developers." msgstr "" -#: ../data/addin-xml-strings.cs:199 -#, fuzzy +#: ../data/addin-xml-strings.cs:204 msgid "Sources" -msgstr "Βαθμολογία" +msgstr "Πηγές" #. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml -#: ../data/addin-xml-strings.cs:202 -#, fuzzy +#: ../data/addin-xml-strings.cs:207 msgid "SQL Debug Console" -msgstr "Εμφάνιση πλαισίου SQL" +msgstr "Κονσόλα Αποσφαλμάτωσης SQL" -#: ../data/addin-xml-strings.cs:203 +#: ../data/addin-xml-strings.cs:208 msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries." msgstr "" -#: ../data/addin-xml-strings.cs:204 +#: ../data/addin-xml-strings.cs:209 msgid "Debug" msgstr "Αποσφαλμάτωση" #. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml -#: ../data/addin-xml-strings.cs:207 +#: ../data/addin-xml-strings.cs:212 msgid "Torrent Downloader" msgstr "" -#: ../data/addin-xml-strings.cs:208 +#: ../data/addin-xml-strings.cs:213 msgid "Support downloading BitTorrent files from podcasts." msgstr "" #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml -#: ../data/addin-xml-strings.cs:212 +#: ../data/addin-xml-strings.cs:217 #: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44 msgid "Wikipedia" msgstr "Wikipedia" -#: ../data/addin-xml-strings.cs:213 +#: ../data/addin-xml-strings.cs:218 msgid "View artist information from Wikipedia in the context pane." msgstr "" -#: ../data/addin-xml-strings.cs:214 ../data/addin-xml-strings.cs:219 +#: ../data/addin-xml-strings.cs:219 ../data/addin-xml-strings.cs:224 #, fuzzy msgid "Context Pane" msgstr "_Διατομή πλαισίου" #. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml -#: ../data/addin-xml-strings.cs:217 +#: ../data/addin-xml-strings.cs:222 #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44 msgid "YouTube" msgstr "YouTube" -#: ../data/addin-xml-strings.cs:218 +#: ../data/addin-xml-strings.cs:223 msgid "Show related YouTube videos in the context pane" msgstr "" @@ -755,7 +764,9 @@ msgstr "Δεν μπορεί να δημιουργηθεί στοιχείο filesrc" #: ../libbanshee/banshee-bpmdetector.c:214 -msgid "Could not create decodebin plugin" +#, fuzzy +#| msgid "Could not create decodebin plugin" +msgid "Could not create decodebin2 plugin" msgstr "Δεν μπορεί να δημιουργηθεί ένθεμα decodebin" #: ../libbanshee/banshee-bpmdetector.c:220 @@ -797,7 +808,9 @@ msgstr "Δεν μπορεί να δημιουργηθεί στοιχείο filesrc" #: ../libbanshee/banshee-transcoder.c:246 -msgid "Could not create 'decodebin' plugin" +#, fuzzy +#| msgid "Could not create 'decodebin' plugin" +msgid "Could not create 'decodebin2' plugin" msgstr "Δεν είναι δυνατή η δημιουργία του ενθέματος 'decodebin'" #: ../libbanshee/banshee-transcoder.c:252 @@ -843,7 +856,7 @@ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs:79 msgid "Fullscreen video playback active" -msgstr "Ενεργοποίηση πλήρης οθόνης για αναπαραγωγή μαγνητοσκόπησης" +msgstr "Ενεργοποίηση πλήρης οθόνης για αναπαραγωγή βίντεο" #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:89 msgid "Could not find an encoder for ripping." @@ -1066,7 +1079,7 @@ #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163 #: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90 msgid "Album Title" -msgstr "Ονομασία λευκώματος" +msgstr "Τίτλος Άλμπουμ" #: ../src/Clients/Booter/Booter/Entry.cs:188 #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160 @@ -1092,7 +1105,7 @@ #: ../src/Clients/Booter/Booter/Entry.cs:192 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114 msgid "Disc Number" msgstr "Αριθμός δίσκου" @@ -1100,7 +1113,7 @@ #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77 #: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92 @@ -1113,7 +1126,7 @@ #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:96 msgid "Rating" -msgstr "Αξιολόγηση" +msgstr "Βαθμολογία" #: ../src/Clients/Booter/Booter/Entry.cs:195 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322 @@ -1214,7 +1227,7 @@ #: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77 msgid "Play Album" -msgstr "Αναπαραγωγή λευκώματος" +msgstr "Αναπαραγωγή Άλμπουμ" #: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:83 msgid "En_queue" @@ -1237,11 +1250,11 @@ #: ../src/Clients/Muinshee/Muinshee/MuinsheeActions.cs:52 msgid "Play _Album" -msgstr "Αναπαραγωγή _λευκώματος" +msgstr "Αναπαραγωγή _Άλμπουμ" #: ../src/Clients/Muinshee/Muinshee/MuinsheeActions.cs:53 msgid "Add an album to the playlist" -msgstr "Προσθήκη λευκώματος στο κατάλογο αναπαραγωγής" +msgstr "Προσθήκη άλμπουμ στη λίστα αναπαραγωγής" #: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267 #, csharp-format @@ -1260,7 +1273,7 @@ #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159 #: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 msgid "Artist, Album, or Title" -msgstr "Καλλιτέχνης, Λεύκωμα, ή Ονομασία" +msgstr "Καλλιτέχνης, Άλμπουμ, ή Τίτλος" #. Alias for %album_artist% #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162 @@ -1268,7 +1281,7 @@ #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82 msgid "Album Artist" -msgstr "Λεύκωμα καλλιτέχνη" +msgstr "Καλλιτέχνης Άλμπουμ" #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98 @@ -1297,7 +1310,7 @@ #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:101 #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:136 msgid "Unknown Album" -msgstr "Άγνωστο λεύκωμα" +msgstr "Άγνωστο Άλμπουμ" #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49 msgid "Unknown Title" @@ -1342,7 +1355,7 @@ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419 msgid "_Restart Video" -msgstr "_Επανεκκίνηση μαγνητοσκόπησης" +msgstr "_Επανεκκίνηση Βίντεο" #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86 @@ -1363,7 +1376,7 @@ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439 msgid "_Jump to Playing Video" -msgstr "_Μεταπήδηση στην αναπαραγόμενη μαγνητοσκόπηση" +msgstr "_Μεταπήδηση στο Αναπαραγόμενο Βίντεο" #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82 @@ -1384,12 +1397,12 @@ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70 #, csharp-format msgid "All Albums ({0})" -msgstr "Όλα τα λευκώματα ({0})" +msgstr "Όλα τα Άλμπουμ ({0})" #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69 #, csharp-format msgid "All Artists ({0})" -msgstr "Όλη οι καλλιτέχνες ({0})" +msgstr "Όλοι οι καλλιτέχνες ({0})" #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:90 @@ -1398,17 +1411,17 @@ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50 msgid "Shuffle by A_lbum" -msgstr "Ανακάτεμα κατά _λεύκωμα" +msgstr "Τυχαίο Ανακάτεμα κατά _Άλμπουμ" #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51 msgid "by album" -msgstr "κατά άλμουμ" +msgstr "κατά άλμπουμ" #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52 msgid "Play all songs from an album, then randomly choose another album" msgstr "" -"Αναπαραγάγετε όλα τα τραγούδια από ένα λεύκωμα, έπειτα τυχαία επιλέξτε άλλο " -"λεύκωμα" +"Αναπαραγωγή όλων των τραγουδιών από ένα άλμπουμ, και στη συνέχεια τυχαία " +"επιλογή άλλου άλμπουμ" #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:49 msgid "Shuffle by A_rtist" @@ -1482,7 +1495,7 @@ msgstr "Σάρωση για μέσο" #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182 -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1375 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382 msgid "Scanning..." msgstr "Σάρωση..." @@ -1525,7 +1538,7 @@ "Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee " "μετεγκαθίσταται σε νέα μορφή." -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1372 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1379 msgid "Refreshing Metadata" msgstr "Ανανέωση μεταδεδομένων σε εξέλιξη" @@ -1617,7 +1630,7 @@ #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83 msgid "Album Artist Initial" -msgstr "Αρχικό λευκώματος καλλιτέχνη:" +msgstr "Αρχικό Καλλιτέχνη Άλμπουμ" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:88 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:199 @@ -1633,10 +1646,10 @@ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:92 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:360 msgid "Album" -msgstr "Λεύκωμα" +msgstr "Άλμπουμ" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:108 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:72 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:73 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:127 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:76 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:97 @@ -1644,40 +1657,40 @@ msgstr "Ονομασία" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:119 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:83 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:84 msgid "Count" msgstr "Μέτρηση" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:125 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:89 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:90 msgid "Number" msgstr "Αριθμός" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:131 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:95 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:96 msgid "Count (unsorted)" msgstr "Μέτρηση (χωρίς ταξινόμηση)" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:137 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:101 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:102 msgid "Number (unsorted)" msgstr "Αριθμός (χωρίς ταξινόμηση)" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:107 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:108 msgid "Disc Count" msgstr "Αρίθμηση δίσκου" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:119 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:120 msgid "Grouping" msgstr "Ομαδοποίηση" #. Catalog.GetString ("Music Library") #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59 -#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39 msgid "Music" msgstr "Μουσική" @@ -1693,7 +1706,7 @@ #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82 msgid "_Sort an artist's albums by year, not title" -msgstr "" +msgstr "_Ταξινόμηση των άλμπουμ ενός καλλιτέχνη κατά έτος και όχι κατά τίτλο" #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92 #, csharp-format @@ -1736,45 +1749,45 @@ msgid "Songs that have not been played or skipped" msgstr "Τραγούδια που έχουν αναπαραχθεί ή παραλειφθεί" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137 msgid "Neglected Favorites" msgstr "Παραμελημένα αγαπημένα" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138 msgid "Favorites not played in over two months" msgstr "Αγαπημένα που δεν έχουν αναπαραχθεί πάνω από δύο μήνες" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142 msgid "Least Favorite" msgstr "Λιγότερο αγαπητό" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143 msgid "Songs rated one or two stars or that you have frequently skipped" msgstr "" "Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που έχουν " "παραλείπονται συχνά" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147 msgid "700 MB of Favorites" msgstr "700 MB από αγαπημένα" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148 msgid "A data CD worth of favorite songs" msgstr "Ένας ψηφιακός δίσκος δεδομένων για αγαπημένα τραγούδια" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153 msgid "80 Minutes of Favorites" msgstr "80 λεπτά από αγαπημένα" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154 msgid "An audio CD worth of favorite songs" msgstr "Ένας ψηφιακός δίσκος ήχου για αγαπημένα τραγούδια" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159 msgid "Unrated" msgstr "Αναξιολόγητο" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:160 msgid "Songs that haven't been rated" msgstr "Τραγούδια που δεν έχουν αξιολογηθεί" @@ -1791,11 +1804,11 @@ #: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43 #: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38 msgid "Videos" -msgstr "Μαγνητοσκοπήσεις" +msgstr "Βίντεο" #: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48 msgid "Search your videos" -msgstr "Αναζητήστε τα βίντεο σας" +msgstr "Αναζήτηση των βίντεο σας" #: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65 msgid "Produced By" @@ -1810,15 +1823,15 @@ #: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:92 msgid "Videos rated four and five stars" -msgstr "Αξιολόγηση μαγνητοσκοπήσεων με τέσσερα και πέντε αστέρια" +msgstr "Βίντεο αξιολογημένα με τέσσερα και πέντε αστέρια" #: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96 msgid "Unwatched" -msgstr "Δεν παρακολουθήθηκε" +msgstr "Δεν προβλήθηκε" #: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:97 msgid "Videos that haven't been played yet" -msgstr "Μαγνητοσκοπήσεις που δεν έχουν αναπαραχθεί ακόμη" +msgstr "Βίντεο που δεν έχουν αναπαραχθεί ακόμη" #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:98 msgid "Default player engine" @@ -1829,12 +1842,12 @@ "No player engines were found. Please ensure Banshee has been cleanly " "installed." msgstr "" -"Δεν βρέθηκαν μηχανές αναπαραγωγέα. Παρακαλώ σιγουρευτείτε ότι το Banshee " +"Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee " "έχει εγκατασταθεί σωστά." #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:347 msgid "Problem with Player Engine" -msgstr "Πρόβλημα με την μηχανή αναπαραγωγής" +msgstr "Πρόβλημα με την Μηχανή Αναπαραγωγής" #: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135 #, csharp-format @@ -1855,7 +1868,7 @@ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52 msgid "Saving Metadata to File" -msgstr "Αποθήκευση μεταδεδομένων σε αρχείο" +msgstr "Αποθήκευση Μεταδεδομένων σε Αρχείο" #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49 msgid "Write _metadata to files" @@ -1913,7 +1926,7 @@ #. disabled by default #: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:302 msgid "Improve Banshee by sending anonymous usage data" -msgstr "" +msgstr "Βελτιώστε το Banshee στέλνοντας ανώνυμες πληροφορίες χρήσης" #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52 msgid "There is no available network connection" @@ -1928,11 +1941,11 @@ msgid "An available, working network connection will be assumed" msgstr "Μια διαθέσιμη, σύνδεση δικτύου εργασίας θα υποτεθεί" -#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:157 +#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159 msgid "_Disable features requiring Internet access" msgstr "_Απενεργοποίηση χαρακτηριστικών που χρειάζονται πρόσβαση στο διαδίκτυο" -#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:158 +#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160 msgid "" "Some features require a broadband Internet connection such as Last.fm or " "cover art fetching" @@ -1951,15 +1964,15 @@ #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309 msgid "Playlist" -msgstr "Κατάλογος αναπαραγωγής" +msgstr "Λίστα Αναπαραγωγής" #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134 msgid "Remove From Playlist" -msgstr "Αφαίρεση από τον κατάλογο αναπαραγωγής" +msgstr "Αφαίρεση από τη Λίστα Αναπαραγωγής" #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135 msgid "Delete Playlist" -msgstr "Διαγραφή καταλόγου αναπαραγωγής" +msgstr "Διαγραφή Λίστας Αναπαραγωγής" #. TODO generate name based on the track selection, or begin editing it #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386 @@ -1967,10 +1980,10 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:394 -#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:496 +#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:500 #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213 msgid "New Playlist" -msgstr "Νέος κατάλογος αναπαραγωγής" +msgstr "Νέα Λίστα Αναπαραγωγής" #: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsfReferencePlaylistFormat.cs:43 msgid "Windows Media ASX" @@ -2019,18 +2032,22 @@ msgstr "στοιχεία" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60 msgid "minutes" msgstr "λεπτά" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61 msgid "hours" msgstr "ώρες" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63 msgid "MB" msgstr "MB" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64 msgid "GB" msgstr "GB" @@ -2055,7 +2072,7 @@ #. Translators: These are unique search aliases for "album artist". You can use CSV for synonyms. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84 msgid "albumartist" -msgstr "καλλιτέχνης λευκώματος" +msgstr "καλλιτέχνης άλμπουμ" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84 msgid "compilationartist" @@ -2064,7 +2081,7 @@ #. Translators: These are unique search aliases for "album". You can use CSV for synonyms. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94 msgid "album" -msgstr "λεύκωμα" +msgstr "άλμπουμ" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94 msgid "on" @@ -2124,7 +2141,7 @@ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:134 msgid "Beats per Minute" -msgstr "Ψηφιολέξεις να λεπτό" +msgstr "Ρυθμός ανά Λεπτό" #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:136 @@ -2182,7 +2199,7 @@ #. Translators: noun #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:169 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:363 -#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:673 +#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:666 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:89 msgid "Name" msgstr "Όνομα" @@ -2267,7 +2284,7 @@ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232 msgid "rating" -msgstr "Αξιολόγηση" +msgstr "βαθμολογία" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232 msgid "stars" @@ -2473,11 +2490,11 @@ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:366 msgid "Highest Rating" -msgstr "Υψηλότερη αξιολόγηση" +msgstr "Υψηλότερη Βαθμολογία" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:367 msgid "Lowest Rating" -msgstr "Χαμηλότερη αξιολόγηση" +msgstr "Χαμηλότερη Βαθμολογία" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:369 msgid "Highest Score" @@ -2594,7 +2611,7 @@ msgid "Edit Smart Playlist" msgstr "Επεξεργασία έξυπνου καταλόγου αναπαραγωγής" -#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:233 +#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:242 msgid "Delete Smart Playlist" msgstr "Διαγραφή έξυπνου καταλόγου αναπαραγωγής" @@ -2680,25 +2697,25 @@ msgid "File _name" msgstr "_Όνομα αρχείου" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:693 #, csharp-format msgid "Adding {0} of {1} to {2}" msgstr "Προσθήκη {0} από {1} σε {2}" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:712 #, csharp-format msgid "Deleting {0} of {1} From {2}" msgstr "Διαγραφεί {0} από {1} από {2}" -#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:678 +#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:671 msgid "Size Ascending" msgstr "Αύξουσα κατά μέγεθος" -#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:683 +#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:676 msgid "Size Descending" msgstr "Φθίνουσα κατά μέγεθος" -#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:796 +#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:789 #, csharp-format msgid "{0} item" msgid_plural "{0} items" @@ -2845,7 +2862,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119 msgid "Make the context pane larger or smaller" -msgstr "Κάντετη διατομή πλαισίου μεγαλύτερη ή μικρότερη" +msgstr "Κάντε τη διατομή πλαισίου μεγαλύτερη ή μικρότερη" #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123 msgid "Hide context pane" @@ -2987,7 +3004,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39 msgid "Select album cover image" -msgstr "Επιλογή συνοδευτικής εικόνας για το λεύκωμα" +msgstr "Επιλογή εικόνας εξωφύλλου για το άλμπουμ" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:47 msgid "All image files" @@ -3153,7 +3170,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:67 msgid "Play or pause the current item" -msgstr "Αναπαράγεται ή διακόψτε το τρέχων στοιχείο" +msgstr "Αναπαραγωγή ή διακοπή του τρέχοντος αντικειμένου" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:70 msgid "_Next" @@ -3215,24 +3232,24 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:78 msgid "Repeat _Off" -msgstr "Απενεργοποίηση _επανάληψης" +msgstr "Απενεργοποίηση _Επανάληψης" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:79 msgid "Do not repeat playlist" -msgstr "Να μην γίνει επανάληψη του καταλόγου αναπαραγωγής" +msgstr "Να μην γίνει επανάληψη της λίστας αναπαραγωγής" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:83 msgid "Repeat _All" -msgstr "Επανάληψη όλων" +msgstr "Επανάληψη Όλων" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84 msgid "Play all songs before repeating playlist" msgstr "" -"Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη του καταλόγου αναπαραγωγής" +"Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:88 msgid "Repeat Singl_e" -msgstr "Επανάληψη _μονού" +msgstr "_Μονή Επανάληψη" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:89 msgid "Repeat the current playing song" @@ -3274,15 +3291,15 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:97 msgid "Export Playlist..." -msgstr "Εξαγωγή καταλόγου αναπαραγωγής..." +msgstr "Εξαγωγή Λίστας Αναπαραγωγής..." #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:98 msgid "Export a playlist" -msgstr "Εξαγωγή ενός καταλόγου αναπαραγωγής" +msgstr "Εξαγωγή μιας λίστας αναπαραγωγής" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:101 msgid "Unmap" -msgstr "Αποχαρτογράφηση" +msgstr "" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:104 msgid "Source Properties" @@ -3337,11 +3354,11 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:469 msgid "Separate by Type" -msgstr "Διαχωρισμός κατά τύπο" +msgstr "Διαχωρισμός κατά Τύπο" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70 msgid "Select _All" -msgstr "Επιλογή _όλων" +msgstr "Επιλογή _Όλων" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71 msgid "Select all tracks" @@ -3349,7 +3366,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74 msgid "Select _None" -msgstr "Επιλογή _κανενός" +msgstr "Επιλογή _Κανενός" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75 msgid "Unselect all tracks" @@ -3358,11 +3375,11 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78 #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59 msgid "_Edit Track Information" -msgstr "_Επεξεργασία πληροφορίας κομματιού" +msgstr "_Επεξεργασία Πληροφοριών Κομματιού" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79 msgid "Edit information on selected tracks" -msgstr "Επεξεργαστείτε την πληροφορία στα επιλεγμένα κομμάτια" +msgstr "Επεξεργαστείτε τις πληροφορίες των επιλεγμένων κομματιών" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252 @@ -3373,7 +3390,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83 msgid "View information on selected tracks" -msgstr "Προβολή πληροφορίας στα επιλεγμένα κομμάτια" +msgstr "Προβολή πληροφοριών των επιλεγμένων κομματιών" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87 msgid "Play the selected item" @@ -3381,7 +3398,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90 msgid "Add _to Playlist" -msgstr "Προσθήκη στο κατάλογο αναπαραγωγής" +msgstr "Προσθήκη στη _Λίστα Αναπαραγωγής" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91 msgid "Append selected items to playlist or create new playlist from selection" @@ -3403,7 +3420,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104 msgid "Remove From _Library" -msgstr "Διαγραφή από τη _βιβλιοθήκη" +msgstr "Διαγραφή από τη _Βιβλιοθήκη" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105 msgid "Remove selected track(s) from library" @@ -3411,7 +3428,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108 msgid "_Open Containing Folder" -msgstr "" +msgstr "Ά_νοιγμα Φακέλου" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109 msgid "Open the folder that contains the selected item" @@ -3419,7 +3436,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112 msgid "_Delete From Drive" -msgstr "_Διαγραφή από τον οδηγό" +msgstr "_Διαγραφή από το Δίσκο" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113 msgid "Permanently delete selected item(s) from medium" @@ -3435,19 +3452,19 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120 msgid "Search for items matching certain criteria" -msgstr "Αναζητήστε για στοιχεία που ταιριάζουν σε συγκεκριμένο κριτήριο" +msgstr "Αναζήτηση για στοιχεία που ταιριάζουν σε συγκεκριμένο κριτήριο" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123 msgid "By Matching _Album" -msgstr "Ταιριάζοντας το _λεύκωμα" +msgstr "Με το Ίδιο _Άλμπουμ" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124 msgid "Search all songs of this album" -msgstr "Αναζήτηση όλων των τραγουδιών αυτού του λευκώματος" +msgstr "Αναζήτηση όλων των τραγουδιών αυτού του άλμπουμ" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127 msgid "By Matching A_rtist" -msgstr "Ταιριάζοντας τον κα_λλιτέχνη" +msgstr "Με τον Ίδιο Κα_λλιτέχνη" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:128 msgid "Search all songs of this artist" @@ -3499,13 +3516,13 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53 msgid "Com_pilation Album Artist:" -msgstr "Σύν_ταξη καλλιτέχνη λευκώματος:" +msgstr "Κα_λλιτέχνης Συλλογής Άλμπουμ:" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57 msgid "" "Check this if this track is part of an album with tracks by various artists" msgstr "" -"Ελέγξτε αν αυτό το κομμάτι είναι μέρος ενός λευκώματος με κομμάτια από " +"Επιλέξτε εάν αυτό το κομμάτι αποτελεί μέρος ενός άλμπουμ με κομμάτια από " "διάφορους καλλιτέχνες" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59 @@ -3513,9 +3530,9 @@ "This value will affect how this album is sorted; if you enter 'Various " "Artists' then the album will located with other albums that start with 'V'." msgstr "" -"Η τιμή θα επηρεάσει το πως αυτό το λεύκωμα έχει ταξινομηθεί• αν εισαγάγετε " -"\"Διάφορους καλλιτέχνες\" τότε το λεύκωμα θα τοποθετηθεί με τα άλλα " -"λευκώματα που ξεκινάνε με \"Δ\"." +"Η επιλογή αυτή θα επηρεάσει τον τρόπο με τον οποίο θα ταξινομηθεί αυτό το " +"άλμπουμ• αν εισάγετε \"Διάφορους Καλλιτέχνες\" τότε το άλμπουμ θα " +"τοποθετηθεί με τα υπόλοιπα άλμπουμ που ξεκινάνε με \"Δ\"." #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44 msgid "Basic Details" @@ -3535,11 +3552,11 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:86 msgid "Set all compilation album artists to these values" -msgstr "Βάλτε σε όλους τους καλλιτέχνες του λευκώματος αυτές τις τιμές" +msgstr "Καθορισμός όλων των καλλιτεχνών συλλογών άλμπουμ σε αυτές τις τιμές" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:106 msgid "Set all album titles to this value" -msgstr "Ρυθμίστε όλες τις ονομασίες του λευκώματος σε αυτή τη τιμή" +msgstr "Καθορισμός όλων των τίτλων άλμπουμ σε αυτή τη τιμή" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:107 msgid "Albu_m Title:" @@ -3623,7 +3640,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:80 msgid "Set all beats per minute to this value" -msgstr "Ρυθμίστε όλες τις ψηφιολέξεις ανά λεπτό σε αυτή τη τιμή" +msgstr "Καθορισμός όλων των ρυθμών ανά λεπτό σε αυτή τη τιμή" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:81 msgid "Bea_ts Per Minute:" @@ -3689,7 +3706,8 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:67 msgid "Set all sort album artists to this value" -msgstr "Ρυθμίστε όλες τις ταξινομημένα λευκώματα καλλιτεχνών σε αυτή τη τιμή" +msgstr "" +"Καθορισμός όλων των ταξινομημένων καλλιτεχνών άλμπουμ σε αυτήν την τιμή" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:68 msgid "Sort Album Artist:" @@ -3697,8 +3715,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:74 msgid "Set all sort album titles to this value" -msgstr "" -"Ρυθμίστε όλες τις ταξινομημένες ονομασίες του λευκώματος σε αυτή τη τιμή" +msgstr "Καθορισμός όλων των ταξινομημένων τίτλων άλμπουμ σε αυτήν την τιμή" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:75 msgid "Sort Album Title:" @@ -3742,21 +3759,21 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:190 msgid "Video Dimensions:" -msgstr "Διαστάσεις αναπαραγωγής μαγνητοσκόπησης:" +msgstr "Διαστάσεις Βίντεο:" #. Translators: {0} is the description of the codec #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:197 #, csharp-format msgid "{0} Codec:" -msgstr "{0} Codec:" +msgstr "" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:202 msgid "Container Formats:" -msgstr "Μορφοποιήσεις κιβωτίου:" +msgstr "" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:207 msgid "Imported On:" -msgstr "Εισήχθηκε στο:" +msgstr "Εισήχθηκε Στις:" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:209 msgid "Last Played:" @@ -3780,11 +3797,12 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:221 msgid "File Size:" -msgstr "Μέγεθος αρχείου:" +msgstr "Μέγεθος Αρχείου:" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61 msgid "bytes" -msgstr "ψηφιολέξεις" +msgstr "" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95 msgid "Track Editor" @@ -3812,7 +3830,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185 msgid "Album:" -msgstr "Λεύκωμα:" +msgstr "Άλμπουμ:" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309 msgid "Sync all field _values" @@ -3883,7 +3901,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:87 msgid "Toggle display of album cover art" -msgstr "Εναλλαγή εμφάνισης εξωφύλλου των άλμπουμ" +msgstr "Εναλλαγή εμφάνισης του εξωφύλλου των άλμπουμ" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs:92 msgid "Active Task Running" @@ -3902,7 +3920,7 @@ #. simply: "Chicago Public Radio" or whatever the artist name is #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538 msgid "Unknown Stream" -msgstr "Άγνωστη ροή" +msgstr "Άγνωστη Ροή" #. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541 @@ -4044,7 +4062,7 @@ "library now, or choose to do so later." msgstr "" "Η βιβλιοθήκη των πολυμέσων σας είναι άδεια. Μπορείτε να εισαγάγετε μουσική " -"και μαγνητοσκοπήσεις στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα." +"και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα." #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89 msgid "Import _from:" @@ -4125,6 +4143,10 @@ msgid "Playlist _Name:" msgstr "_Όνομα λίστας αναπαραγωγής:" +#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108 +msgid "Predefined Smart Playlists" +msgstr "Προκαθορισμένοι έξυπνοι κατάλογοι αναπαραγωγής" + #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119 msgid "Open in editor" msgstr "Άνοιγμα σε επεξεργαστή" @@ -4140,8 +4162,8 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:111 msgid "Show the artist/album browser to the left of the track list" msgstr "" -"Εμφάνιση του φυλλομετρητή καλλιτέχνη/λεύκωμα στην αριστερά του καταλόγου του " -"κομματιού" +"Εμφάνιση του φυλλομετρητή καλλιτέχνη/άλμπουμ στα αριστερά του καταλόγου " +"κομματιών" #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:114 msgid "Browser on Top" @@ -4150,7 +4172,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115 msgid "Show the artist/album browser above the track list" msgstr "" -"Εμφανίστε το φυλλομετρητή καλλιτέχνης/λεύκωμα πάνω από τον κατάλογο κομματιού" +"Εμφανίστε το φυλλομετρητή καλλιτεχνών/άλμπουμ πάνω από τον κατάλογο κομματιών" #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120 msgid "Show Browser" @@ -4158,9 +4180,9 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121 msgid "Show or hide the artist/album browser" -msgstr "Εμφανίστε ή αποκρύψτε το φυλλομετρητή καλλιτέχνης/λεύκωμα" +msgstr "Εμφάνιση ή απόκρυψη του φυλλομετρητή καλλιτεχνών/άλμπουμ" -#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:119 +#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121 #, csharp-format msgid "Loading {0}..." msgstr "Φόρτωση {0}..." @@ -4171,7 +4193,7 @@ "Disc" msgstr "" "Εισαγωγή\n" -"δίσκου" +"Δίσκου" #: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95 msgid "Clear search" @@ -4187,9 +4209,9 @@ msgstr "Αδρανή" #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149 -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:68 +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58 msgid "Contacting..." -msgstr "Σε επαφή..." +msgstr "Επικοινωνία..." #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:159 msgid "Buffering" @@ -4207,30 +4229,30 @@ msgid "Full Volume" msgstr "Μέγιστη ένταση" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:89 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:96 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102 msgid "Device" msgstr "Συσκευή" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:90 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:97 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104 msgid "Generation" msgstr "Παραγωγή" #. FIXME #. AddDapProperty (Catalog.GetString ("Color"), "black"); -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:95 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:102 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105 msgid "Capacity" msgstr "Χωρητικότητα" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:96 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:103 msgid "Available" msgstr "Διαθέσιμα" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:97 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105 -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:135 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:104 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141 msgid "Serial number" msgstr "Σειριακός αριθμός" @@ -4239,35 +4261,48 @@ #. string [] capabilities = new string [ipod_device.ModelInfo.Capabilities.Count]; #. ipod_device.ModelInfo.Capabilities.CopyTo (capabilities, 0); #. AddDapProperty (Catalog.GetString ("Capabilities"), String.Join (", ", capabilities)); -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:104 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:111 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113 msgid "Supports cover art" msgstr "Υποστήριξη έντεχνου εξωφύλλου" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:105 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:112 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:114 msgid "Supports photos" msgstr "Υποστηρίζει φωτογραφίες" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:379 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:407 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:491 msgid "Track duration is zero" msgstr "Η διάρκεια του κομματιού είναι μηδέν" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:650 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:510 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:694 msgid "Syncing iPod" -msgstr "Συγχρονισμός του iPod" +msgstr "Συγχρονισμός του iPod" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:651 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:511 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:695 msgid "Preparing to synchronize..." msgstr "Προετοιμασία για συγχρονισμό..." -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:589 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:676 -msgid "Flushing to disk..." -msgstr "Καθαρισμός στο δίσκο." +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:514 +#, csharp-format +#| msgid "Adding {0} of {1} to {2}" +msgid "Adding track {0} of {1}" +msgstr "Προσθήκη κομματιού {0} από {1}" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:550 +#, csharp-format +#| msgid "Importing {0} of {1}" +msgid "Removing track {0} of {1}" +msgstr "Απομάκρυνση κομματιού {0} από {1}" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:614 +#, fuzzy +#| msgid "Saving new database..." +msgid "Writing media database" +msgstr "Αποθήκευση νέας βάσης δεδομένων..." #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:131 #, csharp-format @@ -4275,7 +4310,7 @@ msgstr "Συγχρονισμός {0}" #. Note to translators: {0}, {1} and {2} will be replaced with numbers. -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:256 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:260 #, csharp-format msgid "{0} to add, {1} to remove, {2} to update" msgstr "{0} για προσθήκη, {1} για διαγραφή, {2} για ενημέρωση" @@ -4290,7 +4325,7 @@ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 msgid "Vendor" -msgstr "Μικροπωλητής" +msgstr "Κατασκευαστής" #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:280 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:133 @@ -4353,7 +4388,7 @@ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:369 msgid "Are you sure you want to continue?" -msgstr "Σίγουρος θέλετε να συνεχίσετε;" +msgstr "Είστε σίγουρος ότι θέλετε να συνεχίσετε;" #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:377 msgid "Remove tracks" @@ -4378,7 +4413,7 @@ #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:71 msgid "Free Space" -msgstr "Ελεύθερος χώρος" +msgstr "Ελεύθερος Χώρος" #. Translators: {0} is the name assigned to a Digital Audio Player by its owner #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:55 @@ -4468,34 +4503,38 @@ msgid "Error rebuilding iPod database" msgstr "Σφάλμα κατά την επανακατασκευή της βάσης δεδομένων iPod" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103 msgid "Color" msgstr "Χρώμα" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107 msgid "Produced on" msgstr "Δημιουργήθηκε στο" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108 msgid "Firmware" msgstr "Υλικολογισμικό" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:111 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112 msgid "Capabilities" msgstr "Δυνατότητες" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680 msgid "Out of space on device" msgstr "Δεν υπάρχει χώρος στη συσκευή" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680 msgid "Please manually remove some songs" msgstr "Παρακαλώ manually αφαιρέστε μερικά τραγούδια" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:672 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:724 msgid "Updating..." msgstr "Ενημέρωση..." +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:728 +msgid "Flushing to disk..." +msgstr "Καθαρισμός στο δίσκο." + #: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:61 msgid "Unable to read your iPod" msgstr "Αδύνατη η ανάγνωση του iPod σας" @@ -4619,22 +4658,38 @@ "για περισσότερες πληροφορίες στο http://www.banshee-project.org/Guide/DAPs/" "MTP." -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:136 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142 +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66 msgid "Version" msgstr "Έκδοση" -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:138 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:144 msgid "Battery level" msgstr "Επίπεδο γεμίσματος" #. user_event.Progress = (double)current / total; #. Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the #. track currently being loaded, and {2} is the total # of tracks that will be loaded. -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:154 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:160 #, csharp-format msgid "Loading {0} - {1} of {2}" msgstr "Γίνεται φόρτωση {0} - {1} από {2}" +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:57 +msgid "Amazon MP3 Purchases" +msgstr "Αγορές Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:53 +#, fuzzy +#| msgid "Amazon MP3 Files" +msgid "Amazon MP3s" +msgstr "Αρχεία Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:54 +#| msgid "Search the Amazon MP3 Store" +msgid "Songs purchased from the Amazon MP3 Store" +msgstr "Τραγούδια αγορασμένα από το κατάστημα Amazon MP3" + #: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:40 msgid "Download Amazon MP3 Purchase" msgstr "Μεταφόρτωση της Amazon MP3 αγοράς" @@ -4647,30 +4702,8 @@ msgid "Amazon MP3 Purchase" msgstr "Αγορά Amazon MP3" -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:67 -msgid "Amazon MP3 Purchases" -msgstr "Αγορές Amazon MP3" - -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:176 -#, csharp-format -msgid "{0} download at {1}/s" -msgid_plural "{0} downloads at {1}/s" -msgstr[0] "{0} μεταφόρτωση με {1}/s" -msgstr[1] "{0} μεταφορτώσεις με {1}/s" - -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:184 -#, csharp-format -msgid "{0} download at {1}/s ({2} pending)" -msgid_plural "{0} downloads at {1}/s ({2} pending)" -msgstr[0] "{0} μεταφόρτωση με {1}/s ({2} σε αναμονή)" -msgstr[1] "{0} μεταφορτώσεις με {1}/s ({2} σε αναμονή)" - -#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/SignOutButton.cs:38 -msgid "Sign out of Amazon" -msgstr "Αποσύνδεση από Amazon" - #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42 -#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:38 +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39 msgid "Amazon MP3 Store" msgstr "Κατάστημα Amazon MP3" @@ -4706,11 +4739,15 @@ msgid "United States (amazon.com)" msgstr "Ηνωμένες Πολιτείες (amazon.com)" -#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:47 +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43 #, csharp-format msgid "Search the Amazon MP3 Store" msgstr "Αναζήτση στο κατάστημα Amazon MP3" +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45 +msgid "How Your Purchases Support GNOME" +msgstr "" + #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:55 msgid "Open Book" msgstr "Άνοιγμα Βιβλίου" @@ -4760,23 +4797,24 @@ msgid "Author" msgstr "Συγγραφέας" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:62 +#. Translators: This means the first letter of the author's name +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:63 msgid "Author Initial" msgstr "Αρχικός Συγγραφέας:" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:67 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:68 msgid "Book Title" msgstr "Τίτλος Βιβλίου" #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68 msgid "Audiobooks, etc" -msgstr "Ακουστικά βιβλία, κτλ" +msgstr "Ακουστικά βιβλία, κλπ" #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75 msgid "Search your audiobooks" msgstr "Αναζήτηση των ακουστικών βιβλίων σας" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:144 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:145 #, csharp-format msgid "{0} book" msgid_plural "{0} books" @@ -4895,8 +4933,8 @@ #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191 msgid "Automatic import off since this album is already in the Music Library." msgstr "" -"Αυτόματο σταμάτημα εισαγωγής από την στιγμή που αυτό το λεύκωμα είναι ήδη " -"στην βιβλιοθήκη μουσικής." +"Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη " +"Βιβλιοθήκη Μουσικής." #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214 msgid "Could not import CD" @@ -4952,8 +4990,8 @@ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116 msgid "Tap this button to the beat to set the BPM for this song manually" msgstr "" -"Κτυπήστε ελαφριά αυτό το κουμπί στο βαθμό που να ρυθμιστεί χειρονακτικά το " -"BPM για αυτό το τραγούδι" +"Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα το ρυθμό ανά " +"λεπτό αυτού του τραγουδιού" #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148 msgid "_Automatically detect BPM for all songs" @@ -4976,22 +5014,6 @@ msgid "{0} - {1}" msgstr "{0} - {1}" -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107 -msgid "_Cover Art" -msgstr "_΄Εντεχνο εξώφυλλο" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:108 -msgid "Manage cover art" -msgstr "Διαχείριση έντεχνου εξώφυλλου" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110 -msgid "_Download Cover Art" -msgstr "_Καταφόρτωση έντεχνου εξώφυλλου" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:111 -msgid "Download cover art for all tracks" -msgstr "Καταφόρτωση έντεχνων εξώφυλλων για όλα τα κομμάτια" - #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:42 msgid "Shared Music" msgstr "Κοινόχρηστη μουσική" @@ -5082,7 +5104,7 @@ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178 msgid "Add Remote DAAP Server" -msgstr "Προσθήκη Απομακρυσμένου DAAP Εξυπηρετητή" +msgstr "Προσθήκη Απομακρυσμένου Εξυπηρετητή DAAP" #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179 msgid "Add a new remote DAAP server" @@ -5163,14 +5185,12 @@ msgstr "Εισαγωγή αρχείων στη βιβλιοθήκη" #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62 -#, fuzzy msgid "eMusic Files" -msgstr "Αρχεία πολυμέσων" +msgstr "Αρχεία eMusic" #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78 -#, fuzzy msgid "eMusic Tracks" -msgstr "Βιβλιοθήκη μουσικής" +msgstr "Κομμάτια eMusic" #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:57 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:58 @@ -5197,16 +5217,16 @@ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:46 msgid "Duplicate Albums" -msgstr "Διπλοτυπία Άλμπουμ" +msgstr "Δημιουργία Αντιγράφου Άλμπουμ" #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47 msgid "" "Displayed are albums that should likely be merged. For each row, click the " "desired title to make it bold, or uncheck it to take no action." msgstr "" -"Τα προβαλλόμενα είναι άλμπουμ που πιθανότατα πρέπει να συγχωνευθούν. Για τη " -"κάθε σειρά, κάντε κλικ στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή ξε-" -"τσεκάρετέ τον για να μην γίνει καμία ενέργεια." +"Τα προβαλλόμενα είναι άλμπουμ που πιθανότατα πρέπει να συγχωνευθούν. Για " +"κάθε σειρά, πατήστε στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή απο-" +"επιλέξτε τον για να μην γίνει καμία ενέργεια." #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46 msgid "Duplicate Artists" @@ -5662,9 +5682,8 @@ msgstr "" #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:80 -#, fuzzy msgid "Open Source Movies" -msgstr "Ιδιότητες πηγής" +msgstr "" #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:81 msgid "Prelinger Archives" @@ -5725,7 +5744,7 @@ #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:95 msgid "Additional Collections" -msgstr "" +msgstr "Επιπλέον Συλλογές" #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:98 msgid "Audio Books & Poetry" @@ -5759,7 +5778,7 @@ #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:108 msgid "Radio Programs" -msgstr "" +msgstr "Προγράμματα Ραδιοφώνου" #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:111 msgid "Education" @@ -5873,8 +5892,9 @@ msgstr "Περιγραφή:" #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128 +#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50 msgid "Rating:" -msgstr "Βαθμολόγηση:" +msgstr "Βαθμολογία:" #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:125 msgid "_Last.fm" @@ -5926,11 +5946,11 @@ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:86 msgid "View Artist's Videos" -msgstr "Προβολή των μαγνητοσκοπήσεων του καλλιτέχνη" +msgstr "Προβολή των Βίντεο του Καλλιτέχνη" #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:87 msgid "Find videos by this artist" -msgstr "Εύρεση μαγνητοσκοπήσεων μέσω αυτού του καλλιτέχνη" +msgstr "Αναζήτηση βίντεο αυτού του καλλιτέχνη" #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:90 #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:106 @@ -5944,11 +5964,11 @@ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:99 msgid "View this album's Last.fm page" -msgstr "Προβολή της σελίδας του λευκώματος Last.fm" +msgstr "Προβολή της σελίδας Last.fm του άλμπουμ" #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:107 msgid "Recommend this album to someone" -msgstr "Προτείνετε αυτό το λεύκωμα σε κάποιον" +msgstr "Προτείνετε αυτό το άλμπουμ σε κάποιον" #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:114 msgid "View this track's Last.fm page" @@ -6064,7 +6084,7 @@ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:80 #, csharp-format msgid "Top Albums by {0}" -msgstr "Κορυφαία λευκώματα από {0}" +msgstr "Κορυφαία Άλμπουμ από {0}" #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:81 #, csharp-format @@ -6325,7 +6345,7 @@ #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:50 msgid "Miro Guide" -msgstr "" +msgstr "Οδηγός Miro" #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:97 msgid "Discover interesting podcasts in the Miro Guide podcast directory!" @@ -6333,14 +6353,18 @@ #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:100 msgid "Open Miro Guide" -msgstr "" +msgstr "Άνοιγμα Οδηγού Miro" #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:56 -msgid "Search for Podcasts" +#, fuzzy +#| msgid "Search for Podcasts" +msgid "Search for podcasts" msgstr "Ανανέωση όλων των Podcasts" #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:57 -msgid "Search for Video Podcasts" +#, fuzzy +#| msgid "Search for Video Podcasts" +msgid "Search for video podcasts" msgstr "Αναζήτηση για Βίντεο Podcasts" #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139 @@ -6551,7 +6575,7 @@ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:127 msgid "Disable Auto Updates" -msgstr "" +msgstr "Απενεργοποίηση Αυτόματων Ενημερώσεων" #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:145 #, csharp-format @@ -6805,6 +6829,197 @@ msgid "No videos found" msgstr "Δεν βρέθηκαν βίντεο" +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36 +#, fuzzy +#| msgid "Hide context pane" +msgid "open context menu" +msgstr "Απόκρυψη διατομής πλαισίου" + +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37 +msgid "click" +msgstr "" + +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37 +#| msgid "Venue:" +msgid "menu" +msgstr "" + +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612 +#, csharp-format +msgid "Hide {0}" +msgstr "Απόκρυψη {0}" + +#. Translators: {0} is substituted with the application name +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53 +#, fuzzy, csharp-format +#| msgid "Banshee Encountered a Fatal Error" +msgid "{0} Encountered a Fatal Error" +msgstr "To Banshee αντιμετώπισε ένα αναπόφευκτο σφάλμα" + +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92 +msgid "Error Details" +msgstr "Λεπτομέρειες σφάλματος" + +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136 +msgid "An unhandled exception was thrown: " +msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε:" + +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58 +msgid "Assembly Version Information" +msgstr "Πληροφορία για την έκδοση συναρμολόγησης" + +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64 +msgid "Assembly Name" +msgstr "Όνομα συναρμολόγησης" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62 +msgid "KB" +msgstr "KB" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86 +#, fuzzy +#| msgid "Con_ductor:" +msgid "Condition:" +msgstr "Διευ_θύνων:" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104 +msgid "_Match" +msgstr "_Ταίριασμα" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111 +#| msgid "All" +msgid "all" +msgstr "όλα" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112 +msgid "any" +msgstr "κάθε" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117 +msgid "of the following:" +msgstr "από το παρακάτω:" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58 +msgid "_Limit to" +msgstr "_Οριοθέτηση στο" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85 +#, fuzzy +#| msgid "(none selected)" +msgid "selected by" +msgstr "(κανένα επιλεγμένο)" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42 +msgid "ago" +msgstr "πριν" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59 +msgid "seconds" +msgstr "deyter;olepta" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62 +msgid "days" +msgstr "μέρες" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63 +msgid "weeks" +msgstr "εβδομάδες" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64 +msgid "months" +msgstr "μήνες" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65 +msgid "years" +msgstr "έτη" + +#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:71 +#, csharp-format +msgid "{0} download at {1}/s" +msgid_plural "{0} downloads at {1}/s" +msgstr[0] "{0} μεταφόρτωση με {1}/s" +msgstr[1] "{0} μεταφορτώσεις με {1}/s" + +#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:79 +#, csharp-format +msgid "{0} download at {1}/s ({2} pending)" +msgid_plural "{0} downloads at {1}/s ({2} pending)" +msgstr[0] "{0} μεταφόρτωση με {1}/s ({2} σε αναμονή)" +msgstr[1] "{0} μεταφορτώσεις με {1}/s ({2} σε αναμονή)" + +#. public static readonly Operator Equal = new Operator ("equals", "= {0}", "==", "=", ":"); +#. public static readonly Operator NotEqual = new Operator ("notEqual", "!= {0}", true, "!=", "!:"); +#. public static readonly Operator LessThanEqual = new Operator ("lessThanEquals", "<= {0}", "<="); +#. public static readonly Operator GreaterThanEqual = new Operator ("greaterThanEquals", ">= {0}", ">="); +#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:47 +msgid "before" +msgstr "πριν" + +#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:48 +msgid "after" +msgstr "μετά" + +#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:43 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:41 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:45 +msgid "is" +msgstr "είναι" + +#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:44 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:42 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:46 +msgid "is not" +msgstr "δεν είναι" + +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:43 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47 +msgid "at most" +msgstr "το πολύ" + +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:44 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46 +msgid "at least" +msgstr "τουλάχιστον" + +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:45 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45 +msgid "less than" +msgstr "μικρότερο από" + +#. The SQL operators in these Operators are reversed from normal on purpose +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:46 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44 +msgid "more than" +msgstr "περισσότερο από" + +#: ../src/Hyena/Hyena/Hyena.Query/NullQueryValue.cs:41 +msgid "empty" +msgstr "άδειο" + +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90 +#, fuzzy, csharp-format +#| msgid "{0} day" +#| msgid_plural "{0} days" +msgid "{0} ago" +msgstr "{0} ημέρα" + +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:43 +#, fuzzy +msgid "contains" +msgstr "Συνέχεια" + +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:44 +msgid "doesn't contain" +msgstr "δεν περιέχει" + +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:47 +msgid "starts with" +msgstr "ξεκινάει με" + +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:48 +msgid "ends with" +msgstr "τελειώνει με" + #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76 msgid "Last.fm Account Login" msgstr "Σύνδεση στο λογαριασμό Last.fm" @@ -6924,6 +7139,21 @@ msgid "Unknown Podcast" msgstr "Άγνωστο Podcast" +#~ msgid "Sign out of Amazon" +#~ msgstr "Αποσύνδεση από Amazon" + +#~ msgid "_Cover Art" +#~ msgstr "_΄Εντεχνο εξώφυλλο" + +#~ msgid "Manage cover art" +#~ msgstr "Διαχείριση έντεχνου εξώφυλλου" + +#~ msgid "_Download Cover Art" +#~ msgstr "_Καταφόρτωση έντεχνου εξώφυλλου" + +#~ msgid "Download cover art for all tracks" +#~ msgstr "Καταφόρτωση έντεχνων εξώφυλλων για όλα τα κομμάτια" + #~ msgid "Could not create 'filesrc' plugin" #~ msgstr "Δεν είναι δυνατή η δημιουργία της προσθήκης 'filesrc'" @@ -6963,9 +7193,6 @@ #~ msgid "Import Media to Library" #~ msgstr "Εισαγωγή πολυμέσων στη βιβλιοθήκη" -#~ msgid "Predefined Smart Playlists" -#~ msgstr "Προκαθορισμένοι έξυπνοι κατάλογοι αναπαραγωγής" - #~ msgid "Manually manage this device" #~ msgstr "Χειρονακτικά διαχειριστείτε αυτή τη συσκευή" @@ -7022,90 +7249,6 @@ #~ msgid "Subscribe to Podcast..." #~ msgstr "Εγγρραφή στη θαλαμοεκπομπή..." -#~ msgid "Hide {0}" -#~ msgstr "Απόκρυψη {0}" - -#~ msgid "Banshee Encountered a Fatal Error" -#~ msgstr "To Banshee αντιμετώπισε ένα αναπόφευκτο σφάλμα" - -#~ msgid "Error Details" -#~ msgstr "Λεπτομέρειες σφάλματος" - -#~ msgid "An unhandled exception was thrown: " -#~ msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε:" - -#~ msgid "Assembly Version Information" -#~ msgstr "Πληροφορία για την έκδοση συναρμολόγησης" - -#~ msgid "Assembly Name" -#~ msgstr "Όνομα συναρμολόγησης" - -#~ msgid "KB" -#~ msgstr "KB" - -#~ msgid "_Match" -#~ msgstr "_Ταίριασμα" - -#~ msgid "any" -#~ msgstr "κάθε" - -#~ msgid "of the following:" -#~ msgstr "από το παρακάτω:" - -#~ msgid "_Limit to" -#~ msgstr "_Οριοθέτηση στο" - -#~ msgid "ago" -#~ msgstr "πριν" - -#~ msgid "seconds" -#~ msgstr "deyter;olepta" - -#~ msgid "days" -#~ msgstr "μέρες" - -#~ msgid "months" -#~ msgstr "μήνες" - -#~ msgid "years" -#~ msgstr "έτη" - -#~ msgid "before" -#~ msgstr "πριν" - -#~ msgid "after" -#~ msgstr "μετά" - -#~ msgid "is" -#~ msgstr "είναι" - -#~ msgid "is not" -#~ msgstr "δεν είναι" - -#~ msgid "at most" -#~ msgstr "το πολύ" - -#~ msgid "at least" -#~ msgstr "τουλάχιστον" - -#~ msgid "less than" -#~ msgstr "μικρότερο από" - -#~ msgid "more than" -#~ msgstr "περισσότερο από" - -#~ msgid "empty" -#~ msgstr "άδειο" - -#~ msgid "doesn't contain" -#~ msgstr "δεν περιέχει" - -#~ msgid "starts with" -#~ msgstr "ξεκινάει με" - -#~ msgid "ends with" -#~ msgstr "τελειώνει με" - #~ msgid "Failed to Login to Last.fm" #~ msgstr "Αποτυχία σύνδεσης στο Last.fm" diff -Nru banshee-1.8.0/po/sl.po banshee-1.8.1/po/sl.po --- banshee-1.8.0/po/sl.po 2010-09-07 20:15:30.000000000 +0000 +++ banshee-1.8.1/po/sl.po 2011-01-28 20:56:47.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: banshee\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=general\n" -"POT-Creation-Date: 2010-09-01 21:37+0000\n" -"PO-Revision-Date: 2010-09-03 17:01+0100\n" +"POT-Creation-Date: 2010-10-01 19:11+0000\n" +"PO-Revision-Date: 2010-10-04 08:16+0100\n" "Last-Translator: Andrej Žnidaršič \n" "Language-Team: Slovenian GNOME Translation Team \n" "MIME-Version: 1.0\n" @@ -401,6 +401,7 @@ #. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml #: ../data/addin-xml-strings.cs:193 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:193 #: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:203 @@ -723,8 +724,8 @@ msgstr "Predmeta filesrc ni mogoče ustvariti" #: ../libbanshee/banshee-bpmdetector.c:214 -msgid "Could not create decodebin plugin" -msgstr "Vstavka decodebin ni mogoče ustvariti" +msgid "Could not create decodebin2 plugin" +msgstr "Vstavka decodebin2 ni mogoče ustvariti" #: ../libbanshee/banshee-bpmdetector.c:220 msgid "Could not create audioconvert plugin" @@ -765,8 +766,8 @@ msgstr "Predmeta izvira ni mogoče ustvariti" #: ../libbanshee/banshee-transcoder.c:246 -msgid "Could not create 'decodebin' plugin" -msgstr "Vstavka 'decodebin' ni mogoče ustvariti" +msgid "Could not create 'decodebin2' plugin" +msgstr "Vstavka 'decodebin2' ni mogoče ustvariti" #: ../libbanshee/banshee-transcoder.c:252 msgid "Could not create sink element" @@ -1034,7 +1035,7 @@ #: ../src/Clients/Booter/Booter/Entry.cs:192 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114 msgid "Disc Number" msgstr "Številka diska" @@ -1042,7 +1043,7 @@ #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77 #: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92 @@ -1237,72 +1238,72 @@ msgid "Unknown Title" msgstr "Neznan naslov" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191 #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91 msgid "Various Artists" msgstr "Različni izvajalci" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 msgid "Stream location not found" msgstr "Mesta pretoka ni mogoče najti" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:324 msgid "File not found" msgstr "Datoteke ni mogoče najti" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349 msgid "Codec for playing this media type not available" msgstr "Kodek za predvajanje te vrste večpredstavnostnih datotek ni na voljo" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351 msgid "File protected by Digital Rights Management (DRM)" msgstr "Datoteka je zaščitena z upravljanjem digitalnih pravic (DRM)" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353 msgid "Unknown error" msgstr "Neznana napaka" #. TODO turn this into a PrimarySource-owned delegate? -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422 msgid "_Restart Podcast" msgstr "_Ponovno predvajaj podcast" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423 msgid "_Restart Audiobook" msgstr "_Ponovno zaženi zvočno knjigo" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424 msgid "_Restart Video" msgstr "_Ponovno predvajaj video" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86 msgid "_Restart Song" msgstr "_Ponovno predvajaj" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426 msgid "_Restart Item" msgstr "_Ponovno zaženi predmet" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442 msgid "_Jump to Playing Podcast" msgstr "_Skoči na predvajan podcast" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443 msgid "_Jump to Playing Audiobook" msgstr "_Skoči na predvajano zvočno knjigo" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444 msgid "_Jump to Playing Video" msgstr "_Skoči na predvajan video" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82 msgid "_Jump to Playing Song" msgstr "_Skoči na predvajano skladbo" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446 msgid "_Jump to Playing Item" msgstr "_Skoči na predvajan predmet" @@ -1400,30 +1401,30 @@ msgid "Play songs randomly from the playlist" msgstr "Naključno predvajanje skladb iz seznama predvajanja" -#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:132 +#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:138 msgid "Scanning for media" msgstr "Preiskovanje za večpredstavnostne datoteke" -#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182 +#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188 #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382 msgid "Scanning..." msgstr "Preiskovanje ..." -#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:198 +#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204 #, csharp-format msgid "Scanning ({0} files)..." msgstr "Preiskovanje ({0} datotek) ..." -#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:232 +#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238 msgid "Importing Media" msgstr "Uvažanje večpredstavnostnih datotek" -#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:239 +#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245 #: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119 msgid "The import process is currently running. Would you like to stop it?" msgstr "Postopek uvažanja je v teku. Ali ga želite zaustaviti?" -#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245 +#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251 #: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81 #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:185 #, csharp-format @@ -1554,7 +1555,7 @@ msgstr "Album" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:108 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:72 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:73 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:127 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:76 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:97 @@ -1562,40 +1563,40 @@ msgstr "Naslov" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:119 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:83 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:84 msgid "Count" msgstr "Števec" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:125 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:89 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:90 msgid "Number" msgstr "Številka" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:131 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:95 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:96 msgid "Count (unsorted)" msgstr "Števec (neurejeno)" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:137 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:101 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:102 msgid "Number (unsorted)" msgstr "Številka (neurejeno)" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:107 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:108 msgid "Disc Count" msgstr "Število diskov" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:119 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:120 msgid "Grouping" msgstr "Združevanje" #. Catalog.GetString ("Music Library") #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59 -#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39 msgid "Music" msgstr "Glasba" @@ -1823,11 +1824,11 @@ msgid "An available, working network connection will be assumed" msgstr "Predvidena bo delujoča omrežna povezava" -#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:157 +#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159 msgid "_Disable features requiring Internet access" msgstr "_Onemogoči zmožnosti, ki zahtevajo medmrežni dostop" -#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:158 +#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160 msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching" msgstr "Nekatere zmožnosti kot so Last.fm ali pridobivanje naslovnic zahtevajo širokopasovno medmrežno povezavo " @@ -1910,18 +1911,22 @@ msgstr "predmeti" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60 msgid "minutes" msgstr "minut" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61 msgid "hours" msgstr "ur" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63 msgid "MB" msgstr "MB" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64 msgid "GB" msgstr "GB" @@ -2573,12 +2578,12 @@ msgid "File _name" msgstr "Ime _datoteke" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:693 #, csharp-format msgid "Adding {0} of {1} to {2}" msgstr "Dodajanje {0} od {1} k {2}" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:712 #, csharp-format msgid "Deleting {0} of {1} From {2}" msgstr "Brisanje {0} od {1} iz {2}" @@ -3640,6 +3645,7 @@ msgstr "Velikost datoteke:" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61 msgid "bytes" msgstr "bajtov" @@ -3971,6 +3977,10 @@ msgid "Playlist _Name:" msgstr "Ime _seznama predvajanja:" +#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108 +msgid "Predefined Smart Playlists" +msgstr "Predloge pametnih seznamov prevajanja" + #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119 msgid "Open in editor" msgstr "Odpri v urejevalniku" @@ -4029,7 +4039,7 @@ msgstr "Nedejavno" #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149 -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:68 +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58 msgid "Contacting..." msgstr "Vzpostavljanje stika ..." @@ -4049,30 +4059,30 @@ msgid "Full Volume" msgstr "Polna glasnost" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:89 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:101 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102 msgid "Device" msgstr "Naprava" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:90 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:102 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104 msgid "Generation" msgstr "Ustvarjanje" #. FIXME #. AddDapProperty (Catalog.GetString ("Color"), "black"); -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:95 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:107 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105 msgid "Capacity" msgstr "Zmogljivost" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:96 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108 msgid "Available" msgstr "Na voljo" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:97 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105 -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:135 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141 msgid "Serial number" msgstr "Zaporedna številka" @@ -4081,43 +4091,42 @@ #. string [] capabilities = new string [ipod_device.ModelInfo.Capabilities.Count]; #. ipod_device.ModelInfo.Capabilities.CopyTo (capabilities, 0); #. AddDapProperty (Catalog.GetString ("Capabilities"), String.Join (", ", capabilities)); -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:104 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113 msgid "Supports cover art" msgstr "Podpira ovitke" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:105 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:117 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:114 msgid "Supports photos" msgstr "Podpira fotografije" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:388 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:412 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:491 msgid "Track duration is zero" msgstr "Trajanje skladbe je nič" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:490 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:651 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:515 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:694 msgid "Syncing iPod" msgstr "Usklajevanje iPoda" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:491 -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:652 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:516 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:695 msgid "Preparing to synchronize..." msgstr "Pripravljanje na usklajevanje ..." -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:494 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:519 #, csharp-format msgid "Adding track {0} of {1}" msgstr "Dodajanje skladbe {0} od {1}" -#. TODO sync updated metadata to changed tracks -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:512 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:555 #, csharp-format msgid "Removing track {0} of {1}" msgstr "Odstranjevanje skladbe {0} od {1}" -#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:568 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:619 msgid "Writing media database" msgstr "Zapisovanje podatkovne zbirke medija" @@ -4127,7 +4136,7 @@ msgstr "Uskladitev {0}" #. Note to translators: {0}, {1} and {2} will be replaced with numbers. -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:256 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:260 #, csharp-format msgid "{0} to add, {1} to remove, {2} to update" msgstr "{0} za dodajanje, {1} za odstranitev, {2} za posodobitev" @@ -4312,35 +4321,35 @@ msgid "Error rebuilding iPod database" msgstr "Napaka ponovne izgradnje podatkovne zbirke iPod" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103 msgid "Color" msgstr "Barva" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107 msgid "Produced on" msgstr "Proizvedeno ob" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108 msgid "Firmware" msgstr "Strojna programska oprema" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:111 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112 msgid "Capabilities" msgstr "Zmožnosti" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:635 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680 msgid "Out of space on device" msgstr "Na napravi ni prostora" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:635 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680 msgid "Please manually remove some songs" msgstr "Skladbe je treba odstraniti ročno" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:673 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:724 msgid "Updating..." msgstr "Posodabljanje ..." -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:677 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:728 msgid "Flushing to disk..." msgstr "Čiščenje na disk ..." @@ -4452,22 +4461,27 @@ msgid "There was an error intializing MTP device support. See http://www.banshee-project.org/Guide/DAPs/MTP for more information." msgstr "Prišlo je do napake med zagonom podpore naprave MTP. Več podrobnosti je na voljo na http://www.banshee-project.org/Guide/DAPs/MTP" -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:136 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142 +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66 msgid "Version" msgstr "Različica" -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:138 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:144 msgid "Battery level" msgstr "Polnost baterije" #. user_event.Progress = (double)current / total; #. Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the #. track currently being loaded, and {2} is the total # of tracks that will be loaded. -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:154 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:160 #, csharp-format msgid "Loading {0} - {1} of {2}" msgstr "Nalaganje {0} - {1} of {2}" +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:57 +msgid "Amazon MP3 Purchases" +msgstr "Nakupi Amazon MP3" + #: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:53 msgid "Amazon MP3s" msgstr "Amazon MP3-ji" @@ -4488,28 +4502,6 @@ msgid "Amazon MP3 Purchase" msgstr "Nakup Amazon MP3" -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:67 -msgid "Amazon MP3 Purchases" -msgstr "Nakupi Amazon MP3" - -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:176 -#, csharp-format -msgid "{0} download at {1}/s" -msgid_plural "{0} downloads at {1}/s" -msgstr[0] "{0} prejemov pri {1}/s" -msgstr[1] "{0} prejem pri {1}/s" -msgstr[2] "{0} prejema pri {1}/s" -msgstr[3] "{0} prejemi pri {1}/s" - -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:184 -#, csharp-format -msgid "{0} download at {1}/s ({2} pending)" -msgid_plural "{0} downloads at {1}/s ({2} pending)" -msgstr[0] "{0} prejemov pri {1}/s ({2} čakajočih)" -msgstr[1] "{0} prejem pri {1}/s ({2} čakajočih)" -msgstr[2] "{0} prejema pri {1}/s ({2} čakajočih)" -msgstr[3] "{0} prejemi pri {1}/s ({2} čakajočih)" - #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42 #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39 msgid "Amazon MP3 Store" @@ -4601,11 +4593,12 @@ msgid "Author" msgstr "Avtor" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:62 +#. Translators: This means the first letter of the author's name +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:63 msgid "Author Initial" msgstr "Začetnice avtorja" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:67 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:68 msgid "Book Title" msgstr "Naslov knjige" @@ -4617,7 +4610,7 @@ msgid "Search your audiobooks" msgstr "Išče po vaših zvočnih knjigah" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:144 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:145 #, csharp-format msgid "{0} book" msgid_plural "{0} books" @@ -4797,22 +4790,6 @@ msgid "{0} - {1}" msgstr "{0} - {1}" -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107 -msgid "_Cover Art" -msgstr "_Ovitki" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:108 -msgid "Manage cover art" -msgstr "Urejanje ovitkov" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110 -msgid "_Download Cover Art" -msgstr "_Prejmi ovitke" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:111 -msgid "Download cover art for all tracks" -msgstr "Prejem ovitkov za vse skladbe" - #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:42 msgid "Shared Music" msgstr "Souporaba glasbe" @@ -5665,6 +5642,7 @@ msgstr "Opis:" #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128 +#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50 msgid "Rating:" msgstr "Ocena:" @@ -6580,6 +6558,189 @@ msgid "No videos found" msgstr "Ni mogoče najti videov" +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36 +msgid "open context menu" +msgstr "odpri vsebinski meni" + +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37 +msgid "click" +msgstr "kliknite" + +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37 +msgid "menu" +msgstr "meni" + +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612 +#, csharp-format +msgid "Hide {0}" +msgstr "Skrij {0}" + +#. Translators: {0} is substituted with the application name +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53 +#, csharp-format +msgid "{0} Encountered a Fatal Error" +msgstr "{0} je prišel do usodne napake" + +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92 +msgid "Error Details" +msgstr "Podrobnosti napake" + +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136 +msgid "An unhandled exception was thrown: " +msgstr "Nesprejeto izjemno dejanje:" + +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58 +msgid "Assembly Version Information" +msgstr "Podrobnosti različice zbirnika" + +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64 +msgid "Assembly Name" +msgstr "Ime zbirnika" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62 +msgid "KB" +msgstr "kB" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86 +msgid "Condition:" +msgstr "Pogoj:" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104 +msgid "_Match" +msgstr "_Skladanje" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111 +msgid "all" +msgstr "vse" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112 +msgid "any" +msgstr "karkoli" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117 +msgid "of the following:" +msgstr "od sledečih:" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58 +msgid "_Limit to" +msgstr "_Omeji na" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85 +msgid "selected by" +msgstr "izbrano po" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42 +msgid "ago" +msgstr "nazaj" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59 +msgid "seconds" +msgstr " sekund" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62 +msgid "days" +msgstr " dni" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63 +msgid "weeks" +msgstr "tedenov" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64 +msgid "months" +msgstr "mesecev" + +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65 +msgid "years" +msgstr "let" + +#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:71 +#, csharp-format +msgid "{0} download at {1}/s" +msgid_plural "{0} downloads at {1}/s" +msgstr[0] "{0} prejemov pri {1}/s" +msgstr[1] "{0} prejem pri {1}/s" +msgstr[2] "{0} prejema pri {1}/s" +msgstr[3] "{0} prejemi pri {1}/s" + +#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:79 +#, csharp-format +msgid "{0} download at {1}/s ({2} pending)" +msgid_plural "{0} downloads at {1}/s ({2} pending)" +msgstr[0] "{0} prejemov pri {1}/s ({2} čakajočih)" +msgstr[1] "{0} prejem pri {1}/s ({2} čakajočih)" +msgstr[2] "{0} prejema pri {1}/s ({2} čakajočih)" +msgstr[3] "{0} prejemi pri {1}/s ({2} čakajočih)" + +#. public static readonly Operator Equal = new Operator ("equals", "= {0}", "==", "=", ":"); +#. public static readonly Operator NotEqual = new Operator ("notEqual", "!= {0}", true, "!=", "!:"); +#. public static readonly Operator LessThanEqual = new Operator ("lessThanEquals", "<= {0}", "<="); +#. public static readonly Operator GreaterThanEqual = new Operator ("greaterThanEquals", ">= {0}", ">="); +#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:47 +msgid "before" +msgstr "pred" + +#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:48 +msgid "after" +msgstr "za" + +#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:43 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:41 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:45 +msgid "is" +msgstr "je" + +#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:44 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:42 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:46 +msgid "is not" +msgstr "ni" + +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:43 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47 +msgid "at most" +msgstr "največ" + +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:44 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46 +msgid "at least" +msgstr "najmanj" + +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:45 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45 +msgid "less than" +msgstr "manj kot" + +#. The SQL operators in these Operators are reversed from normal on purpose +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:46 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44 +msgid "more than" +msgstr "več kot" + +#: ../src/Hyena/Hyena/Hyena.Query/NullQueryValue.cs:41 +msgid "empty" +msgstr "prazno" + +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90 +#, csharp-format +msgid "{0} ago" +msgstr "{0} nazaj" + +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:43 +msgid "contains" +msgstr "vsebuje" + +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:44 +msgid "doesn't contain" +msgstr "ne vsebuje" + +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:47 +msgid "starts with" +msgstr "se začne z" + +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:48 +msgid "ends with" +msgstr "se konča z" + #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76 msgid "Last.fm Account Login" msgstr "Prijava računa Last.fm" @@ -6690,6 +6851,14 @@ msgid "Unknown Podcast" msgstr "Neznan Podcast" +#~ msgid "_Cover Art" +#~ msgstr "_Ovitki" +#~ msgid "Manage cover art" +#~ msgstr "Urejanje ovitkov" +#~ msgid "_Download Cover Art" +#~ msgstr "_Prejmi ovitke" +#~ msgid "Download cover art for all tracks" +#~ msgstr "Prejem ovitkov za vse skladbe" #~ msgid "Sign out of Amazon" #~ msgstr "Odjavi se iz Amazona" #~ msgid "MTP Support Ignoring Device" @@ -6716,80 +6885,6 @@ #~ msgstr ", " #~ msgid "the " #~ msgstr " " -#~ msgid "open context menu" -#~ msgstr "odpri vsebinski meni" -#~ msgid "click" -#~ msgstr "kliknite" -#~ msgid "menu" -#~ msgstr "meni" -#~ msgid "Hide {0}" -#~ msgstr "Skrij {0}" -#~ msgid "Banshee Encountered a Fatal Error" -#~ msgstr "Prišlo je do usodne napake" -#~ msgid "Error Details" -#~ msgstr "Podrobnosti napake" -#~ msgid "An unhandled exception was thrown: " -#~ msgstr "Nesprejeto izjemno dejanje:" -#~ msgid "Assembly Version Information" -#~ msgstr "Podrobnosti različice zbirnika" -#~ msgid "Assembly Name" -#~ msgstr "Ime zbirnika" -#~ msgid "KB" -#~ msgstr "kB" -#~ msgid "Condition:" -#~ msgstr "Pogoj:" -#~ msgid "_Match" -#~ msgstr "_Skladanje" -#~ msgid "all" -#~ msgstr "vse" -#~ msgid "any" -#~ msgstr "karkoli" -#~ msgid "of the following:" -#~ msgstr "od sledečih:" -#~ msgid "_Limit to" -#~ msgstr "_Omeji na" -#~ msgid "selected by" -#~ msgstr "izbrano po" -#~ msgid "ago" -#~ msgstr "nazaj" -#~ msgid "seconds" -#~ msgstr " sekund" -#~ msgid "days" -#~ msgstr " dni" -#~ msgid "weeks" -#~ msgstr "tedenov" -#~ msgid "months" -#~ msgstr "mesecev" -#~ msgid "years" -#~ msgstr "let" -#~ msgid "before" -#~ msgstr "pred" -#~ msgid "after" -#~ msgstr "za" -#~ msgid "is" -#~ msgstr "je" -#~ msgid "is not" -#~ msgstr "ni" -#~ msgid "at most" -#~ msgstr "največ" -#~ msgid "at least" -#~ msgstr "najmanj" -#~ msgid "less than" -#~ msgstr "manj kot" -#~ msgid "more than" -#~ msgstr "več kot" -#~ msgid "empty" -#~ msgstr "prazno" -#~ msgid "{0} ago" -#~ msgstr "{0} nazaj" -#~ msgid "contains" -#~ msgstr "vsebuje" -#~ msgid "doesn't contain" -#~ msgstr "ne vsebuje" -#~ msgid "starts with" -#~ msgstr "se začne z" -#~ msgid "ends with" -#~ msgstr "se konča z" #~ msgid "View Track Information" #~ msgstr "Oglej si podrobnosti skladbe" #~ msgid "Save your position in tracks so you can resume playback later." @@ -6812,8 +6907,6 @@ #~ msgstr "Trenutni vir:" #~ msgid "Details" #~ msgstr "Podrobnosti" -#~ msgid "Predefined Smart Playlists" -#~ msgstr "Predloge pametnih seznamov prevajanja" #~ msgid "_Search:" #~ msgstr "_Išči:" #~ msgid "Filter Results" diff -Nru banshee-1.8.0/po/sv.po banshee-1.8.1/po/sv.po --- banshee-1.8.0/po/sv.po 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/po/sv.po 2011-01-28 20:56:47.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: banshee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-21 16:11+0200\n" -"PO-Revision-Date: 2010-07-21 16:14+0100\n" +"POT-Creation-Date: 2010-08-05 17:14+0200\n" +"PO-Revision-Date: 2010-10-05 08:59+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -145,9 +145,8 @@ msgstr "" #: ../data/addin-xml-strings.cs:71 -#, fuzzy msgid "Download and import music purchased from Amazon.com" -msgstr "Hämta och importera musik som köpts från eMusic" +msgstr "Hämta och importera musik som köpts från Amazon.com" #. ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml #: ../data/addin-xml-strings.cs:75 @@ -683,7 +682,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206 #: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60 msgid "Banshee Media Player" -msgstr "Musikspelaren Banshee" +msgstr "Mediaspelaren Banshee" #: ../data/desktop-files/common.desktop.in.h:2 #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:192 @@ -844,7 +843,7 @@ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:139 msgid "GStreamer# 0.10" -msgstr "" +msgstr "GStreamer# 0.10" #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91 #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:131 @@ -1061,9 +1060,8 @@ msgstr "Visa användargränssnittet på den aktiva skrivbordsytan" #: ../src/Clients/Booter/Booter/Entry.cs:201 -#, fuzzy msgid "Enter the full-screen mode" -msgstr "Växla från eller till helskärmsläge" +msgstr "Gå in i helskärmsläge" #: ../src/Clients/Booter/Booter/Entry.cs:202 msgid "Hide the user interface" @@ -1818,7 +1816,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:375 -#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:490 +#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:496 #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213 msgid "New Playlist" msgstr "Ny spellista" @@ -2492,7 +2490,7 @@ msgstr "Stäng felrapport" #: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83 -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46 msgid "Error" msgstr "Fel" @@ -2517,24 +2515,24 @@ msgid "Drive" msgstr "Disk" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:235 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:238 msgid "File Organization" msgstr "Organisering av filer" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:236 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:239 msgid "Folder hie_rarchy" msgstr "Mapphie_rarki" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:237 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:240 msgid "File _name" msgstr "Fil_namn" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:686 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689 #, csharp-format msgid "Adding {0} of {1} to {2}" msgstr "Lägger till {0} av {1} till {2}" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:705 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708 #, csharp-format msgid "Deleting {0} of {1} From {2}" msgstr "Tar bort {0} av {1} från {2}" @@ -2614,11 +2612,11 @@ msgid "Disable album grid and show the classic layout instead" msgstr "" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:81 msgid "Cannot Reorder While Sorted" msgstr "Kan inte arrangera om när sorterad" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:78 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:82 msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away." msgstr "För att sätta spellistan i manuellt sorteringsläge, klicka på det nuvarande sorterade kolumnhuvudet tills sorteringspilen försvinner." @@ -2632,18 +2630,22 @@ msgid "{0} of {1}" msgstr "{0} av {1}" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:220 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224 msgid "Playing" msgstr "Spelar upp" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:221 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225 msgid "Paused" msgstr "Pausad" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227 msgid "Protected" msgstr "Skyddad" +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228 +msgid "External Document" +msgstr "Externt dokument" + #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80 msgid "Choose New Cover Art..." msgstr "Välj ny omslagsbild..." @@ -2676,6 +2678,7 @@ # Vad är detta? # http://bugzilla.ximian.com/show_bug.cgi?id=61062 #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139 +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:123 #, csharp-format msgid "{0} Hz" msgstr "{0} Hz" @@ -2701,6 +2704,27 @@ msgid "Loading..." msgstr "Läser in..." +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:74 +msgid "Preamp" +msgstr "" + +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:100 +#, csharp-format +msgid "+{0} dB" +msgstr "+{0} dB" + +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:102 +#, csharp-format +msgid "{0} dB" +msgstr "{0} dB" + +# Vad är detta? +# http://bugzilla.ximian.com/show_bug.cgi?id=61062 +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:124 +#, csharp-format +msgid "{0} kHz" +msgstr "{0} kHz" + #: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:53 msgid "Equalizer" msgstr "Equalizer" @@ -3944,7 +3968,7 @@ msgstr "Inaktiv" #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149 -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:55 +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:68 msgid "Contacting..." msgstr "Kontaktar..." @@ -4230,11 +4254,11 @@ msgid "" "You have used this iPod with a version of iTunes that saves a version of the song database for your iPod that is too new for Banshee to recognize.\n" "\n" -"Banshee can rebuild your database, but some settings might be lost. Using Banshee and iTunes with the same iPod is not recommended." +"Banshee can rebuild your database, but you might lose your settings and all the content in the device (be sure to backup your data first). Using Banshee and iTunes with the same iPod is not recommended." msgstr "" "Du har använt denna iPod med en version av iTunes som sparar en version av låtdatabasen för din iPod som är för ny för att Banshee ska känna igen den.\n" "\n" -"Banshee kan antingen bygga om databasen men vissa inställningar kan gå förlorade. Använda Banshee och iTunes med samma iPod är inte rekommenderat." +"Banshee kan bygga om databasen men du kan förlora vissa inställningar och allt innehåll på enheten (försäkra dig om att säkerhetskopiera ditt data först). Användning av Banshee och iTunes med samma iPod är inte rekommenderat." #: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:88 msgid "Learn more about Banshee's iPod support" @@ -4372,18 +4396,18 @@ msgid "Amazon MP3 Purchase" msgstr "" -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:54 +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:67 msgid "Amazon MP3 Purchases" msgstr "" -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:87 +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:176 #, csharp-format msgid "{0} download at {1}/s" msgid_plural "{0} downloads at {1}/s" msgstr[0] "{0} hämtning i {1}/s" msgstr[1] "{0} hämtningar i {1}/s" -#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:95 +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:184 #, csharp-format msgid "{0} download at {1}/s ({2} pending)" msgid_plural "{0} downloads at {1}/s ({2} pending)" @@ -4888,6 +4912,7 @@ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:73 #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:76 +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77 msgid " and " msgstr " och " @@ -4925,6 +4950,15 @@ msgid "Problem Type:" msgstr "Problemtyp:" +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:46 +#, fuzzy +msgid "Duplicate Genres" +msgstr "Duplicera skiva" + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47 +msgid "Displayed are genres that should likely be merged. For each row, click the desired genre to make it bold, or uncheck it to take no action." +msgstr "" + #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs:76 msgid "Fix?" msgstr "Rätta till?" @@ -5654,12 +5688,11 @@ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:310 #, csharp-format msgid "You are logged in to Last.fm as the user {0}." -msgstr "" +msgstr "Du är inloggad på Last.fm som användaren {0}." #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:313 -#, fuzzy msgid "Log out of Last.fm" -msgstr "Logga in på Last.fm" +msgstr "Logga ut från Last.fm" #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123 msgid "Recently Loved Tracks" @@ -5924,9 +5957,8 @@ msgstr "Bibliotek" #: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131 -#, fuzzy msgid "Launch the Banshee Media Player" -msgstr "Musikspelaren Banshee" +msgstr "Starta Mediaspelaren Banshee" #: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60 #: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2 @@ -7063,8 +7095,6 @@ #~ msgstr "{0} minuter" #~ msgid "Unknown MB" #~ msgstr "Okänt antal MB" -#~ msgid "{0} MB" -#~ msgstr "{0} MB" #~ msgid "New Audio C_D" #~ msgstr "Ny ljud-c_d" #~ msgid "Create a new audio CD" diff -Nru banshee-1.8.0/po/uk.po banshee-1.8.1/po/uk.po --- banshee-1.8.0/po/uk.po 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/po/uk.po 2010-11-14 08:41:58.000000000 +0000 @@ -1,19 +1,16 @@ -# Ukrainian translations for Banshee package. # This file is distributed under the same license as the Banshee package. # Oleksandr Kovalenko , 2008. # Maxim Dziumanenko , 2010 # -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:122 -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:125 -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:128 msgid "" msgstr "" "Project-Id-Version: Banshee\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-05 08:07+0300\n" -"PO-Revision-Date: 2010-04-04 15:08+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=banshee&component=general\n" +"POT-Creation-Date: 2010-09-28 06:36+0000\n" +"PO-Revision-Date: 2010-10-13 15:08+0300\n" "Last-Translator: Maxim Dziumanenko \n" -"Language-Team: Ukrainian\n" +"Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,8 +21,9 @@ #. ../src/Backends/Banshee.Gio/Banshee.Gio.addin.xml #: ../data/addin-xml-strings.cs:8 -msgid "GIO IO backend" -msgstr "Механізм GIO" +#| msgid "GIO IO backend" +msgid "GIO IO and Hardware backends" +msgstr "Механізми GIO IO та Hardware" #. ../src/Backends/Banshee.Gnome/Banshee.Gnome.addin.xml #: ../data/addin-xml-strings.cs:11 @@ -37,7 +35,8 @@ "інтеграція з GNOME." #. ../src/Backends/Banshee.GStreamer/Banshee.GStreamer.addin.xml -#: ../data/addin-xml-strings.cs:14 +#. ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.addin.xml +#: ../data/addin-xml-strings.cs:14 ../data/addin-xml-strings.cs:17 msgid "" "GStreamer multimedia services including playback, CD ripping, and " "transcoding." @@ -46,12 +45,12 @@ "перетворенням форматів." #. ../src/Backends/Banshee.Hal/Banshee.Hal.addin.xml -#: ../data/addin-xml-strings.cs:17 +#: ../data/addin-xml-strings.cs:20 msgid "Provides hardware support through HAL." msgstr "Забезпечує підтримку обладнання засобами HAL." #. ../src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.addin.xml -#: ../data/addin-xml-strings.cs:20 +#: ../data/addin-xml-strings.cs:23 msgid "" "Provides an X11 backend for video support, which enables proper fullscreen " "support." @@ -59,60 +58,72 @@ "Забезпечує для відео засоби X11, що дозволяє перехід у повноекранний режим." #. ../src/Backends/Banshee.Osx/Banshee.Osx.addin.xml -#: ../data/addin-xml-strings.cs:23 +#: ../data/addin-xml-strings.cs:26 msgid "" "Backend providers for the OSX platform. Includes general OSX integration." msgstr "Доступні механізми для платформи OSX, такі як інтеграція з системою." #. ../src/Backends/Banshee.Unix/Banshee.Unix.addin.xml -#: ../data/addin-xml-strings.cs:26 +#: ../data/addin-xml-strings.cs:29 msgid "Provides POSIX/UNIX support, including IO." -msgstr "Забезпечує UNIX/POSIX-сумісність, включно з вводм/виводом." +msgstr "Забезпечує UNIX/POSIX-сумісність, включно з вводом/виводом." #. ../src/Core/Banshee.Core/Banshee.Core.addin.xml -#: ../data/addin-xml-strings.cs:29 +#: ../data/addin-xml-strings.cs:32 msgid "Provides low level non-GUI utilities." msgstr "Забезпечує прості командні засоби." #. ../src/Core/Banshee.Services/Banshee.Services.addin.xml -#: ../data/addin-xml-strings.cs:32 +#: ../data/addin-xml-strings.cs:35 msgid "Provides non-GUI utilities and services." msgstr "Забезпечує командні засоби та служби." #. ../src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml -#: ../data/addin-xml-strings.cs:35 +#: ../data/addin-xml-strings.cs:38 msgid "Provides GUI utilities and services." msgstr "Забезпечує графічні засоби та служби." +#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml +#: ../data/addin-xml-strings.cs:41 +#| msgid "Device Support" +msgid "Apple device Support" +msgstr "Помилка пристроїв Apple" + +#: ../data/addin-xml-strings.cs:42 +#| msgid "Support for most iPod devices." +msgid "Support for most iPod/iPhone/iPad devices." +msgstr "Підтримка більшості моделей iPod/iPhone/iPad." + +#: ../data/addin-xml-strings.cs:43 ../data/addin-xml-strings.cs:48 +#: ../data/addin-xml-strings.cs:53 ../data/addin-xml-strings.cs:58 +#: ../data/addin-xml-strings.cs:63 +msgid "Device Support" +msgstr "Помилка пристроїв" + #. ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml -#: ../data/addin-xml-strings.cs:38 +#: ../data/addin-xml-strings.cs:46 msgid "iPod Support" -msgstr "iPod" +msgstr "Підтримка iPod" -#: ../data/addin-xml-strings.cs:39 +#: ../data/addin-xml-strings.cs:47 msgid "Support for most iPod devices." msgstr "Підтримка більшості моделей iPod." -#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:45 -#: ../data/addin-xml-strings.cs:50 ../data/addin-xml-strings.cs:55 -msgid "Device Support" -msgstr "Помилка пристроїв" - #. ../src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml -#: ../data/addin-xml-strings.cs:43 +#: ../data/addin-xml-strings.cs:51 msgid "Karma Support" msgstr "Підтримка Karma" -#: ../data/addin-xml-strings.cs:44 +#: ../data/addin-xml-strings.cs:52 msgid "Support for Rio Karma devices." msgstr "Підтримка пристрою Rio Karma." #. ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml -#: ../data/addin-xml-strings.cs:48 +#: ../data/addin-xml-strings.cs:56 msgid "Mass Storage Media Player Support" msgstr "Пристрої-накопичувачі" -#: ../data/addin-xml-strings.cs:49 +#: ../data/addin-xml-strings.cs:57 msgid "" "Support for USB-drive based devices, including many iAudio devices and " "Android, Pre, and Galaxy phones." @@ -121,177 +132,210 @@ "Android, Pre та Galaxy." #. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml -#: ../data/addin-xml-strings.cs:53 +#: ../data/addin-xml-strings.cs:61 msgid "MTP Media Player Support" msgstr "Програвачі MTP" -#: ../data/addin-xml-strings.cs:54 +#: ../data/addin-xml-strings.cs:62 msgid "Support for MTP devices, including many Creative Zen devices." msgstr "Підтримка протоколу підключення пристроїв Creative Zen та інші" #. ../src/Dap/Banshee.Dap/Banshee.Dap.addin.xml -#: ../data/addin-xml-strings.cs:58 +#: ../data/addin-xml-strings.cs:66 msgid "Digital Media Player Support" msgstr "Цифрові програвачі" -#: ../data/addin-xml-strings.cs:59 +#: ../data/addin-xml-strings.cs:67 msgid "Provides general support for many kinds of media player devices." msgstr "Забезпечує підтримку основних функцій різних програвачів." +#. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml +#: ../data/addin-xml-strings.cs:70 +msgid "Amazon MP3 Store Source" +msgstr "Джерело магазин Amazon MP3" + +#: ../data/addin-xml-strings.cs:71 +msgid "Browse, search, and purchase music from the Amazon MP3 store" +msgstr "Огляд, пошук та придбання музики з магазину Amazon MP3 " + +#: ../data/addin-xml-strings.cs:72 ../data/addin-xml-strings.cs:77 +#: ../data/addin-xml-strings.cs:112 ../data/addin-xml-strings.cs:127 +#: ../data/addin-xml-strings.cs:137 ../data/addin-xml-strings.cs:142 +#: ../data/addin-xml-strings.cs:161 +msgid "Online Sources" +msgstr "Інтернет-служби" + +#. ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.addin.xml +#: ../data/addin-xml-strings.cs:75 +msgid "Amazon MP3 Import" +msgstr "Імпорт з Amazon MP3" + +#: ../data/addin-xml-strings.cs:76 +#| msgid "Download and import music purchased from eMusic" +msgid "Download and import music purchased from Amazon.com" +msgstr "Завантаження та імпорт композицій, придбаних у Amazon.com" + #. ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml -#: ../data/addin-xml-strings.cs:62 +#: ../data/addin-xml-strings.cs:80 msgid "Audiobooks Library" msgstr "Фонотека" -#: ../data/addin-xml-strings.cs:63 +#: ../data/addin-xml-strings.cs:81 msgid "Organize audiobooks, lectures, etc." msgstr "Керування аудіокнигами та подібними фонограмами." -#: ../data/addin-xml-strings.cs:64 ../data/addin-xml-strings.cs:69 -#: ../data/addin-xml-strings.cs:104 ../data/addin-xml-strings.cs:114 -#: ../data/addin-xml-strings.cs:157 ../data/addin-xml-strings.cs:162 +#: ../data/addin-xml-strings.cs:82 ../data/addin-xml-strings.cs:87 +#: ../data/addin-xml-strings.cs:117 ../data/addin-xml-strings.cs:132 +#: ../data/addin-xml-strings.cs:190 ../data/addin-xml-strings.cs:195 msgid "Core" msgstr "Основні" #. ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml -#: ../data/addin-xml-strings.cs:67 +#: ../data/addin-xml-strings.cs:85 msgid "Audio CD Support" msgstr "Підтримка Audio CD" -#: ../data/addin-xml-strings.cs:68 +#: ../data/addin-xml-strings.cs:86 msgid "Listen to and rip Audio CDs." msgstr "Відтворювати та імпортувати звичайні звукові CD" -#. ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks.addin.xml -#: ../data/addin-xml-strings.cs:72 -msgid "Bookmarks" -msgstr "Закладки" - -#: ../data/addin-xml-strings.cs:73 -msgid "Save your position in tracks so you can resume playback later." -msgstr "" -"Запам'ятати будь-який момент композиції, щоб продовжити відтворення пізніше" - -#: ../data/addin-xml-strings.cs:74 ../data/addin-xml-strings.cs:79 -#: ../data/addin-xml-strings.cs:84 ../data/addin-xml-strings.cs:89 -#: ../data/addin-xml-strings.cs:94 ../data/addin-xml-strings.cs:124 -#: ../data/addin-xml-strings.cs:133 ../data/addin-xml-strings.cs:138 -#: ../data/addin-xml-strings.cs:143 ../data/addin-xml-strings.cs:152 -#: ../data/addin-xml-strings.cs:181 -msgid "Utilities" -msgstr "Додаткові засоби" - #. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml -#: ../data/addin-xml-strings.cs:77 +#: ../data/addin-xml-strings.cs:90 msgid "Boo Scripting" msgstr "Мова сценаріїв Boo" -#: ../data/addin-xml-strings.cs:78 +#: ../data/addin-xml-strings.cs:91 msgid "Customize and extend Banshee with Boo-language scripts." msgstr "Розширення можливостей Banshee за допомогою сценаріїв мовою Boo." +#: ../data/addin-xml-strings.cs:92 ../data/addin-xml-strings.cs:97 +#: ../data/addin-xml-strings.cs:102 ../data/addin-xml-strings.cs:107 +#: ../data/addin-xml-strings.cs:122 ../data/addin-xml-strings.cs:147 +#: ../data/addin-xml-strings.cs:156 ../data/addin-xml-strings.cs:166 +#: ../data/addin-xml-strings.cs:171 ../data/addin-xml-strings.cs:176 +#: ../data/addin-xml-strings.cs:185 ../data/addin-xml-strings.cs:214 +msgid "Utilities" +msgstr "Додаткові засоби" + #. ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml -#: ../data/addin-xml-strings.cs:82 +#: ../data/addin-xml-strings.cs:95 msgid "BPM Detection" msgstr "Визначення ритму" -#: ../data/addin-xml-strings.cs:83 +#: ../data/addin-xml-strings.cs:96 msgid "Detect the beats per minute (BPM) of your music." msgstr "Обчислити кількість ударів за хвилину (BPM)" #. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml -#: ../data/addin-xml-strings.cs:87 +#: ../data/addin-xml-strings.cs:100 msgid "Cover Art Fetching" msgstr "Обкладинки" -#: ../data/addin-xml-strings.cs:88 +#: ../data/addin-xml-strings.cs:101 msgid "Fetch cover art for all items in your library." msgstr "Завантажувати обкладинки до елементам коллекції" #. ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml -#: ../data/addin-xml-strings.cs:92 +#: ../data/addin-xml-strings.cs:105 msgid "DAAP Sharing" msgstr "Доступ по протоколу DAAP" -#: ../data/addin-xml-strings.cs:93 +#: ../data/addin-xml-strings.cs:106 msgid "Browse and listen to music shared over your local network." msgstr "Відтворювати музику, доступну з локальної мережі" #. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml -#: ../data/addin-xml-strings.cs:97 +#: ../data/addin-xml-strings.cs:110 msgid "eMusic Import" msgstr "Імпорт eMusic" -#: ../data/addin-xml-strings.cs:98 +#: ../data/addin-xml-strings.cs:111 msgid "Download and import music purchased from eMusic" msgstr "Завантаження та імпорт композицій, придбаних у eMusic" -#: ../data/addin-xml-strings.cs:99 ../data/addin-xml-strings.cs:109 -#: ../data/addin-xml-strings.cs:119 -msgid "Online Sources" -msgstr "Інтернет-служби" - #. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml -#: ../data/addin-xml-strings.cs:102 +#: ../data/addin-xml-strings.cs:115 msgid "File System Preview Queue" msgstr "Черга файлів" -#: ../data/addin-xml-strings.cs:103 +#: ../data/addin-xml-strings.cs:116 msgid "Preview files without importing to your library." msgstr "Попереднє прослуховування файлів без імпорту у колекцію." +#. ../src/Extensions/Banshee.Fixup/Banshee.Fixup.addin.xml +#: ../data/addin-xml-strings.cs:120 +msgid "Metadata Fixup" +msgstr "Фіксація медіаданих" + +#: ../data/addin-xml-strings.cs:121 +msgid "Fix broken and missing metadata using bulk operations" +msgstr "Виправити пошкоджені та відсутні метадані використовуючи блочні операції" + #. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml -#: ../data/addin-xml-strings.cs:107 +#: ../data/addin-xml-strings.cs:125 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:58 msgid "Internet Archive" msgstr "«Архів інтернету»" -#: ../data/addin-xml-strings.cs:108 +#: ../data/addin-xml-strings.cs:126 msgid "Browse and search the Internet Archive's vast media collection." msgstr "Здійснення пошуку та перегляд колекцій у «Архіві інтернету»" #. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml -#: ../data/addin-xml-strings.cs:112 +#: ../data/addin-xml-strings.cs:130 msgid "Internet Radio" msgstr "Інтернет-радіо" -#: ../data/addin-xml-strings.cs:113 +#: ../data/addin-xml-strings.cs:131 msgid "Listen to and organize Internet Radio stations." msgstr "Прослуховування інтернет-радії та керування списком радіостанцій" #. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml -#: ../data/addin-xml-strings.cs:117 -msgid "Last.fm Radio and Scrobbling" -msgstr "Радіо та скробблінг на Last.fm" +#: ../data/addin-xml-strings.cs:135 +#| msgid "Last.fm Radio and Scrobbling" +msgid "Last.fm Scrobbling" +msgstr "Скробблінг на Last.fm" -#: ../data/addin-xml-strings.cs:118 -msgid "Last.fm streaming radio, scrobbling, and context pane recommendations." +#: ../data/addin-xml-strings.cs:136 +#| msgid "" +#| "Last.fm streaming radio, scrobbling, and context pane recommendations." +msgid "Last.fm scrobbling and context pane recommendations." msgstr "Онлайн-радіо, скробблінг та рекомендації Last.fm" +#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml +#: ../data/addin-xml-strings.cs:140 +#| msgid "Last.fm Station" +msgid "Last.fm Radio" +msgstr "Радіо Last.fm" + +#: ../data/addin-xml-strings.cs:141 +msgid "Last.fm streaming radio for paid subscribers." +msgstr "Потокове радіо Last.fm для передплатників." + #. ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml -#: ../data/addin-xml-strings.cs:122 +#: ../data/addin-xml-strings.cs:145 msgid "Library Watcher" msgstr "Сторож" -#: ../data/addin-xml-strings.cs:123 +#: ../data/addin-xml-strings.cs:146 msgid "Automatically update music and video libraries" msgstr "Слідкувати за змінами у колекції та оновлювати базу даних" #. ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml -#: ../data/addin-xml-strings.cs:127 +#: ../data/addin-xml-strings.cs:150 msgid "MeeGo Support" msgstr "Підтримка MeeGo" -#: ../data/addin-xml-strings.cs:128 +#: ../data/addin-xml-strings.cs:151 msgid "Provides MeeGo integration, including a custom media panel." msgstr "Забезпечує інтеграцію з MeeGon, включаючи доопрацьовану медіа панель." #. ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml -#: ../data/addin-xml-strings.cs:131 +#: ../data/addin-xml-strings.cs:154 msgid "Mini Mode" msgstr "Компактний режим" -#: ../data/addin-xml-strings.cs:132 +#: ../data/addin-xml-strings.cs:155 msgid "" "Control Banshee through a small window with only playback controls and track " "information." @@ -299,31 +343,50 @@ "Керування Banshee за допомогою невеликого вікна з кнопками та поточною " "інформацією" +#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml +#: ../data/addin-xml-strings.cs:159 +msgid "Miro Guide Podcast Directory" +msgstr "Каталог подкастів Міро Гіда" + +#: ../data/addin-xml-strings.cs:160 +msgid "Browse and subscribe to thousands of audio and video podcasts." +msgstr "Огляд та передплата тисячі аудіо та відео подкастів." + +#. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml +#: ../data/addin-xml-strings.cs:164 +msgid "MPRIS D-Bus interface" +msgstr "інтерфейс MPRIS D-Bus" + +#: ../data/addin-xml-strings.cs:165 +msgid "Control Banshee using the MPRIS D-Bus interface." +msgstr "Керування Banshee використовуючи інтерфейс MPRIS D-Bus." + #. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml -#: ../data/addin-xml-strings.cs:136 +#: ../data/addin-xml-strings.cs:169 msgid "Multimedia Keys" msgstr "Мультимедійні клавіші" -#: ../data/addin-xml-strings.cs:137 +#: ../data/addin-xml-strings.cs:170 msgid "Control playback via the multimedia keys on your keyboard." msgstr "Керування та навігація за допомогою мультимедіа-клавіш" #. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml -#: ../data/addin-xml-strings.cs:141 +#: ../data/addin-xml-strings.cs:174 msgid "Notification Area Icon" msgstr "Значок у області сповіщення" -#: ../data/addin-xml-strings.cs:142 +#: ../data/addin-xml-strings.cs:175 msgid "Display an icon in the notification area for controlling Banshee." msgstr "Показувати керівний значок у панелі" #. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml -#: ../data/addin-xml-strings.cs:146 +#: ../data/addin-xml-strings.cs:179 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164 #: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50 msgid "Now Playing" msgstr "Зараз програється" -#: ../data/addin-xml-strings.cs:147 +#: ../data/addin-xml-strings.cs:180 msgid "" "Provides a source that displays embedded video and provides fullscreen video " "playback and controls." @@ -332,104 +395,106 @@ "керування" #. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml -#: ../data/addin-xml-strings.cs:150 +#: ../data/addin-xml-strings.cs:183 msgid "Importers for Amarok, Rhythmbox and iTunes" msgstr "Імпорт з Amarok, Rhythmbox та iTunes" -#: ../data/addin-xml-strings.cs:151 +#: ../data/addin-xml-strings.cs:184 msgid "Import your library from Amarok, Rhythmbox or iTunes." msgstr "Функції імпорту колекцій других медіапрогравачів" #. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml -#: ../data/addin-xml-strings.cs:155 +#: ../data/addin-xml-strings.cs:188 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:58 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:79 msgid "Play Queue" msgstr "Програти чергу" -#: ../data/addin-xml-strings.cs:156 +#: ../data/addin-xml-strings.cs:189 msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over." msgstr "Відтворювати композиції у вибраному порядку чи задіяти Auto DJ" #. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml -#: ../data/addin-xml-strings.cs:160 +#: ../data/addin-xml-strings.cs:193 +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:188 #: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107 -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:99 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:203 msgid "Podcasts" msgstr "Подкасти" -#: ../data/addin-xml-strings.cs:161 +#: ../data/addin-xml-strings.cs:194 msgid "Subscribe to podcasts and stream or download episodes." msgstr "Стеження за подкастами та перегляд чи завантаження випусків" #. ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml -#: ../data/addin-xml-strings.cs:165 +#: ../data/addin-xml-strings.cs:198 msgid "Remote Audio" msgstr "Звук на відстані" -#: ../data/addin-xml-strings.cs:166 +#: ../data/addin-xml-strings.cs:199 msgid "Provides support for remote speakers like the Airport Express" msgstr "" "Забезпечує підтримку дистанційних пристроїв, таких як колонки Airport Express" #. ../src/Extensions/Banshee.Sample/Banshee.Sample.addin.xml -#: ../data/addin-xml-strings.cs:169 +#: ../data/addin-xml-strings.cs:202 #: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40 msgid "Sample" msgstr "Зразок" -#: ../data/addin-xml-strings.cs:170 +#: ../data/addin-xml-strings.cs:203 msgid "A sample source useful to developers." msgstr "Простий зразок для розробників." -#: ../data/addin-xml-strings.cs:171 +#: ../data/addin-xml-strings.cs:204 msgid "Sources" msgstr "Джерела" #. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml -#: ../data/addin-xml-strings.cs:174 +#: ../data/addin-xml-strings.cs:207 msgid "SQL Debug Console" msgstr "Консоль SQL" -#: ../data/addin-xml-strings.cs:175 +#: ../data/addin-xml-strings.cs:208 msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries." msgstr "Надає графічні засоби для стеження та створення SQL-запитів" -#: ../data/addin-xml-strings.cs:176 +#: ../data/addin-xml-strings.cs:209 msgid "Debug" msgstr "Налагодження" #. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml -#: ../data/addin-xml-strings.cs:179 +#: ../data/addin-xml-strings.cs:212 msgid "Torrent Downloader" msgstr "Завантаження торрентів" -#: ../data/addin-xml-strings.cs:180 +#: ../data/addin-xml-strings.cs:213 msgid "Support downloading BitTorrent files from podcasts." msgstr "Підтримка завантаження подкастів по протоколу BitTorrent" #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml -#: ../data/addin-xml-strings.cs:184 +#: ../data/addin-xml-strings.cs:217 #: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44 msgid "Wikipedia" msgstr "Вікіпедія" -#: ../data/addin-xml-strings.cs:185 +#: ../data/addin-xml-strings.cs:218 msgid "View artist information from Wikipedia in the context pane." msgstr "" "Показувати у зведеній панелі інформацію про виконавців, що є у Вікіпедії" -#: ../data/addin-xml-strings.cs:186 ../data/addin-xml-strings.cs:191 +#: ../data/addin-xml-strings.cs:219 ../data/addin-xml-strings.cs:224 msgid "Context Pane" msgstr "Панель зведення" #. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml -#: ../data/addin-xml-strings.cs:189 +#: ../data/addin-xml-strings.cs:222 #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44 msgid "YouTube" msgstr "YouTube" -#: ../data/addin-xml-strings.cs:190 +#: ../data/addin-xml-strings.cs:223 msgid "Show related YouTube videos in the context pane" msgstr "Показувати схожі ролики з YouTube у панелі зведення" @@ -678,14 +743,14 @@ #: ../data/desktop-files/common.desktop.in.h:1 #: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76 -#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:94 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:201 +#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:109 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206 #: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60 msgid "Banshee Media Player" msgstr "Програвач медіа Banshee" #: ../data/desktop-files/common.desktop.in.h:2 -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:192 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:193 msgid "Media Player" msgstr "Програвач медіа" @@ -702,8 +767,9 @@ msgstr "Неможливо створити елемент filesrc" #: ../libbanshee/banshee-bpmdetector.c:214 -msgid "Could not create decodebin plugin" -msgstr "Неможливо створити втулок decodebin" +#| msgid "Could not create decodebin plugin" +msgid "Could not create decodebin2 plugin" +msgstr "Неможливо створити модуль decodebin2" #: ../libbanshee/banshee-bpmdetector.c:220 msgid "Could not create audioconvert plugin" @@ -739,16 +805,19 @@ msgstr "Неможливо створити додаток filesink" #: ../libbanshee/banshee-transcoder.c:240 -msgid "Could not create 'filesrc' plugin" -msgstr "Неможливо створити додаток 'filesrc'" +#| msgid "Could not create filesrc element" +msgid "Could not create source element" +msgstr "Неможливо створити елемент джерела" #: ../libbanshee/banshee-transcoder.c:246 -msgid "Could not create 'decodebin' plugin" -msgstr "Неможливо створити додаток" +#| msgid "Could not create 'decodebin' plugin" +msgid "Could not create 'decodebin2' plugin" +msgstr "Неможливо створити модуль 'decodebin2'" #: ../libbanshee/banshee-transcoder.c:252 -msgid "Could not create 'filesink' plugin" -msgstr "Неможливо створити додаток 'filesink'" +#| msgid "Could not create filesrc element" +msgid "Could not create sink element" +msgstr "Неможливо створити елемент sink" #: ../libbanshee/banshee-transcoder.c:258 msgid "Could not create 'sinkben' plugin" @@ -766,7 +835,7 @@ msgid "Could not get sink pad from encoder" msgstr "Неможливо отримати sink pad від кодера" -#: ../libbanshee/banshee-transcoder.c:344 +#: ../libbanshee/banshee-transcoder.c:341 msgid "Could not construct pipeline" msgstr "Неможливо спорудити конвеєр" @@ -802,12 +871,12 @@ msgid "Could not create BPM detection driver." msgstr "Неможливо створити драйвер для визначення BPM." -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:80 -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:738 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766 msgid "Enable _gapless playback" msgstr "Відтворювати _безперервно" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:81 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:83 msgid "" "Eliminate the small playback gap on track change. Useful for concept albums " "and classical music" @@ -815,27 +884,27 @@ "Виключити паузу між композиціями. Призначено для альбомів без чіткого " "розподілу, а також класичною музики." -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:146 -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:181 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187 msgid "Could not initialize GStreamer library" msgstr "Неможливо ініціалізувати бібліотеку GStreamer" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:419 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430 msgid "Unknown Error" msgstr "Невідома помилка" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:732 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760 msgid "_Enable ReplayGain correction" msgstr "_Увімкнути корекцію підсилення (ReplayGain)" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:733 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761 msgid "" "For tracks that have ReplayGain data, automatically scale (normalize) " "playback volume" msgstr "" "Автоматично підстроювати гучність композицій, що містять дані ReplayGain" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:739 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767 msgid "" "Eliminate the small playback gap on track change. Useful for concept albums " "and classical music." @@ -847,71 +916,77 @@ msgid "Could not create transcoder" msgstr "Неможливо створити транскодер" +#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:222 +msgid "GStreamer# 0.10" +msgstr "GStreamer# 0.10" + #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91 -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:128 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132 msgid "_Close" msgstr "_Закрити" #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92 -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:129 +#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:238 +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133 msgid "Close" msgstr "Закрити" -#: ../src/Clients/Booter/Booter/Entry.cs:146 +#: ../src/Clients/Booter/Booter/Entry.cs:148 msgid "Help Options" msgstr "Опції довідки" -#: ../src/Clients/Booter/Booter/Entry.cs:147 +#: ../src/Clients/Booter/Booter/Entry.cs:149 msgid "Show this help" msgstr "Показати цю довідку" -#: ../src/Clients/Booter/Booter/Entry.cs:148 +#: ../src/Clients/Booter/Booter/Entry.cs:150 msgid "Show options for controlling playback" msgstr "Показати опції для керування програванням" -#: ../src/Clients/Booter/Booter/Entry.cs:149 +#: ../src/Clients/Booter/Booter/Entry.cs:151 msgid "Show options for querying the playing track" msgstr "Показати опції для запиту доріжки, що програється" -#: ../src/Clients/Booter/Booter/Entry.cs:150 +#: ../src/Clients/Booter/Booter/Entry.cs:152 msgid "Show options for querying the playing engine" msgstr "Показати опції для запиту рушія програвання" -#: ../src/Clients/Booter/Booter/Entry.cs:151 +#: ../src/Clients/Booter/Booter/Entry.cs:153 msgid "Show options for the user interface" msgstr "Показати опції для інтерфейсу користувача" -#: ../src/Clients/Booter/Booter/Entry.cs:152 +#: ../src/Clients/Booter/Booter/Entry.cs:154 msgid "Show options for developers and debugging" msgstr "Показати опції для розробників та налагоджування" -#: ../src/Clients/Booter/Booter/Entry.cs:153 +#: ../src/Clients/Booter/Booter/Entry.cs:155 msgid "Show all option groups" msgstr "Показати всі групи опцій" -#: ../src/Clients/Booter/Booter/Entry.cs:154 +#: ../src/Clients/Booter/Booter/Entry.cs:156 msgid "Show version information" msgstr "Показати інформацію про версії" -#: ../src/Clients/Booter/Booter/Entry.cs:157 +#: ../src/Clients/Booter/Booter/Entry.cs:159 msgid "Playback Control Options" msgstr "Опції керування програванням" -#: ../src/Clients/Booter/Booter/Entry.cs:158 +#: ../src/Clients/Booter/Booter/Entry.cs:160 msgid "" "Play the next track, optionally restarting if the 'restart' value is set" msgstr "" "Програти наступну доріжку, опційно перезапустити, якщо значення \"перезапуск" "\" встановлене" -#: ../src/Clients/Booter/Booter/Entry.cs:159 +#: ../src/Clients/Booter/Booter/Entry.cs:161 msgid "" "Play the previous track, optionally restarting if the 'restart value is set" msgstr "" "Програти попередню доріжку, опційно перезапустити, якщо значення \"перезапуск" "\" встановлене" -#: ../src/Clients/Booter/Booter/Entry.cs:160 +#: ../src/Clients/Booter/Booter/Entry.cs:162 msgid "" "If the current song has been played longer than 4 seconds then restart it, " "otherwise the same as --previous" @@ -919,29 +994,29 @@ "Якщо пройшло більше 4 секунд від початку композиції, почати заново, інакше " "те ж саме, що --previous" -#: ../src/Clients/Booter/Booter/Entry.cs:161 +#: ../src/Clients/Booter/Booter/Entry.cs:163 msgid "Automatically start playing any tracks enqueued on the command line" msgstr "" "Автоматично розпочати програвання будь-якої доріжки, що поставлена в чергу з " "командного рядка" -#: ../src/Clients/Booter/Booter/Entry.cs:162 +#: ../src/Clients/Booter/Booter/Entry.cs:164 msgid "Start playback" msgstr "Розпочати програвання" -#: ../src/Clients/Booter/Booter/Entry.cs:163 +#: ../src/Clients/Booter/Booter/Entry.cs:165 msgid "Pause playback" msgstr "Призупинити програвання" -#: ../src/Clients/Booter/Booter/Entry.cs:164 +#: ../src/Clients/Booter/Booter/Entry.cs:166 msgid "Toggle playback" msgstr "Увімкнути/вимкнути програвання" -#: ../src/Clients/Booter/Booter/Entry.cs:165 +#: ../src/Clients/Booter/Booter/Entry.cs:167 msgid "Completely stop playback" msgstr "Повністю зупинити програвання" -#: ../src/Clients/Booter/Booter/Entry.cs:167 +#: ../src/Clients/Booter/Booter/Entry.cs:169 msgid "" "Enable or disable playback stopping after the currently playing track (value " "should be either 'true' or 'false')" @@ -949,106 +1024,106 @@ "Увімкнути чи вимкнути зупинку програвання після поточної доріжки (значення " "має бути \"так\" чи \"ні\")" -#: ../src/Clients/Booter/Booter/Entry.cs:168 +#: ../src/Clients/Booter/Booter/Entry.cs:170 msgid "Set the playback volume (0-100), prefix with +/- for relative values" msgstr "Встановити гучність програвання (0-100) або змінити на +/-(значення)" -#: ../src/Clients/Booter/Booter/Entry.cs:169 +#: ../src/Clients/Booter/Booter/Entry.cs:171 msgid "Seek to a specific point (seconds, float)" msgstr "Прокрутити до визначеного місця (секунди, плаваюча кома)" -#: ../src/Clients/Booter/Booter/Entry.cs:170 +#: ../src/Clients/Booter/Booter/Entry.cs:172 msgid "Set the currently played track's rating (0 to 5)" msgstr "Оцінити композицію (від 0 до 5)" -#: ../src/Clients/Booter/Booter/Entry.cs:173 +#: ../src/Clients/Booter/Booter/Entry.cs:175 msgid "Player Engine Query Options" msgstr "Опції черги рушія програвача" -#: ../src/Clients/Booter/Booter/Entry.cs:174 +#: ../src/Clients/Booter/Booter/Entry.cs:176 msgid "Current player state" msgstr "Поточний стан програвача" -#: ../src/Clients/Booter/Booter/Entry.cs:175 +#: ../src/Clients/Booter/Booter/Entry.cs:177 msgid "Last player state" msgstr "Останній стан програвача" -#: ../src/Clients/Booter/Booter/Entry.cs:176 +#: ../src/Clients/Booter/Booter/Entry.cs:178 msgid "Query whether the player can be paused" msgstr "Запитати чи програвач може бути призупинений" -#: ../src/Clients/Booter/Booter/Entry.cs:177 +#: ../src/Clients/Booter/Booter/Entry.cs:179 msgid "Query whether the player can seek" msgstr "Запитати чи програвач може прокручувати" -#: ../src/Clients/Booter/Booter/Entry.cs:178 +#: ../src/Clients/Booter/Booter/Entry.cs:180 msgid "Player volume" msgstr "Гучність програвача" -#: ../src/Clients/Booter/Booter/Entry.cs:179 +#: ../src/Clients/Booter/Booter/Entry.cs:181 msgid "Player position in currently playing track" msgstr "Місце програвання в поточній доріжці" -#: ../src/Clients/Booter/Booter/Entry.cs:182 +#: ../src/Clients/Booter/Booter/Entry.cs:184 msgid "Playing Track Metadata Query Options" msgstr "Опції запиту метаданих доріжки, що програється" -#: ../src/Clients/Booter/Booter/Entry.cs:183 +#: ../src/Clients/Booter/Booter/Entry.cs:185 msgid "URI" msgstr "URI-адреса" -#: ../src/Clients/Booter/Booter/Entry.cs:184 -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:148 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:85 +#: ../src/Clients/Booter/Booter/Entry.cs:186 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:161 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89 msgid "Artist Name" msgstr "Ім'я виконавця" -#: ../src/Clients/Booter/Booter/Entry.cs:185 -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:149 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:86 +#: ../src/Clients/Booter/Booter/Entry.cs:187 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90 msgid "Album Title" msgstr "Назва альбому" -#: ../src/Clients/Booter/Booter/Entry.cs:186 -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:147 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:84 +#: ../src/Clients/Booter/Booter/Entry.cs:188 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88 msgid "Track Title" msgstr "Назва доріжки" -#: ../src/Clients/Booter/Booter/Entry.cs:187 +#: ../src/Clients/Booter/Booter/Entry.cs:189 msgid "Duration" msgstr "Тривалість" #. Translators: noun -#: ../src/Clients/Booter/Booter/Entry.cs:188 +#: ../src/Clients/Booter/Booter/Entry.cs:190 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117 msgid "Track Number" msgstr "Номер доріжки" #. Translators: noun -#: ../src/Clients/Booter/Booter/Entry.cs:189 +#: ../src/Clients/Booter/Booter/Entry.cs:191 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126 msgid "Track Count" msgstr "Кількість доріжок" -#: ../src/Clients/Booter/Booter/Entry.cs:190 +#: ../src/Clients/Booter/Booter/Entry.cs:192 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114 msgid "Disc Number" msgstr "Номер диску" -#: ../src/Clients/Booter/Booter/Entry.cs:191 -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:151 +#: ../src/Clients/Booter/Booter/Entry.cs:193 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92 msgid "Year" msgstr "Рік" -#: ../src/Clients/Booter/Booter/Entry.cs:192 +#: ../src/Clients/Booter/Booter/Entry.cs:194 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60 @@ -1056,58 +1131,79 @@ msgid "Rating" msgstr "Рейтинг" -#: ../src/Clients/Booter/Booter/Entry.cs:193 +#: ../src/Clients/Booter/Booter/Entry.cs:195 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322 msgid "Score" msgstr "Рахунок" #. Translators: noun -#: ../src/Clients/Booter/Booter/Entry.cs:194 +#: ../src/Clients/Booter/Booter/Entry.cs:196 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143 msgid "Bit Rate" msgstr "Бітрейт" -#: ../src/Clients/Booter/Booter/Entry.cs:197 +#: ../src/Clients/Booter/Booter/Entry.cs:199 msgid "User Interface Options" msgstr "Опції інтерфейсу користувача" -#: ../src/Clients/Booter/Booter/Entry.cs:198 +#: ../src/Clients/Booter/Booter/Entry.cs:200 msgid "Present the user interface on the active workspace" msgstr "Показувати інтерфейс користувача на поточній стільниці" -#: ../src/Clients/Booter/Booter/Entry.cs:199 +#: ../src/Clients/Booter/Booter/Entry.cs:201 +#| msgid "Enter or leave fullscreen mode" +msgid "Enter the full-screen mode" +msgstr "Перемкнути режим на весь екран" + +#: ../src/Clients/Booter/Booter/Entry.cs:202 msgid "Hide the user interface" msgstr "Сховати інтерфейс користувача" -#: ../src/Clients/Booter/Booter/Entry.cs:200 +#: ../src/Clients/Booter/Booter/Entry.cs:203 msgid "Do not present the user interface, regardless of any other options" msgstr "Не показувати інтерфейс користувача незважаючи на інші опції" -#: ../src/Clients/Booter/Booter/Entry.cs:203 +#: ../src/Clients/Booter/Booter/Entry.cs:204 +msgid "Present the import media dialog box" +msgstr "Показати діалогову вікно імпорту носія" + +#: ../src/Clients/Booter/Booter/Entry.cs:205 +msgid "Present the about dialog" +msgstr "Показати діалогове вікно Про програму" + +#: ../src/Clients/Booter/Booter/Entry.cs:206 +msgid "Present the open location dialog" +msgstr "Показати діалогове вікно відкриття місця" + +#: ../src/Clients/Booter/Booter/Entry.cs:207 +msgid "Present the preferences dialog" +msgstr "Показати діалогове вікно параметрів" + +#: ../src/Clients/Booter/Booter/Entry.cs:210 msgid "Debugging and Development Options" msgstr "Опції зневадження та розробки" -#: ../src/Clients/Booter/Booter/Entry.cs:204 +#: ../src/Clients/Booter/Booter/Entry.cs:211 msgid "Enable general debugging features" msgstr "Увімкнути загальні можливості зневадження" -#: ../src/Clients/Booter/Booter/Entry.cs:205 +#: ../src/Clients/Booter/Booter/Entry.cs:212 msgid "Enable debugging output of SQL queries" msgstr "Увімкнути вивід зневадження для запитів SQL" -#: ../src/Clients/Booter/Booter/Entry.cs:206 +#: ../src/Clients/Booter/Booter/Entry.cs:213 msgid "Enable debugging output of Mono.Addins" msgstr "Увімкнути вивід зневадження для Mono.Addins" -#: ../src/Clients/Booter/Booter/Entry.cs:207 +#: ../src/Clients/Booter/Booter/Entry.cs:214 msgid "Specify an alternate database to use" msgstr "Визначити альтернативну базу даних" -#: ../src/Clients/Booter/Booter/Entry.cs:208 +#: ../src/Clients/Booter/Booter/Entry.cs:215 msgid "Specify an alternate key, default is /apps/banshee-1/" msgstr "Вказати альтернативний ключ, типово /apps/banshee-1/" -#: ../src/Clients/Booter/Booter/Entry.cs:209 +#: ../src/Clients/Booter/Booter/Entry.cs:216 msgid "" "Optimize instance for running uninstalled; most notably, this will create an " "alternate Mono.Addins database in the working directory" @@ -1115,16 +1211,16 @@ "Оптимізація нащадка для запуску видалена; скоріш за все, створиться " "альтернативна база даних Mono.Addins в робочій теці" -#: ../src/Clients/Booter/Booter/Entry.cs:211 +#: ../src/Clients/Booter/Booter/Entry.cs:218 msgid "Disable DBus support completely" msgstr "Повністю вимкнути підтримку DBus" -#: ../src/Clients/Booter/Booter/Entry.cs:213 +#: ../src/Clients/Booter/Booter/Entry.cs:220 #, csharp-format msgid "Skip loading a custom gtkrc file ({0}) if it exists" msgstr "Пропустити завантаження власного файлу gtkrc ({0}) якщо він існує" -#: ../src/Clients/Booter/Booter/Entry.cs:244 +#: ../src/Clients/Booter/Booter/Entry.cs:251 #, csharp-format msgid "The following help arguments are invalid: {0}" msgstr "Наступний аргумент допомоги невірний: {0}" @@ -1140,6 +1236,7 @@ #: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86 msgid "_Play" msgstr "_Грати" @@ -1168,36 +1265,43 @@ msgid "Play Song" msgstr "Грати пісню" -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:146 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:83 +#. Translators: this is a verb (command), not a noun (things) +#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:447 +msgid "Search" +msgstr "Знайти" + +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 msgid "Artist, Album, or Title" msgstr "Виконавець, альбом чи назва" -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:150 +#. Alias for %album_artist% +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78 +#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82 +msgid "Album Artist" +msgstr "Виконавець альбому" + +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:91 msgid "Genre" msgstr "Жанр" #. Translators: noun -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:152 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:166 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214 msgid "Comment" msgstr "Коментар" -#. Translators: this is a verb (command), not a noun (things) -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:173 -#, csharp-format -msgid "Search" -msgstr "Знайти" - #: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43 #: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37 #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:100 #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90 msgid "Unknown Artist" msgstr "Невідомий виконавець" @@ -1208,71 +1312,88 @@ msgid "Unknown Album" msgstr "Невідомий альбом" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:48 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49 msgid "Unknown Title" msgstr "Невідома назва" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:185 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:92 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91 msgid "Various Artists" msgstr "Різні виконавці" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:345 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342 msgid "Stream location not found" msgstr "Не знайдено розташування потоку" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:345 -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:321 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:324 msgid "File not found" msgstr "Файл не знайдено" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344 msgid "Codec for playing this media type not available" msgstr "Відсутній декодер цього типа даних" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346 msgid "File protected by Digital Rights Management (DRM)" msgstr "Файл захищено технічними засобами (DRM)" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348 msgid "Unknown error" msgstr "Невідома помилка" #. TODO turn this into a PrimarySource-owned delegate? -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417 msgid "_Restart Podcast" msgstr "Перез_апустити подкаст" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418 +#| msgid "_Restart Video" +msgid "_Restart Audiobook" +msgstr "Перез_апустити аудіокнигу" + +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419 msgid "_Restart Video" msgstr "Перез_апустити відео" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86 msgid "_Restart Song" msgstr "Перез_апустити пісню" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421 msgid "_Restart Item" msgstr "Пере_запустити елемент" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:436 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437 msgid "_Jump to Playing Podcast" msgstr "Пере_йти до подкасту, що програється" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438 +#| msgid "_Jump to Playing Video" +msgid "_Jump to Playing Audiobook" +msgstr "Пере_йти до аудіокниги, що програється" + +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439 msgid "_Jump to Playing Video" msgstr "Пере_йти до відео, що програється" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82 msgid "_Jump to Playing Song" msgstr "Пере_йти до пісні, що програється" -#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439 +#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441 msgid "_Jump to Playing Item" msgstr "Пере_йти до елементу, що програється" +#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes +#. (possibly more than two digits) and {2} is seconds (between 00 and 60). +#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173 +#, csharp-format +msgid "{0} ({1}:{2:00})" +msgstr "{0} ({1}:{2:00})" + #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70 #, csharp-format msgid "All Albums ({0})" @@ -1369,7 +1490,7 @@ msgstr "Триває пошук даних" #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182 -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1359 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382 msgid "Scanning..." msgstr "Триває пошук..." @@ -1394,23 +1515,23 @@ msgid "Importing {0} of {1}" msgstr "Імпортування {0} з {1}" -#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78 +#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79 #, csharp-format msgid "Rescanning {0} of {1}" msgstr "Пересканування {0} з {1}" -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:230 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234 msgid "Upgrading your Banshee Database" msgstr "Оновлення вашої бази даних Banshee" -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:231 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235 msgid "" "Please wait while your old Banshee database is migrated to the new format." msgstr "" "Будь ласка, зачекайте поки ваша стара база даних Banshee оновиться до нового " "формату." -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1356 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1379 msgid "Refreshing Metadata" msgstr "Оновлення метаданих" @@ -1500,13 +1621,6 @@ msgid "Track Artist" msgstr "Виконавець доріжки" -#. Alias for %album_artist% -#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72 -#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78 -#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82 -msgid "Album Artist" -msgstr "Виконавець альбому" - #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83 msgid "Album Artist Initial" msgstr "Початковий виконавець альбому" @@ -1528,7 +1642,7 @@ msgstr "Альбом" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:108 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:72 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:73 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:127 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:76 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:97 @@ -1536,124 +1650,138 @@ msgstr "Назва" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:119 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:83 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:84 msgid "Count" msgstr "Кількість" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:125 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:89 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:90 msgid "Number" msgstr "Номер" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:131 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:95 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:96 msgid "Count (unsorted)" msgstr "Кількість (не відсортовані)" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:137 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:101 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:102 msgid "Number (unsorted)" msgstr "Номер (не відсортовані)" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:107 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:108 msgid "Disc Count" msgstr "Кількість дисків" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:119 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:120 msgid "Grouping" msgstr "Групування" #. Catalog.GetString ("Music Library") #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59 -#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39 msgid "Music" msgstr "Музика" +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:65 +msgid "Search your music" +msgstr "Пошук музики" + #. Misc section -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:77 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:79 #: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65 msgid "Miscellaneous" msgstr "Різні" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82 msgid "_Sort an artist's albums by year, not title" msgstr "Сортувати альбоми за _датою виходу, а не назвою" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:107 -#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:85 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92 +#, csharp-format +#| msgid "{0} second" +#| msgid_plural "{0} seconds" +msgid "{0} song" +msgid_plural "{0} songs" +msgstr[0] "{0} пісня" +msgstr[1] "{0} пісні" +msgstr[2] "{0} пісень" + +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114 +#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:91 msgid "Favorites" msgstr "Улюблені" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:108 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:115 msgid "Songs rated four and five stars" msgstr "Відео з рейтингом чотири чи п'ять зірок" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:112 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119 msgid "Recent Favorites" msgstr "Недавні, що сподобалися" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:113 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120 msgid "Songs listened to often in the past week" msgstr "Пісні, що часто прослуховувались протягом останнього тижня" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:117 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95 msgid "Recently Added" msgstr "Нещодавно додані" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:118 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125 msgid "Songs imported within the last week" msgstr "Пісні, що внесені протягом останнього тижня" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:122 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129 msgid "Unheard" msgstr "Непрослухані" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:123 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130 msgid "Songs that have not been played or skipped" msgstr "Пісні, що не прослуховувались або пропущені" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137 msgid "Neglected Favorites" msgstr "Знехтувані улюблені" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138 msgid "Favorites not played in over two months" msgstr "Улюблені, що не програвались більш ніж два місяці" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142 msgid "Least Favorite" msgstr "Найменш улюблені" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143 msgid "Songs rated one or two stars or that you have frequently skipped" msgstr "Пісні з рейтингом одна або дві зірки, або ті, що ви часто пропускаєте" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147 msgid "700 MB of Favorites" msgstr "700 Мб улюбленого" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148 msgid "A data CD worth of favorite songs" msgstr "КД з даними цінний улюбленими піснями" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:145 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153 msgid "80 Minutes of Favorites" msgstr "80 хвилин улюбленого" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154 msgid "An audio CD worth of favorite songs" msgstr "Звуковий КД цінний улюбленими піснями" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159 msgid "Unrated" msgstr "Без рейтингу" -#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:160 msgid "Songs that haven't been rated" msgstr "Пісні, що не мають рейтингу" @@ -1672,19 +1800,33 @@ msgid "Videos" msgstr "Відео" -#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:64 +#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48 +msgid "Search your videos" +msgstr "Пошук відеофайлів" + +#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65 msgid "Produced By" msgstr "Вироблений" -#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:86 +#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70 +#, csharp-format +#| msgid "{0} item" +#| msgid_plural "{0} items" +msgid "{0} video" +msgid_plural "{0} videos" +msgstr[0] "{0} відео" +msgstr[1] "{0} відео" +msgstr[2] "{0} відео" + +#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:92 msgid "Videos rated four and five stars" msgstr "Відео з рейтингом чотири чи п'ять зірок" -#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90 +#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96 msgid "Unwatched" msgstr "Не переглянуті" -#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:91 +#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:97 msgid "Videos that haven't been played yet" msgstr "Відео, які ще не програвались" @@ -1704,64 +1846,64 @@ msgid "Problem with Player Engine" msgstr "Проблема з рушієм програвача" -#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:134 +#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135 #, csharp-format msgid "Converting {0} of {1}" msgstr "Перетворення {0} з {1}" -#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:134 +#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135 msgid "Initializing" msgstr "Ініціалізація" -#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:137 +#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138 msgid "" "Files are currently being converted to another format. Would you like to " "stop this?" msgstr "Зараз файли перетворюються в інший формат. Ви хочете зупинити це?" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:51 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52 msgid "Saving Metadata to File" msgstr "Збереження метаданих у файл" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:48 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49 msgid "Write _metadata to files" msgstr "Записати _метадані до файлу" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50 msgid "Save tags and other metadata inside supported media files" msgstr "Записувати метадані у файли, формати яких це дозволяють" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:54 -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:136 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:174 msgid "Write _ratings and play counts to files" msgstr "Записувати о_цінки та кількість відтворень у файли" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56 msgid "" "Enable this option to save rating and playcount metadata inside supported " "audio files" msgstr "Зберігати оцінки та лічильники у файлах, формати яких це підтримують" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:59 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60 msgid "_Update file and folder names" msgstr "_Оновити назви файлу і теки" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61 msgid "Rename files and folders according to media metadata" msgstr "Перейменувати файли відповідно до метаданих" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:137 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:175 msgid "" "Enable this option to save rating and play count metadata inside supported " "audio files whenever the rating is changed." msgstr "" "Зберігати оцінки та лічильники у файлах підтримуваних форматів при заміні" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:138 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:176 msgid "Import _ratings" msgstr "Імпортувати о_цінки" -#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:139 +#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:177 msgid "Import play _counts" msgstr "Імпортувати кількість _відтворень" @@ -1782,11 +1924,11 @@ msgid "An available, working network connection will be assumed" msgstr "Наявне справне мережеве з'єднання буде використано " -#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:157 +#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159 msgid "_Disable features requiring Internet access" msgstr "_Вимкнути можливості, що потребують доступу до Інтернет" -#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:158 +#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160 msgid "" "Some features require a broadband Internet connection such as Last.fm or " "cover art fetching" @@ -1794,7 +1936,12 @@ "Деякі можливості потребують широкосмугового з'єднання з Інтернет, такі як " "Last.fm та звантажувач обкладинок" -#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:219 +#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:160 +#| msgid "Smart Playlist" +msgid "Search this playlist" +msgstr "Пошук у переліку програвання" + +#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:229 msgid "The track's rating was set differently on the device and in Banshee" msgstr "" "Оцінка доріжки на пристрої відрізняється від тієї, що зберігається у Banshee" @@ -1813,12 +1960,12 @@ msgstr "Видалити перелік програвання" #. TODO generate name based on the track selection, or begin editing it -#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:390 -#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:396 +#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386 +#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:367 -#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:487 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:394 +#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:500 #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213 msgid "New Playlist" msgstr "Новий перелік програвання" @@ -1870,22 +2017,22 @@ msgstr "елементи" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64 -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60 msgid "minutes" msgstr "хвилини" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65 -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61 msgid "hours" msgstr "години" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66 -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63 msgid "MB" msgstr "Мб" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67 -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64 msgid "GB" msgstr "Гб" @@ -2417,11 +2564,11 @@ #. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:64 #: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:66 -#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:327 +#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:354 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212 -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:380 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:383 msgid "Unknown" msgstr "Невідомо" @@ -2443,12 +2590,12 @@ msgid "Edit Smart Playlist" msgstr "Редагувати розумний перелік програвання" -#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:229 +#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:242 msgid "Delete Smart Playlist" msgstr "Видалити розумний перелік програвання" #: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:147 -#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155 +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161 #, csharp-format msgid "All Genres ({0})" msgstr "Всі жанри ({0})" @@ -2497,7 +2644,7 @@ msgstr "Закрити звіт про помилку" #: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83 -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46 msgid "Error" msgstr "Помилка" @@ -2508,37 +2655,38 @@ msgid "Details" msgstr "Подробиці" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:165 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:152 msgid "Errors" msgstr "Помилки" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:218 -msgid "Sort Playlists by" +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:205 +#| msgid "Sort Playlists by" +msgid "Sort Playlists By" msgstr "Впорядкувати перелік програвання за" #. Translators: this is a noun, referring to the harddisk -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:227 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:214 msgid "Drive" msgstr "Диск" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:248 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:238 msgid "File Organization" msgstr "Керування файлами" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:239 msgid "Folder hie_rarchy" msgstr "_Ієрархія тек" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:240 msgid "File _name" msgstr "_Назва файлу" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:699 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:693 #, csharp-format msgid "Adding {0} of {1} to {2}" msgstr "Додається {0} з {1} до {2}" -#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:718 +#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:712 #, csharp-format msgid "Deleting {0} of {1} From {2}" msgstr "Видаляється {0} з {1} з {2}" @@ -2551,7 +2699,7 @@ msgid "Size Descending" msgstr "За розміром (спадання)" -#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:765 +#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:789 #, csharp-format msgid "{0} item" msgid_plural "{0} items" @@ -2572,11 +2720,11 @@ msgid "Problem parsing playlist" msgstr "Проблема розбору переліку програвання" -#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:61 +#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:67 msgid "Could not launch URL" msgstr "Неможливо відкрити URL-адресу" -#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:62 +#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:68 #, csharp-format msgid "" "{0} could not be opened: {1}\n" @@ -2609,11 +2757,19 @@ msgid "Search:" msgstr "Шукати:" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:76 +msgid "Disable album grid" +msgstr "Вимкнути сітку альбому" + +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:77 +msgid "Disable album grid and show the classic layout instead" +msgstr "Вимкнути сітку альбому та показувати класичне розташування" + +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:76 msgid "Cannot Reorder While Sorted" msgstr "Активний режим впорядкування" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:78 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77 msgid "" "To put the playlist in manual sort mode, click the currently sorted column " "header until the sort arrow goes away." @@ -2631,53 +2787,59 @@ msgid "{0} of {1}" msgstr "{0} з {1}" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:220 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224 msgid "Playing" msgstr "Відтворення" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:221 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225 msgid "Paused" msgstr "Пауза" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227 msgid "Protected" msgstr "Захист" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:79 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228 +#| msgid "Extra processing" +msgid "External Document" +msgstr "Зовнішній документ" + +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80 msgid "Choose New Cover Art..." msgstr "Обрати іншу обгортку..." -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:97 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98 msgid "Delete This Cover Art" msgstr "Прибрати цю обгортку" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:126 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127 msgid "Track #" msgstr "Доріжка №" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:128 msgid "Track & Count" msgstr "Доріжка, кількість" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:131 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132 msgid "Disc #" msgstr "Диск №" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:133 msgid "Disc & Count" msgstr "Диск, кількість" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:135 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:136 #, csharp-format msgid "{0} kbps" msgstr "{0} кбіт/с" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:138 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139 +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:123 #, csharp-format msgid "{0} Hz" msgstr "{0} Гц" -#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:141 +#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:142 #, csharp-format msgid "{0} bits" msgstr "{0} біт" @@ -2698,6 +2860,30 @@ msgid "Loading..." msgstr "Завантаження..." +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:74 +msgid "Preamp" +msgstr "Попер.підсилення" + +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:100 +#, csharp-format +#| msgid "{0} day" +#| msgid_plural "{0} days" +msgid "+{0} dB" +msgstr "+{0} дБ" + +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:102 +#, csharp-format +#| msgid "{0} day" +#| msgid_plural "{0} days" +msgid "{0} dB" +msgstr "{0} дБ" + +#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:124 +#, csharp-format +#| msgid "{0} Hz" +msgid "{0} kHz" +msgstr "{0} кГц" + #: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:53 msgid "Equalizer" msgstr "Еквалайзер" @@ -2708,11 +2894,27 @@ #. Translators: this is the window title when a track is playing #. {0} is the track title, {1} is the artist name -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:198 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:203 #, csharp-format msgid "{0} by {1}" msgstr "{0} виконавця {1}" +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87 +msgid "_Bookmarks" +msgstr "_Закладинки" + +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90 +msgid "_Add Bookmark" +msgstr "_Додати закладинку" + +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91 +msgid "Bookmark the Position in the Current Track" +msgstr "Додати закладинку розташування поточної доріжки" + +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103 +msgid "_Remove Bookmark" +msgstr "_Вилучити закладинку" + #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:54 msgid "Maintainers" msgstr "Утримувачі" @@ -2773,7 +2975,7 @@ "бажаєте, щоб за замовчуванням був Banshee?" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:434 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:435 #, csharp-format msgid "Do not ask me this again" msgstr "Не запитувати знову" @@ -2889,60 +3091,65 @@ msgstr "_Інструменти" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92 -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:133 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135 msgid "_Help" msgstr "_Довідка" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95 +#| msgid "Concerts" +msgid "_Contents" +msgstr "_Зміст" + +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99 msgid "_Web Resources" msgstr "_Ресурс тенет" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:98 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102 msgid "Banshee _User Guide (Wiki)" msgstr "_Посібник користувача Banshee (Wiki)" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:103 msgid "Learn about how to use Banshee" msgstr "Дізнатися про те, як використовувати Banshee" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:104 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108 msgid "Advanced Collection Searching" msgstr "Вдосконалений пошук у збірці" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:105 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:109 msgid "Learn advanced ways to search your media collection" msgstr "Дізнайтеся про вдосконалені шляхи пошуку у вашій збірці медіа" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:110 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114 msgid "Banshee _Home Page" msgstr "_Домашня сторінка Banshee" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:111 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:115 msgid "Visit the Banshee Home Page" msgstr "Відвідати домашню сторінку Banshee" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:116 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:120 msgid "_Get Involved" msgstr "_Взяти участь" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:117 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:121 msgid "Become a contributor to Banshee" msgstr "Сприяти Banshee" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:122 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:126 msgid "_Version Information" msgstr "Інформація про _версію" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:123 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:127 msgid "View detailed version and configuration information" msgstr "Перегляд докладної версії та інформації про конфігурацію" #. Prompt user for location of the playlist. -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:160 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:184 msgid "Import Playlist" msgstr "Імпортування переліку програвання" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:161 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:185 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559 msgid "Playlists" msgstr "Переліки програвання" @@ -3034,6 +3241,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62 msgid "Shuffle" msgstr "Перемішування" @@ -3095,6 +3303,7 @@ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:115 #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:50 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:85 msgid "Preferences" msgstr "Налаштування" @@ -3107,8 +3316,10 @@ msgstr "_Новий розумний перелік програвання" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:74 +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:71 msgid "Refresh" msgstr "Оновити" @@ -3120,136 +3331,142 @@ msgid "Could not export playlist" msgstr "Неможливо експортувати перелік програвання" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:425 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:426 #, csharp-format msgid "Are you sure you want to delete this {0}?" msgstr "Ви впевнені, що хочете видалити цей {0}?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:468 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:469 msgid "Separate by Type" msgstr "Розділяти за типом" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:69 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70 msgid "Select _All" msgstr "Вибрати _всі" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71 msgid "Select all tracks" msgstr "Вибрати всі доріжки" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:73 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74 msgid "Select _None" msgstr "Не вибрати _жодного" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75 msgid "Unselect all tracks" msgstr "Зняти виділення з усіх доріжок" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:77 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59 msgid "_Edit Track Information" msgstr "_Редагувати інформацію про доріжку" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79 msgid "Edit information on selected tracks" msgstr "Редагувати інформацію вибраних доріжок" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:81 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:113 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:155 msgid "Properties" msgstr "Властивості" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83 msgid "View information on selected tracks" msgstr "Переглянути інформацію про вибрані доріжки" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:85 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87 +#| msgid "Play the next item" +msgid "Play the selected item" +msgstr "Програти обраний елемент" + +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90 msgid "Add _to Playlist" msgstr "Додати до _переліку програвання" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91 msgid "Append selected items to playlist or create new playlist from selection" msgstr "Додати вибрані елементи до черги програвання або створити новий" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96 msgid "Create new playlist from selected tracks" msgstr "Створити новий перелік з вибраних доріжок" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100 msgid "_Remove" msgstr "_Вилучити" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101 msgid "Remove selected track(s) from this source" msgstr "Вилучити вибрані доріжки з цього джерела" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:99 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104 msgid "Remove From _Library" msgstr "Вилучити з _бібліотеки" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105 msgid "Remove selected track(s) from library" msgstr "Вилучити вибрані доріжки з бібліотеки" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:103 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108 msgid "_Open Containing Folder" msgstr "_Відкрити теку з об'єктом" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109 msgid "Open the folder that contains the selected item" msgstr "Відкрити теку, що містить об'єкт" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:107 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112 msgid "_Delete From Drive" msgstr "В_идалити з диску" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113 msgid "Permanently delete selected item(s) from medium" msgstr "Назавжди видалити вибрані елементи з носія" #. Translators: this is a verb (command), not a noun (things) -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114 -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:169 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:108 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112 #, csharp-format msgid "_Search" msgstr "По_шук" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120 msgid "Search for items matching certain criteria" msgstr "Шукати всі елементи, що відповідають деякій умові" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:118 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123 msgid "By Matching _Album" msgstr "Збіг _альбому" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124 msgid "Search all songs of this album" msgstr "Шукати всі пісні з цього альбому" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127 msgid "By Matching A_rtist" msgstr "Збіг ви_конавця" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:128 msgid "Search all songs of this artist" msgstr "Шукати всі пісні цього виконавця" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:252 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:258 #, csharp-format msgid "_Delete From \"{0}\"" msgstr "_Видалити з \"{0}\"" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:437 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:464 msgid "The folder could not be found." msgstr "Не вдалось знайти теку." -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:438 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:465 msgid "Please check that the track's location is accessible by the system." msgstr "Перевірити, що файл знаходиться у місці, доступному системі." -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:504 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535 #, csharp-format msgid "Are you sure you want to permanently delete this item?" msgid_plural "" @@ -3258,16 +3475,16 @@ msgstr[1] "Ви впевнені, що хочете назавжди видалити {0} елементи?" msgstr[2] "Ви впевнені, що хочете назавжди видалити {0} елементів?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:508 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:539 msgid "If you delete the selection, it will be permanently lost." msgstr "Якщо ви видалите виділене, воно буде втрачене назавжди" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:511 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542 #, csharp-format msgid "Remove selection from {0}?" msgstr "Вилучити вибране з {0}?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:514 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:545 #, csharp-format msgid "Are you sure you want to remove the selected item from your {1}?" msgid_plural "" @@ -3276,10 +3493,6 @@ msgstr[1] "Ви впевнені, що хочете видалити {0} вибрані елементи з вашої {1}?" msgstr[2] "Ви впевнені, що хочете видалити {0} вибраних елементів з вашої {1}?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543 -msgid "View Track Information" -msgstr "_Змінити метадані" - #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53 msgid "Com_pilation Album Artist:" msgstr "Виконавець зб_ірки:" @@ -3449,36 +3662,36 @@ msgid "Sorting" msgstr "Сортування" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:48 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:52 msgid "Set all sort track titles to this value" msgstr "Встановити цю назву для усіх доріжок при впорядкуванні" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:49 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:53 msgid "Sort Track Title:" msgstr "Назва доріжки при впорядкуванні:" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:56 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:60 msgid "Set all sort track artists to this value" msgstr "Встановити цю назву виконавця для усіх доріжок при впорядкуванні" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:57 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:61 msgid "Sort Track Artist:" msgstr "Виконавець доріжки при впорядкуванні:" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:63 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:67 msgid "Set all sort album artists to this value" msgstr "" "Встановити цю назву виконавця альбому для усіх доріжок при впорядкуванні" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:64 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:68 msgid "Sort Album Artist:" msgstr "Виконавець альбому при впорядкуванні:" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:70 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:74 msgid "Set all sort album titles to this value" msgstr "Встановити цю назву альбому для усіх доріжок при впорядкуванні" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:71 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:75 msgid "Sort Album Title:" msgstr "Назва альбому при впорядкуванні:" @@ -3561,43 +3774,43 @@ msgstr "Розмір файлу:" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222 -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61 msgid "bytes" msgstr "байт" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:85 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95 msgid "Track Editor" msgstr "Редактор доріжок" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:85 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95 msgid "Track Properties" msgstr "Властивості доріжки" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:133 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147 msgid "Show the previous track" msgstr "Показати попередню доріжку" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:139 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153 msgid "Show the next track" msgstr "Показати наступну доріжку" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:169 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183 msgid "Title:" msgstr "Назва:" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:170 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184 msgid "Artist:" msgstr "Виконавець:" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:171 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185 msgid "Album:" msgstr "Альбом:" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:279 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309 msgid "Sync all field _values" msgstr "Синхронізувати всі _значення полів" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:284 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314 msgid "" "Apply the values of all common fields set for this track to all of the " "tracks selected in this editor" @@ -3605,12 +3818,12 @@ "Застосувати значення, що встановлені для цієї доріжки, для всіх спільних " "полів всіх вибраних в редакторі доріжок" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:383 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413 #, csharp-format msgid "Editing {0} of {1} items" msgstr "Редагування {0} з {1} елементів" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:636 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675 #, csharp-format msgid "Save the changes made to the open track?" msgid_plural "Save the changes made to {0} of {1} open tracks?" @@ -3618,11 +3831,11 @@ msgstr[1] "Зберегти зміни зроблені в {0} з {1} відкритих доріжок?" msgstr[2] "Зберегти зміни зроблені в {0} з {1} відкритих доріжок?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:653 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692 msgid "Close _without Saving" msgstr "Закрити _без збереження" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:689 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729 #, csharp-format msgid "If you don't save, changes from the last {0} will be permanently lost." msgstr "Якщо не збережете, зміни з останньої {0} будуть втрачені назавжди." @@ -3673,24 +3886,24 @@ #. Translators: {0} and {1} are for markup so ignore them, {2} and {3} #. are Podcast Name and Published Date, respectively; #. e.g. 'from BBtv published 7/26/2007' -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:496 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:525 #, csharp-format msgid "{0}from{1} {2} {0}published{1} {3}" msgstr "{0}з{1} {2} {0}видані{1} {3}" #. simply: "Chicago Public Radio" or whatever the artist name is -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:509 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538 msgid "Unknown Stream" msgstr "Невідомий потік" #. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:512 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541 #, csharp-format msgid "{0}on{1} {2}" msgstr "{0}на{1} {2}" #. Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:515 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:544 #, csharp-format msgid "{0} {1}" msgstr "{0} {1}" @@ -3698,23 +3911,23 @@ #. Translators: {0} and {1} are for markup so ignore them, {2} and {3} #. are Artist Name and Album Title, respectively; #. e.g. 'by Parkway Drive from Killing with a Smile' -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:551 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:580 #, csharp-format msgid "{0}by{1} {2} {0}from{1} {3}" msgstr "{0}виконавця{1} {2} {0}з{1} {3}" #. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title; #. e.g. 'from Killing with a Smile' -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:555 -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:512 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:584 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522 #, csharp-format msgid "{0}from{1} {2}" msgstr "{0}з{1} {2}" #. Translators: {0} and {1} are for markup so ignore them, {2} is for Artist Name; #. e.g. 'by Parkway Drive' -#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:559 -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:516 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:588 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:526 #, csharp-format msgid "{0}by{1} {2}" msgstr "{0}виконавця{1} {2}" @@ -3768,6 +3981,7 @@ msgstr "Файли" #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63 +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67 #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82 msgid "C_hoose Files" msgstr "_Обрати файли" @@ -3808,11 +4022,11 @@ msgid "Select Folders" msgstr "Виберіть теки" -#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:72 +#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:73 msgid "Import Media to Library" msgstr "Імпортування медіа до бібліотеки" -#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:78 +#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:79 msgid "" "Your media library is empty. You may import new music and videos into your " "library now, or choose to do so later." @@ -3820,21 +4034,21 @@ "Бібліотека медіа порожня. Ви можете імпортувати нову музику та відео зараз " "або вибрати зробити це пізніше." -#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:88 +#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89 msgid "Import _from:" msgstr "_Звідки:" -#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:97 +#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:99 msgid "Do not show this dialog again" msgstr "Не показувати цей діалог знову" -#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:125 +#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385 msgid "_Import" msgstr "_Імпортувати" -#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:67 +#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69 msgid "Videos From Photos Folder" msgstr "Відео та теки з фотографіями" @@ -3899,6 +4113,11 @@ msgid "Playlist _Name:" msgstr "_Назва списку відтворення:" +#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108 +#| msgid "Delete Smart Playlist" +msgid "Predefined Smart Playlists" +msgstr "Наперед визначені розумні переліки програвання" + #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119 msgid "Open in editor" msgstr "Відкрити в редакторі" @@ -3932,6 +4151,12 @@ msgid "Show or hide the artist/album browser" msgstr "Показати або сховати переглядач \"виконавець/альбом\"" +#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121 +#, csharp-format +#| msgid "Loading {0}" +msgid "Loading {0}..." +msgstr "Завантаження {0}..." + #: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189 msgid "" "Insert\n" @@ -3940,6 +4165,11 @@ "Вставте\n" "диск" +#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95 +#| msgid "Folder hie_rarchy" +msgid "Clear search" +msgstr "Очистити пошук" + #: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58 msgid "Seek" msgstr "Прокрутити" @@ -3949,6 +4179,7 @@ msgstr "Бездіяльність" #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149 +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58 msgid "Contacting..." msgstr "Під'єднання..." @@ -3968,45 +4199,120 @@ msgid "Full Volume" msgstr "Повна гучність" +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:96 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102 +msgid "Device" +msgstr "Пристрій" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:97 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104 +msgid "Generation" +msgstr "Генерування" + +#. FIXME +#. AddDapProperty (Catalog.GetString ("Color"), "black"); +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:102 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105 +msgid "Capacity" +msgstr "Ємність" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:103 +msgid "Available" +msgstr "Доступно" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:104 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141 +msgid "Serial number" +msgstr "Серійний номер" + +#. AddDapProperty (Catalog.GetString ("Produced on"), ipod_device.ProductionInfo.DisplayDate); +#. AddDapProperty (Catalog.GetString ("Firmware"), ipod_device.FirmwareVersion); +#. string [] capabilities = new string [ipod_device.ModelInfo.Capabilities.Count]; +#. ipod_device.ModelInfo.Capabilities.CopyTo (capabilities, 0); +#. AddDapProperty (Catalog.GetString ("Capabilities"), String.Join (", ", capabilities)); +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:111 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113 +msgid "Supports cover art" +msgstr "Підтримка обкладинок" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:112 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:114 +msgid "Supports photos" +msgstr "Підтримка фотографій" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:407 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:491 +msgid "Track duration is zero" +msgstr "Тривалість доріжки нульова" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:510 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:694 +msgid "Syncing iPod" +msgstr "Синхронізація iPod" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:511 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:695 +msgid "Preparing to synchronize..." +msgstr "Підготування до синхронізації..." + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:514 +#, csharp-format +#| msgid "Adding {0} of {1} to {2}" +msgid "Adding track {0} of {1}" +msgstr "Додається доріжка {0} з {1}" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:550 +#, csharp-format +#| msgid "Importing {0} of {1}" +msgid "Removing track {0} of {1}" +msgstr "Видалення доріжки {0} з {1}" + +#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:614 +#| msgid "Saving new database..." +msgid "Writing media database" +msgstr "Зберігання медіа-бази даних" + #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:131 #, csharp-format msgid "Sync {0}" msgstr "Синхронізувати {0}" #. Note to translators: {0}, {1} and {2} will be replaced with numbers. -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:256 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:260 #, csharp-format msgid "{0} to add, {1} to remove, {2} to update" msgstr "{0} для додавання, {1} для видалення, {2} для оновлення" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:175 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176 msgid "Device Properties" msgstr "Властивості пристрою" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:199 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200 msgid "Product" msgstr "Продукт" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201 msgid "Vendor" msgstr "Постачальник" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:277 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:280 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:133 #, csharp-format msgid "Loading {0}" msgstr "Завантаження {0}" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:361 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37 msgid "Yes" msgstr "Так" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:361 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38 msgid "No" msgstr "Ні" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:382 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385 #, csharp-format msgid "" "The {0} format is not supported by the device, and no converter was found to " @@ -4015,11 +4321,11 @@ "Формат {0} не підтримується пристроєм, і не знайдений перетворювач, щоб " "перетворити його" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:388 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391 msgid "File format conversion support is not available" msgstr "Підтримка перетворення формату файла недоступна." -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:414 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:417 msgid "Error converting file" msgstr "Помилка перетворення файлу" @@ -4040,7 +4346,7 @@ msgstr "Налаштування синхронізації" #. singular form unused b/c we know it's > 1, but we still need GetPlural -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:364 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:365 #, csharp-format msgid "The sync operation will remove one track from your device." msgid_plural "The sync operation will remove {0} tracks from your device." @@ -4048,11 +4354,11 @@ msgstr[1] "При синхронізації з пристрою буде видалено {0} композиції." msgstr[2] "При синхронізації з пристрою буде видалено {0} композицій." -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:368 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:369 msgid "Are you sure you want to continue?" msgstr "Дійсно продовжити?" -#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:376 +#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:377 msgid "Remove tracks" msgstr "Видаліть доріжки" @@ -4165,72 +4471,35 @@ msgid "Error rebuilding iPod database" msgstr "Помилка перебудови бази iPod" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:98 -msgid "Device" -msgstr "Пристрій" - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:99 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103 msgid "Color" msgstr "Колір" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:100 -msgid "Generation" -msgstr "Генерування" - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101 -msgid "Capacity" -msgstr "Ємність" - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102 -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:148 -msgid "Serial number" -msgstr "Серійний номер" - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107 msgid "Produced on" msgstr "Вироблений на" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108 msgid "Firmware" msgstr "Мікропрограмне забезпечення" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112 msgid "Capabilities" msgstr "Можливості" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:109 -msgid "Supports cover art" -msgstr "Підтримка обкладинок" - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:110 -msgid "Supports photos" -msgstr "Підтримка фотографій" - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:465 -msgid "Track duration is zero" -msgstr "Тривалість доріжки нульова" - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:627 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680 msgid "Out of space on device" msgstr "На пристрої не лишилося місця" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:627 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680 msgid "Please manually remove some songs" msgstr "Будь ласка, вилучіть деякі пісні вручну" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:643 -msgid "Syncing iPod" -msgstr "Синхронізація iPod" - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:644 -msgid "Preparing to synchronize..." -msgstr "Підготування до синхронізації..." - -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:665 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:724 msgid "Updating..." msgstr "Оновлення..." -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:669 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:728 msgid "Flushing to disk..." msgstr "Диск відмикається..." @@ -4239,18 +4508,26 @@ msgstr "Неможливо прочитати ваш iPod" #: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:77 +#| msgid "" +#| "You have used this iPod with a version of iTunes that saves a version of " +#| "the song database for your iPod that is too new for Banshee to " +#| "recognize.\n" +#| "\n" +#| "Banshee can rebuild your database, but some settings might be lost. Using " +#| "Banshee and iTunes with the same iPod is not recommended." msgid "" "You have used this iPod with a version of iTunes that saves a version of the " "song database for your iPod that is too new for Banshee to recognize.\n" "\n" -"Banshee can rebuild your database, but some settings might be lost. Using " -"Banshee and iTunes with the same iPod is not recommended." +"Banshee can rebuild your database, but you might lose your settings and all " +"the content in the device (be sure to backup your data first). Using Banshee " +"and iTunes with the same iPod is not recommended." msgstr "" "Ви використовуєте цей iPod з версією iTunes, що зберігає версію бази даних " "пісень для вашого iPod, що занадто нова для розпізнання Banshee.\n" "\n" "Banshee може перебудувати вашу базу даних, але деякі налаштування можуть " -"втратитись. Використовувати Banshee і iTunes з тим самим iPod не радимо." +"втратитись (зробіть резервну копію даних). Використовувати Banshee і iTunes з тим самим iPod не радимо." #: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:88 msgid "Learn more about Banshee's iPod support" @@ -4339,23 +4616,11 @@ msgid "Ringtones" msgstr "Мелодії дзвінків" -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:78 -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:121 -msgid "MTP Support Ignoring Device" -msgstr "Підтримка MTP нехтує пристроєм" - -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:79 -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:122 -msgid "" -"Banshee's MTP audio player support can only handle one device at a time." -msgstr "" -"Banshee може підтримувати одночасно лише один пристрій аудіопрогравача MTP" - -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:91 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:82 msgid "Error Initializing MTP Device Support" msgstr "Помилка ініціалізації підтримки пристрою MTP" -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:92 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:83 msgid "" "There was an error intializing MTP device support. See http://www.banshee-" "project.org/Guide/DAPs/MTP for more information." @@ -4363,52 +4628,182 @@ "Була помилка ініціалізації підтримки пристрою MTP. Дивіться http://www." "banshee-project.org/Guide/DAPs/MTP для докладної інформації." -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:103 -msgid "Error Finding MTP Device Support" -msgstr "Помилка знаходження підтримки MTP пристроїв" - -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:104 -msgid "" -"An MTP device was detected, but Banshee was unable to load support for it." -msgstr "" -"Знайдений пристрій MTP, але Banshee не має змоги завантажити підтримку для " -"нього." - -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:149 -#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142 +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66 msgid "Version" msgstr "Версія" -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:151 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:144 msgid "Battery level" msgstr "Рівень заряду батареї" #. user_event.Progress = (double)current / total; #. Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the #. track currently being loaded, and {2} is the total # of tracks that will be loaded. -#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:167 +#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:160 #, csharp-format msgid "Loading {0} - {1} of {2}" msgstr "Завантаження {0} - {1} з {2}" +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:57 +msgid "Amazon MP3 Purchases" +msgstr "Покупки у Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:53 +msgid "Amazon MP3s" +msgstr "Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:54 +msgid "Songs purchased from the Amazon MP3 Store" +msgstr "Пісні придбані у магазині Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:40 +msgid "Download Amazon MP3 Purchase" +msgstr "Завантажити покупку у Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:42 +msgid "Amazon MP3 Files" +msgstr "Файли Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:63 +msgid "Amazon MP3 Purchase" +msgstr "Покупка Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42 +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39 +msgid "Amazon MP3 Store" +msgstr "Магазин Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:57 +#| msgid "Count" +msgid "Country" +msgstr "Країна" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:60 +msgid "Which Amazon MP3 storefront to use by default." +msgstr "Який магазин Amazon MP3 типово використовувати." + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:88 +msgid "Automatic (Geo IP detection)" +msgstr "Автоматично (визначається за Geo IP)" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90 +msgid "France (amazon.fr)" +msgstr "Франція (amazon.fr)" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:91 +msgid "Germany, Switzerland, Austria (amazon.de)" +msgstr "Німеччина, Швейцария, Австрия (amazon.de)" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:92 +msgid "Japan (amazon.co.jp)" +msgstr "Японія (amazon.co.jp)" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:93 +msgid "United Kingdom (amazon.co.uk)" +msgstr "Велика Британія (amazon.co.uk)" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:94 +msgid "United States (amazon.com)" +msgstr "Сполучені Штати (amazon.com)" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43 +#, csharp-format +msgid "Search the Amazon MP3 Store" +msgstr "Пошук магазину Amazon MP3" + +#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45 +msgid "How Your Purchases Support GNOME" +msgstr "Як ваша покупка підтримує GNOME" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:55 +#| msgid "Open Location" +msgid "Open Book" +msgstr "Відкрити книгу" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:56 +msgid "Merge Discs..." +msgstr "Об'єднання дисків..." + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65 +#| msgid "Reset" +msgid "Resume" +msgstr "Продовжити" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65 +msgid "Resume playback of this audiobook" +msgstr "Продовжити відтворення аудіодоріжки" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:138 +#, csharp-format +msgid "Merge the {0} selected discs into one book?" +msgid_plural "Merge the {0} selected discs into one book?" +msgstr[0] "Об'єднати {0} обраний диск у одну книгу?" +msgstr[1] "Об'єднати {0} обрані диски у одну книгу?" +msgstr[2] "Об'єднати {0} обраних дисків у одну книгу?" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:143 +msgid "" +"This will ensure the disc numbers are all set properly, and then set the " +"author and book title for all tracks on all these discs to the values below" +msgstr "" +"Це для впевненості правильного порядку усіх номерів дисків, і потім вкажіть наведені нижче значення у якості автора " +"та назви книги для усіх доріжок на усіх дисках" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:152 +#| msgid "Author" +msgid "Author:" +msgstr "Автор:" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:159 +#| msgid "Book Title" +msgid "Book Title:" +msgstr "Назва книги:" + #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:57 -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:67 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:92 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:87 msgid "Author" msgstr "Автор" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:62 +#. Translators: This means the first letter of the author's name +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:63 msgid "Author Initial" msgstr "Ініціал автора" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:67 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:68 msgid "Book Title" msgstr "Назва книги" -#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:44 +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68 msgid "Audiobooks, etc" msgstr "Аудіокниги, тощо" +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75 +msgid "Search your audiobooks" +msgstr "Пошук аудіокниг" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:145 +#, csharp-format +#| msgid "{0} ago" +msgid "{0} book" +msgid_plural "{0} books" +msgstr[0] "{0} книга" +msgstr[1] "{0} книги" +msgstr[2] "{0} книг" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114 +#| msgid "Pause playback" +msgid "Resume Playback" +msgstr "Продовжити програвання" + +#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:120 +#| msgid "Bookmarks" +msgid "No Bookmark Set" +msgstr "Не встановлено закладку" + #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76 #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55 msgid "Audio CD" @@ -4421,7 +4816,7 @@ #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:121 msgid "Importing Audio CD" -msgstr "Імпортування звукового КД" +msgstr "Імпортування звукового CD" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:122 msgid "Initializing Drive" @@ -4436,15 +4831,15 @@ #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:254 msgid "Cannot Import CD" -msgstr "Неможливо імпортувати КД" +msgstr "Неможливо імпортувати CD" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:233 msgid "Audio CDs" -msgstr "Аудіо КД" +msgstr "Аудіо CD" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:235 msgid "Audio CD Importing" -msgstr "Імпортуванння звукового КД" +msgstr "Імпорт звукового CD" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:238 msgid "_Import format" @@ -4452,14 +4847,14 @@ #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:242 msgid "_Automatically import audio CDs when inserted" -msgstr "_Автоматично імпортувати звуковий КД, коли вставлений" +msgstr "_Автоматично імпортувати звуковий CD, коли вставлений" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:243 msgid "" "When an audio CD is inserted, automatically begin importing it if metadata " "can be found and it is not already in the library." msgstr "" -"Коли вставлений звуковий КД, автоматично розпочати його імпортування, якщо " +"Коли вставлений звуковий CD, автоматично розпочати його імпортування, якщо " "знайдені метадані і він ще не в бібліотеці." #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:247 @@ -4468,7 +4863,7 @@ #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:248 msgid "When an audio CD has been imported, automatically eject it." -msgstr "Коли звуковий КД імпортований, автоматично виштовхнути його." +msgstr "Коли звуковий CD імпортований, автоматично виштовхнути його." #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:251 msgid "Use error correction when importing" @@ -4485,27 +4880,27 @@ #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320 #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440 msgid "Import CD" -msgstr "Імпортування КД" +msgstr "Імпортування компакт-диску" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:321 msgid "Import this audio CD to the library" -msgstr "Імпортувати цей звуковий КД до бібліотеки" +msgstr "Імпортувати цей звуковий диск до бібліотеки" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:327 msgid "Duplicate CD" -msgstr "Подвоїти КД" +msgstr "Дублювати компакт-диск" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:328 msgid "Duplicate this audio CD" -msgstr "Подвоїти цей звуковий КД" +msgstr "Подвоїти цей звуковий диск" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130 msgid "Searching for CD metadata..." -msgstr "Пошук метаданих для КД..." +msgstr "Пошук метаданих для диску..." #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163 msgid "Could not fetch metadata for CD." -msgstr "Неможливо отримати метадані для КД." +msgstr "Неможливо отримати метадані для диску." #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191 msgid "Automatic import off since this album is already in the Music Library." @@ -4514,78 +4909,55 @@ #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214 msgid "Could not import CD" -msgstr "Неможливо імпортувати КД" +msgstr "Неможливо імпортувати компакт-диск" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231 msgid "Could not duplicate audio CD" -msgstr "Неможливо подвоїти звуковий КД" +msgstr "Неможливо дублювати звуковий диск" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363 msgid "Ejecting audio CD..." -msgstr "Виштовхування аудіо КД..." +msgstr "Виштовхування аудіо-диску..." #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381 #, csharp-format msgid "Could not eject audio CD: {0}" -msgstr "Неможливо виштовхнути звуковий КД: {0}" +msgstr "Неможливо виштовхнути аудіо-диск: {0}" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414 msgid "Audio CD Preferences" -msgstr "Налаштування аудіо КД" +msgstr "Налаштування аудіо-диску" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415 msgid "Eject Disc" -msgstr "Виштовхнути КД" +msgstr "Виштовхнути компакт-диск" #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439 #, csharp-format msgid "Import ‟{0}”" msgstr "Імпортувати \"{0}\"" -#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:84 -msgid "_Bookmarks" -msgstr "_Закладинки" - -#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:87 -msgid "_Add Bookmark" -msgstr "_Додати закладинку" - -#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:88 -msgid "Bookmark the Position in the Current Track" -msgstr "Додати закладинку розташування поточної доріжки" - -#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:100 -msgid "_Remove Bookmark" -msgstr "_Вилучити закладинку" - -#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes -#. (possibly more than two digits) and {2} is seconds (between 00 and 60). -#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:210 -#, csharp-format -msgid "{0} ({1}:{2:00})" -msgstr "{0} ({1}:{2:00})" - #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs:64 msgid "Detecting BPM" msgstr "Встановлення BPM" -#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:86 +#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91 msgid "D_etect" msgstr "_Виявити" -#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:98 +#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103 msgid "T_ap" msgstr "З_адати" -#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:106 +#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111 msgid "Have Banshee attempt to auto-detect the BPM of this song" msgstr "Banshee буде намагатись автоматично визначити BPM для цієї пісні" -#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:108 +#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113 msgid "Play this song" msgstr "Програти цю пісню" -#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111 +#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116 msgid "Tap this button to the beat to set the BPM for this song manually" msgstr "" "Набивайте на цій кнопці потрібний ритм, щоб встановити его для цієї " @@ -4596,7 +4968,10 @@ msgstr "_Автоматично виявляти BPM для всіх пісень" #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149 -msgid "Detect BPM for all songs that don't already have a value set" +#| msgid "Detect BPM for all songs that don't already have a value set" +msgid "" +"Detect beats per minute (BPM) for all songs that don't already have a value " +"set" msgstr "Визначення BPM для всіх пісень, які ще не мають встановленого значення" #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58 @@ -4608,22 +4983,6 @@ msgid "{0} - {1}" msgstr "{0} - {1}" -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107 -msgid "_Cover Art" -msgstr "_Обкладинки" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:108 -msgid "Manage cover art" -msgstr "Керування обкладинками" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110 -msgid "_Download Cover Art" -msgstr "_Звантажити обкладинки" - -#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:111 -msgid "Download cover art for all tracks" -msgstr "Звантажити обкладинки для всіх доріжок" - #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:42 msgid "Shared Music" msgstr "Спільна музика" @@ -4713,7 +5072,8 @@ msgstr "З'єднання з {0}" #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178 -msgid "Add remote DAAP server" +#| msgid "Add remote DAAP server" +msgid "Add Remote DAAP Server" msgstr "Додати віддалений сервер DAAP" #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179 @@ -4746,8 +5106,9 @@ msgstr "Відкрити віддалений сервер DAAP" #: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:50 -msgid "Enter server name and ip address:" -msgstr "Введіть назву та IP-адресу сервера:" +#| msgid "Enter server name and ip address:" +msgid "Enter server IP address and port:" +msgstr "Введіть IP-адресу та порт сервера:" #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:46 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:133 @@ -4807,7 +5168,7 @@ msgstr "Черга файлової системи" #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72 -#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:71 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72 msgid "Clear" msgstr "Очистити" @@ -4816,7 +5177,7 @@ msgstr "Вилучити всі доріжки з черги файлової системи" #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79 -#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:78 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:81 msgid "Clear on Quit" msgstr "Очистити під час виходу" @@ -4824,6 +5185,86 @@ msgid "Clear the file system queue when quitting" msgstr "Очистити чергу файлової системи під час виходу" +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:46 +#| msgid "Duplicate CD" +msgid "Duplicate Albums" +msgstr "Дублікати альбомів" + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47 +msgid "" +"Displayed are albums that should likely be merged. For each row, click the " +"desired title to make it bold, or uncheck it to take no action." +msgstr "" +"Виводяться альбоми, які мають бути об'єднані. Для кожного рядка, натисніть на " +"бажаному заголовку, щоб зробити його жирним, або зніміть позначку - щоб зняти дію." + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46 +#| msgid "Duplicate CD" +msgid "Duplicate Artists" +msgstr "Дублікати виконавців" + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47 +msgid "" +"Displayed are artists that should likely be merged. For each row, click the " +"desired name to make it bold, or uncheck it to take no action." +msgstr "" +"Виводяться виконавці, які мають бути об'єднані. Для кожного рядка, натисніть на " +"бажаному заголовку, щоб зробити його жирним, або зніміть позначку - щоб зняти дію." + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50 +msgid "Fix Music Metadata..." +msgstr "Виправити метадані музики..." + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48 +#| msgid "Saving Metadata to File" +msgid "Metadata Fixer" +msgstr "Виправлення метаданих" + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:54 +msgid "Problem Type:" +msgstr "Тип проблеми:" + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:66 +#| msgid "Select Files" +msgid "Apply Selected Fixes" +msgstr "Застосувати обрані виправлення" + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:46 +#| msgid "Duplicate CD" +msgid "Duplicate Genres" +msgstr "Дублікати жанрів" + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47 +msgid "" +"Displayed are genres that should likely be merged. For each row, click the " +"desired genre to make it bold, or uncheck it to take no action." +msgstr "" +"Виводяться жанри, які мають бути об'єднані. Для кожного рядка, натисніть на " +"бажаному заголовку, щоб зробити його жирним, або зніміть позначку - щоб зняти дію." + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77 +msgid " and " +msgstr " та " + +#. Translators: These are articles that might be prefixed or suffixed +#. on artist names or album titles. You can add as many as you need, +#. separated by a pipe (|) +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/Solver.cs:198 +msgid "a|an|the" +msgstr " " + +#. Translators: This is the format commonly used in your langauge for +#. suffixing an article, eg in English: ", The" +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/Solver.cs:202 +#, csharp-format +#| msgid "{0}:" +msgid ", {0}" +msgstr ", {0}" + +#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs:77 +msgid "Fix?" +msgstr "Виправити?" + #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48 msgid "View Item Details" msgstr "Переглянути інформацію" @@ -4840,28 +5281,29 @@ msgid "Close Item" msgstr "Закрити елемент" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:96 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:97 msgid "Getting item details from the Internet Archive" msgstr "Завантажується інформація з «Архіву Інтернету»" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:147 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148 msgid "Timed out getting item details from the Internet Archive" msgstr "Час очікування інформації з «Архіву Інтернету» вийшов" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:149 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:190 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:301 msgid "Try Again" msgstr "Спробувати знову" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:150 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:151 msgid "Error getting item details from the Internet Archive" msgstr "Не вдалось отримати інформацію з «Архіву інтернету»" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:205 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66 -#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135 -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166 +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:271 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89 msgid "Description" msgstr "Опис" @@ -4975,7 +5417,7 @@ msgid "Optional Query" msgstr "Необов'язковий запит" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:163 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165 msgid "Sort by:" msgstr "Сортувати за:" @@ -5000,68 +5442,68 @@ msgid "Search..." msgstr "Пошук..." -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:109 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:111 msgid "_Go" msgstr "_Почати" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:117 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:119 msgid "Staff Picks" msgstr "Вибір редакції" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:118 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:587 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:120 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:588 msgid "Creative Commons" msgstr "Creative Commons" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:119 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:121 msgid "History" msgstr "Історія" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:120 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:122 msgid "Classic Cartoons" msgstr "Класика анімації" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:121 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:123 msgid "Speeches" msgstr "Промови" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:122 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:124 msgid "For Children" msgstr "Дітям" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:123 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:125 msgid "Poetry" msgstr "Поезія" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:124 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:126 msgid "Creator is United States" msgstr "Зроблено у США" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:125 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:127 msgid "Old Movies" msgstr "Старе кіно" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:126 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:128 msgid "New From LibriVox" msgstr "Останнє з LibriVox" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:127 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:129 msgid "Old Texts" msgstr "Старі книги" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:128 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:130 msgid "Charlie Chaplin" msgstr "Чарлі Чаплін" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:129 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:131 msgid "NASA" msgstr "NASA" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:130 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:132 msgid "Library of Congress" msgstr "Бібліотека конгресу США" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:146 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148 msgid "" "The Internet Archive, a 501(c)(3) non-profit, is building a digital library " "of Internet sites and other cultural artifacts in digital form. Like a paper " @@ -5073,28 +5515,28 @@ "бібліотека, надає безкоштовний доступ до власних баз даних дослідникам, " "історикам, вченим та широкому загалу." -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:149 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151 msgid "Visit the Internet Archive online at archive.org" msgstr "Перейти у «Архів інтернету» за адресою archive.org" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:305 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307 msgid "Audiobooks" msgstr "Аудіокниги" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:306 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78 msgid "Movies" msgstr "Кіно" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:309 msgid "Lectures" msgstr "Лекції" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:310 msgid "Concerts" msgstr "Концерти" -#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:309 +#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:311 msgid "Books" msgstr "Книги" @@ -5137,7 +5579,7 @@ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:128 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:61 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:98 -#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134 +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135 msgid "Creator" msgstr "Хто створив" @@ -5355,23 +5797,38 @@ msgstr "Додати нову радіостанцію Інтернет або перелік програвання" #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:81 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:59 +#| msgid "Sort Stations by" +msgid "Search your stations" +msgstr "Сортувати станції за" + +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:82 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60 msgid "Edit Station" msgstr "Редагувати станцію" -#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:133 +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134 msgid "Station" msgstr "Станція" -#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:235 +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155 +#, csharp-format +#| msgid "{0} second" +#| msgid_plural "{0} seconds" +msgid "{0} station" +msgid_plural "{0} stations" +msgstr[0] "{0} станція" +msgstr[1] "{0} станції" +msgstr[2] "{0} станцій" + +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241 msgid "Please provide a valid station URI" msgstr "Будь ласка, надайте вірну URI-адресу станції" -#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:248 +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254 msgid "Please provide a station genre" msgstr "Будь ласка, надайте жанр станції" -#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256 +#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262 msgid "Please provide a station title" msgstr "Будь ласка, надайте назву станції" @@ -5414,290 +5871,335 @@ msgstr "Опис:" #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128 -#: ../src/Libraries/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:48 +#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50 msgid "Rating:" msgstr "Рейтинг:" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:122 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:125 msgid "_Last.fm" msgstr "_Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:123 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126 msgid "Configure the Audioscrobbler plugin" msgstr "Конфігурація втулку Audioscrobbler" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:129 msgid "Visit _User Profile Page" msgstr "Відвідати сторінку з профілем _користувача" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:127 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:130 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:164 msgid "Visit Your Last.fm Profile Page" msgstr "Відвідати вашу сторінку Last.fm з профілем " -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:132 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:135 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:91 msgid "_Enable Song Reporting" msgstr "Увімкнути ­_звітування пісень" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:133 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136 msgid "Enable song reporting" msgstr "Увімкнути звітування пісень" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:66 -msgid "_Add Station..." -msgstr "Додати _станцію..." - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:67 -msgid "Add a new Last.fm radio station" -msgstr "Додати нову радіостанцію Last.fm" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:80 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66 msgid "Connect" msgstr "З'єднання" -#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to". -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:86 -#, csharp-format -msgid "Listen to {0} Station" -msgstr "Прослухати станцію {0}" - -#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to". -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:88 -#, csharp-format -msgid "Listen to the Last.fm {0} station for this artist" -msgstr "Прослухати Last.fm станцію {0} для цього виконавця" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:93 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:127 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:152 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:74 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:98 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:113 msgid "View on Last.fm" msgstr "Переглянути на Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:94 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:75 msgid "View this artist's Last.fm page" msgstr "Відвідати сторінку цього виконавця на Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:97 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:78 msgid "View Artist on Wikipedia" msgstr "Переглянути виконавця на Вікіпедії" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:98 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:79 msgid "Find this artist on Wikipedia" msgstr "Шукати цього виконавця у Вікіпедії" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:105 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:86 msgid "View Artist's Videos" msgstr "Переглянути відео виконавця" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:106 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:87 msgid "Find videos by this artist" msgstr "Шукати відео цього виконавця" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:109 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:110 -msgid "Fans of" -msgstr "Фани" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:114 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:115 -msgid "Similar to" -msgstr "Подібний до" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:119 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:135 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:156 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:90 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:106 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:117 msgid "Recommend to" msgstr "Порадити" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:120 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:91 msgid "Recommend this artist to someone" msgstr "Порадити комусь цього виконавця" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:128 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:99 msgid "View this album's Last.fm page" msgstr "Відвідати сторінку альбому на Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:136 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:107 msgid "Recommend this album to someone" msgstr "Порадити комусь цей альбом" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:143 -msgid "Love Track" -msgstr "Улюблена доріжка" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:144 -msgid "Mark current track as loved" -msgstr "Позначити поточну доріжку як улюблену" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:148 -msgid "Ban Track" -msgstr "Заборонити доріжку" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:149 -msgid "Mark current track as banned" -msgstr "Позначити поточну доріжку як заборонену" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:153 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:114 msgid "View this track's Last.fm page" msgstr "Відвідати сторінку доріжки на Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:157 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:118 msgid "Recommend this track to someone" msgstr "Порадити комусь цю доріжку" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:241 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:150 #, csharp-format msgid "http://last.fm/music/{0}" msgstr "http://last.fm/music/{0}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:249 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:158 #, csharp-format msgid "http://last.fm/music/{0}/{1}" msgstr "http://last.fm/music/{0}/{1}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:257 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:166 #, csharp-format msgid "http://last.fm/music/{0}/_/{1}" msgstr "http://last.fm/music/{0}/_/{1}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:265 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:174 #, csharp-format msgid "http://www.last.fm/music/{0}/+videos" msgstr "http://www.last.fm/music/{0}/+videos" #. Translators: this is used for looking up artist pages on Wikipedia; change to your wikipedia language if you want -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:273 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182 #: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:48 #, csharp-format msgid "http://en.wikipedia.org/wiki/{0}" msgstr "http://en.wikipedia.org/wiki/{0}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:307 -#, csharp-format -msgid "Fans of {0}" -msgstr "Фани {0}" +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:78 +msgid "Account" +msgstr "Профіль" + +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:270 +msgid "_Username" +msgstr "_Ім'я користувача" + +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:160 +#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:86 +msgid "Sign up for Last.fm" +msgstr "Зареєструватися на Last.fm" + +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:254 +msgid "" +"Open Last.fm in a browser, giving you the option to authorize Banshee to " +"work with your account" +msgstr "Перейти до Last.fm, щоб дозволити Banshee керувати вашим профілем" + +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:265 +#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49 +msgid "Log in to Last.fm" +msgstr "Увійти до Last.fm" + +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:286 +#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294 +#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321 +msgid "You need to allow Banshee to access your Last.fm account." +msgstr "Треба дозволити Banshee доступ до вишого облікового запису на Last.fm." -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:328 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:296 +msgid "Finish Logging In" +msgstr "Закінчити вхід" + +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:310 #, csharp-format -msgid "Similar to {0}" -msgstr "Схожий з {0}" +msgid "You are logged in to Last.fm as the user {0}." +msgstr "Ви увійшли до Last.fm з іменем користувача {0}." -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:401 -msgid "_Add Station" -msgstr "Додати _станцію" +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:313 +#| msgid "Log in to Last.fm" +msgid "Log out of Last.fm" +msgstr "Вийти з Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:123 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123 msgid "Recently Loved Tracks" msgstr "Нещодавні улюблені доріжки" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:124 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124 msgid "Recently Played Tracks" msgstr "Нещодавно програні доріжки" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:125 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125 msgid "My Top Artists" msgstr "Мої найкращі виконавці" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:206 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:206 #, csharp-format msgid "{0} plays" msgstr "{0} програвань" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:103 -msgid "Sort Stations by" -msgstr "Сортувати станції за" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:163 -msgid "Total Play Count" -msgstr "Всього прослуховувань" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:270 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs:243 msgid "Account Settings" msgstr "Налаштування облікового запису" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:274 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs:247 msgid "Join Last.fm" msgstr "Приєднатись до Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:294 -msgid "Account" -msgstr "Профіль" +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/ContextPage.cs:44 +msgid "Last.fm Recommendations" +msgstr "Рекомендації Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:297 -msgid "_Username" -msgstr "_Ім'я користувача" +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:80 +#, csharp-format +msgid "Top Albums by {0}" +msgstr "Найкращі альбоми {0}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:326 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:354 -msgid "Authorized!" -msgstr "Успішно!" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:326 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:355 -msgid "Authorize..." -msgstr "Авторизація..." +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:81 +#, csharp-format +msgid "Top Tracks by {0}" +msgstr "Найкращі доріжки {0}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:329 -msgid "" -"Open Last.fm in a browser, giving you the option to authorize Banshee to " -"work with your account" -msgstr "Перейти до Last.fm, щоб дозволити Banshee керувати вашим профілем" +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:178 +msgid "Recommended Artists" +msgstr "Виконавці, яких радять" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:335 -#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:86 -msgid "Sign up for Last.fm" -msgstr "Зареєструватися на Last.fm" +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:206 +msgid "No similar artists found" +msgstr "Схожі виконавці не знайдені" + +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60 +#, csharp-format +msgid "{0}% Similarity" +msgstr "{0}% схожості" + +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62 +msgid "Unknown Similarity" +msgstr "Невідома схожість" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59 +msgid "_Add Station..." +msgstr "Додати _станцію..." + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:60 +msgid "Add a new Last.fm radio station" +msgstr "Додати нову радіостанцію Last.fm" + +#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to". +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:73 +#, csharp-format +msgid "Listen to {0} Station" +msgstr "Прослухати станцію {0}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:341 -msgid "Check if Banshee has been authorized" -msgstr "Перевірити авторизацію" +#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to". +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:75 +#, csharp-format +msgid "Listen to the Last.fm {0} station for this artist" +msgstr "Прослухати Last.fm станцію {0} для цього виконавця" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:67 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:80 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:81 +msgid "Fans of" +msgstr "Фани" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:85 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:86 +msgid "Similar to" +msgstr "Подібний до" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:94 +msgid "Love Track" +msgstr "Улюблена доріжка" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:95 +msgid "Mark current track as loved" +msgstr "Позначити поточну доріжку як улюблену" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:99 +msgid "Ban Track" +msgstr "Заборонити доріжку" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:100 +msgid "Mark current track as banned" +msgstr "Позначити поточну доріжку як заборонену" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188 +#, csharp-format +msgid "Fans of {0}" +msgstr "Фани {0}" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209 +#, csharp-format +msgid "Similar to {0}" +msgstr "Схожий з {0}" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240 +msgid "_Add Station" +msgstr "Додати _станцію" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingService.cs:93 +msgid "Sort Stations by" +msgstr "Сортувати станції за" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingService.cs:136 +msgid "Total Play Count" +msgstr "Всього прослуховувань" + +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:68 msgid "New Station" msgstr "Нова станція" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:89 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90 msgid "Station _Type:" msgstr "_Тип станції" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:57 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58 msgid "Last.fm Station" msgstr "Станція Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:150 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:151 msgid "Edit Last.fm Station" msgstr "Редагувати станцію Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:151 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:152 msgid "Delete Last.fm Station" msgstr "Видалити станцію Last.fm" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:238 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239 #, csharp-format msgid "Tuning Last.fm to {0}." msgstr "Last.fm налаштовується на {0}." #. Translators: {0} is an error message sentence from RadioConnection.cs. -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:248 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249 #, csharp-format msgid "Failed to tune in station. {0}" msgstr "Помилка налаштування на станцію. {0}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:356 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:357 #, csharp-format msgid "Getting new songs for {0}." msgstr "отримання нових пісень з {0}." -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:363 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:364 #, csharp-format msgid "No new songs available for {0}." msgstr "Немає новий наявних пісень для {0}." -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:389 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:390 #, csharp-format msgid "Failed to get new songs for {0}." msgstr "Помилка отримання нових пісень для {0}." -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:450 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:451 #, csharp-format msgid "{0} song played" msgid_plural "{0} songs played" @@ -5705,126 +6207,106 @@ msgstr[1] "{0} пісні програні" msgstr[2] "{0} пісень програні" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:582 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:84 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:583 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:84 msgid "Recommended" msgstr "Рекомендовані" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:583 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:93 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:584 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:93 msgid "Personal" msgstr "Особисте" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:584 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:102 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:585 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:102 msgid "Loved" msgstr "Улюблені" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:585 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:586 msgid "Banshee Group" msgstr "Група Banshee" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:586 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:111 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:587 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:111 msgid "Neighbors" msgstr "Сусіди" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:85 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:94 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:85 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:94 msgid "For User:" msgstr "Для користувача:" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:103 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:103 msgid "By User:" msgstr "Користувачем:" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:112 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:112 msgid "Of User:" msgstr "Користувача:" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:120 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:120 msgid "Group" msgstr "Група" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:121 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:121 msgid "Group Name:" msgstr "Назва групи:" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:129 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:129 msgid "Tag" msgstr "Теґ" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:130 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:130 msgid "Tag Name:" msgstr "Назва теґу" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:138 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:138 msgid "Fan" msgstr "Фан" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:139 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:139 msgid "Fans of:" msgstr "Фани:" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:147 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:147 msgid "Similar" msgstr "Подібні" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:148 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:148 msgid "Similar to:" msgstr "Подібний до:" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:156 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:156 msgid "lastfm:// URL" msgstr "lastfm:// URL" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:157 +#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:157 msgid "lastfm://" msgstr "lastfm://" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/ContextPage.cs:44 -msgid "Last.fm Recommendations" -msgstr "Рекомендації Last.fm" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:81 -#, csharp-format -msgid "Top Albums by {0}" -msgstr "Найкращі альбоми {0}" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:82 -#, csharp-format -msgid "Top Tracks by {0}" -msgstr "Найкращі доріжки {0}" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:179 -msgid "Recommended Artists" -msgstr "Виконавці, яких радять" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:207 -msgid "No similar artists found" -msgstr "Схожі виконавці не знайдені" +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109 +#| msgid "_Media" +msgid "Media" +msgstr "Носій" + +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119 +#| msgid "Library Watcher" +msgid "Library" +msgstr "Бібліотека" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60 -#, csharp-format -msgid "{0}% Similarity" -msgstr "{0}% схожості" - -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62 -msgid "Unknown Similarity" -msgstr "Невідома схожість" - -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:69 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131 msgid "Launch the Banshee Media Player" msgstr "Запустити програвач медіа Banshee" -#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1 -msgid "Quick access panel for your media" -msgstr "Панель швидкого доступу до даним" - +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60 #: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2 msgid "media" msgstr "дані" +#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1 +msgid "Quick access panel for your media" +msgstr "Панель швидкого доступу до даним" + #: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeService.cs:25 msgid "_Mini Mode" msgstr "Режим _міні" @@ -5841,19 +6323,40 @@ msgid "Change repeat playback mode" msgstr "Змінити режим повторення програвання" -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:135 +#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:50 +msgid "Miro Guide" +msgstr "Міро гід" + +#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:97 +msgid "Discover interesting podcasts in the Miro Guide podcast directory!" +msgstr "Виявити цікаві подкасти у каталозі подкастів Міро Гід" + +#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:100 +msgid "Open Miro Guide" +msgstr "Відкрити Міро Гід" + +#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:56 +#| msgid "Refresh All Podcasts" +msgid "Search for podcasts" +msgstr "Пошук у подкастах" + +#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:57 +msgid "Search for video podcasts" +msgstr "Пошук відео у подкастах" + +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139 msgid "_Show Notifications" msgstr "_Показати повідомлення" -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:136 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:140 msgid "Show notifications when item changes" msgstr "Показати повідомлення, коли елемент зміниться" -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:340 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:344 msgid "Still Running" msgstr "Все ще запущений" -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:341 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:345 msgid "" "Banshee was closed to the notification area. Use the Quit option to " "end your session." @@ -5861,18 +6364,18 @@ "Banshee закритий до панелі повідомлень. Використовуйте опцію Вийти, " "щоб завершити вашу сесію." -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:470 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:480 msgid "Skip this item" msgstr "Пропустити елемент" -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:474 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:484 msgid "Cannot show notification" msgstr "Неможливо показати повідомлення" #. Translators: {0} and {1} are for markup so ignore them, {2} and {3} #. are Artist Name and Album Title, respectively; #. e.g. 'by Parkway Drive from Killing with a Smile' -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518 #, csharp-format msgid "" "{0}by{1} {2}\n" @@ -5885,16 +6388,24 @@ msgid "Banshee" msgstr "Banshee" -#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143 +#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59 +msgid "Simplify" +msgstr "Спростити" + +#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:60 +msgid "Simplify the Now Playing interface by hiding the source list and more" +msgstr "Спростити інтерфейс відтворення приховавши список джерел та інше" + +#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144 #, csharp-format msgid "Unable to import track: {0}" msgstr "Неможливо імпортувати доріжку: {0}" -#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177 +#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178 msgid "Importing from Amarok failed" msgstr "Імпортування з Amarok зазнало невдачі" -#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188 +#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189 msgid "Amarok" msgstr "Amarok" @@ -5992,19 +6503,24 @@ msgid "Refresh random tracks in the play queue" msgstr "Оновити випадкові доріжки у черзі відтворення" -#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:64 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63 +#| msgid "Refresh random tracks in the play queue" +msgid "Randomize the playback order of items in the play queue" +msgstr "Зробити випадковим порядок відтворення у черзі відтворення" + +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67 msgid "Add More" msgstr "Додати ще" -#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:65 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68 msgid "Add more random tracks to the play queue" msgstr "Додати більше випадкових доріжок у чергу відтворення" -#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73 msgid "Remove all tracks from the play queue" msgstr "Вилучити всі доріжки з черги програвання" -#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:82 msgid "Clear the play queue when quitting" msgstr "Очистити чергу програвання перед виходом" @@ -6012,16 +6528,16 @@ msgid "Remove From Play Queue" msgstr "Вилучити з черги програвання" -#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:821 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:864 msgid "Number of _played songs to show" msgstr "Показувати _відтворених композицій" -#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:827 +#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:870 msgid "Number of _upcoming songs to show" msgstr "Показувати композиції, що _очікують" #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47 -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86 msgid "Podcast" msgstr "Подкаст" @@ -6031,21 +6547,66 @@ msgid "All Podcasts ({0})" msgstr "Всі подкасти ({0})" -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:122 +#| msgid "_Restart Podcast" +msgid "Remove Podcast" +msgstr "Видалити подкаст" + +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:127 +msgid "Disable Auto Updates" +msgstr "Вимкнути автоматичне оновлення" + +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:145 +#, csharp-format +msgid "Network error updating {0}" +msgstr "Мережна помилка при оновленні {0}" + +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:151 +#, csharp-format +msgid "Parsing error updating {0}" +msgstr "Помилка аналізу при оновленні {0}" + +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:154 +#, csharp-format +#| msgid "Authentication Required" +msgid "Authentication error updating {0}" +msgstr "Помилка автентифікації при оновленні {0}" + +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157 +#, csharp-format +#| msgid "Loading {0}" +msgid "Error updating {0}" +msgstr "Помилка при оновленні {0}" + +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:213 +#| msgid "Refresh All Podcasts" +msgid "Search your podcasts" +msgstr "Пошук у подкастах" + +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88 msgid "Published" msgstr "Виданий" -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66 msgid "New" msgstr "Нові" -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:271 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57 msgid "Downloaded" msgstr "Звантажений" +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:293 +#, csharp-format +#| msgid "{0} Folder" +msgid "{0} episode" +msgid_plural "{0} episodes" +msgstr[0] "{0} епізод" +msgstr[1] "{0} епізоди" +msgstr[2] "{0} епізодів" + #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:58 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58 msgid "All Items" @@ -6089,19 +6650,16 @@ msgid "Cancel all podcast downloads?" msgstr "Скасувати звантаження всіх подкастів?" -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:71 -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:95 -msgid "Check for New Episodes" -msgstr "Перевірити наявність нових епізодів" - #. "U", #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72 -msgid "Refresh All Podcasts" -msgstr "Оновити всі подкасти" +#| msgid "Check for New Episodes" +msgid "Check all podcasts for new episodes" +msgstr "Перевірити усі подкасти для нових епізодів" #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:77 -msgid "Subscribe to Podcast..." -msgstr "Підписатися на подкаст..." +#| msgid "Podcast" +msgid "Add Podcast..." +msgstr "Додати подкаст..." #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78 msgid "Subscribe to a new podcast" @@ -6111,6 +6669,10 @@ msgid "Unsubscribe and Delete" msgstr "Відписатися та видалити" +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:95 +msgid "Check for New Episodes" +msgstr "Перевірити наявність нових епізодів" + #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:101 msgid "Download All Episodes" msgstr "Звантажити всі епізоди" @@ -6145,8 +6707,9 @@ msgstr "Відвідати сайт тенет" #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:161 -msgid "Subscribe to Podcast" -msgstr "Підписатися на подкаст" +#| msgid "Podcast" +msgid "Add Podcast" +msgstr "Додати подкаст" #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325 msgid "Invalid URL" @@ -6251,173 +6814,188 @@ msgid "No videos found" msgstr "Відео не знайдено" -#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36 +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36 msgid "open context menu" msgstr "показати меню" -#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37 +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37 msgid "click" msgstr "клацання" -#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37 +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37 msgid "menu" msgstr "меню" -#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612 +#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612 #, csharp-format msgid "Hide {0}" msgstr "Сховати {0}" -#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52 -msgid "Banshee Encountered a Fatal Error" -msgstr "Banshee спіткала невиправна помилка" +#. Translators: {0} is substituted with the application name +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53 +#, csharp-format +#| msgid "Banshee Encountered a Fatal Error" +msgid "{0} Encountered a Fatal Error" +msgstr "У {0} виникла критична помилка" -#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:90 +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92 msgid "Error Details" msgstr "Подробиці помилки" -#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:134 +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136 msgid "An unhandled exception was thrown: " msgstr "Стався виняток, що не оброблюється: " -#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58 +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58 msgid "Assembly Version Information" msgstr "Інформація про версію збірки" -#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64 +#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64 msgid "Assembly Name" msgstr "Назва збірки" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62 msgid "KB" msgstr "кб" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86 msgid "Condition:" msgstr "Умова:" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104 msgid "_Match" msgstr "_Збіг" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111 msgid "all" msgstr "всі" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112 msgid "any" msgstr "будь-який" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117 msgid "of the following:" msgstr "наступних:" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58 msgid "_Limit to" msgstr "_Обмеження до" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85 msgid "selected by" msgstr "вибрані" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42 msgid "ago" msgstr "тому" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59 msgid "seconds" msgstr "секунд" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62 msgid "days" msgstr "днів" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63 msgid "weeks" msgstr "тижнів" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64 msgid "months" msgstr "місяців" -#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65 +#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65 msgid "years" msgstr "років" +#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:71 +#, csharp-format +msgid "{0} download at {1}/s" +msgid_plural "{0} downloads at {1}/s" +msgstr[0] "{0} завантаження {1}/с" +msgstr[1] "{0} завантаження {1}/с" +msgstr[2] "{0} завантаження {1}/с" + +#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:79 +#, csharp-format +msgid "{0} download at {1}/s ({2} pending)" +msgid_plural "{0} downloads at {1}/s ({2} pending)" +msgstr[0] "{0} завантаження {1}/с ({2} очікує)" +msgstr[1] "{0} завантаження {1}/с ({2} очікує)" +msgstr[2] "{0} завантаження {1}/с ({2} очікує)" + #. public static readonly Operator Equal = new Operator ("equals", "= {0}", "==", "=", ":"); #. public static readonly Operator NotEqual = new Operator ("notEqual", "!= {0}", true, "!=", "!:"); #. public static readonly Operator LessThanEqual = new Operator ("lessThanEquals", "<= {0}", "<="); #. public static readonly Operator GreaterThanEqual = new Operator ("greaterThanEquals", ">= {0}", ">="); -#: ../src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs:47 +#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:47 msgid "before" msgstr "до" -#: ../src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs:48 +#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:48 msgid "after" msgstr "після" -#: ../src/Libraries/Hyena/Hyena.Query/EnumQueryValue.cs:43 -#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:41 -#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:45 +#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:43 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:41 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:45 msgid "is" msgstr "є" -#: ../src/Libraries/Hyena/Hyena.Query/EnumQueryValue.cs:44 -#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:42 -#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:46 +#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:44 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:42 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:46 msgid "is not" msgstr "не є" -#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:43 -#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:43 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47 msgid "at most" msgstr "щонайбільше" -#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:44 -#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:44 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46 msgid "at least" msgstr "щонайменше" -#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:45 -#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:45 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45 msgid "less than" msgstr "менше ніж" #. The SQL operators in these Operators are reversed from normal on purpose -#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:46 -#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44 +#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:46 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44 msgid "more than" msgstr "більше ніж" -#: ../src/Libraries/Hyena/Hyena.Query/NullQueryValue.cs:41 +#: ../src/Hyena/Hyena/Hyena.Query/NullQueryValue.cs:41 msgid "empty" msgstr "порожньо" -#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90 +#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90 #, csharp-format msgid "{0} ago" msgstr "{0} тому" -#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:43 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:43 msgid "contains" msgstr "містить" -#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:44 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:44 msgid "doesn't contain" msgstr "не містить" -#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:47 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:47 msgid "starts with" msgstr "починається з" -#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:48 +#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:48 msgid "ends with" msgstr "закінчується на" -#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49 -msgid "Log in to Last.fm" -msgstr "Увійти до Last.fm" - #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76 msgid "Last.fm Account Login" msgstr "Вхід до облікового запису Last.fm" @@ -6434,9 +7012,12 @@ msgid "Authorize for Last.fm" msgstr "Отримати доступ до Last.fm" -#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:448 +#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:447 +#| msgid "" +#| "Last.fm username is invalid or Banshee is not authorized to access you " +#| "account." msgid "" -"Last.fm username is invalid or Banshee is not authorized to access you " +"Last.fm username is invalid or Banshee is not authorized to access your " "account." msgstr "" "Неправильний логін Last.fm, або Banshee не дозволено доступ до вашого " @@ -6447,8 +7028,9 @@ msgstr "Ця служба не існує." #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275 -msgid "This station is only available to subscribers." -msgstr "Станція доступна тільки для тих, хто підписався." +#| msgid "This station is only available to subscribers." +msgid "Stations are only available to paying Last.fm subscribers." +msgstr "Станція доступна тільки для передплатників Last.fm." #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277 msgid "This station is not available." @@ -6485,11 +7067,6 @@ msgid "The method signature is invalid." msgstr "Неправильний підпис методу." -#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294 -#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321 -msgid "You need to allow Banshee to access your Last.fm account." -msgstr "Треба дозволити Banshee доступ до вишого облікового запису на Last.fm." - #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296 msgid "There is not enough content to play this station." msgstr "Недостатньо вмісту, щоб програти цю станцію" @@ -6535,11 +7112,10 @@ msgid "Connected to Last.fm." msgstr "З'єднаний з Last.fm." -#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:149 +#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:147 #: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:97 #: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:100 msgid "Unknown Podcast" msgstr "Невідомий подкаст" -#~ msgid "Switch to source:" -#~ msgstr "Змінити на джерело:" + diff -Nru banshee-1.8.0/src/AssemblyInfo.cs banshee-1.8.1/src/AssemblyInfo.cs --- banshee-1.8.0/src/AssemblyInfo.cs 2010-09-29 19:13:31.000000000 +0000 +++ banshee-1.8.1/src/AssemblyInfo.cs 2011-01-28 21:25:39.000000000 +0000 @@ -2,8 +2,8 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: ApplicationVersion ("1.8.0", "1.8.0")] -[assembly: ApplicationBuildInformation ("git-checkout", "linux-gnu", "x86_64", "2010-09-29 14:13:29 CDT")] +[assembly: ApplicationVersion ("1.8.1", "1.8.1")] +[assembly: ApplicationBuildInformation ("git-checkout", "linux-gnu", "x86_64", "2011-01-28 15:25:38 CST")] [assembly: AssemblyVersion ("1.8.0.0")] [assembly: AssemblyTitle ("Banshee")] diff -Nru banshee-1.8.0/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/HardwareManager.cs banshee-1.8.1/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/HardwareManager.cs --- banshee-1.8.0/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/HardwareManager.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/HardwareManager.cs 2011-01-28 20:57:47.000000000 +0000 @@ -98,12 +98,12 @@ } #endregion - private IEnumerable GetAllBlockDevices () where T : IBlockDevice + private IEnumerable GetAllBlockDevices () where T : class, IBlockDevice { foreach (var lowDevice in manager.GetAllDevices ()) { - IBlockDevice device = lowDevice as IBlockDevice; + T device = lowDevice as T; if (device != null) { - yield return (T) device; + yield return device; } } } diff -Nru banshee-1.8.0/src/Backends/Banshee.Gio/Makefile.in banshee-1.8.1/src/Backends/Banshee.Gio/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.Gio/Makefile.in 2010-09-29 18:14:43.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.Gio/Makefile.in 2011-01-28 21:25:24.000000000 +0000 @@ -41,6 +41,14 @@ subdir = src/Backends/Banshee.Gio ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -67,14 +75,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -146,6 +146,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Banshee.Gnome/Makefile.in banshee-1.8.1/src/Backends/Banshee.Gnome/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.Gnome/Makefile.in 2010-09-28 16:30:07.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.Gnome/Makefile.in 2011-01-28 21:25:24.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Backends/Banshee.Gnome ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs banshee-1.8.1/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs --- banshee-1.8.0/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs 2010-08-24 17:19:11.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs 2011-01-13 18:54:05.000000000 +0000 @@ -142,6 +142,13 @@ using (TagList tags = new TagList (track)) { output_path = String.Format ("{0}.{1}", outputUri.LocalPath, output_extension); + + // Avoid overwriting an existing file + int i = 1; + while (Banshee.IO.File.Exists (new SafeUri (output_path))) { + output_path = String.Format ("{0} ({1}).{2}", outputUri.LocalPath, i++, output_extension); + } + Log.DebugFormat ("GStreamer ripping track {0} to {1}", trackIndex, output_path); br_rip_track (handle, trackIndex + 1, output_path, tags.Handle, out taggingSupported); diff -Nru banshee-1.8.0/src/Backends/Banshee.GStreamer/Makefile.in banshee-1.8.1/src/Backends/Banshee.GStreamer/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.GStreamer/Makefile.in 2010-09-28 16:30:07.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.GStreamer/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Backends/Banshee.GStreamer ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Banshee.GStreamerSharp/Makefile.in banshee-1.8.1/src/Backends/Banshee.GStreamerSharp/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.GStreamerSharp/Makefile.in 2010-09-28 16:30:07.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.GStreamerSharp/Makefile.in 2011-01-28 21:25:23.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Backends/Banshee.GStreamerSharp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Banshee.Hal/Makefile.in banshee-1.8.1/src/Backends/Banshee.Hal/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.Hal/Makefile.in 2010-09-28 16:30:08.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.Hal/Makefile.in 2011-01-28 21:25:24.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Backends/Banshee.Hal ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in banshee-1.8.1/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in 2010-09-28 16:30:08.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in 2011-01-28 21:25:24.000000000 +0000 @@ -38,6 +38,14 @@ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -64,14 +72,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -176,6 +176,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Banshee.NowPlaying.X11/Makefile.in banshee-1.8.1/src/Backends/Banshee.NowPlaying.X11/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.NowPlaying.X11/Makefile.in 2010-09-28 16:30:08.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.NowPlaying.X11/Makefile.in 2011-01-28 21:25:24.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Backends/Banshee.NowPlaying.X11 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -157,6 +157,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Banshee.Osx/Makefile.in banshee-1.8.1/src/Backends/Banshee.Osx/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.Osx/Makefile.in 2010-09-28 16:30:08.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.Osx/Makefile.in 2011-01-28 21:25:24.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Backends/Banshee.Osx ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Banshee.Unix/Makefile.in banshee-1.8.1/src/Backends/Banshee.Unix/Makefile.in --- banshee-1.8.0/src/Backends/Banshee.Unix/Makefile.in 2010-09-28 16:30:08.000000000 +0000 +++ banshee-1.8.1/src/Backends/Banshee.Unix/Makefile.in 2011-01-28 21:25:24.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Backends/Banshee.Unix ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Backends/Makefile.in banshee-1.8.1/src/Backends/Makefile.in --- banshee-1.8.0/src/Backends/Makefile.in 2010-09-28 16:30:08.000000000 +0000 +++ banshee-1.8.1/src/Backends/Makefile.in 2011-01-28 21:25:24.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Clients/Beroe/Makefile.in banshee-1.8.1/src/Clients/Beroe/Makefile.in --- banshee-1.8.0/src/Clients/Beroe/Makefile.in 2010-09-28 16:30:08.000000000 +0000 +++ banshee-1.8.1/src/Clients/Beroe/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Clients/Beroe ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Clients/Booter/banshee-1.linux.in banshee-1.8.1/src/Clients/Booter/banshee-1.linux.in --- banshee-1.8.0/src/Clients/Booter/banshee-1.linux.in 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Clients/Booter/banshee-1.linux.in 2011-01-28 20:56:47.000000000 +0000 @@ -7,8 +7,8 @@ BANSHEE_EXEC_NAME=$(basename $0) BANSHEE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/banshee-1" -export LD_LIBRARY_PATH=@expanded_libdir@/@PACKAGE@:@expanded_libdir@/@PACKAGE@/Extensions:@expanded_libdir@/@PACKAGE@/Backends:@expanded_libdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} -export GST_PLUGIN_PATH=@expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH+:$GST_PLUGIN_PATH} +export LD_LIBRARY_PATH=@expanded_libdir@/@PACKAGE@:@expanded_libdir@/@PACKAGE@/Extensions:@expanded_libdir@/@PACKAGE@/Backends:@expanded_libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export GST_PLUGIN_PATH=@expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH} if [ $BANSHEE_EXEC_NAME = "muinshee" ]; then BANSHEE_CLIENT="Muinshee" export MONO_PATH=@expanded_libdir@/@PACKAGE@/Extensions diff -Nru banshee-1.8.0/src/Clients/Booter/Booter/Entry.cs banshee-1.8.1/src/Clients/Booter/Booter/Entry.cs --- banshee-1.8.0/src/Clients/Booter/Booter/Entry.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Clients/Booter/Booter/Entry.cs 2010-11-14 08:41:58.000000000 +0000 @@ -99,7 +99,11 @@ } else if (ApplicationContext.CommandLine.Contains ("client")) { BootClient (Path.GetFileNameWithoutExtension (ApplicationContext.CommandLine["client"])); } else { - BootClient ("Nereid"); + if (PlatformDetection.IsMeeGo) { + BootClient ("MeeGo"); + } else { + BootClient ("Nereid"); + } } } diff -Nru banshee-1.8.0/src/Clients/Booter/Makefile.in banshee-1.8.1/src/Clients/Booter/Makefile.in --- banshee-1.8.0/src/Clients/Booter/Makefile.in 2010-09-28 16:30:08.000000000 +0000 +++ banshee-1.8.1/src/Clients/Booter/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -41,6 +41,14 @@ subdir = src/Clients/Booter ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -67,14 +75,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -147,6 +147,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Clients/Halie/Makefile.in banshee-1.8.1/src/Clients/Halie/Makefile.in --- banshee-1.8.0/src/Clients/Halie/Makefile.in 2010-09-28 16:30:09.000000000 +0000 +++ banshee-1.8.1/src/Clients/Halie/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Clients/Halie ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Clients/Makefile.in banshee-1.8.1/src/Clients/Makefile.in --- banshee-1.8.0/src/Clients/Makefile.in 2010-09-28 16:30:09.000000000 +0000 +++ banshee-1.8.1/src/Clients/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Clients/MeeGo/Makefile.in banshee-1.8.1/src/Clients/MeeGo/Makefile.in --- banshee-1.8.0/src/Clients/MeeGo/Makefile.in 2010-09-28 16:30:09.000000000 +0000 +++ banshee-1.8.1/src/Clients/MeeGo/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Clients/MeeGo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Clients/Muinshee/Makefile.in banshee-1.8.1/src/Clients/Muinshee/Makefile.in --- banshee-1.8.0/src/Clients/Muinshee/Makefile.in 2010-09-28 16:30:09.000000000 +0000 +++ banshee-1.8.1/src/Clients/Muinshee/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Clients/Muinshee ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Clients/Nereid/Makefile.in banshee-1.8.1/src/Clients/Nereid/Makefile.in --- banshee-1.8.0/src/Clients/Nereid/Makefile.in 2010-09-28 16:30:09.000000000 +0000 +++ banshee-1.8.1/src/Clients/Nereid/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Clients/Nereid ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Clients/Nereid/Nereid/PlayerInterface.cs banshee-1.8.1/src/Clients/Nereid/Nereid/PlayerInterface.cs --- banshee-1.8.0/src/Clients/Nereid/Nereid/PlayerInterface.cs 2010-09-16 14:40:54.000000000 +0000 +++ banshee-1.8.1/src/Clients/Nereid/Nereid/PlayerInterface.cs 2011-01-28 20:57:47.000000000 +0000 @@ -71,6 +71,7 @@ private CoverArtDisplay cover_art_display; private Widget cover_art_container; private ConnectedSeekSlider seek_slider; + private TaskStatusIcon task_status; // Major Interaction Components private SourceView source_view; @@ -97,10 +98,10 @@ private int? original_seek_width; private void SetSimple (bool simple) { - main_menu.Visible = - source_box.Visible = - footer_toolbar.Visible = - track_info_container.Visible = !simple; + var widgets = new Widget [] { main_menu, source_box, footer_toolbar, track_info_container }; + foreach (var w in widgets.Where (w => w != null)) { + w.Visible = !simple; + } original_seek_width = original_seek_width ?? seek_slider.SeekSlider.WidthRequest; seek_slider.SeekSlider.WidthRequest = original_seek_width.Value + (simple ? 100 : 0); @@ -330,7 +331,7 @@ footer_toolbar = new HBox () { BorderWidth = 2 }; - Widget task_status = new Banshee.Gui.Widgets.TaskStatusIcon (); + task_status = new Banshee.Gui.Widgets.TaskStatusIcon (); EventBox status_event_box = new EventBox (); status_event_box.ButtonPressEvent += OnStatusBoxButtonPress; @@ -697,7 +698,8 @@ // The source might have its own custom search entry - use it if so var src = ServiceManager.SourceManager.ActiveSource; var search_entry = src.Properties.Get ("Nereid.SearchEntry") ?? view_container.SearchEntry; - if (focus_search && search_entry.Visible && !search_entry.HasFocus && !source_view.EditingRow) { + if (focus_search && search_entry.Visible && !source_view.EditingRow) { + search_entry.InnerEntry.GrabFocus (); search_entry.HasFocus = true; return true; } diff -Nru banshee-1.8.0/src/Core/Banshee.CollectionIndexer/Makefile.in banshee-1.8.1/src/Core/Banshee.CollectionIndexer/Makefile.in --- banshee-1.8.0/src/Core/Banshee.CollectionIndexer/Makefile.in 2010-09-28 16:30:09.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.CollectionIndexer/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Core/Banshee.CollectionIndexer ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs banshee-1.8.1/src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs --- banshee-1.8.0/src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs 2010-11-14 08:41:58.000000000 +0000 @@ -87,17 +87,16 @@ public static string CreateArtistAlbumId (string artist, string album) { - if (album == unknown_album || album == unknown_album_tr) { + if (album == null || album == unknown_album || album == unknown_album_tr) { // do not attempt to group unknown album tracks together return null; } - if (artist == unknown_artist || artist == unknown_artist_tr) { - artist = null; + if (artist == null || artist == unknown_artist || artist == unknown_artist_tr) { + return null; } - string digestible = String.Format ("{0}\t{1}", artist ?? "", album ?? ""); - + string digestible = String.Format ("{0}\t{1}", artist, album); return String.Format ("album-{0}", Digest (digestible)); } diff -Nru banshee-1.8.0/src/Core/Banshee.Core/Banshee.Base/Tests/CoverArtSpecTests.cs banshee-1.8.1/src/Core/Banshee.Core/Banshee.Base/Tests/CoverArtSpecTests.cs --- banshee-1.8.0/src/Core/Banshee.Core/Banshee.Base/Tests/CoverArtSpecTests.cs 2010-08-24 17:19:09.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Core/Banshee.Base/Tests/CoverArtSpecTests.cs 2010-11-14 08:41:58.000000000 +0000 @@ -47,6 +47,10 @@ AssertDigested (null, null); AssertDigested ("", null); AssertDigested (" ", "7215ee9c7d9dc229d2921a40e899ec5f"); + + // Test that bgo#620010 is fixed + Assert.AreEqual (null, CoverArtSpec.CreateArtistAlbumId (null, null)); + Assert.AreEqual (null, CoverArtSpec.CreateArtistAlbumId (null, "All Albums (6)")); } [Test] diff -Nru banshee-1.8.0/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs banshee-1.8.1/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs --- banshee-1.8.0/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs 2010-11-22 23:41:36.000000000 +0000 @@ -40,7 +40,7 @@ // This is a short list of video types that TagLib# might not support but that // we want to make sure are recognized as videos private static readonly ExtensionSet VideoExtensions = new ExtensionSet ( - "avi", "divx", "dv", "f4p", "f4v", "flv", "m4v", "mkv", "mov", "ogv", "qt", "ts"); + "avi", "divx", "dv", "f4p", "f4v", "flv", "m4v", "mkv", "mov", "ogv", "qt", "ts", "webm"); public static TagLib.File ProcessUri (SafeUri uri) { diff -Nru banshee-1.8.0/src/Core/Banshee.Core/Makefile.in banshee-1.8.1/src/Core/Banshee.Core/Makefile.in --- banshee-1.8.0/src/Core/Banshee.Core/Makefile.in 2010-09-28 16:30:09.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Core/Makefile.in 2011-01-28 21:25:25.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Core/Banshee.Core ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Core/Banshee.Core/Resources/contributors.xml banshee-1.8.1/src/Core/Banshee.Core/Resources/contributors.xml --- banshee-1.8.0/src/Core/Banshee.Core/Resources/contributors.xml 2010-09-15 20:42:33.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Core/Resources/contributors.xml 2011-01-28 21:21:49.000000000 +0000 @@ -17,6 +17,7 @@ Andrew Conkling Andrés G. Aragoneses Andy Midgette + Aran Cox Arthur Carli Arun Raghavan Aurélien Mino @@ -52,6 +53,7 @@ David Spreen David Stone Diego E. Pettenò + Dougal Stanton Eitan Isaacson Elena Grassi Eoin Hennessy @@ -90,6 +92,7 @@ Julien Moutte Juri Pakaste Ken Vandine + kentaro KAZUHAMA Kevin Duffus Konstantin Oshiyko Larry Ewing @@ -132,6 +135,8 @@ Scott Peterson Sebastian Dröge Shaun McCance + Sjoerd Simons + Tim Fisken Tim Yamin Tobias Mueller Todd Berman diff -Nru banshee-1.8.0/src/Core/Banshee.Core/Resources/translators.xml banshee-1.8.1/src/Core/Banshee.Core/Resources/translators.xml --- banshee-1.8.0/src/Core/Banshee.Core/Resources/translators.xml 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Core/Resources/translators.xml 2011-01-28 21:23:51.000000000 +0000 @@ -46,7 +46,7 @@ yumkee lhamo - Εμμανουήλ Καπερνάρος + Χάρης Κουζινόπουλος Adam Weinberger @@ -89,7 +89,7 @@ Antón Méixome - Fran Diéguez + Fran Dieguez Ignacio Casal Quinteiro @@ -197,7 +197,7 @@ Hasan Yılmaz - + Maxim Dziumanenko Oleksandr Kovalenko @@ -213,7 +213,7 @@ Cheng-Chia Tseng Hsin-lin Cheng - + Cheng-Chia Tseng Hsin-lin Cheng diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs 2010-09-22 17:58:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs 2010-11-22 23:44:03.000000000 +0000 @@ -174,12 +174,12 @@ // because of transactions. Needs to be fixed in HyenaDatabaseConnection. ServiceManager.DbConnection.BeginTransaction (); try { - track = new DatabaseTrackInfo (); - track.Uri = uri; + track = new DatabaseTrackInfo () { Uri = uri }; using (var file = StreamTagger.ProcessUri (uri)) { StreamTagger.TrackInfoMerge (track, file, false, true); } + track.Uri = uri; track.PrimarySource = trackPrimarySourceChooser (track); bool save_track = true; diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs 2010-09-28 15:17:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs 2011-01-28 20:56:47.000000000 +0000 @@ -170,7 +170,9 @@ public override void Update () { - PrimarySource.UpdateMetadata (this); + if (PrimarySource != null) { + PrimarySource.UpdateMetadata (this); + } base.Update (); } diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs 2011-01-28 20:57:47.000000000 +0000 @@ -243,7 +243,8 @@ protected void OnTagFound (StreamTag tag) { - if (tag.Equals (StreamTag.Zero) || current_track == null || current_track.Uri.IsFile) { + if (tag.Equals (StreamTag.Zero) || current_track == null + || (current_track.Uri != null && current_track.Uri.IsFile)) { return; } diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs 2010-09-23 19:10:31.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs 2011-01-13 19:07:59.000000000 +0000 @@ -68,7 +68,7 @@ CountCommand = new HyenaSqliteCommand ( "SELECT COUNT(*) FROM CoreTracks WHERE " + condition); - SelectCommand = DatabaseTrackInfo.Provider.CreateFetchCommand (condition); + SelectCommand = DatabaseTrackInfo.Provider.CreateFetchCommand (condition + " LIMIT 1"); } public bool WriteMetadataEnabled { get; set; } diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs 2010-08-24 17:19:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs 2011-01-28 20:56:47.000000000 +0000 @@ -299,7 +299,7 @@ public static SchemaEntry EnableCollection = new SchemaEntry ( "core", "send_anonymous_usage_data", false, // disabled by default - Catalog.GetString ("Improve Banshee by sending anonymous usage data"), null + "Improve Banshee by sending anonymous usage data", null ); } } diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistFormatBase.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistFormatBase.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistFormatBase.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistFormatBase.cs 2011-01-28 20:57:47.000000000 +0000 @@ -41,13 +41,21 @@ { private Dictionary attributes = new Dictionary(); private List> elements = new List>(); - private Uri base_uri = new Uri(Environment.CurrentDirectory); + private Uri base_uri = null; private string title = null; public PlaylistFormatBase() { attributes = new Dictionary(); elements = new List>(); + + if (Environment.CurrentDirectory.Equals ("/")) { + // System.Uri doesn't like / as a value + base_uri = new Uri ("file:///"); + } else { + base_uri = new Uri (Environment.CurrentDirectory); + } + } public virtual void Load(Stream stream, bool validateHeader) diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistParser.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistParser.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistParser.cs 2010-08-24 17:19:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistParser.cs 2011-01-28 20:57:47.000000000 +0000 @@ -50,11 +50,17 @@ }; private List> elements; - private Uri base_uri = new Uri (Environment.CurrentDirectory); + private Uri base_uri = null; private string title = null; public PlaylistParser () { + if (Environment.CurrentDirectory.Equals ("/")) { + // System.Uri doesn't like / as a value + base_uri = new Uri ("file:///"); + } else { + base_uri = new Uri (Environment.CurrentDirectory); + } } public bool Parse (SafeUri uri) diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs 2010-08-24 17:19:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs 2011-01-13 18:54:05.000000000 +0000 @@ -65,7 +65,9 @@ var misc = new Section ("misc", Catalog.GetString ("Miscellaneous"), 20); general.Add (misc); - var anon_data = misc.Add (Banshee.Metrics.BansheeMetrics.EnableCollection); + var anon_data = misc.Add (new SchemaPreference (Banshee.Metrics.BansheeMetrics.EnableCollection, + Catalog.GetString ("Improve Banshee by sending anonymous usage data")) + ); anon_data.ValueChanged += (o) => { if (Banshee.Metrics.BansheeMetrics.EnableCollection.Get ()) { Banshee.Metrics.BansheeMetrics.Start (); diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs 2011-01-28 20:57:47.000000000 +0000 @@ -121,6 +121,9 @@ if (!relevant_fields.Contains (term.Field)) relevant_fields.Add (term.Field); } + } else { + condition_sql = null; + condition_xml = null; } } } diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs banshee-1.8.1/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs --- banshee-1.8.0/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs 2010-08-24 17:19:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs 2011-01-28 20:57:47.000000000 +0000 @@ -150,7 +150,7 @@ PlayCore (); } else { // Stop playing until we load this radio station and play it - ServiceManager.PlayerEngine.Close (); + ServiceManager.PlayerEngine.Close (true); ServiceManager.PlayerEngine.TrackIntercept += OnTrackIntercept; diff -Nru banshee-1.8.0/src/Core/Banshee.Services/Makefile.in banshee-1.8.1/src/Core/Banshee.Services/Makefile.in --- banshee-1.8.0/src/Core/Banshee.Services/Makefile.in 2010-09-28 16:30:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Services/Makefile.in 2011-01-28 21:25:26.000000000 +0000 @@ -41,6 +41,14 @@ subdir = src/Core/Banshee.Services ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -67,14 +75,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -154,6 +154,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs 2010-09-06 22:57:35.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs 2010-11-14 08:41:58.000000000 +0000 @@ -81,6 +81,8 @@ Banshee.Metadata.MetadataService.Instance.ArtworkUpdated += OnArtworkUpdated; } + protected AlbumListView (IntPtr ptr) : base () {} + public override void Dispose () { ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent); diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarksService.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarksService.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarksService.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarksService.cs 2011-01-28 20:56:48.000000000 +0000 @@ -43,7 +43,7 @@ namespace Banshee.Gui { - public class BookmarksService : IExtensionService, IDisposable + public class BookmarksService : IInitializeService, IDisposable { private BookmarkUI ui; @@ -51,7 +51,7 @@ { } - void IExtensionService.Initialize () + void IInitializeService.Initialize () { ui = BookmarkUI.Instance; } diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs 2011-01-28 20:56:48.000000000 +0000 @@ -59,15 +59,15 @@ private Dictionary bookmark_map = new Dictionary (); private InterfaceActionService action_service; - private ActionGroup actions; - private uint ui_manager_id; + private BansheeActionGroup actions; private bool loaded; private static BookmarkUI instance = null; public static BookmarkUI Instance { get { - if (instance == null) + if (instance == null) { instance = new BookmarkUI (); + } return instance; } } @@ -80,7 +80,7 @@ { action_service = ServiceManager.Get (); - actions = new ActionGroup ("Bookmarks"); + actions = new BansheeActionGroup ("Bookmarks"); actions.Add (new ActionEntry [] { new ActionEntry ("BookmarksAction", null, @@ -92,8 +92,9 @@ HandleNewBookmark) }); - action_service.UIManager.InsertActionGroup (actions, 0); - ui_manager_id = action_service.UIManager.AddUiFromResource ("BookmarksMenu.xml"); + actions.AddUiFromFile ("BookmarksMenu.xml"); + actions.Register (); + bookmark_item = action_service.UIManager.GetWidget ("/MainMenu/ToolsMenu/Bookmarks") as ImageMenuItem; new_item = action_service.UIManager.GetWidget ("/MainMenu/ToolsMenu/Bookmarks/Add") as ImageMenuItem; @@ -140,7 +141,12 @@ separator = new SeparatorMenuItem (); foreach (var bookmark in Bookmark.Provider.FetchAllMatching ("Type IS NULL")) { - AddBookmark (bookmark); + if (bookmark.Track != null) { + AddBookmark (bookmark); + } else { + Hyena.Log.DebugFormat ("Removing bookmark that points to missing track ({0})", bookmark.Position); + bookmark.Remove (); + } } bookmark_item.ShowAll (); @@ -161,7 +167,6 @@ ImageMenuItem select_item = new ImageMenuItem (bookmark.Name.Replace ("_", "__")); select_item.Image = new Image (Stock.JumpTo, IconSize.Menu); select_item.Activated += delegate { - Console.WriteLine ("item delegate, main thread? {0}", ThreadAssist.InMainThread); bookmark.JumpTo (); }; bookmark_menu.Append (select_item); @@ -201,10 +206,8 @@ public void Dispose () { - action_service.UIManager.RemoveUi (ui_manager_id); - action_service.UIManager.RemoveActionGroup (actions); + actions.Dispose (); actions = null; - instance = null; } } diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs 2011-01-13 19:03:16.000000000 +0000 @@ -130,9 +130,10 @@ } } else if (args.Change == ExtensionChange.Remove) { if (extension_actions.ContainsKey (node.Id)) { + string name = extension_actions[node.Id].Name; extension_actions[node.Id].Dispose (); - Log.DebugFormat ("Extension actions unloaded: {0}", extension_actions[node.Id].Name); extension_actions.Remove (node.Id); + Log.DebugFormat ("Extension actions unloaded: {0}", name); } } } catch (Exception e) { diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs 2011-01-28 20:56:48.000000000 +0000 @@ -431,6 +431,13 @@ return; } + foreach (var track in source.TrackModel.SelectedItems) { + if (track.IsPlaying) { + ServiceManager.PlayerEngine.Close (); + break; + } + } + ThreadAssist.SpawnFromMain (delegate { library.RemoveSelectedTracks (source.TrackModel as DatabaseTrackListModel); }); @@ -481,6 +488,12 @@ return; if (source != null && source.CanDeleteTracks) { + foreach (var track in source.TrackModel.SelectedItems) { + if (track.IsPlaying) { + ServiceManager.PlayerEngine.Close (); + break; + } + } source.DeleteSelectedTracks (); } } diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs 2010-09-02 14:46:02.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs 2010-11-14 08:41:58.000000000 +0000 @@ -117,7 +117,7 @@ return AddStockButton (stock, response, false); } - public new Button AddButton (string message, ResponseType response, bool isDefault) + public Button AddButton (string message, ResponseType response, bool isDefault) { return AddButton (message, response, isDefault, false); } @@ -127,7 +127,7 @@ return AddButton (stock, response, isDefault, true); } - public new Button AddButton (string message, ResponseType response, bool isDefault, bool isStock) + public Button AddButton (string message, ResponseType response, bool isDefault, bool isStock) { Button button = new Button (message); button.CanDefault = true; diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs 2010-08-24 17:19:09.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs 2011-01-28 20:57:47.000000000 +0000 @@ -31,6 +31,7 @@ using Banshee.Configuration; using Banshee.ServiceStack; +using Hyena; namespace Banshee.Gui.Dialogs { @@ -67,7 +68,8 @@ base (title, parent, action) { LocalOnly = Banshee.IO.Provider.LocalOnly; - SetCurrentFolderUri (LastFileChooserUri.Get (Environment.GetFolderPath (Environment.SpecialFolder.Personal))); + string fallback = SafeUri.FilenameToUri (Environment.GetFolderPath (Environment.SpecialFolder.Personal)); + SetCurrentFolderUri (LastFileChooserUri.Get (fallback)); WindowPosition = WindowPosition.Center; } diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorTrackInfo.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorTrackInfo.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorTrackInfo.cs 2010-08-24 17:19:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorTrackInfo.cs 2011-01-28 20:57:47.000000000 +0000 @@ -92,17 +92,18 @@ public TagLib.File GetTaglibFile () { - TagLib.File file = null; + if (Uri.Scheme == "http" || Uri.Scheme == "https") + return null; try { - file = StreamTagger.ProcessUri (Uri); + return StreamTagger.ProcessUri (Uri); } catch (Exception e) { if (Uri.Scheme == "file") { Hyena.Log.Exception ("Cannot load TagLib file", e); } } - return file; + return null; } } } diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceComboBox.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceComboBox.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceComboBox.cs 2010-08-24 17:19:09.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceComboBox.cs 2010-11-14 08:43:35.000000000 +0000 @@ -38,6 +38,7 @@ { public class SourceComboBox : ComboBox { + SourceRowRenderer renderer; private SourceModel store; public new SourceModel Model { get { return store; } @@ -46,7 +47,7 @@ public SourceComboBox () { - SourceRowRenderer renderer = new SourceRowRenderer (); + renderer = new SourceRowRenderer (); renderer.ParentWidget = this; PackStart (renderer, true); SetCellDataFunc (renderer, new CellLayoutDataFunc (SourceRowRenderer.CellDataHandler)); diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs --- banshee-1.8.0/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs 2010-09-02 22:13:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs 2011-01-28 20:56:48.000000000 +0000 @@ -278,7 +278,7 @@ private int Middle (Gdk.Rectangle area, int height) { - return area.Y + (int)Math.Round ((double)(area.Height - height) / 2.0) + 1; + return area.Y + (int)Math.Round ((double)(area.Height - height) / 2.0, MidpointRounding.AwayFromZero); } public override CellEditable StartEditing (Gdk.Event evnt, Widget widget, string path, diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Makefile.am banshee-1.8.1/src/Core/Banshee.ThickClient/Makefile.am --- banshee-1.8.0/src/Core/Banshee.ThickClient/Makefile.am 2010-09-19 20:30:21.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Makefile.am 2011-01-28 20:56:48.000000000 +0000 @@ -165,6 +165,7 @@ RESOURCES = \ Banshee.ThickClient.addin.xml \ + Resources/BookmarksMenu.xml \ Resources/banshee-logo.png \ Resources/browser-album-cover.png \ Resources/context-pane-close.png \ diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Makefile.in banshee-1.8.1/src/Core/Banshee.ThickClient/Makefile.in --- banshee-1.8.0/src/Core/Banshee.ThickClient/Makefile.in 2010-09-28 16:30:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Makefile.in 2011-01-28 21:25:26.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Core/Banshee.ThickClient ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ @@ -545,6 +547,7 @@ RESOURCES = \ Banshee.ThickClient.addin.xml \ + Resources/BookmarksMenu.xml \ Resources/banshee-logo.png \ Resources/browser-album-cover.png \ Resources/context-pane-close.png \ diff -Nru banshee-1.8.0/src/Core/Banshee.ThickClient/Resources/BookmarksMenu.xml banshee-1.8.1/src/Core/Banshee.ThickClient/Resources/BookmarksMenu.xml --- banshee-1.8.0/src/Core/Banshee.ThickClient/Resources/BookmarksMenu.xml 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.ThickClient/Resources/BookmarksMenu.xml 2010-11-14 08:41:58.000000000 +0000 @@ -0,0 +1,9 @@ + + + + + + + + + diff -Nru banshee-1.8.0/src/Core/Banshee.WebBrowser/libossifer/Makefile.in banshee-1.8.1/src/Core/Banshee.WebBrowser/libossifer/Makefile.in --- banshee-1.8.0/src/Core/Banshee.WebBrowser/libossifer/Makefile.in 2010-09-28 16:30:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.WebBrowser/libossifer/Makefile.in 2011-01-28 21:25:26.000000000 +0000 @@ -38,6 +38,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -64,14 +72,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -178,6 +178,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Core/Banshee.WebBrowser/Makefile.in banshee-1.8.1/src/Core/Banshee.WebBrowser/Makefile.in --- banshee-1.8.0/src/Core/Banshee.WebBrowser/Makefile.in 2010-09-28 16:30:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.WebBrowser/Makefile.in 2011-01-28 21:25:26.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Core/Banshee.WebBrowser ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -157,6 +157,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Core/Banshee.Widgets/Makefile.in banshee-1.8.1/src/Core/Banshee.Widgets/Makefile.in --- banshee-1.8.0/src/Core/Banshee.Widgets/Makefile.in 2010-09-28 16:30:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Banshee.Widgets/Makefile.in 2011-01-28 21:25:26.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Core/Banshee.Widgets ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Core/Makefile.in banshee-1.8.1/src/Core/Makefile.in --- banshee-1.8.0/src/Core/Makefile.in 2010-09-28 16:30:10.000000000 +0000 +++ banshee-1.8.1/src/Core/Makefile.in 2011-01-28 21:25:26.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs banshee-1.8.1/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs --- banshee-1.8.0/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs 2010-09-02 14:46:03.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs 2011-01-28 20:56:48.000000000 +0000 @@ -337,10 +337,12 @@ protected bool TrackNeedsTranscoding (TrackInfo track) { - foreach (string mimetype in AcceptableMimeTypes) { - if (ServiceManager.MediaProfileManager.GetExtensionForMimeType (track.MimeType) == - ServiceManager.MediaProfileManager.GetExtensionForMimeType (mimetype)) { - return false; + string extension = ServiceManager.MediaProfileManager.GetExtensionForMimeType (track.MimeType); + if (extension != null) { + foreach (string mimetype in AcceptableMimeTypes) { + if (extension == ServiceManager.MediaProfileManager.GetExtensionForMimeType (mimetype)) { + return false; + } } } diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap/Makefile.in banshee-1.8.1/src/Dap/Banshee.Dap/Makefile.in --- banshee-1.8.0/src/Dap/Banshee.Dap/Makefile.in 2010-09-28 16:30:11.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap/Makefile.in 2011-01-28 21:25:27.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Dap/Banshee.Dap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs banshee-1.8.1/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs --- banshee-1.8.0/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs 2010-09-29 18:08:47.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs 2011-01-28 20:57:47.000000000 +0000 @@ -92,6 +92,7 @@ SupportsVideo = Device.SupportsVideo; Initialize (); + GPod.ITDB.InitIpod (Volume.MountPoint, Device.IpodInfo == null ? null : Device.IpodInfo.ModelNumber, Name); // FIXME: Properly parse the device, color and generation and don't use the fallback strings @@ -170,7 +171,7 @@ try { MediaDatabase = new GPod.ITDB (Device.Mountpoint); } catch (GLib.GException e) { - Log.Exception ("iPod database could be loaded, creating a new one", e); + Log.Exception ("iPod database could not be loaded, creating a new one", e); if (GPod.ITDB.InitIpod (Volume.MountPoint, null, Volume.Name)) { // this may throw again. In the future we need to implement some kind of alert // mechanism to let the user know that something more serious is wrong with their @@ -195,7 +196,14 @@ }); } + var invalid_tracks = new List (); foreach (var ipod_track in MediaDatabase.Tracks) { + + if (String.IsNullOrEmpty (ipod_track.IpodPath)) { + invalid_tracks.Add (ipod_track); + continue; + } + try { var track = new AppleDeviceTrackInfo (ipod_track); if (!tracks_map.ContainsKey (track.TrackId)) { @@ -207,6 +215,13 @@ Log.Exception (e); } } + if (invalid_tracks.Count > 0) { + Log.Warning (String.Format ("Found {0} invalid tracks on the device", invalid_tracks.Count)); + foreach (var track in invalid_tracks) { + DeleteTrack (track, false); + } + } + Hyena.Data.Sqlite.HyenaSqliteCommand insert_cmd = new Hyena.Data.Sqlite.HyenaSqliteCommand ( @"INSERT INTO CorePlaylistEntries (PlaylistID, TrackID) @@ -401,6 +416,25 @@ } } + + private void DeleteTrack (GPod.Track track, bool removeFile) + { + foreach (var playlist in MediaDatabase.Playlists) { + playlist.Tracks.Remove (track); + } + + if (SupportsPodcasts && track.MediaType == GPod.MediaType.Podcast) { + MediaDatabase.PodcastsPlaylist.Tracks.Remove (track); + } + + MediaDatabase.MasterPlaylist.Tracks.Remove (track); + MediaDatabase.Tracks.Remove (track); + + if (removeFile) { + Banshee.IO.File.Delete (new SafeUri (GPod.ITDB.GetLocalPath (Device, track))); + } + } + protected override void AddTrackToDevice (DatabaseTrackInfo track, SafeUri fromUri) { lock (sync_mutex) { @@ -568,18 +602,7 @@ if (track.IpodTrack != null) { UpdateProgress (progressUpdater, message, total - tracks_to_remove.Count, total); - foreach (var playlist in MediaDatabase.Playlists) { - playlist.Tracks.Remove (track.IpodTrack); - } - - if (SupportsPodcasts && track.IpodTrack.MediaType == GPod.MediaType.Podcast) { - MediaDatabase.PodcastsPlaylist.Tracks.Remove (track.IpodTrack); - } - - MediaDatabase.MasterPlaylist.Tracks.Remove (track.IpodTrack); - MediaDatabase.Tracks.Remove (track.IpodTrack); - - Banshee.IO.File.Delete (new SafeUri (GPod.ITDB.GetLocalPath (Device, track.IpodTrack))); + DeleteTrack (track.IpodTrack, true); } else { Log.Error ("The ipod track was null"); } @@ -623,6 +646,7 @@ } catch (Exception e) { Log.Exception ("Failed to save iPod database", e); } + MediaDatabase.StopSync (); progressUpdater.Finish (); Hyena.Log.Debug ("Ending AppleDevice sync thread cycle"); diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs banshee-1.8.1/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs --- banshee-1.8.0/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs 2010-09-24 18:45:08.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs 2011-01-13 19:04:42.000000000 +0000 @@ -99,6 +99,11 @@ Year = track.Year; MediaAttributes = track.MediaAttributes; + ArtistNameSort = track.ArtistNameSort; + AlbumTitleSort = track.AlbumTitleSort; + AlbumArtistSort = track.AlbumArtistSort; + TrackTitleSort = track.TrackTitleSort; + var podcast_info = track.ExternalObject as IPodcastInfo; if (podcast_info != null) { description = podcast_info.Description; @@ -144,6 +149,10 @@ Year = track.Year; description = track.Description; ReleaseDate = track.TimeReleased; + ArtistNameSort = track.SortArtist; + AlbumTitleSort = track.SortAlbum; + AlbumArtistSort = track.SortAlbumArtist; + TrackTitleSort = track.SortTitle; rating = track.Rating > 5 ? 0 : (int) track.Rating; @@ -221,11 +230,18 @@ track.Title = TrackTitle; track.Genre = Genre; + track.SortArtist = ArtistNameSort; + track.SortAlbum = AlbumTitleSort; + track.SortAlbumArtist = AlbumArtistSort; + track.SortTitle = TrackTitleSort; + track.Rating = ((Rating >= 1) && (Rating <= 5)) ? (uint)Rating : 0; if (HasAttribute (TrackMediaAttributes.Podcast)) { track.Description = description; track.RememberPlaybackPosition = true; + track.SkipWhenShuffling = true; + track.Flag4 = (byte)1; track.MarkUnplayed = (track.PlayCount == 0); } diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.AppleDevice/Makefile.in banshee-1.8.1/src/Dap/Banshee.Dap.AppleDevice/Makefile.in --- banshee-1.8.0/src/Dap/Banshee.Dap.AppleDevice/Makefile.in 2010-09-28 16:30:10.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.AppleDevice/Makefile.in 2011-01-28 21:25:26.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Dap/Banshee.Dap.AppleDevice ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/Makefile.in banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/Makefile.in --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/Makefile.in 2010-09-28 16:30:11.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/Makefile.in 2011-01-28 21:25:26.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Dap/Banshee.Dap.Ipod ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-blue.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-blue.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-gold.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-gold.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-green.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-green.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-pink.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-pink.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-silver.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-silver.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-black.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-black.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-white.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-white.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-shuffle.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-shuffle.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-color.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-color.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-monochrome.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-monochrome.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-color.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-color.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-monochrome.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-monochrome.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-video-black.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-video-black.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-video-white.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-video-white.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-blue.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-blue.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-gold.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-gold.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-green.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-green.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-pink.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-pink.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-silver.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-silver.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-black.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-black.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-white.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-white.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-shuffle.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-shuffle.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-color.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-color.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-monochrome.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-monochrome.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-color.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-color.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-monochrome.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-monochrome.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-video-black.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-video-black.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-video-white.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-video-white.png differ diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-blue.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-blue.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-blue.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-blue.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Mini Blue + October 2005 + + + Ryan Collier (pseudo) + + + http://www.pseudocode.org + + + media + device + ipod + + + + + + http://www.tango-project.org + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-gold.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-gold.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-gold.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-gold.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Mini Gold + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + + media + device + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-green.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-green.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-green.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-green.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Mini Green + October 2005 + + + Ryan Collier (pseudo) + + + + + http://tango-project.org + + + http://www.pseudocode.org + + + media + device + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-pink.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-pink.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-pink.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-pink.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Mini Pink + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + media + device + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-silver.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-silver.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-silver.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-silver.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Mini Silver + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + media + device + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-black.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-black.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-black.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-black.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,726 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Nano Black + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + media + device + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-white.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-white.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-white.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-white.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,704 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Nano White + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + media + device + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-shuffle.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-shuffle.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-shuffle.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-shuffle.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,658 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Protable Media - iPod Shuffle + October 2005 + + + + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + media, device, ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-color.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-color.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-color.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-color.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Standard Color + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + device + media + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-monochrome.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-monochrome.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-monochrome.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-monochrome.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Standard Monochrome + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + device + media + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-color.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-color.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-color.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-color.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod U2 Color + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + device + media + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-monochrome.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-monochrome.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-monochrome.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-monochrome.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,4115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod U2 Monochrome + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + device + media + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-black.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-black.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-black.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-black.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,726 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Nano Black + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + media + device + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-white.svg banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-white.svg --- banshee-1.8.0/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-white.svg 1970-01-01 00:00:00.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-white.svg 2010-05-26 02:11:23.000000000 +0000 @@ -0,0 +1,704 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Portable Media - iPod Nano White + October 2005 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + media + device + ipod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R + + + + + + + + + + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Karma/Makefile.in banshee-1.8.1/src/Dap/Banshee.Dap.Karma/Makefile.in --- banshee-1.8.0/src/Dap/Banshee.Dap.Karma/Makefile.in 2010-09-28 16:30:11.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Karma/Makefile.in 2011-01-28 21:25:27.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Dap/Banshee.Dap.Karma ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs --- banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs 2010-09-02 14:46:03.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs 2010-11-14 08:41:58.000000000 +0000 @@ -489,7 +489,7 @@ if (track.PrimarySourceId == DbId) return; - SafeUri new_uri = new SafeUri (GetTrackPath (track, System.IO.Path.GetExtension (fromUri.LocalPath))); + SafeUri new_uri = new SafeUri (GetTrackPath (track, System.IO.Path.GetExtension (fromUri))); // If it already is on the device but it's out of date, remove it //if (File.Exists(new_uri) && File.GetLastWriteTime(track.Uri.LocalPath) > File.GetLastWriteTime(new_uri)) //RemoveTrack(new MassStorageTrackInfo(new SafeUri(new_uri))); diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml --- banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml 2010-09-19 17:29:28.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml 2011-01-28 20:57:47.000000000 +0000 @@ -35,6 +35,9 @@ + + + vendor-id="0x0fce" product-id="0xd12e,0xe12e,0x2138,0x3138"/> + diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/Makefile.in --- banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2010-09-28 16:30:11.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2011-01-28 21:25:27.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Dap/Banshee.Dap.MassStorage ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/phone-samsung-galaxy-s.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/phone-samsung-galaxy-s.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/phone-samsung-galaxy-s.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/phone-samsung-galaxy-s.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/24x24/devices/phone-samsung-galaxy-s.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/24x24/devices/phone-samsung-galaxy-s.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/256x256/devices/phone-samsung-galaxy-s.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/256x256/devices/phone-samsung-galaxy-s.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/phone-samsung-galaxy-s.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/phone-samsung-galaxy-s.png differ Binary files /tmp/Nc5eqUC2GE/banshee-1.8.0/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/phone-samsung-galaxy-s.png and /tmp/rMGrT8104e/banshee-1.8.1/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/phone-samsung-galaxy-s.png differ diff -Nru banshee-1.8.0/src/Dap/Banshee.Dap.Mtp/Makefile.in banshee-1.8.1/src/Dap/Banshee.Dap.Mtp/Makefile.in --- banshee-1.8.0/src/Dap/Banshee.Dap.Mtp/Makefile.in 2010-09-28 16:30:11.000000000 +0000 +++ banshee-1.8.1/src/Dap/Banshee.Dap.Mtp/Makefile.in 2011-01-28 21:25:27.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Dap/Banshee.Dap.Mtp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Dap/Makefile.in banshee-1.8.1/src/Dap/Makefile.in --- banshee-1.8.0/src/Dap/Makefile.in 2010-09-28 16:30:11.000000000 +0000 +++ banshee-1.8.1/src/Dap/Makefile.in 2011-01-28 21:25:27.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.AmazonMp3/Makefile.in banshee-1.8.1/src/Extensions/Banshee.AmazonMp3/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.AmazonMp3/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.AmazonMp3/Makefile.in 2011-01-28 21:25:27.000000000 +0000 @@ -41,6 +41,14 @@ subdir = src/Extensions/Banshee.AmazonMp3 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -67,14 +75,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -156,6 +156,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in banshee-1.8.1/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in 2010-09-28 16:30:11.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in 2011-01-28 21:25:27.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.AmazonMp3.Store ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Audiobook/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Audiobook/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Audiobook/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Audiobook/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Audiobook ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.AudioCd/Makefile.in banshee-1.8.1/src/Extensions/Banshee.AudioCd/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.AudioCd/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.AudioCd/Makefile.in 2011-01-28 21:25:27.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.AudioCd ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.BooScript/Makefile.in banshee-1.8.1/src/Extensions/Banshee.BooScript/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.BooScript/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.BooScript/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.BooScript ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Bpm/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Bpm/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Bpm/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Bpm/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Bpm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.CoverArt/Makefile.in banshee-1.8.1/src/Extensions/Banshee.CoverArt/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.CoverArt/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.CoverArt/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.CoverArt ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs banshee-1.8.1/src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs --- banshee-1.8.0/src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs 2010-09-02 14:46:03.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs 2011-01-28 20:57:47.000000000 +0000 @@ -53,6 +53,8 @@ private DaapContainerSource container; private Dictionary source_map; + private uint actions_id; + internal static DaapProxyWebServer ProxyServer { get { return proxy_server; } } @@ -75,6 +77,12 @@ proxy_server = null; } + var uia_service = ServiceManager.Get (); + if (uia_service != null) { + uia_service.UIManager.RemoveUi (actions_id); + uia_service.GlobalActions.Remove ("AddRemoteDaapServerAction"); + } + // Dispose any remaining child sources if (source_map != null) { foreach (KeyValuePair kv in source_map) { @@ -173,13 +181,15 @@ } var uia_service = ServiceManager.Get (); - uia_service.GlobalActions.Add ( - new ActionEntry ("AddRemoteDaapServerAction", Stock.Add, - Catalog.GetString ("Add Remote DAAP Server"), null, - Catalog.GetString ("Add a new remote DAAP server"), - OnAddRemoteServer) - ); - uia_service.UIManager.AddUiFromResource ("GlobalUI.xml"); + if (uia_service != null) { + uia_service.GlobalActions.Add ( + new ActionEntry ("AddRemoteDaapServerAction", Stock.Add, + Catalog.GetString ("Add Remote DAAP Server"), null, + Catalog.GetString ("Add a new remote DAAP server"), + OnAddRemoteServer) + ); + actions_id = uia_service.UIManager.AddUiFromResource ("GlobalUI.xml"); + } } private void OnAddRemoteServer (object o, EventArgs args) diff -Nru banshee-1.8.0/src/Extensions/Banshee.Daap/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Daap/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Daap/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Daap/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Daap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Emusic/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Emusic/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Emusic/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Emusic/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Emusic ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.FileSystemQueue/Makefile.in banshee-1.8.1/src/Extensions/Banshee.FileSystemQueue/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.FileSystemQueue/Makefile.in 2010-09-28 16:30:12.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.FileSystemQueue/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.FileSystemQueue ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Fixup/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Fixup/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Fixup/Makefile.in 2010-09-28 16:30:13.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Fixup/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Fixup ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.InternetArchive/Makefile.in banshee-1.8.1/src/Extensions/Banshee.InternetArchive/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.InternetArchive/Makefile.in 2010-09-28 16:30:13.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.InternetArchive/Makefile.in 2011-01-28 21:25:28.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.InternetArchive ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs banshee-1.8.1/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs --- banshee-1.8.0/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs 2010-09-02 14:46:03.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs 2011-01-28 20:56:49.000000000 +0000 @@ -341,5 +341,9 @@ public override bool HasViewableTrackProperties { get { return false; } } + + public override bool HasEditableTrackProperties { + get { return true; } + } } } diff -Nru banshee-1.8.0/src/Extensions/Banshee.InternetRadio/Makefile.in banshee-1.8.1/src/Extensions/Banshee.InternetRadio/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.InternetRadio/Makefile.in 2010-09-28 16:30:13.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.InternetRadio/Makefile.in 2011-01-28 21:25:29.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.InternetRadio ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Lastfm/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Lastfm/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Lastfm/Makefile.in 2010-09-28 16:30:13.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Lastfm/Makefile.in 2011-01-28 21:25:29.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Lastfm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.LastfmStreaming/Makefile.in banshee-1.8.1/src/Extensions/Banshee.LastfmStreaming/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.LastfmStreaming/Makefile.in 2010-09-28 16:30:13.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.LastfmStreaming/Makefile.in 2011-01-28 21:25:29.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.LastfmStreaming ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.LibraryWatcher/Makefile.in banshee-1.8.1/src/Extensions/Banshee.LibraryWatcher/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.LibraryWatcher/Makefile.in 2010-09-28 16:30:13.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.LibraryWatcher/Makefile.in 2011-01-28 21:25:29.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.LibraryWatcher ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.MeeGo/Makefile.in banshee-1.8.1/src/Extensions/Banshee.MeeGo/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.MeeGo/Makefile.in 2010-09-28 16:30:13.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.MeeGo/Makefile.in 2011-01-28 21:25:29.000000000 +0000 @@ -41,6 +41,14 @@ subdir = src/Extensions/Banshee.MeeGo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -67,14 +75,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -157,6 +157,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.MiniMode/Makefile.in banshee-1.8.1/src/Extensions/Banshee.MiniMode/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.MiniMode/Makefile.in 2010-09-28 16:30:13.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.MiniMode/Makefile.in 2011-01-28 21:25:29.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.MiniMode ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.MiroGuide/Makefile.in banshee-1.8.1/src/Extensions/Banshee.MiroGuide/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.MiroGuide/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.MiroGuide/Makefile.in 2011-01-28 21:25:29.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.MiroGuide ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Mpris/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Mpris/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Mpris/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Mpris/Makefile.in 2011-01-28 21:25:29.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Mpris ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.MultimediaKeys/Makefile.in banshee-1.8.1/src/Extensions/Banshee.MultimediaKeys/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.MultimediaKeys/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.MultimediaKeys/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.MultimediaKeys ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs banshee-1.8.1/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs --- banshee-1.8.0/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs 2010-09-02 14:46:03.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs 2011-01-13 19:00:19.000000000 +0000 @@ -421,9 +421,22 @@ visual = GLib.Object.GetObject (raw_ret) as Gdk.Visual; } - // TODO the proper check is (visual->red_prec + visual->blue_prec + visual->green_prec < visual->depth) - // but this seems to work +#if HAVE_GDK_2_22 + IntPtr r_mask, r_shift, r_precision; + IntPtr g_mask, g_shift, g_precision; + IntPtr b_mask, b_shift, b_precision; + + if (visual == null) { + visual_is_rgba = false; + } else { + gdk_visual_get_red_pixel_details(visual.Handle, out r_mask, out r_shift, out r_precision); + gdk_visual_get_green_pixel_details(visual.Handle, out g_mask, out g_shift, out g_precision); + gdk_visual_get_blue_pixel_details(visual.Handle, out b_mask, out b_shift, out b_precision); + visual_is_rgba = ((int)r_precision + (int)g_precision + (int)b_precision) < gdk_visual_get_depth(visual.Handle); + } +#else visual_is_rgba = visual != null && visual == Screen.RgbaVisual; +#endif // we can't be double-buffered when we aren't using a real RGBA visual DoubleBuffered = visual_is_rgba; @@ -433,6 +446,20 @@ } } +#if HAVE_GDK_2_22 + [DllImport ("libgdk-x11-2.0.so.0")] + private static extern int gdk_visual_get_depth(IntPtr visual); + + [DllImport ("libgdk-x11-2.0.so.0")] + private static extern void gdk_visual_get_red_pixel_details(IntPtr visual, out IntPtr mask, out IntPtr shift, out IntPtr precision); + + [DllImport ("libgdk-x11-2.0.so.0")] + private static extern void gdk_visual_get_green_pixel_details(IntPtr visual, out IntPtr mask, out IntPtr shift, out IntPtr precision); + + [DllImport ("libgdk-x11-2.0.so.0")] + private static extern void gdk_visual_get_blue_pixel_details(IntPtr visual, out IntPtr mask, out IntPtr shift, out IntPtr precision); +#endif + [DllImport ("libgdk-x11-2.0.so.0")] private static extern IntPtr gdk_x11_screen_lookup_visual (IntPtr screen, int visual_id); diff -Nru banshee-1.8.0/src/Extensions/Banshee.NotificationArea/Makefile.am banshee-1.8.1/src/Extensions/Banshee.NotificationArea/Makefile.am --- banshee-1.8.0/src/Extensions/Banshee.NotificationArea/Makefile.am 2010-07-15 03:20:16.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.NotificationArea/Makefile.am 2011-01-13 19:00:19.000000000 +0000 @@ -5,6 +5,10 @@ NOTIFY_SHARP_LIBS = endif +if HAVE_GDK_2_22 +GMCS_FLAGS+= "-define:HAVE_GDK_2_22" +endif + ASSEMBLY = Banshee.NotificationArea TARGET = library LINK = $(REF_EXTENSION_NOTIFICATIONAREA) $(NOTIFY_SHARP_LIBS) diff -Nru banshee-1.8.0/src/Extensions/Banshee.NotificationArea/Makefile.in banshee-1.8.1/src/Extensions/Banshee.NotificationArea/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.NotificationArea/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.NotificationArea/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -33,14 +33,23 @@ build_triplet = @build@ host_triplet = @host@ @EXTERNAL_NOTIFY_SHARP_FALSE@am__append_1 = "-define:INTERNAL_NOTIFY_SHARP" +@HAVE_GDK_2_22_TRUE@am__append_2 = "-define:HAVE_GDK_2_22" DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/build/build.environment.mk \ $(top_srcdir)/build/build.mk \ $(top_srcdir)/build/build.rules.mk -@ENABLE_TESTS_TRUE@@PLATFORM_DARWIN_FALSE@am__append_2 = " $(NUNIT_LIBS)" +@ENABLE_TESTS_TRUE@@PLATFORM_DARWIN_FALSE@am__append_3 = " $(NUNIT_LIBS)" subdir = src/Extensions/Banshee.NotificationArea ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -67,14 +76,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -146,6 +147,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ @@ -166,7 +169,7 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMCS_FLAGS = @GMCS_FLAGS@ $(am__append_1) +GMCS_FLAGS = @GMCS_FLAGS@ $(am__append_1) $(am__append_2) GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ @@ -388,7 +391,7 @@ ASSEMBLY = Banshee.NotificationArea TARGET = library LINK = $(REF_EXTENSION_NOTIFICATIONAREA) $(NOTIFY_SHARP_LIBS) \ - $(am__append_2) + $(am__append_3) INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR) SOURCES = \ Banshee.NotificationArea/GtkNotificationAreaBox.cs \ diff -Nru banshee-1.8.0/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenWindow.cs banshee-1.8.1/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenWindow.cs --- banshee-1.8.0/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenWindow.cs 2010-09-02 14:46:03.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenWindow.cs 2011-01-13 19:06:40.000000000 +0000 @@ -124,8 +124,8 @@ Gdk.Screen screen = Screen; int monitor = screen.GetMonitorAtWindow (parent.GdkWindow); Gdk.Rectangle bounds = screen.GetMonitorGeometry (monitor); - Move (bounds.X, 0); - SetDefaultSize (bounds.Width, bounds.Height); + Move (bounds.X, bounds.Y); + Resize (bounds.Width, bounds.Height); } protected override void OnRealized () @@ -182,7 +182,6 @@ if (parent.IsActive) { parent.GdkWindow.SkipPagerHint = false; parent.GdkWindow.SkipTaskbarHint = false; - Hide (); parent.RemoveNotification ("is-active", ParentActiveNotification); } else { parent.GdkWindow.SkipPagerHint = true; diff -Nru banshee-1.8.0/src/Extensions/Banshee.NowPlaying/Makefile.in banshee-1.8.1/src/Extensions/Banshee.NowPlaying/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.NowPlaying/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.NowPlaying/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.NowPlaying ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.PlayerMigration/Makefile.in banshee-1.8.1/src/Extensions/Banshee.PlayerMigration/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.PlayerMigration/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.PlayerMigration/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.PlayerMigration ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.PlayQueue/Makefile.in banshee-1.8.1/src/Extensions/Banshee.PlayQueue/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.PlayQueue/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.PlayQueue/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.PlayQueue ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Podcasting/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Podcasting/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Podcasting/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Podcasting/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Podcasting ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.RemoteAudio/Makefile.in banshee-1.8.1/src/Extensions/Banshee.RemoteAudio/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.RemoteAudio/Makefile.in 2010-09-28 16:30:14.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.RemoteAudio/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.RemoteAudio ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Sample/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Sample/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Sample/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Sample/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -137,6 +137,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.SqlDebugConsole/Makefile.in banshee-1.8.1/src/Extensions/Banshee.SqlDebugConsole/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.SqlDebugConsole/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.SqlDebugConsole/Makefile.in 2011-01-28 21:25:30.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -137,6 +137,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Torrent/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Torrent/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Torrent/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Torrent/Makefile.in 2011-01-28 21:25:31.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Torrent ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.Wikipedia/Makefile.in banshee-1.8.1/src/Extensions/Banshee.Wikipedia/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.Wikipedia/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.Wikipedia/Makefile.in 2011-01-28 21:25:31.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Extensions/Banshee.Wikipedia ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Banshee.YouTube/Makefile.in banshee-1.8.1/src/Extensions/Banshee.YouTube/Makefile.in --- banshee-1.8.0/src/Extensions/Banshee.YouTube/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Banshee.YouTube/Makefile.in 2011-01-28 21:25:31.000000000 +0000 @@ -41,6 +41,14 @@ subdir = src/Extensions/Banshee.YouTube ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -67,14 +75,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -146,6 +146,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Extensions/Makefile.in banshee-1.8.1/src/Extensions/Makefile.in --- banshee-1.8.0/src/Extensions/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Extensions/Makefile.in 2011-01-28 21:25:31.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Hyena/build/m4/Makefile.in banshee-1.8.1/src/Hyena/build/m4/Makefile.in --- banshee-1.8.0/src/Hyena/build/m4/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Hyena/build/m4/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -138,6 +138,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Hyena/build/Makefile.in banshee-1.8.1/src/Hyena/build/Makefile.in --- banshee-1.8.0/src/Hyena/build/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Hyena/build/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -37,6 +37,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -63,14 +71,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -155,6 +155,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Hyena/build/pkg-config/Makefile.in banshee-1.8.1/src/Hyena/build/pkg-config/Makefile.in --- banshee-1.8.0/src/Hyena/build/pkg-config/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Hyena/build/pkg-config/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -36,6 +36,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -62,14 +70,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -148,6 +148,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Hyena/Hyena/Makefile.in banshee-1.8.1/src/Hyena/Hyena/Makefile.in --- banshee-1.8.0/src/Hyena/Hyena/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Hyena/Hyena/Makefile.in 2011-01-28 21:25:31.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Hyena/Hyena ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Hyena/Hyena.Data.Sqlite/Makefile.in banshee-1.8.1/src/Hyena/Hyena.Data.Sqlite/Makefile.in --- banshee-1.8.0/src/Hyena/Hyena.Data.Sqlite/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Hyena/Hyena.Data.Sqlite/Makefile.in 2011-01-28 21:25:31.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Hyena/Hyena.Data.Sqlite ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs banshee-1.8.1/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs --- banshee-1.8.0/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs 2010-08-24 17:19:09.000000000 +0000 +++ banshee-1.8.1/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs 2011-01-28 20:57:34.000000000 +0000 @@ -36,7 +36,7 @@ { public class ColumnHeaderCellText : ColumnCellText, IHeaderCell { - public delegate Column DataHandler (); + public new delegate Column DataHandler (); private DataHandler data_handler; private bool has_sort; diff -Nru banshee-1.8.0/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs banshee-1.8.1/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs --- banshee-1.8.0/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs 2010-08-24 17:19:09.000000000 +0000 +++ banshee-1.8.1/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs 2010-11-18 21:37:04.000000000 +0000 @@ -40,6 +40,10 @@ { public partial class ListView : ListViewBase { +#if ENABLE_ATK + internal ListViewAccessible accessible; +#endif + static ListView () { #if ENABLE_ATK @@ -146,10 +150,11 @@ private void AccessibleCellRedrawn (int column, int row) { - var accessible = Accessible as ICellAccessibleParent; +#if ENABLE_ATK if (accessible != null) { accessible.CellRedrawn (column, row); } +#endif } } @@ -165,7 +170,10 @@ protected override Atk.Object OnCreateAccessible (GLib.Object obj) { - return new ListViewAccessible (obj); + Log.InformationFormat ("Creating Accessible for {0}", obj); + var accessible = new ListViewAccessible (obj); + (obj as ListView).accessible = accessible; + return accessible; } protected override GLib.GType OnGetAccessibleType () diff -Nru banshee-1.8.0/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs banshee-1.8.1/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs --- banshee-1.8.0/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs 2010-09-03 02:55:40.000000000 +0000 +++ banshee-1.8.1/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs 2011-01-28 20:57:34.000000000 +0000 @@ -205,6 +205,8 @@ HeaderFocused = false; } break; + case Gdk.Key.l: + case Gdk.Key.L: case Gdk.Key.Right: case Gdk.Key.KP_Right: handled = true; @@ -215,6 +217,8 @@ InvalidateHeader (); } break; + case Gdk.Key.h: + case Gdk.Key.H: case Gdk.Key.Left: case Gdk.Key.KP_Left: handled = true; diff -Nru banshee-1.8.0/src/Hyena/Hyena.Gui/Makefile.in banshee-1.8.1/src/Hyena/Hyena.Gui/Makefile.in --- banshee-1.8.0/src/Hyena/Hyena.Gui/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Hyena/Hyena.Gui/Makefile.in 2011-01-28 21:25:31.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Hyena/Hyena.Gui ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Hyena/Makefile.in banshee-1.8.1/src/Hyena/Makefile.in --- banshee-1.8.0/src/Hyena/Makefile.in 2010-09-28 16:30:15.000000000 +0000 +++ banshee-1.8.1/src/Hyena/Makefile.in 2011-01-28 21:25:31.000000000 +0000 @@ -36,6 +36,14 @@ COPYING NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -62,14 +70,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -151,6 +151,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Hyena/Mono.Data.Sqlite/Makefile.in banshee-1.8.1/src/Hyena/Mono.Data.Sqlite/Makefile.in --- banshee-1.8.0/src/Hyena/Mono.Data.Sqlite/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Hyena/Mono.Data.Sqlite/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Hyena/Mono.Data.Sqlite ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs banshee-1.8.1/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs --- banshee-1.8.0/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs 2010-08-24 17:19:11.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs 2011-01-28 20:57:47.000000000 +0000 @@ -239,7 +239,7 @@ Log.DebugException (e); response = (HttpWebResponse)e.Response; } - return response.GetResponseStream (); + return response != null ? response.GetResponseStream () : null; } private Stream Post (string uri, string data) @@ -259,7 +259,7 @@ Log.DebugException (e); response = (HttpWebResponse)e.Response; } - return response.GetResponseStream (); + return response != null ? response.GetResponseStream () : null; } #endregion diff -Nru banshee-1.8.0/src/Libraries/Lastfm/Makefile.in banshee-1.8.1/src/Libraries/Lastfm/Makefile.in --- banshee-1.8.0/src/Libraries/Lastfm/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Lastfm/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Libraries/Lastfm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Libraries/Lastfm.Gui/Makefile.in banshee-1.8.1/src/Libraries/Lastfm.Gui/Makefile.in --- banshee-1.8.0/src/Libraries/Lastfm.Gui/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Lastfm.Gui/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Libraries/Lastfm.Gui ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Libraries/Makefile.in banshee-1.8.1/src/Libraries/Makefile.in --- banshee-1.8.0/src/Libraries/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -35,6 +35,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -61,14 +69,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -150,6 +150,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Libraries/Migo/Makefile.in banshee-1.8.1/src/Libraries/Migo/Makefile.in --- banshee-1.8.0/src/Libraries/Migo/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Migo/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Libraries/Migo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Libraries/Migo/Migo.Net/AsyncWebClient.cs banshee-1.8.1/src/Libraries/Migo/Migo.Net/AsyncWebClient.cs --- banshee-1.8.0/src/Libraries/Migo/Migo.Net/AsyncWebClient.cs 2010-09-02 14:46:03.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Migo/Migo.Net/AsyncWebClient.cs 2010-11-14 08:41:58.000000000 +0000 @@ -88,7 +88,6 @@ public event EventHandler ResponseReceived; public event EventHandler DownloadProgressChanged; - public event EventHandler TransferRateUpdated; public event EventHandler DownloadFileCompleted; public event EventHandler DownloadDataCompleted; diff -Nru banshee-1.8.0/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs banshee-1.8.1/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs --- banshee-1.8.0/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs 2010-08-24 17:19:11.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs 2011-01-28 20:56:49.000000000 +0000 @@ -51,8 +51,6 @@ private readonly object sync = new object (); private ManualResetEvent download_handle; - public event EventHandler> EnclosureDownloadCompleted; - public EnclosureManager (DownloadManager downloadManager) { download_manager = downloadManager; @@ -334,23 +332,6 @@ } } } - - OnEnclosureDownloadCompleted (task); - } - - private void OnEnclosureDownloadCompleted (HttpFileDownloadTask task) - { - /*EventHandler> handler = EnclosureDownloadCompleted; - - if (handler != null) { - AsyncCommandQueue cmdQCpy = command_queue; - - if (cmdQCpy != null) { - cmdQCpy.Register (new EventWrapper> ( - handler, this, new TaskEventArgs (task)) - ); - } - } */ } private void DownloadTaskRemoved (FeedEnclosure enc, HttpFileDownloadTask task, bool decQueuedCount) diff -Nru banshee-1.8.0/src/Libraries/Migo/Migo.Syndication/FeedItem.cs banshee-1.8.1/src/Libraries/Migo/Migo.Syndication/FeedItem.cs --- banshee-1.8.0/src/Libraries/Migo/Migo.Syndication/FeedItem.cs 2010-08-24 17:19:11.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Migo/Migo.Syndication/FeedItem.cs 2011-01-28 20:56:49.000000000 +0000 @@ -77,10 +77,6 @@ private DateTime pubDate; private string title; - public event Action ItemAdded; - public event Action ItemChanged; - public event Action ItemRemoved; - #region Database-backed Properties [DatabaseColumn ("ItemID", Constraints = DatabaseColumnConstraints.PrimaryKey)] diff -Nru banshee-1.8.0/src/Libraries/Mono.Media/Makefile.in banshee-1.8.1/src/Libraries/Mono.Media/Makefile.in --- banshee-1.8.0/src/Libraries/Mono.Media/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Mono.Media/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Libraries/Mono.Media ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Libraries/Mtp/Makefile.in banshee-1.8.1/src/Libraries/Mtp/Makefile.in --- banshee-1.8.0/src/Libraries/Mtp/Makefile.in 2010-09-28 16:30:16.000000000 +0000 +++ banshee-1.8.1/src/Libraries/Mtp/Makefile.in 2011-01-28 21:25:32.000000000 +0000 @@ -43,6 +43,14 @@ subdir = src/Libraries/Mtp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -69,14 +77,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -148,6 +148,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Libraries/MusicBrainz/Makefile.in banshee-1.8.1/src/Libraries/MusicBrainz/Makefile.in --- banshee-1.8.0/src/Libraries/MusicBrainz/Makefile.in 2010-09-28 16:30:17.000000000 +0000 +++ banshee-1.8.1/src/Libraries/MusicBrainz/Makefile.in 2011-01-28 21:25:33.000000000 +0000 @@ -40,6 +40,14 @@ subdir = src/Libraries/MusicBrainz ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -66,14 +74,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -145,6 +145,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/src/Makefile.in banshee-1.8.1/src/Makefile.in --- banshee-1.8.0/src/Makefile.in 2010-09-28 16:30:17.000000000 +0000 +++ banshee-1.8.1/src/Makefile.in 2011-01-28 21:25:33.000000000 +0000 @@ -36,6 +36,14 @@ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -62,14 +70,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -151,6 +151,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/tests/Analyzer/Makefile.in banshee-1.8.1/tests/Analyzer/Makefile.in --- banshee-1.8.0/tests/Analyzer/Makefile.in 2010-09-28 16:30:17.000000000 +0000 +++ banshee-1.8.1/tests/Analyzer/Makefile.in 2011-01-28 21:25:33.000000000 +0000 @@ -36,6 +36,14 @@ subdir = tests/Analyzer ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -62,14 +70,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -139,6 +139,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/tests/Makefile.in banshee-1.8.1/tests/Makefile.in --- banshee-1.8.0/tests/Makefile.in 2010-09-28 16:30:17.000000000 +0000 +++ banshee-1.8.1/tests/Makefile.in 2011-01-28 21:25:33.000000000 +0000 @@ -38,6 +38,14 @@ SUBDIRS = ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -64,14 +72,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -152,6 +152,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ diff -Nru banshee-1.8.0/tests/Performance/Makefile.in banshee-1.8.1/tests/Performance/Makefile.in --- banshee-1.8.0/tests/Performance/Makefile.in 2010-09-28 16:30:17.000000000 +0000 +++ banshee-1.8.1/tests/Performance/Makefile.in 2011-01-28 21:25:33.000000000 +0000 @@ -36,6 +36,14 @@ subdir = tests/Performance ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ $(top_srcdir)/build/m4/banshee/boo.m4 \ $(top_srcdir)/build/m4/banshee/daap.m4 \ @@ -62,14 +70,6 @@ $(top_srcdir)/build/m4/banshee/taglib.m4 \ $(top_srcdir)/build/m4/banshee/torrent.m4 \ $(top_srcdir)/build/m4/banshee/youtube.m4 \ - $(top_srcdir)/build/m4/shamrock/expansions.m4 \ - $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ - $(top_srcdir)/build/m4/shamrock/i18n.m4 \ - $(top_srcdir)/build/m4/shamrock/mono.m4 \ - $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ - $(top_srcdir)/build/m4/shamrock/nunit.m4 \ - $(top_srcdir)/build/m4/shamrock/programs.m4 \ - $(top_srcdir)/build/m4/shamrock/util.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -139,6 +139,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDK_2_22_CFLAGS = @GDK_2_22_CFLAGS@ +GDK_2_22_LIBS = @GDK_2_22_LIBS@ GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ GDK_X11_CFLAGS = @GDK_X11_CFLAGS@