[Pkg-cli-apps-commits] [banshee] 01/12: Imported Upstream version 2.9.0+really2.6.1
Chow Loong Jin
hyperair at debian.org
Mon Feb 24 18:50:27 UTC 2014
This is an automated email from the git hooks/post-receive script.
hyperair pushed a commit to branch ubuntu/trusty
in repository banshee.
commit fbf05caccb15ab96bb03536b2ee30dc833867141
Author: Chow Loong Jin <hyperair at debian.org>
Date: Sun Feb 9 16:32:16 2014 +0800
Imported Upstream version 2.9.0+really2.6.1
---
AUTHORS | 11 +-
COPYING | 2 +-
ChangeLog | 4 +-
HACKING | 7 +-
Makefile.am | 14 +-
Makefile.in | 32 +-
NEWS | 106 +-
README | 11 +-
aclocal.m4 | 40 +-
build/GConfSchemaExtractor.cs | 39 +-
build/Makefile.in | 19 +-
build/TranslatorExtractor.cs | 5 +-
build/build.environment.mk | 12 +-
build/build.rules.mk | 6 +-
build/m4/Makefile.in | 19 +-
build/m4/banshee/bnpx11.m4 | 47 +-
build/m4/banshee/boo.m4 | 23 +-
build/m4/banshee/dap-mtp.m4 | 16 +-
build/m4/banshee/gio.m4 | 45 +-
build/m4/banshee/gtk-sharp.m4 | 12 +-
build/m4/banshee/libbanshee.m4 | 31 +-
build/m4/banshee/libwebkit.m4 | 2 +-
build/m4/banshee/notify-sharp.m4 | 10 +-
build/m4/banshee/soundmenu.m4 | 10 +
build/m4/banshee/ubuntuonemusicstore.m4 | 4 +-
build/m4/banshee/youtube.m4 | 16 +-
build/m4/shamrock/i18n.m4 | 4 -
build/m4/shamrock/mono.m4 | 14 -
build/pkg-config/Makefile.in | 19 +-
configure | 2345 +++++++++------
configure.ac | 56 +-
data/Makefile.am | 11 +-
data/Makefile.in | 85 +-
data/audio-profiles/Makefile.in | 19 +-
data/banshee.appdata.xml | 29 -
data/banshee.appdata.xml.in | 25 -
data/desktop-files/Makefile.in | 19 +-
data/desktop-files/common.desktop.in | 1 -
data/icon-theme-hicolor/Makefile.in | 19 +-
docs/Banshee/Makefile.in | 19 +-
docs/Hyena/Makefile.in | 19 +-
docs/Makefile.in | 19 +-
extras/Makefile.in | 19 +-
extras/metrics/Makefile.in | 37 +-
help/C/add-podcast.page | 80 +
help/C/add-radio.page | 71 +
help/C/{extensions.page => advanced.page} | 24 +-
help/C/amazon.page | 108 +-
help/C/emusic.page | 14 +
help/C/extensions.page | 24 +-
help/C/import.page | 56 +-
help/C/index.page | 25 +-
help/C/introduction.page | 41 +-
help/C/itunes-import.page | 14 +
help/C/keyboard-shortcuts.page | 154 -
help/C/keyboardshortcuts.page | 145 +
help/C/lastfm.page | 194 +-
help/C/manage-coverart.page | 31 +
help/C/manage-playlists.page | 248 +-
help/C/manage-tags.page | 103 +-
help/C/play-queue.page | 155 +-
help/C/play.page | 194 +-
help/C/podcast.page | 119 -
help/C/radio.page | 137 -
help/C/rb-import.page | 14 +
help/C/search.page | 135 +-
help/C/sort.page | 51 +-
help/C/sync.page | 234 +-
help/C/ui.page | 139 +-
help/Makefile.am | 14 +-
help/Makefile.in | 34 +-
help/ca/add-podcast.page | 60 +
help/ca/add-radio.page | 50 +
help/{zh_CN/extensions.page => ca/advanced.page} | 24 +-
help/ca/amazon.page | 77 +-
help/ca/ca.po | 22 +-
help/ca/emusic.page | 13 +
help/ca/extensions.page | 22 +-
help/ca/import.page | 44 +-
help/ca/index.page | 22 +-
help/ca/introduction.page | 29 +-
help/ca/itunes-import.page | 13 +
help/ca/keyboard-shortcuts.page | 150 -
help/ca/keyboardshortcuts.page | 134 +
help/ca/lastfm.page | 165 +-
help/ca/manage-coverart.page | 29 +
help/ca/manage-playlists.page | 173 +-
help/ca/manage-tags.page | 77 +-
help/ca/play-queue.page | 108 +-
help/ca/play.page | 168 +-
help/ca/podcast.page | 117 -
help/ca/radio.page | 135 -
help/ca/rb-import.page | 13 +
help/ca/search.page | 108 +-
help/ca/sort.page | 37 +-
help/ca/sync.page | 175 +-
help/ca/ui.page | 115 +-
help/cs/add-podcast.page | 60 +
help/cs/add-radio.page | 50 +
help/{zh_CN/extensions.page => cs/advanced.page} | 24 +-
help/cs/amazon.page | 55 +-
help/cs/cs.po | 2592 +++++++---------
help/cs/emusic.page | 13 +
help/cs/extensions.page | 22 +-
help/cs/import.page | 29 +-
help/cs/index.page | 18 +-
help/cs/introduction.page | 22 +-
help/cs/itunes-import.page | 13 +
help/cs/keyboard-shortcuts.page | 149 -
help/cs/keyboardshortcuts.page | 134 +
help/cs/lastfm.page | 95 +-
help/cs/manage-coverart.page | 29 +
help/cs/manage-playlists.page | 127 +-
help/cs/manage-tags.page | 60 +-
help/cs/play-queue.page | 78 +-
help/cs/play.page | 121 +-
help/cs/podcast.page | 82 -
help/cs/radio.page | 95 -
help/cs/rb-import.page | 13 +
help/cs/search.page | 90 +-
help/cs/sort.page | 24 +-
help/cs/sync.page | 119 +-
help/cs/ui.page | 88 +-
help/da/add-podcast.page | 78 +
help/da/add-radio.page | 69 +
help/{zh_CN/extensions.page => da/advanced.page} | 24 +-
help/da/amazon.page | 108 +-
help/da/emusic.page | 13 +
help/da/extensions.page | 22 +-
help/da/import.page | 52 +-
help/da/index.page | 22 +-
help/da/introduction.page | 44 +-
help/da/itunes-import.page | 13 +
help/da/keyboard-shortcuts.page | 153 -
help/da/keyboardshortcuts.page | 144 +
help/da/lastfm.page | 193 +-
help/da/manage-coverart.page | 29 +
help/da/manage-playlists.page | 248 +-
help/da/manage-tags.page | 101 +-
help/da/play-queue.page | 154 +-
help/da/play.page | 193 +-
help/da/podcast.page | 117 -
help/da/radio.page | 135 -
help/da/rb-import.page | 13 +
help/da/search.page | 130 +-
help/da/sort.page | 37 +-
help/da/sync.page | 183 +-
help/da/ui.page | 119 +-
help/de/add-podcast.page | 60 +
help/de/add-radio.page | 50 +
help/{zh_CN/extensions.page => de/advanced.page} | 24 +-
help/de/amazon.page | 77 +-
help/de/emusic.page | 13 +
help/de/extensions.page | 22 +-
help/de/import.page | 42 +-
help/de/index.page | 22 +-
help/de/introduction.page | 29 +-
help/de/itunes-import.page | 13 +
help/de/keyboard-shortcuts.page | 150 -
help/de/keyboardshortcuts.page | 134 +
help/de/lastfm.page | 145 +-
help/de/manage-coverart.page | 29 +
help/de/manage-playlists.page | 173 +-
help/de/manage-tags.page | 77 +-
help/de/play-queue.page | 108 +-
help/de/play.page | 168 +-
help/de/podcast.page | 117 -
help/de/radio.page | 135 -
help/de/rb-import.page | 13 +
help/de/search.page | 108 +-
help/de/sort.page | 37 +-
help/de/sync.page | 175 +-
help/de/ui.page | 115 +-
help/el/add-podcast.page | 60 +
help/el/add-radio.page | 59 +
help/{cs/extensions.page => el/advanced.page} | 24 +-
help/el/amazon.page | 55 +-
help/el/el.po | 3091 +++++++++-----------
help/el/emusic.page | 13 +
help/el/extensions.page | 22 +-
help/el/import.page | 29 +-
help/el/index.page | 22 +-
help/el/introduction.page | 22 +-
help/el/itunes-import.page | 13 +
help/el/keyboard-shortcuts.page | 149 -
help/el/keyboardshortcuts.page | 134 +
help/el/lastfm.page | 113 +-
help/el/manage-coverart.page | 29 +
help/el/manage-playlists.page | 139 +-
help/el/manage-tags.page | 62 +-
help/el/play-queue.page | 103 +-
help/el/play.page | 125 +-
help/el/podcast.page | 82 -
help/el/radio.page | 95 -
help/el/rb-import.page | 13 +
help/el/search.page | 107 +-
help/el/sort.page | 24 +-
help/el/sync.page | 129 +-
help/el/ui.page | 90 +-
help/en_GB/add-podcast.page | 60 +
help/en_GB/add-radio.page | 50 +
.../{zh_CN/extensions.page => en_GB/advanced.page} | 24 +-
help/en_GB/amazon.page | 77 +-
help/en_GB/emusic.page | 13 +
help/en_GB/extensions.page | 22 +-
help/en_GB/import.page | 42 +-
help/en_GB/index.page | 22 +-
help/en_GB/introduction.page | 23 +-
help/en_GB/itunes-import.page | 13 +
help/en_GB/keyboard-shortcuts.page | 150 -
help/en_GB/keyboardshortcuts.page | 134 +
help/en_GB/lastfm.page | 163 +-
help/en_GB/manage-coverart.page | 29 +
help/en_GB/manage-playlists.page | 173 +-
help/en_GB/manage-tags.page | 83 +-
help/en_GB/play-queue.page | 108 +-
help/en_GB/play.page | 168 +-
help/en_GB/podcast.page | 117 -
help/en_GB/radio.page | 135 -
help/en_GB/rb-import.page | 13 +
help/en_GB/search.page | 108 +-
help/en_GB/sort.page | 37 +-
help/en_GB/sync.page | 175 +-
help/en_GB/ui.page | 115 +-
help/es/add-podcast.page | 60 +
help/es/add-radio.page | 50 +
help/{zh_CN/extensions.page => es/advanced.page} | 24 +-
help/es/amazon.page | 55 +-
help/es/emusic.page | 13 +
help/es/es.po | 3002 ++++++++-----------
help/es/extensions.page | 22 +-
help/es/import.page | 31 +-
help/es/index.page | 18 +-
help/es/introduction.page | 24 +-
help/es/itunes-import.page | 13 +
help/es/keyboard-shortcuts.page | 149 -
help/es/keyboardshortcuts.page | 134 +
help/es/lastfm.page | 64 +-
help/es/manage-coverart.page | 29 +
help/es/manage-playlists.page | 127 +-
help/es/manage-tags.page | 60 +-
help/es/play-queue.page | 80 +-
help/es/play.page | 123 +-
help/es/podcast.page | 82 -
help/es/radio.page | 95 -
help/es/rb-import.page | 13 +
help/es/search.page | 94 +-
help/es/sort.page | 24 +-
help/es/sync.page | 125 +-
help/es/ui.page | 88 +-
help/fr/add-podcast.page | 60 +
help/fr/add-radio.page | 50 +
help/{zh_CN/extensions.page => fr/advanced.page} | 24 +-
help/fr/amazon.page | 77 +-
help/fr/emusic.page | 13 +
help/fr/extensions.page | 22 +-
help/fr/import.page | 42 +-
help/fr/index.page | 22 +-
help/fr/introduction.page | 29 +-
help/fr/itunes-import.page | 13 +
help/fr/keyboard-shortcuts.page | 150 -
help/fr/keyboardshortcuts.page | 134 +
help/fr/lastfm.page | 156 +-
help/fr/manage-coverart.page | 29 +
help/fr/manage-playlists.page | 173 +-
help/fr/manage-tags.page | 83 +-
help/fr/play-queue.page | 108 +-
help/fr/play.page | 168 +-
help/fr/podcast.page | 117 -
help/fr/radio.page | 135 -
help/fr/rb-import.page | 13 +
help/fr/search.page | 108 +-
help/fr/sort.page | 37 +-
help/fr/sync.page | 175 +-
help/fr/ui.page | 115 +-
help/gl/add-podcast.page | 78 +
help/gl/add-radio.page | 69 +
help/{zh_CN/extensions.page => gl/advanced.page} | 24 +-
help/gl/amazon.page | 108 +-
help/gl/emusic.page | 13 +
help/gl/extensions.page | 22 +-
help/gl/import.page | 52 +-
help/gl/index.page | 22 +-
help/gl/introduction.page | 42 +-
help/gl/itunes-import.page | 13 +
help/gl/keyboard-shortcuts.page | 153 -
help/gl/keyboardshortcuts.page | 144 +
help/gl/lastfm.page | 193 +-
help/gl/manage-coverart.page | 29 +
help/gl/manage-playlists.page | 248 +-
help/gl/manage-tags.page | 101 +-
help/gl/play-queue.page | 154 +-
help/gl/play.page | 193 +-
help/gl/podcast.page | 117 -
help/gl/radio.page | 135 -
help/gl/rb-import.page | 13 +
help/gl/search.page | 135 +-
help/gl/sort.page | 51 +-
help/gl/sync.page | 234 +-
help/gl/ui.page | 136 +-
help/hu/add-podcast.page | 60 +
help/hu/add-radio.page | 50 +
help/{zh_CN/extensions.page => hu/advanced.page} | 24 +-
help/hu/amazon.page | 77 +-
help/hu/emusic.page | 13 +
help/hu/extensions.page | 22 +-
help/hu/import.page | 42 +-
help/hu/index.page | 22 +-
help/hu/introduction.page | 29 +-
help/hu/itunes-import.page | 13 +
help/hu/keyboard-shortcuts.page | 150 -
help/hu/keyboardshortcuts.page | 134 +
help/hu/lastfm.page | 156 +-
help/hu/manage-coverart.page | 29 +
help/hu/manage-playlists.page | 173 +-
help/hu/manage-tags.page | 83 +-
help/hu/play-queue.page | 108 +-
help/hu/play.page | 168 +-
help/hu/podcast.page | 117 -
help/hu/radio.page | 135 -
help/hu/rb-import.page | 13 +
help/hu/search.page | 108 +-
help/hu/sort.page | 37 +-
help/hu/sync.page | 175 +-
help/hu/ui.page | 115 +-
help/ja/add-podcast.page | 60 +
help/ja/add-radio.page | 50 +
help/{zh_CN/extensions.page => ja/advanced.page} | 24 +-
help/ja/amazon.page | 77 +-
help/ja/emusic.page | 13 +
help/ja/extensions.page | 22 +-
help/ja/import.page | 42 +-
help/ja/index.page | 22 +-
help/ja/introduction.page | 29 +-
help/ja/itunes-import.page | 13 +
help/ja/keyboard-shortcuts.page | 150 -
help/ja/keyboardshortcuts.page | 134 +
help/ja/lastfm.page | 163 +-
help/ja/manage-coverart.page | 29 +
help/ja/manage-playlists.page | 173 +-
help/ja/manage-tags.page | 77 +-
help/ja/play-queue.page | 108 +-
help/ja/play.page | 168 +-
help/ja/podcast.page | 117 -
help/ja/radio.page | 135 -
help/ja/rb-import.page | 13 +
help/ja/search.page | 108 +-
help/ja/sort.page | 37 +-
help/ja/sync.page | 175 +-
help/ja/ui.page | 115 +-
help/pt_BR/add-podcast.page | 78 +
help/pt_BR/add-radio.page | 69 +
.../{zh_CN/extensions.page => pt_BR/advanced.page} | 24 +-
help/pt_BR/amazon.page | 81 +-
help/pt_BR/emusic.page | 13 +
help/pt_BR/extensions.page | 22 +-
help/pt_BR/import.page | 47 +-
help/pt_BR/index.page | 22 +-
help/pt_BR/introduction.page | 29 +-
help/pt_BR/itunes-import.page | 13 +
help/pt_BR/keyboard-shortcuts.page | 150 -
help/pt_BR/keyboardshortcuts.page | 134 +
help/pt_BR/lastfm.page | 165 +-
help/pt_BR/manage-coverart.page | 29 +
help/pt_BR/manage-playlists.page | 177 +-
help/pt_BR/manage-tags.page | 79 +-
help/pt_BR/play-queue.page | 137 +-
help/pt_BR/play.page | 181 +-
help/pt_BR/podcast.page | 86 -
help/pt_BR/radio.page | 116 -
help/pt_BR/rb-import.page | 13 +
help/pt_BR/search.page | 109 +-
help/pt_BR/sort.page | 37 +-
help/pt_BR/sync.page | 182 +-
help/pt_BR/ui.page | 119 +-
help/sl/add-podcast.page | 60 +
help/sl/add-radio.page | 50 +
help/{zh_CN/extensions.page => sl/advanced.page} | 24 +-
help/sl/amazon.page | 77 +-
help/sl/emusic.page | 13 +
help/sl/extensions.page | 22 +-
help/sl/import.page | 42 +-
help/sl/index.page | 22 +-
help/sl/introduction.page | 29 +-
help/sl/itunes-import.page | 13 +
help/sl/keyboard-shortcuts.page | 150 -
help/sl/keyboardshortcuts.page | 134 +
help/sl/lastfm.page | 156 +-
help/sl/manage-coverart.page | 29 +
help/sl/manage-playlists.page | 173 +-
help/sl/manage-tags.page | 77 +-
help/sl/play-queue.page | 108 +-
help/sl/play.page | 168 +-
help/sl/podcast.page | 117 -
help/sl/radio.page | 135 -
help/sl/rb-import.page | 13 +
help/sl/search.page | 108 +-
help/sl/sort.page | 37 +-
help/sl/sync.page | 175 +-
help/sl/ui.page | 115 +-
help/uk/add-podcast.page | 60 +
help/uk/add-radio.page | 50 +
help/{de/extensions.page => uk/advanced.page} | 24 +-
help/uk/amazon.page | 77 +-
help/uk/emusic.page | 13 +
help/uk/extensions.page | 22 +-
help/uk/import.page | 42 +-
help/uk/index.page | 22 +-
help/uk/introduction.page | 29 +-
help/uk/itunes-import.page | 13 +
help/uk/keyboard-shortcuts.page | 150 -
help/uk/keyboardshortcuts.page | 134 +
help/uk/lastfm.page | 163 +-
help/uk/manage-coverart.page | 29 +
help/uk/manage-playlists.page | 173 +-
help/uk/manage-tags.page | 77 +-
help/uk/play-queue.page | 108 +-
help/uk/play.page | 168 +-
help/uk/podcast.page | 117 -
help/uk/radio.page | 135 -
help/uk/rb-import.page | 13 +
help/uk/search.page | 108 +-
help/uk/sort.page | 37 +-
help/uk/sync.page | 175 +-
help/uk/ui.page | 115 +-
help/zh_CN/add-podcast.page | 78 +
help/zh_CN/add-radio.page | 69 +
help/zh_CN/{extensions.page => advanced.page} | 24 +-
help/zh_CN/amazon.page | 108 +-
help/zh_CN/emusic.page | 13 +
help/zh_CN/extensions.page | 22 +-
help/zh_CN/import.page | 52 +-
help/zh_CN/index.page | 22 +-
help/zh_CN/introduction.page | 46 +-
help/zh_CN/itunes-import.page | 13 +
help/zh_CN/keyboard-shortcuts.page | 153 -
help/zh_CN/keyboardshortcuts.page | 144 +
help/zh_CN/lastfm.page | 193 +-
help/zh_CN/manage-coverart.page | 29 +
help/zh_CN/manage-playlists.page | 248 +-
help/zh_CN/manage-tags.page | 101 +-
help/zh_CN/play-queue.page | 154 +-
help/zh_CN/play.page | 193 +-
help/zh_CN/podcast.page | 117 -
help/zh_CN/radio.page | 135 -
help/zh_CN/rb-import.page | 13 +
help/zh_CN/search.page | 123 +-
help/zh_CN/sort.page | 28 +-
help/zh_CN/sync.page | 119 +-
help/zh_CN/ui.page | 94 +-
help/zh_CN/zh_CN.po | 2169 ++++++--------
libbanshee/Makefile.in | 19 +-
libbanshee/banshee-player-missing-elements.c | 2 +-
libbanshee/banshee-player-pipeline.c | 3 -
libbanshee/banshee-player.c | 11 +-
ltmain.sh | 4 +-
po/POTFILES.in | 2 +-
po/ca.po | 14 +-
po/cs.po | 841 +++---
po/da.po | 1227 ++++----
po/el.po | 1480 ++++------
po/es.po | 852 +++---
po/fr.po | 212 +-
po/gl.po | 839 +++---
po/hu.po | 844 +++---
po/id.po | 800 +++--
po/ja.po | 332 +--
po/lt.po | 1401 ++++-----
po/lv.po | 1165 ++++----
po/nb.po | 2205 +++++++-------
po/pl.po | 851 +++---
po/pt.po | 667 ++---
po/pt_BR.po | 808 +++--
po/ru.po | 1584 ++++------
po/sl.po | 1442 ++++-----
po/sr.po | 301 +-
po/sr at latin.po | 301 +-
po/tr.po | 352 ++-
po/zh_HK.po | 241 +-
po/zh_TW.po | 241 +-
src/AssemblyInfo.cs | 6 +-
.../Banshee.GStreamer/PlayerEngine.cs | 13 +-
src/Backends/Banshee.GStreamer/Makefile.in | 37 +-
.../Banshee.GStreamerSharp/PlayerEngine.cs | 15 +-
src/Backends/Banshee.GStreamerSharp/Makefile.in | 37 +-
.../DeviceMediaCapabilities.cs | 19 +-
...MetadataSource.cs => GioDriveMetadetaSource.cs} | 10 +-
.../LowLevel/GioMetadataSource.cs | 4 +-
.../LowLevel/GioVolumeMetadataSource.cs | 4 +-
.../Banshee.Hardware.Gio/LowLevel/Manager.cs | 11 +-
.../LowLevel/RawBlockDevice.cs | 8 +-
.../Banshee.Hardware.Gio/LowLevel/RawVolume.cs | 13 +-
.../Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs | 2 +-
.../Banshee.Gio/Banshee.IO.Gio/Directory.cs | 10 +-
src/Backends/Banshee.Gio/Makefile.am | 16 +-
src/Backends/Banshee.Gio/Makefile.in | 52 +-
.../Banshee.GnomeBackend/GnomeService.cs | 4 +-
src/Backends/Banshee.Gnome/Makefile.in | 37 +-
src/Backends/Banshee.NowPlaying.X11/Makefile.in | 37 +-
.../Banshee.NowPlaying.X11/libbnpx11/Makefile.in | 19 +-
.../libbnpx11/bacon-resize.c | 4 +-
.../Banshee.Osx/Banshee.OsxBackend/OsxService.cs | 6 +-
src/Backends/Banshee.Osx/Makefile.in | 37 +-
src/Backends/Banshee.Unix/Makefile.in | 37 +-
.../GtkWindowThumbnailToolbarManager.cs | 2 +-
src/Backends/Banshee.Windows/Makefile.in | 19 +-
src/Backends/Makefile.in | 19 +-
src/Clients/Beroe/Makefile.in | 37 +-
src/Clients/Booter/Booter/Entry.cs | 11 +-
src/Clients/Booter/Makefile.in | 37 +-
src/Clients/Booter/banshee.linux.in | 4 -
src/Clients/Halie/Makefile.in | 37 +-
src/Clients/Makefile.in | 19 +-
src/Clients/MeeGo/Makefile.in | 37 +-
src/Clients/Muinshee/Makefile.in | 37 +-
src/Clients/Muinshee/Muinshee/AlbumDialog.cs | 31 +-
src/Clients/Muinshee/Muinshee/BaseDialog.cs | 8 +-
src/Clients/Muinshee/Muinshee/PlayerInterface.cs | 34 +-
src/Clients/Muinshee/Muinshee/SongDialog.cs | 11 +-
src/Clients/Nereid/Makefile.in | 37 +-
src/Clients/Nereid/Nereid/PlayerInterface.cs | 53 +-
src/Clients/Nereid/Nereid/ViewContainer.cs | 2 +-
src/Core/Banshee.CollectionIndexer/Makefile.in | 37 +-
src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs | 22 +-
src/Core/Banshee.Core/Banshee.Base/PathPattern.cs | 8 +-
.../Banshee.Core/Banshee.Collection/AlbumInfo.cs | 1 -
.../Banshee.Core/Banshee.Collection/ArtistInfo.cs | 1 -
.../Banshee.Core/Banshee.Collection/TrackInfo.cs | 1 -
.../Banshee.Configuration/ConfigurationClient.cs | 63 +-
.../Banshee.Configuration/SchemaEntry.cs | 6 +-
src/Core/Banshee.Core/Banshee.IO/Directory.cs | 3 +
src/Core/Banshee.Core/Banshee.IO/Provider.cs | 12 +-
.../Banshee.IO/ProviderConfiguration.cs | 45 -
src/Core/Banshee.Core/Makefile.am | 1 -
src/Core/Banshee.Core/Makefile.in | 38 +-
src/Core/Banshee.Core/Resources/COPYING | 2 +-
src/Core/Banshee.Core/Resources/contributors.xml | 11 +-
src/Core/Banshee.Core/Resources/translators.xml | 7 +-
.../Banshee.Collection.Database/Bookmark.cs | 2 +-
.../DatabaseAlbumArtistInfo.cs | 4 +-
.../DatabaseAlbumInfo.cs | 12 +-
.../DatabaseAlbumListModel.cs | 8 +-
.../DatabaseArtistInfo.cs | 4 +-
.../DatabaseImportManager.cs | 12 +-
.../DatabaseTrackInfo.cs | 34 +-
.../DatabaseYearInfo.cs | 4 +-
.../Banshee.Collection.Database/RandomByAlbum.cs | 2 +-
.../Banshee.Collection.Database/RandomByArtist.cs | 2 +-
.../Banshee.Collection.Database/Shuffler.cs | 8 +-
.../CollectionIndexerService.cs | 5 +-
.../Banshee.Collection/RescanPipeline.cs | 47 +-
.../Banshee.Database/BansheeDbFormatMigrator.cs | 20 +-
.../Banshee.Equalizer/EqualizerManager.cs | 2 +-
.../Banshee.Hardware/FileSystem.cs | 44 -
.../Banshee.Library/LibraryImportManager.cs | 4 +-
.../Banshee.Library/LibrarySchema.cs | 7 +
.../Banshee.Library/LibrarySource.cs | 5 +-
.../Banshee.Library/MusicLibrarySource.cs | 4 +-
.../Banshee.MediaEngine/NullPlayerEngine.cs | 4 -
.../Banshee.MediaEngine/PlayerEngine.cs | 7 -
.../Banshee.MediaEngine/PlayerEngineService.cs | 12 +-
.../Banshee.MediaProfiles/ProfileConfiguration.cs | 12 +-
.../Banshee.Metadata/MetadataService.cs | 3 +-
.../Banshee.Metadata/SaveTrackMetadataJob.cs | 4 -
.../PlaybackControllerService.cs | 6 +-
.../Banshee.Playlist/AbstractPlaylistSource.cs | 10 +-
.../Banshee.Playlist/PlaylistFileUtil.cs | 31 +-
.../Banshee.Playlist/PlaylistSource.cs | 12 +-
.../AsfReferencePlaylistFormat.cs | 4 +-
.../Banshee.Playlists.Formats/AsxPlaylistFormat.cs | 10 +-
.../Banshee.Playlists.Formats/IPlaylistFormat.cs | 3 +-
.../Banshee.Playlists.Formats/M3uPlaylistFormat.cs | 18 +-
.../Banshee.Playlists.Formats/PlaylistElement.cs | 39 -
.../PlaylistFormatBase.cs | 30 +-
.../Banshee.Playlists.Formats/PlaylistParser.cs | 4 +-
.../Banshee.Playlists.Formats/PlsPlaylistFormat.cs | 8 +-
.../Tests/PlaylistFormatTests.cs | 65 +-
.../XspfPlaylistFormat.cs | 4 +-
.../Banshee.SmartPlaylist/SmartPlaylistSource.cs | 6 +-
.../Banshee.Sources/PrimarySource.cs | 39 +-
.../Banshee.Services/Banshee.Sources/Source.cs | 4 +-
.../Banshee.Sources/SourceManager.cs | 14 +-
.../Banshee.Streaming/RadioTrackInfo.cs | 8 +-
src/Core/Banshee.Services/Makefile.am | 2 -
src/Core/Banshee.Services/Makefile.in | 39 +-
.../Banshee.Addins.Gui/AddinView.cs | 6 +-
.../Banshee.CairoGlyphs/BansheeLineLogo.cs | 4 +-
.../Banshee.Collection.Gui/AlbumListView.cs | 52 +-
.../Banshee.Collection.Gui/ArtworkManager.cs | 23 +-
.../Banshee.Collection.Gui/ArtworkRenderer.cs | 18 +-
.../Banshee.Collection.Gui/BaseTrackListView.cs | 4 +-
.../Banshee.Collection.Gui/ColumnCellAlbum.cs | 11 +-
.../ColumnCellCreativeCommons.cs | 2 +-
.../ColumnCellStatusIndicator.cs | 4 +-
.../Banshee.Collection.Gui/ColumnCellTrack.cs | 10 +-
.../Banshee.Collection.Gui/CoverArtEditor.cs | 6 +-
.../PersistentColumnController.cs | 10 +-
.../Tests/ArtworkManagerTests.cs | 102 -
.../Banshee.ContextPane/ContextPane.cs | 8 +-
.../Banshee.Equalizer.Gui/EqualizerBandScale.cs | 5 +-
.../Banshee.Equalizer.Gui/EqualizerLevelsBox.cs | 4 +-
.../EqualizerPresetComboBox.cs | 6 +-
.../Banshee.Equalizer.Gui/EqualizerWindow.cs | 21 +-
.../Banshee.Gui.Dialogs/AboutDialog.cs | 10 +-
.../Banshee.Gui.Dialogs/BansheeDialog.cs | 11 +-
.../Banshee.Gui.Dialogs/ErrorListDialog.cs | 8 +-
.../Banshee.Gui.Dialogs/OpenLocationDialog.cs | 4 +-
.../Banshee.Gui.Dialogs/SeekDialog.cs | 5 +-
.../Banshee.Gui.TrackEditor/AlbumArtistEntry.cs | 9 +-
.../EditorEditableUndoAdapter.cs | 2 +-
.../Banshee.Gui.TrackEditor/FieldPage.cs | 5 +-
.../Banshee.Gui.TrackEditor/GenreEntry.cs | 10 +-
.../Banshee.Gui.TrackEditor/HelpPage.cs | 6 +-
.../Banshee.Gui.TrackEditor/LicenseEntry.cs | 10 +-
.../Banshee.Gui.TrackEditor/PageNavigationEntry.cs | 3 +-
.../Banshee.Gui.TrackEditor/RangeEntry.cs | 2 +-
.../Banshee.Gui.TrackEditor/StatisticsPage.cs | 10 +-
.../Banshee.Gui.TrackEditor/TextViewEntry.cs | 9 +-
.../Banshee.Gui.TrackEditor/TrackEditorDialog.cs | 19 +-
.../Banshee.Gui.Widgets/ArtworkPopup.cs | 12 +-
.../Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs | 28 +-
.../Banshee.Gui.Widgets/ConnectedSeekSlider.cs | 4 +-
.../Banshee.Gui.Widgets/CoverArtDisplay.cs | 6 +-
.../Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs | 52 +-
.../Banshee.Gui.Widgets/TitledList.cs | 6 +-
.../Banshee.Gui.Widgets/TrackInfoDisplay.cs | 56 +-
.../Banshee.Gui.Widgets/UserJobTile.cs | 8 +-
.../Banshee.Gui/BaseClientWindow.cs | 26 +-
.../Banshee.Gui/GlobalActions.cs | 23 +-
.../Banshee.Gui/GtkBaseClient.cs | 32 +-
.../Banshee.Gui/GtkElementsService.cs | 16 +-
.../Banshee.Gui/PersistentPaneController.cs | 8 +-
.../Banshee.Gui/PersistentWindowController.cs | 70 +-
.../Banshee.Gui/SourceActions.cs | 6 +-
.../Banshee.Gui/TrackActions.cs | 27 -
.../Banshee.ThickClient/Banshee.Gui/ViewActions.cs | 2 +-
.../Banshee.Gui/WindowConfiguration.cs | 104 -
.../Banshee.Library.Gui/ImportDialog.cs | 4 +-
.../ProfileConfigurationDialog.cs | 7 +-
.../Banshee.Preferences.Gui/NotebookPage.cs | 2 +-
.../Banshee.Preferences.Gui/SectionBox.cs | 10 +-
.../PlaybackErrorQueryValueEntry.cs | 4 +-
.../Banshee.Query.Gui/PlaylistQueryValueEntry.cs | 4 +-
.../SmartPlaylistQueryValueEntry.cs | 4 +-
.../Banshee.Sources.Gui/CellEditEntry.cs | 2 +-
.../CompositeTrackSourceContents.cs | 45 +-
.../FilteredListSourceContents.cs | 34 +-
.../Banshee.Sources.Gui/SourceModel.cs | 10 +-
.../Banshee.Sources.Gui/SourceRowRenderer.cs | 108 +-
.../Banshee.Sources.Gui/SourceSwitcherEntry.cs | 2 +-
.../Banshee.Sources.Gui/SourceView.cs | 33 +-
.../Banshee.Sources.Gui/SourceView_DragAndDrop.cs | 10 +-
src/Core/Banshee.ThickClient/Makefile.am | 2 -
src/Core/Banshee.ThickClient/Makefile.in | 39 +-
.../Banshee.WebSource/WebBrowserShell.cs | 7 +-
src/Core/Banshee.WebBrowser/Makefile.in | 37 +-
src/Core/Banshee.WebBrowser/libossifer/Makefile.in | 19 +-
.../Banshee.Widgets/CustomActionProxy.cs | 5 +-
.../Banshee.Widgets/Banshee.Widgets/DateButton.cs | 328 +--
.../Banshee.Widgets/DiscUsageDisplay.cs | 53 +-
.../Banshee.Widgets/HoverImageButton.cs | 256 ++
.../Banshee.Widgets/LinearProgress.cs | 33 +-
.../Banshee.Widgets/Banshee.Widgets/LinkLabel.cs | 65 +-
.../Banshee.Widgets/Banshee.Widgets/MessagePane.cs | 4 +-
.../Banshee.Widgets/Banshee.Widgets/SearchEntry.cs | 424 ++-
.../Banshee.Widgets/Banshee.Widgets/SeekSlider.cs | 1 +
.../Banshee.Widgets/StreamPositionLabel.cs | 80 +-
src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs | 9 +-
.../Banshee.Widgets/Banshee.Widgets/TileView.cs | 4 +-
src/Core/Banshee.Widgets/Makefile.am | 1 +
src/Core/Banshee.Widgets/Makefile.in | 38 +-
src/Core/Makefile.in | 19 +-
.../Banshee.Dap.AppleDevice/AppleDeviceSource.cs | 21 +-
src/Dap/Banshee.Dap.AppleDevice/Makefile.in | 37 +-
.../Banshee.Dap.Karma/KarmaSource.cs | 4 +-
src/Dap/Banshee.Dap.Karma/Makefile.in | 37 +-
.../Banshee.Dap.MassStorage.addin.xml | 4 -
.../Banshee.Dap.MassStorage/MassStorageDevice.cs | 23 +-
.../Banshee.Dap.MassStorage/MassStorageSource.cs | 22 +-
.../Banshee.Dap.MassStorage/SymbianDevice.cs | 107 -
src/Dap/Banshee.Dap.MassStorage/Makefile.am | 1 -
src/Dap/Banshee.Dap.MassStorage/Makefile.in | 38 +-
.../ThemeIcons/128x128/devices/phone-nokia-n95.png | Bin 17226 -> 0 bytes
.../ThemeIcons/16x16/devices/phone-nokia-n95.png | Bin 1208 -> 0 bytes
.../ThemeIcons/22x22/devices/phone-nokia-n95.png | Bin 1248 -> 0 bytes
.../ThemeIcons/24x24/devices/phone-nokia-n95.png | Bin 1413 -> 0 bytes
.../ThemeIcons/256x256/devices/phone-nokia-n95.png | Bin 60041 -> 0 bytes
.../ThemeIcons/32x32/devices/phone-nokia-n95.png | Bin 2035 -> 0 bytes
.../ThemeIcons/48x48/devices/phone-nokia-n95.png | Bin 3642 -> 0 bytes
.../Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs | 10 +-
src/Dap/Banshee.Dap.Mtp/Makefile.in | 37 +-
src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs | 32 +
src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs | 14 +-
src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs | 6 +-
.../Banshee.Dap.Gui/DapPropertiesDialog.cs | 4 +-
.../Banshee.Dap.Gui/DapPropertiesDisplay.cs | 16 +-
src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs | 2 +-
src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs | 4 +-
src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs | 13 +-
src/Dap/Banshee.Dap/Makefile.in | 37 +-
src/Dap/Makefile.in | 19 +-
.../StoreWebBrowserShell.cs | 1 -
src/Extensions/Banshee.AmazonMp3.Store/Makefile.in | 37 +-
src/Extensions/Banshee.AmazonMp3/Makefile.in | 37 +-
.../Banshee.Audiobook/AudiobookLibrarySource.cs | 2 +-
.../Banshee.Audiobook/BookView.cs | 14 +-
src/Extensions/Banshee.Audiobook/Makefile.in | 37 +-
src/Extensions/Banshee.BooScript/Makefile.in | 37 +-
.../Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs | 4 +-
src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs | 12 +-
src/Extensions/Banshee.Bpm/Makefile.in | 37 +-
.../Banshee.CoverArt/CoverArtJob.cs | 9 +-
src/Extensions/Banshee.CoverArt/Makefile.in | 37 +-
.../Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs | 6 +-
.../Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs | 4 +-
src/Extensions/Banshee.Daap/Makefile.in | 37 +-
src/Extensions/Banshee.Emusic.Store/Makefile.in | 37 +-
src/Extensions/Banshee.Emusic/Makefile.in | 37 +-
.../FileSystemQueueSource.cs | 4 +-
src/Extensions/Banshee.FileSystemQueue/Makefile.in | 37 +-
.../Banshee.Fixup/Banshee.Fixup/Problem.cs | 6 +-
src/Extensions/Banshee.Fixup/Makefile.in | 37 +-
.../Banshee.InternetArchive/DetailsView.cs | 24 +-
.../Banshee.InternetArchive/HeaderFilters.cs | 7 +-
.../Banshee.InternetArchive/HomeView.cs | 4 +-
.../Banshee.InternetArchive/Item.cs | 2 +-
src/Extensions/Banshee.InternetArchive/Makefile.in | 37 +-
.../Banshee.InternetRadio/InternetRadioSource.cs | 4 -
.../InternetRadioSourceContents.cs | 13 +-
.../Banshee.InternetRadio/StationEditor.cs | 9 +-
src/Extensions/Banshee.InternetRadio/Makefile.in | 37 +-
.../AudioscrobblerService.cs | 126 +-
.../Banshee.Lastfm.Audioscrobbler/Queue.cs | 26 +-
.../RecommendationPane.cs | 11 +-
.../Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs | 14 +-
.../Banshee.Lastfm/LastfmSourceContents.cs | 39 +-
src/Extensions/Banshee.Lastfm/Makefile.in | 37 +-
.../LastfmStreamingActions.cs | 18 +-
.../Banshee.LastfmStreaming/StationEditor.cs | 10 +-
.../Banshee.LastfmStreaming/StationSource.cs | 6 +-
src/Extensions/Banshee.LastfmStreaming/Makefile.in | 37 +-
.../LibraryWatcherService.cs | 29 +-
.../Banshee.LibraryWatcher/SourceWatcher.cs | 4 +-
src/Extensions/Banshee.LibraryWatcher/Makefile.in | 37 +-
src/Extensions/Banshee.MeeGo/Makefile.in | 37 +-
.../Banshee.MiniMode/MiniModeWindow.cs | 29 +-
src/Extensions/Banshee.MiniMode/Makefile.in | 37 +-
src/Extensions/Banshee.MiroGuide/Makefile.in | 37 +-
src/Extensions/Banshee.Mpris/Makefile.in | 37 +-
src/Extensions/Banshee.MultimediaKeys/Makefile.in | 37 +-
.../GtkNotificationAreaBox.cs | 226 +-
.../NotificationAreaService.cs | 128 +-
.../Banshee.NotificationArea/TrackInfoPopup.cs | 21 +-
.../X11NotificationArea.cs | 647 ++++
...icationAreaBox.cs => X11NotificationAreaBox.cs} | 349 ++-
.../Banshee.NotificationArea/Makefile.am | 6 +
.../Banshee.NotificationArea/Makefile.in | 46 +-
.../Notifications/Notification.cs | 2 +-
.../Banshee.NowPlaying/FullscreenWindow.cs | 42 +-
.../Banshee.NowPlaying/NowPlayingContents.cs | 26 +-
.../Banshee.NowPlaying/NowPlayingInterface.cs | 14 +-
.../Banshee.NowPlaying/OverlayWindow.cs | 53 +-
.../Banshee.NowPlaying/VideoDisplay.cs | 14 +-
.../Banshee.NowPlaying/XOverlayVideoDisplay.cs | 18 +-
src/Extensions/Banshee.NowPlaying/Makefile.in | 37 +-
.../AudioCdDiscModel.cs | 4 +-
src/Extensions/Banshee.OpticalDisc/Makefile.in | 37 +-
.../Banshee.PlayQueue/PlayQueueActions.cs | 10 +-
.../Banshee.PlayQueue/PlayQueueSource.cs | 6 +-
src/Extensions/Banshee.PlayQueue/Makefile.in | 37 +-
.../ItunesPlayerImportDialogs.cs | 14 +-
.../ItunesPlayerImportSource.cs | 4 +-
.../RhythmboxPlayerImportSource.cs | 2 +-
src/Extensions/Banshee.PlayerMigration/Makefile.in | 37 +-
.../PodcastTrackListModel.cs | 2 +-
.../Banshee.Podcasting.Gui/ColumnCellPodcast.cs | 11 +-
.../ColumnCellPodcastStatusIndicator.cs | 2 +-
.../Banshee.Podcasting.Gui/PodcastActions.cs | 12 +-
.../Dialog/PodcastFeedPropertiesDialog.cs | 10 +-
.../Dialog/PodcastPropertiesDialog.cs | 5 +-
.../Dialog/PodcastSubscribeDialog.cs | 6 +-
.../PodcastSourceContents.cs | 14 +-
.../Banshee.Podcasting/PodcastService.cs | 2 +-
src/Extensions/Banshee.Podcasting/Makefile.in | 37 +-
src/Extensions/Banshee.RemoteAudio/Makefile.in | 37 +-
src/Extensions/Banshee.Sample/Makefile.in | 19 +-
.../Banshee.SoundMenu/SoundMenuProxy.cs | 13 +
src/Extensions/Banshee.SoundMenu/Makefile.am | 6 +-
src/Extensions/Banshee.SoundMenu/Makefile.in | 46 +-
src/Extensions/Banshee.SqlDebugConsole/Makefile.in | 19 +-
src/Extensions/Banshee.Torrent/Makefile.in | 37 +-
src/Extensions/Banshee.UPnPClient/Makefile.in | 37 +-
.../UbuntuOneMusicStoreSource.cs | 1 +
.../Banshee.UbuntuOneMusicStore/Makefile.in | 37 +-
src/Extensions/Banshee.Wikipedia/Makefile.in | 37 +-
.../Banshee.YouTube.Gui/VideoStreamTile.cs | 8 +-
.../Banshee.YouTube/Banshee.YouTube/YouTubePane.cs | 6 +-
src/Extensions/Banshee.YouTube/Makefile.am | 2 +-
src/Extensions/Banshee.YouTube/Makefile.in | 509 ++--
src/Extensions/Makefile.in | 19 +-
.../Hyena.Data.Sqlite/HyenaSqliteConnection.cs | 12 +-
.../Hyena.Data.Sqlite/SqliteModelProvider.cs | 11 +-
.../Hyena.Data.Sqlite/Tests/DbBoundType.cs | 2 +-
src/Hyena/Hyena.Data.Sqlite/Makefile.in | 37 +-
.../Accessibility/ColumnCellAccessible.cs | 2 +-
.../ColumnHeaderCellTextAccessible.cs | 2 +-
.../Accessibility/ListViewAccessible_Selection.cs | 2 +-
.../Accessibility/ListViewAccessible_Table.cs | 13 +-
src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs | 4 +-
src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCell.cs | 2 +-
.../Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs | 17 +-
.../Hyena.Gui/Hyena.Data.Gui/ColumnCellRating.cs | 2 +-
.../Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs | 5 +-
.../Hyena.Data.Gui/ColumnHeaderCellText.cs | 2 +-
.../Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs | 1 -
.../Hyena.Data.Gui/ListView/ListView_Accessible.cs | 28 +-
.../Hyena.Data.Gui/ListView/ListView_Header.cs | 16 +-
.../ListView/ListView_Interaction.cs | 115 +-
.../Hyena.Data.Gui/ListView/ListView_Rendering.cs | 306 +-
.../Hyena.Data.Gui/ListView/ListView_Windowing.cs | 54 +-
.../Hyena.Gui/Hyena.Data.Gui/ListViewTestModule.cs | 26 +-
src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Brush.cs | 6 +-
src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs | 43 +-
src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Prelight.cs | 14 +-
.../Hyena.Gui.Canvas/ShadowMarginStyle.cs | 2 +-
src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Slider.cs | 31 +-
src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TestTile.cs | 2 +-
src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs | 24 +-
.../Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs | 5 +-
.../Hyena.Gui.Dialogs/VersionInformationDialog.cs | 6 +-
src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkColors.cs | 148 +
src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs | 158 +-
src/Hyena/Hyena.Gui/Hyena.Gui.Theming/Theme.cs | 74 +-
.../Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs | 29 +-
.../Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs | 15 +-
.../Hyena.Gui/Hyena.Gui/CairoDamageDebugger.cs | 2 +-
src/Hyena/Hyena.Gui/Hyena.Gui/CairoExtensions.cs | 18 +-
src/Hyena/Hyena.Gui/Hyena.Gui/CompositeUtils.cs | 80 +-
.../Hyena.Gui/Hyena.Gui/EditableEraseAction.cs | 4 +-
.../Hyena.Gui/Hyena.Gui/EditableInsertAction.cs | 4 +-
.../Hyena.Gui/Hyena.Gui/EditableUndoAdapter.cs | 4 +-
src/Hyena/Hyena.Gui/Hyena.Gui/GtkUtilities.cs | 83 +-
src/Hyena/Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs | 92 +
src/Hyena/Hyena.Gui/Hyena.Gui/HyenaActionGroup.cs | 4 +-
src/Hyena/Hyena.Gui/Hyena.Gui/RatingRenderer.cs | 6 +-
src/Hyena/Hyena.Gui/Hyena.Gui/ShadingTestWindow.cs | 14 +-
src/Hyena/Hyena.Gui/Hyena.Gui/TooltipSetter.cs | 87 +
.../Hyena.Query.Gui/FileSizeQueryValueEntry.cs | 4 +-
src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs | 6 +-
.../Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs | 10 +-
.../Hyena.Gui/Hyena.Query.Gui/QueryTermBox.cs | 18 +-
.../Hyena.Query.Gui/TimeSpanQueryValueEntry.cs | 4 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs | 25 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs | 81 -
.../Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs | 64 +-
.../Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs | 34 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/EntryPopup.cs | 15 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/GrabHandle.cs | 14 +-
.../Hyena.Gui/Hyena.Widgets/HigMessageDialog.cs | 5 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/MenuButton.cs | 18 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/MessageBar.cs | 37 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/PulsingButton.cs | 40 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/RatingEntry.cs | 91 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs | 70 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs | 206 +-
.../Hyena.Gui/Hyena.Widgets/TextViewEditable.cs | 12 +-
src/Hyena/Hyena.Gui/Hyena.Widgets/WrapLabel.cs | 18 +-
src/Hyena/Hyena.Gui/Makefile.am | 5 +-
src/Hyena/Hyena.Gui/Makefile.in | 44 +-
src/Hyena/Hyena/Hyena.Data/IListModel.cs | 3 +-
src/Hyena/Hyena/Hyena/Paths.cs | 34 +-
src/Hyena/Hyena/Makefile.in | 37 +-
src/Hyena/Makefile.am | 8 -
src/Hyena/Makefile.in | 27 +-
src/Hyena/build/Makefile.in | 19 +-
src/Hyena/build/m4/Makefile.in | 19 +-
src/Hyena/build/pkg-config/Makefile.in | 19 +-
.../Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs | 9 +-
src/Libraries/Lastfm.Gui/Makefile.in | 37 +-
.../Lastfm/Lastfm/AudioscrobblerConnection.cs | 138 +-
src/Libraries/Lastfm/Lastfm/IQueue.cs | 4 +-
src/Libraries/Lastfm/Lastfm/LastfmRequest.cs | 134 +-
.../Lastfm/Lastfm/Tests/LastfmRequestTests.cs | 147 -
src/Libraries/Lastfm/Makefile.am | 3 +-
src/Libraries/Lastfm/Makefile.in | 40 +-
src/Libraries/Makefile.in | 19 +-
src/Libraries/Migo/Makefile.in | 37 +-
src/Libraries/Migo/Migo.Syndication/Feed.cs | 10 +-
src/Libraries/Mono.Media/Makefile.in | 37 +-
src/Libraries/Mtp/Makefile.am | 8 +
src/Libraries/Mtp/Makefile.in | 47 +-
src/Libraries/Mtp/Mtp/FileType.cs | 2 +
src/Libraries/Mtp/Mtp/Track.cs | 2 +
src/Libraries/MusicBrainz/Makefile.in | 37 +-
src/Makefile.in | 19 +-
tests/Analyzer/Makefile.in | 31 +-
tests/Makefile.am | 1 -
tests/Makefile.in | 33 +-
tests/Performance/Makefile.in | 31 +-
899 files changed, 35595 insertions(+), 42997 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 8e0a6cd..5166f5d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,13 +1,13 @@
Maintainers:
Aaron Bockover
- Andrés G. Aragoneses
Alexander Kojevnikov
+ Andrés G. Aragoneses
Bertrand Lorentz
Gabriel Burt
Contributors:
+ Aaron Borden
Alan McGovern
- Alex Willmy
Abner Silva
Adam Lofts
Age Bosma
@@ -26,7 +26,6 @@ Contributors:
Andrea Cimitan
Andreas Neustifter
Andrew Conkling
- Andrés G. Aragoneses
Andy Midgette
Andy Street
Aran Cox
@@ -90,10 +89,10 @@ Contributors:
Götz Waschk
Haitao Feng
Hajime Mizuno
- Hans Oesterholt
Hans Petter Jansson
Harold Schreckengost
Iain Lane
+ IBBoard
Igor Guerrero Fonseca
Ilya Konstantinov
Ivan N. Zlatev
@@ -136,7 +135,6 @@ Contributors:
Martin Pitt
Matt Enright
Matt Sturgeon
- Michael Farrell
Michael Kaiser
Michael Martin-Smucker
Michael Monreal
@@ -169,7 +167,6 @@ Contributors:
Phil Trimble
Pratik Patel
Przemysław Grzegorczyk
- Rashid Khan
Raimo Radczewski
Robin Stocker
Roderich Schupp
@@ -181,6 +178,7 @@ Contributors:
Scott Peterson
Sebastian Dröge
Shaun McCance
+ Sindhu S
Sjoerd Simons
Tim Fisken
Tim Yamin
@@ -189,7 +187,6 @@ Contributors:
Tobias Arrskog
Tobias Mueller
Todd Berman
- Tomasz Maczynski
Travis Glenn Hansen
Travis Patterson
Travis Reitter
diff --git a/COPYING b/COPYING
index 26a505e..d89d829 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
Copyright (C) 2005-2011 Novell, Inc.
-Copyright (C) 2005–2013 Other Contributors
+Copyright (C) 2005–2012 Other Contributors
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/ChangeLog b/ChangeLog
index c39c05b..eabb480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2013-10-08 The Banshee Project <http://banshee.fm>
+2013-04-16 The Banshee Project <http://banshee.fm>
- Banshee 2.9.0
+ Banshee 2.6.1
You probably are looking for the useful change summary detailed
in the NEWS file, perfect for downstream maintainers.
diff --git a/HACKING b/HACKING
index 9313b35..4fc63ca 100644
--- a/HACKING
+++ b/HACKING
@@ -80,16 +80,11 @@ guidelines. If code is in violation, you will be asked to reformat it.
Dictionary<K, V> not Dictionary<K,V>
- 9. Use 4 space characters for indentation, NOT tabs (except in Makefiles)
+ 9. Use 4 space characters for indention, NOT tabs
10. Try to observe a 120 character wrap margin. If your lines are over 120
characters, break and indent them logically.
- 11. One space at both sides of all type of operators (assignment,
- equality, mathematical, event-subscription, ...):
-
- var compare = (a + b * c) != (d - e * f);
-
.NET API Naming Guidelines
==========================
diff --git a/Makefile.am b/Makefile.am
index 7fc9ba1..1f47e59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,15 +57,11 @@ check-bootstrap-env:
done; \
fi
-PROFILE_DEFAULT=--profile=log:time=fast,calls,noalloc,maxframes=5
-PROFILE_HEAP=--profile=logging:heap=all,gc-dumps=-1
-PROFILE_GUI=--profile=gui-thread-check
-
run: check-bootstrap-env $(MO_FILES)
- (cd bin; $(MONO) --debug $(PROFILE_GUI) $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
+ (cd bin; $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
run-profiled: check-bootstrap-env $(MO_FILES)
- (cd bin; LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/local/lib $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) $(PROFILE_DEFAULT) Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS))
+ (cd bin; LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/local/lib $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) --profile=log:time=fast,calls,noalloc,maxframes=5 Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS))
run-logged: check-bootstrap-env $(MO_FILES)
(cd bin; $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS) | tee last-run-log)
@@ -82,7 +78,7 @@ run-trace: $(MO_FILES)
Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS) > ../banshee.trace)
run-profile-heap: $(MO_FILES)
- (cd bin; $(MONO) $(PROFILE_HEAP) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
+ (cd bin; $(MONO) --profile=logging:heap=all,gc-dumps=-1 --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
query-trace:
@echo "Did you set BANSHEE_DEV_MONO_OPTIONS to --trace=disabled?"; \
@@ -112,7 +108,7 @@ csharp:
csharp -lib:bin/ -pkg:glib-sharp-2.0 -pkg:gtk-sharp-2.0 -pkg:gconf-sharp-2.0 -pkg:dbus-sharp -pkg:taglib-sharp -pkg:ipod-sharp -pkg:mono-addins $(addprefix "-reference:", $(wildcard bin/*.dll)); \
popd;
-test: all
+test:
@pushd tests; \
make test \
popd;
@@ -120,7 +116,7 @@ test: all
hg:
pushd bin; \
echo "class Entry { static void Main () { Hyena.Gui.TestModuleRunner.Run (); } }" > tester.cs; \
- $(MCS) -r:Hyena.Gui.dll tester.cs; \
+ gmcs -r:Hyena.Gui.dll tester.cs; \
mono --debug tester.exe; \
rm tester.*; \
popd;
diff --git a/Makefile.in b/Makefile.in
index 963ce97..01bb88e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -232,15 +232,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -249,6 +258,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -263,6 +274,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -270,6 +283,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -467,9 +482,6 @@ SUBDIRS = \
LC_BUILD = $(top_builddir)/bin/share/locale
PO_FILES = $(addprefix po/, $(addsuffix .gmo, $(ALL_LINGUAS)))
MO_FILES = $(patsubst po/%.gmo, $(LC_BUILD)/%/LC_MESSAGES/$(PACKAGE).mo, $(PO_FILES))
-PROFILE_DEFAULT = --profile=log:time=fast,calls,noalloc,maxframes=5
-PROFILE_HEAP = --profile=logging:heap=all,gc-dumps=-1
-PROFILE_GUI = --profile=gui-thread-check
EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
@@ -1071,10 +1083,10 @@ check-bootstrap-env:
fi
run: check-bootstrap-env $(MO_FILES)
- (cd bin; $(MONO) --debug $(PROFILE_GUI) $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
+ (cd bin; $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
run-profiled: check-bootstrap-env $(MO_FILES)
- (cd bin; LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/local/lib $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) $(PROFILE_DEFAULT) Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS))
+ (cd bin; LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/local/lib $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) --profile=log:time=fast,calls,noalloc,maxframes=5 Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS))
run-logged: check-bootstrap-env $(MO_FILES)
(cd bin; $(MONO) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS) | tee last-run-log)
@@ -1091,7 +1103,7 @@ run-trace: $(MO_FILES)
Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS) > ../banshee.trace)
run-profile-heap: $(MO_FILES)
- (cd bin; $(MONO) $(PROFILE_HEAP) --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
+ (cd bin; $(MONO) --profile=logging:heap=all,gc-dumps=-1 --debug $(BANSHEE_DEV_MONO_OPTIONS) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS))
query-trace:
@echo "Did you set BANSHEE_DEV_MONO_OPTIONS to --trace=disabled?"; \
@@ -1121,7 +1133,7 @@ csharp:
csharp -lib:bin/ -pkg:glib-sharp-2.0 -pkg:gtk-sharp-2.0 -pkg:gconf-sharp-2.0 -pkg:dbus-sharp -pkg:taglib-sharp -pkg:ipod-sharp -pkg:mono-addins $(addprefix "-reference:", $(wildcard bin/*.dll)); \
popd;
-test: all
+test:
@pushd tests; \
make test \
popd;
@@ -1129,7 +1141,7 @@ test: all
hg:
pushd bin; \
echo "class Entry { static void Main () { Hyena.Gui.TestModuleRunner.Run (); } }" > tester.cs; \
- $(MCS) -r:Hyena.Gui.dll tester.cs; \
+ gmcs -r:Hyena.Gui.dll tester.cs; \
mono --debug tester.exe; \
rm tester.*; \
popd;
diff --git a/NEWS b/NEWS
index f79d4ab..c80b955 100644
--- a/NEWS
+++ b/NEWS
@@ -1,92 +1,30 @@
===============================================================================
-Banshee 2.9.0 - 2013-10-08
+Banshee 2.6.1 - 2013-04-16
===============================================================================
- Banshee 2.9.0 is the culmination of twelve months' work by 19 developers,
- 27 translators and dozens of bug reporters and testers. It is a development
- release, the first of the 2.9.x releases leading up to our future stable
- release Banshee 3.0.
-
- New Features:
-
- * GTK3
-
- This is the first release using the 3.x version of GTK+, thanks
- to work that has been done in Gtk# to bind this version.
-
- * Device synchronization for Symbian
-
- Banshee can now sync media to Symbian devices like Nokia N95. Please
- help testing this new feature so we can mention more Symbian devices
- in our release notes for Banshee 3!
+ Banshee 2.6.1 is a stable, bug-fix release building on Banshee 2.6.0.
+ Minor enhancements:
+ * bgo#697683: Dap.MassStorage: add product id for (WebOS) Palm Pre 2
+ * DatabaseImportManager: Add .amr to import whitelist
- Enhancements:
+ Notable Bugs Fixed (15 fixed since 2.6.0):
- * Add basic AppData file for inclusion in open source app stores
- * Add keywords to .desktop entry for easy find in Unity & GNOME Shell (bgo#700524)
- * Main UI: make Search textbox remember its size (bgo#653819)
- * Lastfm: avoid unnecessary wait when submitting successful scrobbles
- * DatabaseImportManager: Add .amr to import whitelist
- * PlayerEngine: Add support for accurate seek
- * GSettings: implement new, still unused, SchemaExtractor for GSettings
- * build: use the gui-thread-check profiler module by default when debugging
- * configure: better guess for the C# compiler available
- * AppleDeviceSource: use progressUpdaters for all sync operations
-
-
- Notable Bugs Fixed (37 fixed since 2.6.0):
-
- * bgo#709376: SourceManager: avoid warnings when shutting down
- * ArtworkManager: prevent wrong inclusion of null artwork_id in cache
- * bgo#686908: libbanshee: Only call volume set callback on Mac
- * bgo#706173: Feed: Avoid loop when podcast has date values in the future
- * bgo#700753: PrimarySource: fix crash if 1st track had a Dap transcoding error
- * bgo#687495: MtpSource: prevent a freeze when dealing with Windows Phone
- * bgo#696520: Handle all values from a rowid database column as long
- * bgo#699735: Gio: prevent a freeze when mounting a LVM volume
- * bgo#692153: InternetRadio: refresh UI after editing station
- * bgo#679769: StatisticsPage: Fix crash when no tracks are selected
+ * bgo#689123: DatabaseTrackInfo: don't default to MusicFilePattern when null
* bgo#696700: DapPropertiesDialog: Make sure progress bar value is valid
* bgo#696877: PlaylistFileUtil: Only import playlist items that are files
* bgo#692374: Avoid race when using GConf and DBus with threads
- * bgo#696111: ListView: when initializing a11y, disable instead of hanging
- * bgo#691532: LastFM: display progress for multiple-track scrobbles
- * bgo#691696: build: Improve MSBuild experience without autotools
- * bgo#689123: DatabaseTrackInfo: don't default to MusicFilePattern when null
- * bgo#689018: Audioscrobbler: avoid 414 Request-URI Too Large
- * bgo#691971: PrimarySource: Allow cancelling track delete job
- * bgo#665268: InternetRadio: Previous should never mean a restart
- * bgo#686657: InternetRadio: UI to correctly update status indicator columns
+ * bgo#696111: ListView: Do not enable a11y when it would cause freezes
* bgo#658142: Dap: better check for the playing track before ejecting
* bgo#684089: PrimarySource: prevent AddTrackJob respawn if cancelled
* bgo#689016: LastFm: Avoid crashing if scrobbling response is not JSON
- * bgo#653282: Dap.MassStorage: not import dirs twice for case-insensitive drives
* bgo#691694: configure: stop using obsolete AutoMake macro
- * bnc#798267: build: test dmcs before gmcs when trying to find the compiler
- * bgo#577225: RescanPipeline: warn about removal of many tracks
+ * bgo#661902: Docs: Removed "Common Problems"
* bgo#688540: Mtp: Fix file type in sync with libmtp > 1.1.0
- * bgo#690300: Dap: Settings of DAP sources are not remembered between sessions
* bgo#639947: Dap: Use Unicode codes for quotation marks
- * bgo#686584: build: Make gio-hardware be enabled by default
- * bgo#686584: build: make GIO backend be enabled by default
- * bgo#686582: YouTube: advice about --disable-youtube configuration flag
- * bgo#686671: configure: earlier check for glib
* bgo#685920: LastFm: Null check for scrobble parameters
* bgo#685131: Add GTK category in .desktop files to comply with spec
-
-
- Known issues (unfortunately the major architectural change to GTK3 caused
- some problems that we're still looking into):
-
- * bgo#709617: No alternating colors in the ListView
- * bgo#709619: ListView header decoration do not match regular TreeView
- * bgo#666452: Drag and drop crash banshee on gtk3 branch
- * Ubuntu: No text on the main (left) source switching pad when selecting
- a source (fixed already in Ubuntu 13.10). To fix this manually in Ubuntu
- version 13.04 (or older?), do:
- `cd /usr/share/themes && wget -O - -o /dev/null http://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/trunk/diff/311 | sudo patch -p0`
-
+ * bgo#679769: StatisticsPage: Fix crash when no tracks are selected
===============================================================================
SOURCES / PACKAGES
@@ -95,9 +33,9 @@ SOURCES / PACKAGES
Sources
-------
- * Banshee 2.9.0 Tarballs:
- http://ftp.gnome.org/pub/GNOME/sources/banshee/2.9/banshee-2.9.0.tar.xz
- http://ftp.gnome.org/pub/GNOME/sources/banshee/2.9/banshee-2.9.0.sha256sum
+ * Banshee 2.6.1 Tarballs:
+ http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-2.6.1.tar.xz
+ http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-2.6.1.sha256sum
Packages
--------
@@ -120,7 +58,7 @@ REPORT BUGS - HELP THE PROJECT - GROW THE COMMUNITY
hesitate to file bugs!
* http://banshee.fm/contribute/file-bugs
- * http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&version=2.9.0
+ * http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&version=2.6.1
===============================================================================
@@ -133,19 +71,11 @@ Contributors For This Release
The following people directly contributed to the release of this version
of Banshee. Without their help, there would be no release!
- Andres G. Aragoneses, Alex Willmy, Aruna Sankaranarayanan, Bertrand
- Lorentz, Chow Loong Jin, Ekaterina Gerasimova, Hans Petter Jansson,
- Hans Oesterholt, James Boocock, Michael Farrell, Nicholas Little,
- Olivier Dufour, Phil Trimble, Rashid Khan, Samuel Gyger, Sindhu S,
- Timo Dörr, Tomasz Maczynski
+ Aaron Borden, Andres G. Aragoneses, Bertrand Lorentz, Hans Peter Jansson,
+ IBBoard, James Boocock, Nicholas Little, Phil Trimble, Sindhu S
The following people contributed updated translations to this release.
Without them, our project's reach would be much more limited.
- Aleksej Kabanov, Alexandre Franke, Andika Triwidada, António Lima,
- Aurimas Černius, Balázs Úr, Cheng-Chia Tseng, Daniel Mustieles, Dimitris
- Spingos, dyzdyz010 at sina.com, Enrico Nicoletto, Fran Diéguez, Hajime
- Taira, Jiro Matsuzawa, Joe Hansen, Jordi Mas, Kjartan Maraas, Marek
- Černocký, Martin Srebotnjak, Matej Urbančič, Muhammet Kara, Мирослав
- Николић, Piotr Drąg, Milagros Alessandra Infante Montero, Rafael
- Ferreira, Rūdolfs Mazurs, Wolfgang Stöggl, Yuri Myasoedov
+ Alexandre Franke, Andika Triwidada, Rafael Ferreira, Wolfgang Stöggl
+
diff --git a/README b/README
index 2a85838..bd70bf4 100644
--- a/README
+++ b/README
@@ -22,10 +22,10 @@ on various operating systems/distros. The listed versions are the minimum
acceptable; higher versions are fine.
- Required
- * Mono 2.8.2
+ * Mono 2.4.3
* SQlite 3.4
* GStreamer 0.10.26
- * Gtk# 2.99.1
+ * Gtk# 2.12.10
* GLib 2.22
* dbus-sharp 0.7
* dbus-sharp-glib 0.5
@@ -33,13 +33,14 @@ acceptable; higher versions are fine.
* TagLib# 2.0.3.7
- Required unless you pass some --disable flags to configure
- * libmtp 1.1.0
+ * libmtp 0.3.0
* mono-zeroconf 0.8.0
* boo 0.8.1
- * gio-sharp 2.99.1
+ * gio-sharp 2.22.3
+ * gtk-sharp-beans
* gdata-sharp-youtube 1.4
* webkit-1.0 1.2.2
- * gudev-sharp 3.0
+ * gudev-sharp 0.1
* gkeyfile-sharp 0.1
* libgpod-sharp 0.7.95
* mono-upnp 0.1
diff --git a/aclocal.m4 b/aclocal.m4
index 4dc03e9..9b66006 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2250,14 +2250,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
+ LD="${LD-ld} -m elf_i386"
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -2621,8 +2614,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -3446,6 +3438,17 @@ freebsd* | dragonfly*)
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -3562,7 +3565,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -4178,6 +4181,10 @@ freebsd* | dragonfly*)
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4216,7 +4223,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4968,7 +4975,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -5267,7 +5274,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -7156,6 +7163,9 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
+ gnu*)
+ ;;
+
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -7317,7 +7327,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff --git a/build/GConfSchemaExtractor.cs b/build/GConfSchemaExtractor.cs
index 11469cb..7eafee1 100644
--- a/build/GConfSchemaExtractor.cs
+++ b/build/GConfSchemaExtractor.cs
@@ -5,38 +5,16 @@ using System.Text.RegularExpressions;
using System.Collections.Generic;
using System.Reflection;
-public class GConfSchemaExtractorProgram
+public class GConfSchemaExtractor
{
- private static Dictionary<string, StringBuilder> entries;
- private static int schema_count;
+ private static Dictionary<string, StringBuilder> entries =
+ new Dictionary<string, StringBuilder>();
+ private static int schema_count = 0;
public static void Main(string [] args)
{
- if (args.Length != 2) {
- Console.Error.WriteLine ("Usage: gconf-schema-extractor.exe Foo.dll bar.schema");
- Environment.Exit (1);
- }
-
- Extract (args [0], args [1]);
- }
-
- private static void Extract (string assemblyName, string outputFile)
- {
- Assembly asm = Assembly.LoadFrom (assemblyName);
- StringBuilder sbuilder = Extract (asm.GetTypes ());
- if (sbuilder != null) {
- using (StreamWriter writer = new StreamWriter (outputFile)) {
- writer.Write (sbuilder.ToString ());
- }
- }
- }
-
- internal static StringBuilder Extract (IEnumerable<Type> types)
- {
- schema_count = 0;
- entries = new Dictionary<string, StringBuilder> ();
-
- foreach (Type type in types) {
+ Assembly asm = Assembly.LoadFrom(args[0]);
+ foreach(Type type in asm.GetTypes()) {
foreach(FieldInfo field in type.GetFields()) {
if(field.FieldType.IsGenericType &&
field.FieldType.GetGenericTypeDefinition().Name.StartsWith("SchemaEntry")) {
@@ -73,9 +51,10 @@ public class GConfSchemaExtractorProgram
final.Append(" </schemalist>\n");
final.Append("</gconfschemafile>\n");
- return final;
+ using(StreamWriter writer = new StreamWriter(args[1])) {
+ writer.Write(final.ToString());
+ }
}
- return null;
}
private static string GetString(object o, string name)
diff --git a/build/Makefile.in b/build/Makefile.in
index 18bf321..5822fdc 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -241,15 +241,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -258,6 +267,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -272,6 +283,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -279,6 +292,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/build/TranslatorExtractor.cs b/build/TranslatorExtractor.cs
index 4c801c9..3e73dc5 100644
--- a/build/TranslatorExtractor.cs
+++ b/build/TranslatorExtractor.cs
@@ -8,7 +8,6 @@
//
using System;
-using System.Globalization;
using System.IO;
using System.Collections.Generic;
using System.Text.RegularExpressions;
@@ -110,12 +109,10 @@ public class TranslatorExtractor
case "ast": language_name = "Asturian"; break;
case "ca": language_name = "Catalan"; break;
case "ca at valencia": language_name = "Catalan (Valencian)"; break;
- case "cs": language_name = "Czech"; break;
case "de": language_name = "German"; break;
case "fr": language_name = "French"; break;
case "el": language_name = "Greek"; break;
case "en_GB": language_name = "British English"; break;
- case "gl": language_name = "Galician"; break;
case "gu": language_name = "Gujarati"; break;
case "he": language_name = "Hebrew"; break;
case "id": language_name = "Indonesian"; break;
@@ -127,7 +124,7 @@ public class TranslatorExtractor
case "zh_TW": language_name = "Chinese (Taiwan)"; break;
default: break;
}
-
+
Console.WriteLine(" <language code=\"{0}\" name=\"{1}\">", language_code, language_name);
List<string> sorted_names = new List<string> (names.Values);
sorted_names.Sort ();
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 48cae63..508e261 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -9,14 +9,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -135,7 +136,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -143,14 +144,13 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -168,7 +168,7 @@ REF_EXTENSION_UPNP= $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DEP
REF_EXTENSION_WIKIPEDIA= $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 4f942c2..344b90f 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -14,7 +14,6 @@ endif
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
@@ -34,12 +33,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/build/m4/Makefile.in b/build/m4/Makefile.in
index 4fc2fdc..7c4be59 100644
--- a/build/m4/Makefile.in
+++ b/build/m4/Makefile.in
@@ -171,15 +171,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -188,6 +197,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -202,6 +213,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -209,6 +222,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/build/m4/banshee/bnpx11.m4 b/build/m4/banshee/bnpx11.m4
index 8d7a52c..5e74bdf 100644
--- a/build/m4/banshee/bnpx11.m4
+++ b/build/m4/banshee/bnpx11.m4
@@ -4,37 +4,34 @@ AC_DEFUN([BANSHEE_CHECK_NOW_PLAYING_X11],
[
have_x11=no
have_xvidmode=no
- GTK_TARGETS=$(pkg-config --variable=targets gtk+-3.0)
- for GTK_TARGET in $GTK_TARGETS; do
- if test x$GTK_TARGET = xx11; then
- PKG_CHECK_MODULES(BNPX_GTK, gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0)
+ if test x$(pkg-config --variable=target gtk+-2.0) = xx11; then
+ PKG_CHECK_MODULES(BNPX_GTK, gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8)
- AC_PATH_X
+ AC_PATH_X
- have_x11=yes
+ have_x11=yes
- if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
- X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"`
- fi
- if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
- X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
- fi
- BNPX_CFLAGS="$X_INCLUDES $CFLAGS"
- BNPX_LIBS="$X_LIBRARIES $LIBS"
+ if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
+ X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"`
+ fi
+ if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
+ X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+ fi
+ BNPX_CFLAGS="$X_INCLUDES $CFLAGS"
+ BNPX_LIBS="$X_LIBRARIES $LIBS"
- PKG_CHECK_MODULES(XVIDMODE, xrandr >= 1.1.1 xxf86vm >= 1.0.1,
- have_xvidmode=yes, have_xvidmode=no)
+ PKG_CHECK_MODULES(XVIDMODE, xrandr >= 1.1.1 xxf86vm >= 1.0.1,
+ have_xvidmode=yes, have_xvidmode=no)
- if test x$have_xvidmode = xyes; then
- AC_DEFINE(HAVE_XVIDMODE,, [Define this if you have the XVidMode and XRandR extension installed])
- fi
-
- dnl Explicit link against libX11 to avoid problems with crappy linkers
- BNPX_LIBS="$X_LIBRARIES -lX11"
- AC_SUBST(BNPX_LIBS)
- AC_SUBST(BNPX_CFLAGS)
+ if test x$have_xvidmode = xyes; then
+ AC_DEFINE(HAVE_XVIDMODE,, [Define this if you have the XVidMode and XRandR extension installed])
fi
- done
+
+ dnl Explicit link against libX11 to avoid problems with crappy linkers
+ BNPX_LIBS="$X_LIBRARIES -lX11"
+ AC_SUBST(BNPX_LIBS)
+ AC_SUBST(BNPX_CFLAGS)
+ fi
AM_CONDITIONAL(HAVE_XVIDMODE, [test x$have_xvidmode = xyes])
])
diff --git a/build/m4/banshee/boo.m4 b/build/m4/banshee/boo.m4
index d6b89ac..94d4e04 100644
--- a/build/m4/banshee/boo.m4
+++ b/build/m4/banshee/boo.m4
@@ -1,19 +1,22 @@
AC_DEFUN([BANSHEE_CHECK_BOO],
[
- BOO_REQUIRED=0.8.1
-
- AC_ARG_ENABLE([boo],
- [AC_HELP_STRING([--enable-boo], [Enable boo language support])],
- [],
- [enable_boo=no]
+ AC_ARG_ENABLE([boo], AC_HELP_STRING([--disable-boo],
+ [Do not build with boo support]),
+ [
+ if test "x$enableval" = "xno"; then
+ enable_boo=no
+ elif test "x$enableval" = "xyes"; then
+ enable_boo=yes
+ fi
+ ], enable_boo=yes
)
- if test "x$enable_boo" = "xno"; then
- AM_CONDITIONAL(HAVE_BOO, false)
- else
- PKG_CHECK_MODULES(BOO, boo >= $BOO_REQUIRED)
+ if test "x$enable_boo" = "xyes"; then
+ PKG_CHECK_MODULES(BOO, boo >= 0.8.1)
AC_SUBST(BOO_LIBS)
AM_CONDITIONAL(HAVE_BOO, true)
+ else
+ AM_CONDITIONAL(HAVE_BOO, false)
fi
])
diff --git a/build/m4/banshee/dap-mtp.m4 b/build/m4/banshee/dap-mtp.m4
index b939f6f..264d32b 100644
--- a/build/m4/banshee/dap-mtp.m4
+++ b/build/m4/banshee/dap-mtp.m4
@@ -1,6 +1,6 @@
AC_DEFUN([BANSHEE_CHECK_DAP_MTP],
[
- LIBMTP_REQUIRED=1.1.0
+ LIBMTP_REQUIRED=0.3.0
AC_ARG_ENABLE(mtp, AC_HELP_STRING([--disable-mtp], [Disable MTP DAP support]), , enable_mtp="yes")
@@ -17,9 +17,23 @@ AC_DEFUN([BANSHEE_CHECK_DAP_MTP],
if test "x$enable_libmtp" = "xyes"; then
LIBMTP_SO_MAP=$(basename $(find $($PKG_CONFIG --variable=libdir libmtp) -maxdepth 1 -regex '.*libmtp\.so\.[[0-9]][[0-9]]*$' | sort | tail -n 1))
AC_SUBST(LIBMTP_SO_MAP)
+ AC_CHECK_MEMBER([struct LIBMTP_track_struct.modificationdate],
+ LIBMTP_HAS_MODDATE=yes,
+ LIBMTP_HAS_MODDATE=no,
+ [[#include <libmtp.h>]])
+
+ AC_MSG_CHECKING([whether LIBMTP_FILETYPE_FOLDER enum value is defined])
+ AC_COMPUTE_INT([LIBMTP_HAS_FOLDER], [LIBMTP_FILETYPE_FOLDER], [#include <libmtp.h>], LIBMTP_HAS_FOLDER=no)
+ if test "x$LIBMTP_HAS_FOLDER" = "xno"; then
+ AC_MSG_RESULT([no])
+ else
+ AC_MSG_RESULT([yes])
+ fi
fi
AM_CONDITIONAL(ENABLE_MTP, test "x$enable_libmtp" = "xyes")
+ AM_CONDITIONAL(LIBMTP_TRACK_STRUCT_HAS_MODDATE, [test "$LIBMTP_HAS_MODDATE" = "yes"])
+ AM_CONDITIONAL(LIBMTP_FILETYPE_ENUM_HAS_FOLDER, [test "$LIBMTP_HAS_FOLDER" = "0"])
AC_CHECK_SIZEOF(time_t)
AM_CONDITIONAL(LIBMTP_SIZEOF_TIME_T_64, [test "x$ac_cv_sizeof_time_t" = "x8"])
])
diff --git a/build/m4/banshee/gio.m4 b/build/m4/banshee/gio.m4
index dd2f023..269517a 100644
--- a/build/m4/banshee/gio.m4
+++ b/build/m4/banshee/gio.m4
@@ -1,38 +1,51 @@
AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
[
- GIOSHARP_REQUIRED=2.99
- GUDEVSHARP_REQUIRED=3.0
+ GNOMESHARP_REQUIRED=2.8
AC_ARG_ENABLE(gio, AC_HELP_STRING([--disable-gio], [Disable GIO for IO operations]), ,enable_gio="yes")
AC_ARG_ENABLE(gio_hardware, AC_HELP_STRING([--disable-gio-hardware], [Disable GIO Hardware backend]), ,enable_gio_hardware="yes")
if test "x$enable_gio" = "xyes"; then
+ PKG_CHECK_MODULES(GTKSHARP_BEANS,
+ gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED,
+ enable_gio=yes, enable_gio=no)
- has_gio_sharp=no
PKG_CHECK_MODULES(GIOSHARP,
- gio-sharp-3.0 >= $GIOSHARP_REQUIRED,
- has_gio_sharp=yes, has_gio_sharp=no)
- if test "x$has_gio_sharp" = "xno"; then
- AC_MSG_ERROR([gio-sharp-3.0 was not found or is not up to date. Please install gio-sharp-3.0 of at least version $GIOSHARP_REQUIRED, or disable GIO support by passing --disable-gio])
- fi
+ gio-sharp-2.0 >= 2.22.3,
+ enable_gio="$enable_gio", enable_gio=no)
- if test "x$enable_gio_hardware" = "xyes"; then
+ asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
+ for asm in $asms; do
+ FILENAME=`basename $asm`
+ if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
+ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
+ [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
+ [[ -r "$asm.mdb" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
+ SEENBEFORE="$SEENBEFORE $FILENAME"
+ fi
+ done
+ AC_SUBST(GIOSHARP_ASSEMBLIES)
- has_gudev_sharp=no
+ PKG_CHECK_MODULES(GLIB_2_22,
+ glib-2.0 >= 2.22,
+ enable_gio="$enable_gio", enable_gio=no)
+
+ if test "x$enable_gio_hardware" = "xyes"; then
PKG_CHECK_MODULES(GUDEV_SHARP,
- gudev-sharp-3.0 >= $GUDEVSHARP_REQUIRED,
- has_gudev_sharp=yes, has_gudev_sharp=no)
+ gudev-sharp-1.0 >= 0.1,
+ enable_gio_hardware="$enable_gio", enable_gio_hardware=no)
- if test "x$has_gudev_sharp" = "xno"; then
- AC_MSG_ERROR([gudev-sharp-3.0 was not found or is not up to date. Please install gudev-sharp-3.0 of at least version $GUDEVSHARP_REQUIRED, or disable GIO Hardware support by passing --disable-gio-hardware])
- fi
+ PKG_CHECK_MODULES(GKEYFILE_SHARP,
+ gkeyfile-sharp >= 0.1,
+ enable_gio_hardware="$enable_gio_hardware", enable_gio_hardware=no)
if test "x$enable_gio_hardware" = "xno"; then
GUDEV_SHARP_LIBS=''
+ GKEYFILE_SHARP_LIBS=''
fi
fi
- AM_CONDITIONAL(ENABLE_GIO, true)
+ AM_CONDITIONAL(ENABLE_GIO, test "x$enable_gio" = "xyes")
AM_CONDITIONAL(ENABLE_GIO_HARDWARE, test "x$enable_gio_hardware" = "xyes")
else
enable_gio_hardware="no"
diff --git a/build/m4/banshee/gtk-sharp.m4 b/build/m4/banshee/gtk-sharp.m4
index 6319ade..529a0e7 100644
--- a/build/m4/banshee/gtk-sharp.m4
+++ b/build/m4/banshee/gtk-sharp.m4
@@ -1,12 +1,12 @@
AC_DEFUN([BANSHEE_CHECK_GTK_SHARP],
[
- GTKSHARP3_REQUIRED=2.99.1
+ GTKSHARP2_REQUIRED=2.12.10
- PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-3.0 >= $GTKSHARP3_REQUIRED)
- PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED)
-
- gtk_sharp_version=$(pkg-config --modversion gtk-sharp-3.0)
+ PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED)
+ AC_SUBST(GTKSHARP_LIBS)
+ PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GTKSHARP2_REQUIRED)
AC_SUBST(GLIBSHARP_LIBS)
- AC_SUBST(GTKSHARP_LIBS)
+
+ gtk_version="2"
])
diff --git a/build/m4/banshee/libbanshee.m4 b/build/m4/banshee/libbanshee.m4
index 3172cbc..9c9da10 100644
--- a/build/m4/banshee/libbanshee.m4
+++ b/build/m4/banshee/libbanshee.m4
@@ -5,24 +5,25 @@ AC_DEFUN([BANSHEE_CHECK_LIBBANSHEE],
AC_HEADER_STDC
- # needed so autoconf doesn't complain before checking the existence of glib-2.0 in configure.ac
- m4_pattern_allow([AM_PATH_GLIB_2_0])
AM_PATH_GLIB_2_0
LIBBANSHEE_LIBS=""
LIBBANSHEE_CFLAGS=""
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
- SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GTK)
-
- GTK_TARGETS=$(pkg-config --variable=targets gtk+-3.0)
- for GTK_TARGET in $GTK_TARGETS; do
- if test x$GTK_TARGET = xx11; then
- GRAPHICS_SUBSYSTEM_X11="yes"
- elif test x$GTK_TARGET = xquartz; then
- GRAPHICS_SUBSYSTEM_QUARTZ="yes"
- fi
- done
+ GRAPHICS_SUBSYSTEM="Unknown"
+ GTK_TARGET=$(pkg-config --variable=target gtk+-2.0)
+
+ if test x$GTK_TARGET = xx11; then
+ PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= 2.8)
+ SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GDK_X11)
+ GRAPHICS_SUBSYSTEM="X11"
+ elif test x$GTK_TARGET = xquartz; then
+ PKG_CHECK_MODULES(GDK_QUARTZ, gdk-quartz-2.0 >= 2.14)
+ SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GDK_QUARTZ)
+ GRAPHICS_SUBSYSTEM="Quartz"
+ else
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8)
+ fi
AC_ARG_ENABLE(clutter, AS_HELP_STRING([--enable-clutter],
[Enable support for clutter video sink]), , enable_clutter="no")
@@ -36,8 +37,8 @@ AC_DEFUN([BANSHEE_CHECK_LIBBANSHEE],
[Define if the video sink should be Clutter])
fi
- AM_CONDITIONAL(HAVE_X11, test "x$GRAPHICS_SUBSYSTEM_X11" = "xyes")
- AM_CONDITIONAL(HAVE_QUARTZ, test "x$GRAPHICS_SUBSYSTEM_QUARTZ" = "xyes")
+ AM_CONDITIONAL(HAVE_X11, test "x$GRAPHICS_SUBSYSTEM" = "xX11")
+ AM_CONDITIONAL(HAVE_QUARTZ, test "x$GRAPHICS_SUBSYSTEM" = "xQuartz")
AM_CONDITIONAL(HAVE_CLUTTER, test "x$enable_clutter" = "xyes")
AC_SUBST(GRAPHICS_SUBSYSTEM)
diff --git a/build/m4/banshee/libwebkit.m4 b/build/m4/banshee/libwebkit.m4
index b5f0637..d1f81c8 100644
--- a/build/m4/banshee/libwebkit.m4
+++ b/build/m4/banshee/libwebkit.m4
@@ -9,7 +9,7 @@ AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
if test "x$enable_webkit" = "xyes"; then
have_libwebkit=no
PKG_CHECK_MODULES(LIBWEBKIT,
- webkitgtk-3.0 >= $WEBKIT_MIN_VERSION
+ webkit-1.0 >= $WEBKIT_MIN_VERSION
libsoup-2.4 >= $SOUP_MIN_VERSION,
have_libwebkit=yes, have_libwebkit=no)
AC_SUBST(LIBWEBKIT_LIBS)
diff --git a/build/m4/banshee/notify-sharp.m4 b/build/m4/banshee/notify-sharp.m4
index 3025b6b..bbe444a 100644
--- a/build/m4/banshee/notify-sharp.m4
+++ b/build/m4/banshee/notify-sharp.m4
@@ -1,16 +1,12 @@
AC_DEFUN([BANSHEE_CHECK_NOTIFY_SHARP],
[
- AC_ARG_WITH([system-notify-sharp],
- AC_HELP_STRING([--with-system-notify-sharp], [Use the notify-sharp library installed on the system]),
- use_system_notifysharp="yes", use_system_notifysharp="no")
-
- if test "x$use_system_notifysharp" = "xyes"; then
- PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp)
+ PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_notify_sharp=yes, have_notify_sharp=no)
+ if test "x$have_notify_sharp" = "xyes"; then
AC_SUBST(NOTIFY_SHARP_LIBS)
AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
else
AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, false)
- AC_MSG_NOTICE([Using internal copy of notify-sharp])
+ AC_MSG_RESULT([no])
fi
])
diff --git a/build/m4/banshee/soundmenu.m4 b/build/m4/banshee/soundmenu.m4
index 612f229..9522feb 100644
--- a/build/m4/banshee/soundmenu.m4
+++ b/build/m4/banshee/soundmenu.m4
@@ -1,10 +1,20 @@
AC_DEFUN([BANSHEE_CHECK_SOUNDMENU],
[
+ LIBINDICATESHARP_REQUIRED=0.4.1
+
AC_ARG_ENABLE([soundmenu],
AS_HELP_STRING([--enable-soundmenu], [Enable sound menu support]),
enable_soundmenu=$enableval, enable_soundmenu=no
)
+ if test "x$enable_soundmenu" = "xyes"; then
+ has_indicatesharp=no
+ PKG_CHECK_MODULES(INDICATESHARP,
+ indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED,
+ has_indicatesharp=yes, has_indicatesharp=no)
+ fi
+
+ AM_CONDITIONAL(HAVE_INDICATESHARP, test "x$has_indicatesharp" = "xyes")
AM_CONDITIONAL(ENABLE_SOUNDMENU, test "x$enable_soundmenu" = "xyes")
])
diff --git a/build/m4/banshee/ubuntuonemusicstore.m4 b/build/m4/banshee/ubuntuonemusicstore.m4
index 144c86d..50c8cb7 100644
--- a/build/m4/banshee/ubuntuonemusicstore.m4
+++ b/build/m4/banshee/ubuntuonemusicstore.m4
@@ -1,7 +1,5 @@
AC_DEFUN([BANSHEE_CHECK_UBUNTUONE],
[
- UBUNTUONESHARP_REQUIRED=0.9.2
-
AC_ARG_ENABLE([ubuntuone],
AS_HELP_STRING([--enable-ubuntuone], [Enable Ubuntu One Music Store support]),
enable_ubuntuone=$enableval, enable_ubuntuone=no
@@ -10,7 +8,7 @@ AC_DEFUN([BANSHEE_CHECK_UBUNTUONE],
if test "x$enable_ubuntuone" = "xyes"; then
has_ubuntuonesharp=no
PKG_CHECK_MODULES(UBUNTUONESHARP,
- [ubuntuone-sharp-1.0 >= $UBUNTUONESHARP_REQUIRED],
+ [ubuntuone-sharp-1.0 >= 0.9.2],
has_ubuntuonesharp=yes, has_ubuntuonesharp=no)
if test "x$has_ubuntuonesharp" = "xno"; then
AC_MSG_ERROR([ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone])
diff --git a/build/m4/banshee/youtube.m4 b/build/m4/banshee/youtube.m4
index b7f7bad..9161c5d 100644
--- a/build/m4/banshee/youtube.m4
+++ b/build/m4/banshee/youtube.m4
@@ -5,24 +5,16 @@ AC_DEFUN([BANSHEE_CHECK_YOUTUBE],
AC_ARG_ENABLE(youtube, AC_HELP_STRING([--disable-youtube], [Disable Youtube extension]), , enable_youtube="yes")
if test "x$enable_youtube" = "xyes"; then
-
- has_gdata=no
PKG_CHECK_MODULES(GDATASHARP,
- gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION,
- has_gdata=yes, has_gdata=no)
- if test "x$has_gdata" = "xno"; then
- AC_MSG_ERROR([gdata-sharp-youtube was not found or is not up to date. Please install gdata-sharp-youtube of at least version $GDATASHARP_REQUIRED_VERSION, or disable YouTube extension by passing --disable-youtube])
- fi
-
- PKG_CHECK_MODULES(GDATASHARP_1_5_OR_HIGHER,
gdata-sharp-youtube >= 1.5,
[AM_CONDITIONAL(HAVE_GDATASHARP_1_5, true)],
- [AM_CONDITIONAL(HAVE_GDATASHARP_1_5, false)]
+ [PKG_CHECK_MODULES(GDATASHARP, gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION)
+ AM_CONDITIONAL(HAVE_GDATASHARP_1_5, false)]
)
AC_SUBST(GDATASHARP_LIBS)
- AM_CONDITIONAL(ENABLE_YOUTUBE, true)
+ AM_CONDITIONAL(HAVE_GDATA, true)
else
AM_CONDITIONAL(HAVE_GDATASHARP_1_5, false)
- AM_CONDITIONAL(ENABLE_YOUTUBE, false)
+ AM_CONDITIONAL(HAVE_GDATA, false)
fi
])
diff --git a/build/m4/shamrock/i18n.m4 b/build/m4/shamrock/i18n.m4
index a10faa2..e632647 100644
--- a/build/m4/shamrock/i18n.m4
+++ b/build/m4/shamrock/i18n.m4
@@ -4,11 +4,7 @@ AC_DEFUN([SHAMROCK_CONFIGURE_I18N],
GETTEXT_PACKAGE=$1
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
-
- # needed so autoconf doesn't complain before checking the existence of glib-2.0 in configure.ac
- m4_pattern_allow([AM_GLIB_GNU_GETTEXT])
AM_GLIB_GNU_GETTEXT
-
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
])
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
index 1338a39..c40ecbf 100644
--- a/build/m4/shamrock/mono.m4
+++ b/build/m4/shamrock/mono.m4
@@ -8,20 +8,6 @@ AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER],
SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
])
-AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER_OR_HIGHER],
-[
- if pkg-config --atleast-version=2.8 mono; then
- SHAMROCK_FIND_PROGRAM(MCS, dmcs)
- fi
- if test "x$MCS" = "x" ; then
- SHAMROCK_FIND_PROGRAM(MCS, gmcs)
- fi
-
- if test "x$MCS" = "x" ; then
- AC_MSG_ERROR([You need to install 'gmcs'])
- fi
-])
-
AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
[
SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
diff --git a/build/pkg-config/Makefile.in b/build/pkg-config/Makefile.in
index 7d282c0..5bd6c81 100644
--- a/build/pkg-config/Makefile.in
+++ b/build/pkg-config/Makefile.in
@@ -201,15 +201,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -218,6 +227,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -232,6 +243,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -239,6 +252,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/configure b/configure
index 668bea6..472f6ef 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for banshee 2.9.0.
+# Generated by GNU Autoconf 2.69 for banshee 2.6.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=banshee>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='banshee'
PACKAGE_TARNAME='banshee'
-PACKAGE_VERSION='2.9.0'
-PACKAGE_STRING='banshee 2.9.0'
+PACKAGE_VERSION='2.6.1'
+PACKAGE_STRING='banshee 2.6.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=banshee'
PACKAGE_URL=''
@@ -672,16 +672,16 @@ ENABLE_GAPLESS_FALSE
ENABLE_GAPLESS_TRUE
GST_PLUGINS_BASE_LIBS
GST_PLUGINS_BASE_CFLAGS
-BOO_LIBS
-BOO_CFLAGS
-HAVE_BOO_FALSE
-HAVE_BOO_TRUE
ENABLE_UBUNTUONE_FALSE
ENABLE_UBUNTUONE_TRUE
UBUNTUONESHARP_LIBS
UBUNTUONESHARP_CFLAGS
ENABLE_SOUNDMENU_FALSE
ENABLE_SOUNDMENU_TRUE
+HAVE_INDICATESHARP_FALSE
+HAVE_INDICATESHARP_TRUE
+INDICATESHARP_LIBS
+INDICATESHARP_CFLAGS
HAVE_MEEGO_FALSE
HAVE_MEEGO_TRUE
HAVE_MONOTORRENT_DBUS_FALSE
@@ -707,6 +707,10 @@ LIBGPODSHARP_LIBS
LIBGPODSHARP_CFLAGS
LIBMTP_SIZEOF_TIME_T_64_FALSE
LIBMTP_SIZEOF_TIME_T_64_TRUE
+LIBMTP_FILETYPE_ENUM_HAS_FOLDER_FALSE
+LIBMTP_FILETYPE_ENUM_HAS_FOLDER_TRUE
+LIBMTP_TRACK_STRUCT_HAS_MODDATE_FALSE
+LIBMTP_TRACK_STRUCT_HAS_MODDATE_TRUE
ENABLE_MTP_FALSE
ENABLE_MTP_TRUE
LIBMTP_SO_MAP
@@ -741,10 +745,10 @@ MONOMAC_LIBS
MONOMAC_CFLAGS
GTKMACINTEGRATION_LIBS
GTKMACINTEGRATION_CFLAGS
-GTKSHARP_LIBS
-GTKSHARP_CFLAGS
GLIBSHARP_LIBS
GLIBSHARP_CFLAGS
+GTKSHARP_LIBS
+GTKSHARP_CFLAGS
TAGLIB_SHARP_LIBS
TAGLIB_SHARP_CFLAGS
NUNIT_LIBS
@@ -759,16 +763,21 @@ ENABLE_GIO_HARDWARE_FALSE
ENABLE_GIO_HARDWARE_TRUE
ENABLE_GIO_FALSE
ENABLE_GIO_TRUE
+GKEYFILE_SHARP_LIBS
+GKEYFILE_SHARP_CFLAGS
GUDEV_SHARP_LIBS
GUDEV_SHARP_CFLAGS
+GLIB_2_22_LIBS
+GLIB_2_22_CFLAGS
+GIOSHARP_ASSEMBLIES
GIOSHARP_LIBS
GIOSHARP_CFLAGS
-ENABLE_YOUTUBE_FALSE
-ENABLE_YOUTUBE_TRUE
+GTKSHARP_BEANS_LIBS
+GTKSHARP_BEANS_CFLAGS
+HAVE_GDATA_FALSE
+HAVE_GDATA_TRUE
HAVE_GDATASHARP_1_5_FALSE
HAVE_GDATASHARP_1_5_TRUE
-GDATASHARP_1_5_OR_HIGHER_LIBS
-GDATASHARP_1_5_OR_HIGHER_CFLAGS
GDATASHARP_LIBS
GDATASHARP_CFLAGS
HAVE_LIBSOUP_GNOME_FALSE
@@ -786,6 +795,10 @@ BUILD_DOCS_TRUE
DOCDIR
MDASSEMBLER
MONODOCER
+HAVE_BOO_FALSE
+HAVE_BOO_TRUE
+BOO_LIBS
+BOO_CFLAGS
EXTERNAL_NOTIFY_SHARP_FALSE
EXTERNAL_NOTIFY_SHARP_TRUE
NOTIFY_SHARP_LIBS
@@ -798,10 +811,16 @@ DBUS_SHARP_LIBS
DBUS_SHARP_CFLAGS
DBUS_SHARP_GLIB_LIBS
DBUS_SHARP_GLIB_CFLAGS
+HAVE_GDK_2_22_FALSE
+HAVE_GDK_2_22_TRUE
+GDK_2_22_LIBS
+GDK_2_22_CFLAGS
MEEGO_PANELS_DIR
BANSHEE_DESKTOP_NAME
MEEGO_PANEL_LIBS
MEEGO_PANEL_CFLAGS
+GNOME_2_28_LIBS
+GNOME_2_28_CFLAGS
MONO
MCS
MONO_MODULE_LIBS
@@ -844,6 +863,10 @@ CLUTTER_LIBS
CLUTTER_CFLAGS
GTK_LIBS
GTK_CFLAGS
+GDK_QUARTZ_LIBS
+GDK_QUARTZ_CFLAGS
+GDK_X11_LIBS
+GDK_X11_CFLAGS
GLIB_COMPILE_RESOURCES
GLIB_MKENUMS
GOBJECT_QUERY
@@ -1031,7 +1054,7 @@ with_help_dir
with_omf_dir
with_help_formats
enable_scrollkeeper
-with_system_notify_sharp
+enable_boo
enable_docs
enable_webkit
enable_youtube
@@ -1053,7 +1076,6 @@ enable_torrent
enable_meego
enable_soundmenu
enable_ubuntuone
-enable_boo
enable_gapless_playback
enable_release
with_vendor_build_id
@@ -1071,8 +1093,10 @@ CPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-GLIB_CFLAGS
-GLIB_LIBS
+GDK_X11_CFLAGS
+GDK_X11_LIBS
+GDK_QUARTZ_CFLAGS
+GDK_QUARTZ_LIBS
GTK_CFLAGS
GTK_LIBS
CLUTTER_CFLAGS
@@ -1090,8 +1114,12 @@ GNOME_DOC_UTILS_CFLAGS
GNOME_DOC_UTILS_LIBS
MONO_MODULE_CFLAGS
MONO_MODULE_LIBS
+GNOME_2_28_CFLAGS
+GNOME_2_28_LIBS
MEEGO_PANEL_CFLAGS
MEEGO_PANEL_LIBS
+GDK_2_22_CFLAGS
+GDK_2_22_LIBS
DBUS_SHARP_GLIB_CFLAGS
DBUS_SHARP_GLIB_LIBS
DBUS_SHARP_CFLAGS
@@ -1102,6 +1130,8 @@ MONO_ADDINS_SETUP_CFLAGS
MONO_ADDINS_SETUP_LIBS
NOTIFY_SHARP_CFLAGS
NOTIFY_SHARP_LIBS
+BOO_CFLAGS
+BOO_LIBS
LIBWEBKIT_CFLAGS
LIBWEBKIT_LIBS
LIBSOUP_2_38_CFLAGS
@@ -1110,22 +1140,26 @@ LIBSOUP_GNOME_CFLAGS
LIBSOUP_GNOME_LIBS
GDATASHARP_CFLAGS
GDATASHARP_LIBS
-GDATASHARP_1_5_OR_HIGHER_CFLAGS
-GDATASHARP_1_5_OR_HIGHER_LIBS
+GTKSHARP_BEANS_CFLAGS
+GTKSHARP_BEANS_LIBS
GIOSHARP_CFLAGS
GIOSHARP_LIBS
+GLIB_2_22_CFLAGS
+GLIB_2_22_LIBS
GUDEV_SHARP_CFLAGS
GUDEV_SHARP_LIBS
+GKEYFILE_SHARP_CFLAGS
+GKEYFILE_SHARP_LIBS
MOONLIGHT_CFLAGS
MOONLIGHT_LIBS
NUNIT_CFLAGS
NUNIT_LIBS
TAGLIB_SHARP_CFLAGS
TAGLIB_SHARP_LIBS
-GLIBSHARP_CFLAGS
-GLIBSHARP_LIBS
GTKSHARP_CFLAGS
GTKSHARP_LIBS
+GLIBSHARP_CFLAGS
+GLIBSHARP_LIBS
GTKMACINTEGRATION_CFLAGS
GTKMACINTEGRATION_LIBS
MONOMAC_CFLAGS
@@ -1150,10 +1184,10 @@ MONO_ZEROCONF_CFLAGS
MONO_ZEROCONF_LIBS
MONOTORRENT_DBUS_CFLAGS
MONOTORRENT_DBUS_LIBS
+INDICATESHARP_CFLAGS
+INDICATESHARP_LIBS
UBUNTUONESHARP_CFLAGS
UBUNTUONESHARP_LIBS
-BOO_CFLAGS
-BOO_LIBS
GST_PLUGINS_BASE_CFLAGS
GST_PLUGINS_BASE_LIBS'
@@ -1696,7 +1730,7 @@ if test "$ac_init_help" = "long"; then
# 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 2.9.0 to adapt to many kinds of systems.
+\`configure' configures banshee 2.6.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1770,7 +1804,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of banshee 2.9.0:";;
+ short | recursive ) echo "Configuration of banshee 2.6.1:";;
esac
cat <<\_ACEOF
@@ -1793,6 +1827,7 @@ Optional Features:
--enable-gst-sharp Enable Gst# backend
--enable-user-help Enable building the user-help [[default=auto]]
--disable-scrollkeeper do not make updates to the scrollkeeper database
+ --disable-boo Do not build with boo support
--disable-docs Do not build documentation
--disable-webkit Disable extensions which require WebKit
--disable-youtube Disable Youtube extension
@@ -1814,7 +1849,6 @@ Optional Features:
--enable-meego Enable MeeGo integration
--enable-soundmenu Enable sound menu support
--enable-ubuntuone Enable Ubuntu One Music Store support
- --enable-boo Enable boo language support
--enable-gapless-playback
Enable gapless playback engine (requires
gst-plugins-base > 0.10.25.2)
@@ -1834,8 +1868,6 @@ Optional Packages:
--with-omf-dir=DIR path to OMF files
--with-help-formats=FORMATS
list of formats
- --with-system-notify-sharp
- Use the notify-sharp library installed on the system
--with-gconf-source=sourceaddress
Config database for installing schema files.
--with-gconf-schema-file-dir=dir
@@ -1857,8 +1889,14 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
- GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
- GLIB_LIBS linker flags for GLIB, overriding pkg-config
+ GDK_X11_CFLAGS
+ C compiler flags for GDK_X11, overriding pkg-config
+ GDK_X11_LIBS
+ linker flags for GDK_X11, overriding pkg-config
+ GDK_QUARTZ_CFLAGS
+ C compiler flags for GDK_QUARTZ, overriding pkg-config
+ GDK_QUARTZ_LIBS
+ linker flags for GDK_QUARTZ, overriding pkg-config
GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
GTK_LIBS linker flags for GTK, overriding pkg-config
CLUTTER_CFLAGS
@@ -1888,10 +1926,18 @@ Some influential environment variables:
C compiler flags for MONO_MODULE, overriding pkg-config
MONO_MODULE_LIBS
linker flags for MONO_MODULE, overriding pkg-config
+ GNOME_2_28_CFLAGS
+ C compiler flags for GNOME_2_28, overriding pkg-config
+ GNOME_2_28_LIBS
+ linker flags for GNOME_2_28, overriding pkg-config
MEEGO_PANEL_CFLAGS
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
DBUS_SHARP_GLIB_CFLAGS
C compiler flags for DBUS_SHARP_GLIB, overriding pkg-config
DBUS_SHARP_GLIB_LIBS
@@ -1912,6 +1958,8 @@ Some influential environment variables:
C compiler flags for NOTIFY_SHARP, overriding pkg-config
NOTIFY_SHARP_LIBS
linker flags for NOTIFY_SHARP, overriding pkg-config
+ BOO_CFLAGS C compiler flags for BOO, overriding pkg-config
+ BOO_LIBS linker flags for BOO, overriding pkg-config
LIBWEBKIT_CFLAGS
C compiler flags for LIBWEBKIT, overriding pkg-config
LIBWEBKIT_LIBS
@@ -1928,19 +1976,26 @@ Some influential environment variables:
C compiler flags for GDATASHARP, overriding pkg-config
GDATASHARP_LIBS
linker flags for GDATASHARP, overriding pkg-config
- GDATASHARP_1_5_OR_HIGHER_CFLAGS
- C compiler flags for GDATASHARP_1_5_OR_HIGHER, overriding
- pkg-config
- GDATASHARP_1_5_OR_HIGHER_LIBS
- linker flags for GDATASHARP_1_5_OR_HIGHER, overriding pkg-config
+ GTKSHARP_BEANS_CFLAGS
+ C compiler flags for GTKSHARP_BEANS, overriding pkg-config
+ GTKSHARP_BEANS_LIBS
+ linker flags for GTKSHARP_BEANS, overriding pkg-config
GIOSHARP_CFLAGS
C compiler flags for GIOSHARP, overriding pkg-config
GIOSHARP_LIBS
linker flags for GIOSHARP, overriding pkg-config
+ GLIB_2_22_CFLAGS
+ C compiler flags for GLIB_2_22, overriding pkg-config
+ GLIB_2_22_LIBS
+ linker flags for GLIB_2_22, overriding pkg-config
GUDEV_SHARP_CFLAGS
C compiler flags for GUDEV_SHARP, overriding pkg-config
GUDEV_SHARP_LIBS
linker flags for GUDEV_SHARP, overriding pkg-config
+ GKEYFILE_SHARP_CFLAGS
+ C compiler flags for GKEYFILE_SHARP, overriding pkg-config
+ GKEYFILE_SHARP_LIBS
+ linker flags for GKEYFILE_SHARP, overriding pkg-config
MOONLIGHT_CFLAGS
C compiler flags for MOONLIGHT, overriding pkg-config
MOONLIGHT_LIBS
@@ -1952,14 +2007,14 @@ Some influential environment variables:
C compiler flags for TAGLIB_SHARP, overriding pkg-config
TAGLIB_SHARP_LIBS
linker flags for TAGLIB_SHARP, overriding pkg-config
- GLIBSHARP_CFLAGS
- C compiler flags for GLIBSHARP, overriding pkg-config
- GLIBSHARP_LIBS
- linker flags for GLIBSHARP, overriding pkg-config
GTKSHARP_CFLAGS
C compiler flags for GTKSHARP, overriding pkg-config
GTKSHARP_LIBS
linker flags for GTKSHARP, overriding pkg-config
+ GLIBSHARP_CFLAGS
+ C compiler flags for GLIBSHARP, overriding pkg-config
+ GLIBSHARP_LIBS
+ linker flags for GLIBSHARP, overriding pkg-config
GTKMACINTEGRATION_CFLAGS
C compiler flags for GTKMACINTEGRATION, overriding pkg-config
GTKMACINTEGRATION_LIBS
@@ -2006,12 +2061,14 @@ Some influential environment variables:
C compiler flags for MONOTORRENT_DBUS, overriding pkg-config
MONOTORRENT_DBUS_LIBS
linker flags for MONOTORRENT_DBUS, overriding pkg-config
+ INDICATESHARP_CFLAGS
+ C compiler flags for INDICATESHARP, overriding pkg-config
+ INDICATESHARP_LIBS
+ linker flags for INDICATESHARP, overriding pkg-config
UBUNTUONESHARP_CFLAGS
C compiler flags for UBUNTUONESHARP, overriding pkg-config
UBUNTUONESHARP_LIBS
linker flags for UBUNTUONESHARP, overriding pkg-config
- BOO_CFLAGS C compiler flags for BOO, overriding pkg-config
- BOO_LIBS linker flags for BOO, overriding pkg-config
GST_PLUGINS_BASE_CFLAGS
C compiler flags for GST_PLUGINS_BASE, overriding pkg-config
GST_PLUGINS_BASE_LIBS
@@ -2083,7 +2140,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-banshee configure 2.9.0
+banshee configure 2.6.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2358,6 +2415,63 @@ fi
} # ac_fn_c_try_run
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
+
# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
# --------------------------------------------
# Tries to find the compile-time value of EXPR in a program that includes
@@ -2635,7 +2749,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by banshee $as_me 2.9.0, which was
+It was created by banshee $as_me 2.6.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3451,7 +3565,7 @@ fi
# Define the identity of the package.
PACKAGE='banshee'
- VERSION='2.9.0'
+ VERSION='2.6.1'
cat >>confdefs.h <<_ACEOF
@@ -6046,8 +6160,7 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -6448,6 +6561,10 @@ freebsd* | dragonfly*)
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -6486,7 +6603,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -7583,14 +7700,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
+ LD="${LD-ld} -m elf_i386"
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -9415,7 +9525,7 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -11585,6 +11695,17 @@ freebsd* | dragonfly*)
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -11701,7 +11822,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -12752,11 +12873,11 @@ CC="$lt_save_CC"
DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-user-help --enable-release"
-API_VERSION=2.9
+API_VERSION=2.6
-ASM_VERSION=2.9.0.0
+ASM_VERSION=2.6.0.0
-DISPLAY_VERSION="2.9"
+DISPLAY_VERSION="2.6.1"
@@ -12805,34 +12926,86 @@ DISPLAY_VERSION="2.9"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if ${ac_cv_search_strerror+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_strerror=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_strerror+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_strerror+:} false; then :
+else
+ ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+fi
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -12840,13 +13013,12 @@ done
done
IFS=$as_save_IFS
- ;;
-esac
fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -12854,28 +13026,26 @@ fi
fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -12883,20 +13053,19 @@ done
done
IFS=$as_save_IFS
- ;;
-esac
fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
+ if test "x$ac_ct_CC" = x; then
+ CC=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12904,298 +13073,38 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
+ CC=$ac_ct_CC
fi
else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+ CC="$ac_cv_prog_CC"
fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
-$as_echo_n "checking for GLIB... " >&6; }
-
-if test -n "$GLIB_CFLAGS"; then
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.22\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.22") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.22" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GLIB_LIBS"; then
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.22\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.22") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.22" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.22" 2>&1`
- else
- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.22" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GLIB_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (glib-2.0 >= 2.22) were not met:
-
-$GLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
- GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
- GLIB_LIBS=$pkg_cv_GLIB_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
-
-else
- ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
fi
fi
@@ -13854,8 +13763,6 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
- # needed so autoconf doesn't complain before checking the existence of glib-2.0 in configure.ac
-
# Check whether --enable-glibtest was given.
if test "${enable_glibtest+set}" = set; then :
enableval=$enable_glibtest;
@@ -14216,6 +14123,212 @@ rm -f core conftest.err conftest.$ac_objext \
LIBBANSHEE_LIBS=""
LIBBANSHEE_CFLAGS=""
+ GRAPHICS_SUBSYSTEM="Unknown"
+ GTK_TARGET=$(pkg-config --variable=target gtk+-2.0)
+
+ if test x$GTK_TARGET = xx11; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK_X11" >&5
+$as_echo_n "checking for GDK_X11... " >&6; }
+
+if test -n "$GDK_X11_CFLAGS"; then
+ pkg_cv_GDK_X11_CFLAGS="$GDK_X11_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-x11-2.0 >= 2.8\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdk-x11-2.0 >= 2.8") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GDK_X11_CFLAGS=`$PKG_CONFIG --cflags "gdk-x11-2.0 >= 2.8" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GDK_X11_LIBS"; then
+ pkg_cv_GDK_X11_LIBS="$GDK_X11_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-x11-2.0 >= 2.8\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdk-x11-2.0 >= 2.8") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GDK_X11_LIBS=`$PKG_CONFIG --libs "gdk-x11-2.0 >= 2.8" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-x11-2.0 >= 2.8" 2>&1`
+ else
+ GDK_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-x11-2.0 >= 2.8" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GDK_X11_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (gdk-x11-2.0 >= 2.8) were not met:
+
+$GDK_X11_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GDK_X11_CFLAGS
+and GDK_X11_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GDK_X11_CFLAGS
+and GDK_X11_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ GDK_X11_CFLAGS=$pkg_cv_GDK_X11_CFLAGS
+ GDK_X11_LIBS=$pkg_cv_GDK_X11_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+ LIBBANSHEE_CFLAGS="$LIBBANSHEE_CFLAGS $GDK_X11_CFLAGS"
+
+
+ LIBBANSHEE_LIBS="$LIBBANSHEE_LIBS $GDK_X11_LIBS"
+
+
+ GRAPHICS_SUBSYSTEM="X11"
+ elif test x$GTK_TARGET = xquartz; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK_QUARTZ" >&5
+$as_echo_n "checking for GDK_QUARTZ... " >&6; }
+
+if test -n "$GDK_QUARTZ_CFLAGS"; then
+ pkg_cv_GDK_QUARTZ_CFLAGS="$GDK_QUARTZ_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-quartz-2.0 >= 2.14\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdk-quartz-2.0 >= 2.14") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GDK_QUARTZ_CFLAGS=`$PKG_CONFIG --cflags "gdk-quartz-2.0 >= 2.14" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GDK_QUARTZ_LIBS"; then
+ pkg_cv_GDK_QUARTZ_LIBS="$GDK_QUARTZ_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-quartz-2.0 >= 2.14\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdk-quartz-2.0 >= 2.14") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GDK_QUARTZ_LIBS=`$PKG_CONFIG --libs "gdk-quartz-2.0 >= 2.14" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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_QUARTZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-quartz-2.0 >= 2.14" 2>&1`
+ else
+ GDK_QUARTZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-quartz-2.0 >= 2.14" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GDK_QUARTZ_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (gdk-quartz-2.0 >= 2.14) were not met:
+
+$GDK_QUARTZ_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GDK_QUARTZ_CFLAGS
+and GDK_QUARTZ_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GDK_QUARTZ_CFLAGS
+and GDK_QUARTZ_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ GDK_QUARTZ_CFLAGS=$pkg_cv_GDK_QUARTZ_CFLAGS
+ GDK_QUARTZ_LIBS=$pkg_cv_GDK_QUARTZ_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+ LIBBANSHEE_CFLAGS="$LIBBANSHEE_CFLAGS $GDK_QUARTZ_CFLAGS"
+
+
+ LIBBANSHEE_LIBS="$LIBBANSHEE_LIBS $GDK_QUARTZ_LIBS"
+
+
+ GRAPHICS_SUBSYSTEM="Quartz"
+ else
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
@@ -14225,12 +14338,12 @@ if test -n "$GTK_CFLAGS"; then
pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0" 2>/dev/null`
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.8" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14242,12 +14355,12 @@ if test -n "$GTK_LIBS"; then
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0" 2>/dev/null`
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.8" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14268,14 +14381,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.8" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.8" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0) were not met:
+ as_fn_error $? "Package requirements (gtk+-2.0 >= 2.8) were not met:
$GTK_PKG_ERRORS
@@ -14307,23 +14420,7 @@ else
$as_echo "yes" >&6; }
fi
-
-
- LIBBANSHEE_CFLAGS="$LIBBANSHEE_CFLAGS $GTK_CFLAGS"
-
-
- LIBBANSHEE_LIBS="$LIBBANSHEE_LIBS $GTK_LIBS"
-
-
-
- GTK_TARGETS=$(pkg-config --variable=targets gtk+-3.0)
- for GTK_TARGET in $GTK_TARGETS; do
- if test x$GTK_TARGET = xx11; then
- GRAPHICS_SUBSYSTEM_X11="yes"
- elif test x$GTK_TARGET = xquartz; then
- GRAPHICS_SUBSYSTEM_QUARTZ="yes"
- fi
- done
+ fi
# Check whether --enable-clutter was given.
if test "${enable_clutter+set}" = set; then :
@@ -14438,7 +14535,7 @@ $as_echo "#define HAVE_CLUTTER 1" >>confdefs.h
fi
- if test "x$GRAPHICS_SUBSYSTEM_X11" = "xyes"; then
+ if test "x$GRAPHICS_SUBSYSTEM" = "xX11"; then
HAVE_X11_TRUE=
HAVE_X11_FALSE='#'
else
@@ -14446,7 +14543,7 @@ else
HAVE_X11_FALSE=
fi
- if test "x$GRAPHICS_SUBSYSTEM_QUARTZ" = "xyes"; then
+ if test "x$GRAPHICS_SUBSYSTEM" = "xQuartz"; then
HAVE_QUARTZ_TRUE=
HAVE_QUARTZ_FALSE='#'
else
@@ -14739,9 +14836,7 @@ fi
have_x11=no
have_xvidmode=no
- GTK_TARGETS=$(pkg-config --variable=targets gtk+-3.0)
- for GTK_TARGET in $GTK_TARGETS; do
- if test x$GTK_TARGET = xx11; then
+ if test x$(pkg-config --variable=target gtk+-2.0) = xx11; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BNPX_GTK" >&5
@@ -14751,12 +14846,12 @@ if test -n "$BNPX_GTK_CFLAGS"; then
pkg_cv_BNPX_GTK_CFLAGS="$BNPX_GTK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BNPX_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0" 2>/dev/null`
+ pkg_cv_BNPX_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14768,12 +14863,12 @@ if test -n "$BNPX_GTK_LIBS"; then
pkg_cv_BNPX_GTK_LIBS="$BNPX_GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BNPX_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0" 2>/dev/null`
+ pkg_cv_BNPX_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14794,14 +14889,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BNPX_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0" 2>&1`
+ BNPX_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8" 2>&1`
else
- BNPX_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0" 2>&1`
+ BNPX_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$BNPX_GTK_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0) were not met:
+ as_fn_error $? "Package requirements (gtk+-2.0 >= 2.8 gdk-x11-2.0 >= 2.8) were not met:
$BNPX_GTK_PKG_ERRORS
@@ -14834,7 +14929,7 @@ $as_echo "yes" >&6; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
$as_echo_n "checking for X... " >&6; }
@@ -15028,16 +15123,16 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
- have_x11=yes
+ have_x11=yes
- if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
- X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"`
- fi
- if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
- X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
- fi
- BNPX_CFLAGS="$X_INCLUDES $CFLAGS"
- BNPX_LIBS="$X_LIBRARIES $LIBS"
+ if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
+ X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"`
+ fi
+ if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
+ X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+ fi
+ BNPX_CFLAGS="$X_INCLUDES $CFLAGS"
+ BNPX_LIBS="$X_LIBRARIES $LIBS"
pkg_failed=no
@@ -15111,17 +15206,16 @@ $as_echo "yes" >&6; }
have_xvidmode=yes
fi
- if test x$have_xvidmode = xyes; then
+ if test x$have_xvidmode = xyes; then
$as_echo "#define HAVE_XVIDMODE /**/" >>confdefs.h
- fi
+ fi
- BNPX_LIBS="$X_LIBRARIES -lX11"
+ BNPX_LIBS="$X_LIBRARIES -lX11"
- fi
- done
+ fi
if test x$have_xvidmode = xyes; then
HAVE_XVIDMODE_TRUE=
HAVE_XVIDMODE_FALSE='#'
@@ -15430,12 +15524,12 @@ if test -n "$MONO_MODULE_CFLAGS"; then
pkg_cv_MONO_MODULE_CFLAGS="$MONO_MODULE_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.8.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "mono >= 2.8.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.4.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mono >= 2.4.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MONO_MODULE_CFLAGS=`$PKG_CONFIG --cflags "mono >= 2.8.2" 2>/dev/null`
+ pkg_cv_MONO_MODULE_CFLAGS=`$PKG_CONFIG --cflags "mono >= 2.4.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15447,12 +15541,12 @@ if test -n "$MONO_MODULE_LIBS"; then
pkg_cv_MONO_MODULE_LIBS="$MONO_MODULE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.8.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "mono >= 2.8.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono >= 2.4.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mono >= 2.4.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MONO_MODULE_LIBS=`$PKG_CONFIG --libs "mono >= 2.8.2" 2>/dev/null`
+ pkg_cv_MONO_MODULE_LIBS=`$PKG_CONFIG --libs "mono >= 2.4.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15473,14 +15567,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mono >= 2.8.2" 2>&1`
+ MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mono >= 2.4.3" 2>&1`
else
- MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mono >= 2.8.2" 2>&1`
+ MONO_MODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mono >= 2.4.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$MONO_MODULE_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (mono >= 2.8.2) were not met:
+ as_fn_error $? "Package requirements (mono >= 2.4.3) were not met:
$MONO_MODULE_PKG_ERRORS
@@ -15515,52 +15609,7 @@ fi
- if pkg-config --atleast-version=2.8 mono; then
-
- # Extract the first word of "dmcs", so it can be a program name with args.
-set dummy dmcs; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MCS in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-MCS=$ac_cv_path_MCS
-if test -n "$MCS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
-$as_echo "$MCS" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
- fi
- if test "x$MCS" = "x" ; then
# Extract the first word of "gmcs", so it can be a program name with args.
set dummy gmcs; ac_word=$2
@@ -15589,6 +15638,7 @@ done
done
IFS=$as_save_IFS
+ test -z "$ac_cv_path_MCS" && ac_cv_path_MCS="no"
;;
esac
fi
@@ -15604,15 +15654,14 @@ fi
- fi
-
- if test "x$MCS" = "x" ; then
+ if test "x$MCS" = "xno"; then
as_fn_error $? "You need to install 'gmcs'" "$LINENO" 5
fi
+
# Extract the first word of "mono", so it can be a program name with args.
set dummy mono; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -15663,9 +15712,7 @@ fi
- for asm in $(echo "mono,2.0,Mono.Posix
- ICSharpCode.SharpZipLib
-" | cut -d, -f3- | sed 's/\,/ /g')
+ for asm in $(echo "mono,2.0,Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib" | cut -d, -f3- | sed 's/\,/ /g')
do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono 2.0 GAC for $asm.dll" >&5
$as_echo_n "checking for Mono 2.0 GAC for $asm.dll... " >&6; }
@@ -15686,19 +15733,19 @@ $as_echo "not found" >&6; }
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEEGO_PANEL" >&5
-$as_echo_n "checking for MEEGO_PANEL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_2_28" >&5
+$as_echo_n "checking for GNOME_2_28... " >&6; }
-if test -n "$MEEGO_PANEL_CFLAGS"; then
- pkg_cv_MEEGO_PANEL_CFLAGS="$MEEGO_PANEL_CFLAGS"
+if test -n "$GNOME_2_28_CFLAGS"; then
+ pkg_cv_GNOME_2_28_CFLAGS="$GNOME_2_28_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meego-panel\""; } >&5
- ($PKG_CONFIG --exists --print-errors "meego-panel") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= 2.28\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= 2.28") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MEEGO_PANEL_CFLAGS=`$PKG_CONFIG --cflags "meego-panel" 2>/dev/null`
+ pkg_cv_GNOME_2_28_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0 >= 2.28" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15706,16 +15753,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$MEEGO_PANEL_LIBS"; then
- pkg_cv_MEEGO_PANEL_LIBS="$MEEGO_PANEL_LIBS"
+if test -n "$GNOME_2_28_LIBS"; then
+ pkg_cv_GNOME_2_28_LIBS="$GNOME_2_28_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meego-panel\""; } >&5
- ($PKG_CONFIG --exists --print-errors "meego-panel") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= 2.28\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= 2.28") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MEEGO_PANEL_LIBS=`$PKG_CONFIG --libs "meego-panel" 2>/dev/null`
+ pkg_cv_GNOME_2_28_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0 >= 2.28" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15736,40 +15783,191 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MEEGO_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meego-panel" 2>&1`
+ GNOME_2_28_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-desktop-2.0 >= 2.28" 2>&1`
else
- MEEGO_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meego-panel" 2>&1`
+ GNOME_2_28_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-desktop-2.0 >= 2.28" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$MEEGO_PANEL_PKG_ERRORS" >&5
+ echo "$GNOME_2_28_PKG_ERRORS" >&5
- HAVE_MEEGO_PANEL=no
+ HAVE_GNOME_2_28=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_MEEGO_PANEL=no
+ HAVE_GNOME_2_28=no
else
- MEEGO_PANEL_CFLAGS=$pkg_cv_MEEGO_PANEL_CFLAGS
- MEEGO_PANEL_LIBS=$pkg_cv_MEEGO_PANEL_LIBS
+ GNOME_2_28_CFLAGS=$pkg_cv_GNOME_2_28_CFLAGS
+ GNOME_2_28_LIBS=$pkg_cv_GNOME_2_28_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_MEEGO_PANEL=yes
-fi
-if "x$HAVE_MEEGO_PANEL" = "xyes"; then
- BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
-else
- BANSHEE_DESKTOP_NAME="_Name=Banshee"
+ HAVE_GNOME_2_28=yes
fi
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEEGO_PANEL" >&5
+$as_echo_n "checking for MEEGO_PANEL... " >&6; }
-if test "x$HAVE_MEEGO_PANEL" = "xyes"; then
- MEEGO_PANELS_DIR=`$PKG_CONFIG --variable=meego_panel_panels_dir meego-panel`
+if test -n "$MEEGO_PANEL_CFLAGS"; then
+ pkg_cv_MEEGO_PANEL_CFLAGS="$MEEGO_PANEL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meego-panel\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "meego-panel") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MEEGO_PANEL_CFLAGS=`$PKG_CONFIG --cflags "meego-panel" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
- MEEGO_PANELS_DIR='${datadir}/mutter-meego/panels'
+ pkg_failed=yes
fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$MEEGO_PANEL_LIBS"; then
+ pkg_cv_MEEGO_PANEL_LIBS="$MEEGO_PANEL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meego-panel\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "meego-panel") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MEEGO_PANEL_LIBS=`$PKG_CONFIG --libs "meego-panel" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+ MEEGO_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meego-panel" 2>&1`
+ else
+ MEEGO_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meego-panel" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MEEGO_PANEL_PKG_ERRORS" >&5
+
+ HAVE_MEEGO_PANEL=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_MEEGO_PANEL=no
+else
+ MEEGO_PANEL_CFLAGS=$pkg_cv_MEEGO_PANEL_CFLAGS
+ MEEGO_PANEL_LIBS=$pkg_cv_MEEGO_PANEL_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_MEEGO_PANEL=yes
+fi
+if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then
+ BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
+else
+ BANSHEE_DESKTOP_NAME="_Name=Banshee"
+fi
+
+
+if test "x$HAVE_MEEGO_PANEL" = "xyes"; then
+ MEEGO_PANELS_DIR=`$PKG_CONFIG --variable=meego_panel_panels_dir meego-panel`
+else
+ MEEGO_PANELS_DIR='${datadir}/mutter-meego/panels'
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GDK_2_22_CFLAGS=`$PKG_CONFIG --cflags "gdk-x11-2.0 >= 2.22" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+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:${as_lineno-$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GDK_2_22_LIBS=`$PKG_CONFIG --libs "gdk-x11-2.0 >= 2.22" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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 --cflags --libs "gdk-x11-2.0 >= 2.22" 2>&1`
+ else
+ GDK_2_22_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "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
+
+ have_gdk_2_22=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ 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:${as_lineno-$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
@@ -16148,16 +16346,6 @@ fi
-# Check whether --with-system-notify-sharp was given.
-if test "${with_system_notify_sharp+set}" = set; then :
- withval=$with_system_notify_sharp; use_system_notifysharp="yes"
-else
- use_system_notifysharp="no"
-fi
-
-
- if test "x$use_system_notifysharp" = "xyes"; then
-
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY_SHARP" >&5
$as_echo_n "checking for NOTIFY_SHARP... " >&6; }
@@ -16216,15 +16404,127 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NOTIFY_SHARP_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (notify-sharp) were not met:
+ have_notify_sharp=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_notify_sharp=no
+else
+ NOTIFY_SHARP_CFLAGS=$pkg_cv_NOTIFY_SHARP_CFLAGS
+ NOTIFY_SHARP_LIBS=$pkg_cv_NOTIFY_SHARP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_notify_sharp=yes
+fi
+ if test "x$have_notify_sharp" = "xyes"; then
+
+ if true; then
+ EXTERNAL_NOTIFY_SHARP_TRUE=
+ EXTERNAL_NOTIFY_SHARP_FALSE='#'
+else
+ EXTERNAL_NOTIFY_SHARP_TRUE='#'
+ EXTERNAL_NOTIFY_SHARP_FALSE=
+fi
+
+ else
+ if false; then
+ EXTERNAL_NOTIFY_SHARP_TRUE=
+ EXTERNAL_NOTIFY_SHARP_FALSE='#'
+else
+ EXTERNAL_NOTIFY_SHARP_TRUE='#'
+ EXTERNAL_NOTIFY_SHARP_FALSE=
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+
+
+
+ # Check whether --enable-boo was given.
+if test "${enable_boo+set}" = set; then :
+ enableval=$enable_boo;
+ if test "x$enableval" = "xno"; then
+ enable_boo=no
+ elif test "x$enableval" = "xyes"; then
+ enable_boo=yes
+ fi
+
+else
+ enable_boo=yes
+
+fi
+
+
+ if test "x$enable_boo" = "xyes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BOO" >&5
+$as_echo_n "checking for BOO... " >&6; }
+
+if test -n "$BOO_CFLAGS"; then
+ pkg_cv_BOO_CFLAGS="$BOO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"boo >= 0.8.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "boo >= 0.8.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_BOO_CFLAGS=`$PKG_CONFIG --cflags "boo >= 0.8.1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$BOO_LIBS"; then
+ pkg_cv_BOO_LIBS="$BOO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"boo >= 0.8.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "boo >= 0.8.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_BOO_LIBS=`$PKG_CONFIG --libs "boo >= 0.8.1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+ BOO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "boo >= 0.8.1" 2>&1`
+ else
+ BOO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "boo >= 0.8.1" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BOO_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (boo >= 0.8.1) were not met:
-$NOTIFY_SHARP_PKG_ERRORS
+$BOO_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables NOTIFY_SHARP_CFLAGS
-and NOTIFY_SHARP_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables BOO_CFLAGS
+and BOO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -16235,39 +16535,37 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables NOTIFY_SHARP_CFLAGS
-and NOTIFY_SHARP_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables BOO_CFLAGS
+and BOO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- NOTIFY_SHARP_CFLAGS=$pkg_cv_NOTIFY_SHARP_CFLAGS
- NOTIFY_SHARP_LIBS=$pkg_cv_NOTIFY_SHARP_LIBS
+ BOO_CFLAGS=$pkg_cv_BOO_CFLAGS
+ BOO_LIBS=$pkg_cv_BOO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
if true; then
- EXTERNAL_NOTIFY_SHARP_TRUE=
- EXTERNAL_NOTIFY_SHARP_FALSE='#'
+ HAVE_BOO_TRUE=
+ HAVE_BOO_FALSE='#'
else
- EXTERNAL_NOTIFY_SHARP_TRUE='#'
- EXTERNAL_NOTIFY_SHARP_FALSE=
+ HAVE_BOO_TRUE='#'
+ HAVE_BOO_FALSE=
fi
else
if false; then
- EXTERNAL_NOTIFY_SHARP_TRUE=
- EXTERNAL_NOTIFY_SHARP_FALSE='#'
+ HAVE_BOO_TRUE=
+ HAVE_BOO_FALSE='#'
else
- EXTERNAL_NOTIFY_SHARP_TRUE='#'
- EXTERNAL_NOTIFY_SHARP_FALSE=
+ HAVE_BOO_TRUE='#'
+ HAVE_BOO_FALSE=
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: Using internal copy of notify-sharp" >&5
-$as_echo "$as_me: Using internal copy of notify-sharp" >&6;}
fi
@@ -16419,14 +16717,14 @@ if test -n "$LIBWEBKIT_CFLAGS"; then
pkg_cv_LIBWEBKIT_CFLAGS="$LIBWEBKIT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkitgtk-3.0 >= \$WEBKIT_MIN_VERSION
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= \$WEBKIT_MIN_VERSION
libsoup-2.4 >= \$SOUP_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "webkitgtk-3.0 >= $WEBKIT_MIN_VERSION
+ ($PKG_CONFIG --exists --print-errors "webkit-1.0 >= $WEBKIT_MIN_VERSION
libsoup-2.4 >= $SOUP_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBWEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkitgtk-3.0 >= $WEBKIT_MIN_VERSION
+ pkg_cv_LIBWEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit-1.0 >= $WEBKIT_MIN_VERSION
libsoup-2.4 >= $SOUP_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
@@ -16439,14 +16737,14 @@ if test -n "$LIBWEBKIT_LIBS"; then
pkg_cv_LIBWEBKIT_LIBS="$LIBWEBKIT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkitgtk-3.0 >= \$WEBKIT_MIN_VERSION
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= \$WEBKIT_MIN_VERSION
libsoup-2.4 >= \$SOUP_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "webkitgtk-3.0 >= $WEBKIT_MIN_VERSION
+ ($PKG_CONFIG --exists --print-errors "webkit-1.0 >= $WEBKIT_MIN_VERSION
libsoup-2.4 >= $SOUP_MIN_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBWEBKIT_LIBS=`$PKG_CONFIG --libs "webkitgtk-3.0 >= $WEBKIT_MIN_VERSION
+ pkg_cv_LIBWEBKIT_LIBS=`$PKG_CONFIG --libs "webkit-1.0 >= $WEBKIT_MIN_VERSION
libsoup-2.4 >= $SOUP_MIN_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
@@ -16468,10 +16766,10 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBWEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "webkitgtk-3.0 >= $WEBKIT_MIN_VERSION
+ LIBWEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "webkit-1.0 >= $WEBKIT_MIN_VERSION
libsoup-2.4 >= $SOUP_MIN_VERSION" 2>&1`
else
- LIBWEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "webkitgtk-3.0 >= $WEBKIT_MIN_VERSION
+ LIBWEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "webkit-1.0 >= $WEBKIT_MIN_VERSION
libsoup-2.4 >= $SOUP_MIN_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -16699,8 +16997,6 @@ fi
if test "x$enable_youtube" = "xyes"; then
- has_gdata=no
-
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDATASHARP" >&5
$as_echo_n "checking for GDATASHARP... " >&6; }
@@ -16709,12 +17005,12 @@ if test -n "$GDATASHARP_CFLAGS"; then
pkg_cv_GDATASHARP_CFLAGS="$GDATASHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= \$GDATASHARP_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= 1.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= 1.5") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GDATASHARP_CFLAGS=`$PKG_CONFIG --cflags "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>/dev/null`
+ pkg_cv_GDATASHARP_CFLAGS=`$PKG_CONFIG --cflags "gdata-sharp-youtube >= 1.5" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16726,12 +17022,12 @@ if test -n "$GDATASHARP_LIBS"; then
pkg_cv_GDATASHARP_LIBS="$GDATASHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= \$GDATASHARP_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= 1.5\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= 1.5") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GDATASHARP_LIBS=`$PKG_CONFIG --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>/dev/null`
+ pkg_cv_GDATASHARP_LIBS=`$PKG_CONFIG --libs "gdata-sharp-youtube >= 1.5" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16752,44 +17048,131 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GDATASHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>&1`
+ GDATASHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdata-sharp-youtube >= 1.5" 2>&1`
else
- GDATASHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>&1`
+ GDATASHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdata-sharp-youtube >= 1.5" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GDATASHARP_PKG_ERRORS" >&5
- has_gdata=no
-elif test $pkg_failed = untried; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDATASHARP" >&5
+$as_echo_n "checking for GDATASHARP... " >&6; }
+
+if test -n "$GDATASHARP_CFLAGS"; then
+ pkg_cv_GDATASHARP_CFLAGS="$GDATASHARP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= \$GDATASHARP_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GDATASHARP_CFLAGS=`$PKG_CONFIG --cflags "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GDATASHARP_LIBS"; then
+ pkg_cv_GDATASHARP_LIBS="$GDATASHARP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= \$GDATASHARP_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GDATASHARP_LIBS=`$PKG_CONFIG --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+ GDATASHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>&1`
+ else
+ GDATASHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GDATASHARP_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION) were not met:
+
+$GDATASHARP_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GDATASHARP_CFLAGS
+and GDATASHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- has_gdata=no
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GDATASHARP_CFLAGS
+and GDATASHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
else
GDATASHARP_CFLAGS=$pkg_cv_GDATASHARP_CFLAGS
GDATASHARP_LIBS=$pkg_cv_GDATASHARP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- has_gdata=yes
+
fi
- if test "x$has_gdata" = "xno"; then
- as_fn_error $? "gdata-sharp-youtube was not found or is not up to date. Please install gdata-sharp-youtube of at least version $GDATASHARP_REQUIRED_VERSION, or disable YouTube extension by passing --disable-youtube" "$LINENO" 5
- fi
+ if false; then
+ HAVE_GDATASHARP_1_5_TRUE=
+ HAVE_GDATASHARP_1_5_FALSE='#'
+else
+ HAVE_GDATASHARP_1_5_TRUE='#'
+ HAVE_GDATASHARP_1_5_FALSE=
+fi
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDATASHARP_1_5_OR_HIGHER" >&5
-$as_echo_n "checking for GDATASHARP_1_5_OR_HIGHER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDATASHARP" >&5
+$as_echo_n "checking for GDATASHARP... " >&6; }
-if test -n "$GDATASHARP_1_5_OR_HIGHER_CFLAGS"; then
- pkg_cv_GDATASHARP_1_5_OR_HIGHER_CFLAGS="$GDATASHARP_1_5_OR_HIGHER_CFLAGS"
+if test -n "$GDATASHARP_CFLAGS"; then
+ pkg_cv_GDATASHARP_CFLAGS="$GDATASHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= 1.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= 1.5") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= \$GDATASHARP_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GDATASHARP_1_5_OR_HIGHER_CFLAGS=`$PKG_CONFIG --cflags "gdata-sharp-youtube >= 1.5" 2>/dev/null`
+ pkg_cv_GDATASHARP_CFLAGS=`$PKG_CONFIG --cflags "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16797,16 +17180,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$GDATASHARP_1_5_OR_HIGHER_LIBS"; then
- pkg_cv_GDATASHARP_1_5_OR_HIGHER_LIBS="$GDATASHARP_1_5_OR_HIGHER_LIBS"
+if test -n "$GDATASHARP_LIBS"; then
+ pkg_cv_GDATASHARP_LIBS="$GDATASHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= 1.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= 1.5") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdata-sharp-youtube >= \$GDATASHARP_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GDATASHARP_1_5_OR_HIGHER_LIBS=`$PKG_CONFIG --libs "gdata-sharp-youtube >= 1.5" 2>/dev/null`
+ pkg_cv_GDATASHARP_LIBS=`$PKG_CONFIG --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16827,26 +17210,46 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GDATASHARP_1_5_OR_HIGHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdata-sharp-youtube >= 1.5" 2>&1`
+ GDATASHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>&1`
else
- GDATASHARP_1_5_OR_HIGHER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdata-sharp-youtube >= 1.5" 2>&1`
+ GDATASHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$GDATASHARP_1_5_OR_HIGHER_PKG_ERRORS" >&5
+ echo "$GDATASHARP_PKG_ERRORS" >&5
- if false; then
- HAVE_GDATASHARP_1_5_TRUE=
- HAVE_GDATASHARP_1_5_FALSE='#'
-else
- HAVE_GDATASHARP_1_5_TRUE='#'
- HAVE_GDATASHARP_1_5_FALSE=
-fi
+ as_fn_error $? "Package requirements (gdata-sharp-youtube >= $GDATASHARP_REQUIRED_VERSION) were not met:
+
+$GDATASHARP_PKG_ERRORS
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+Alternatively, you may set the environment variables GDATASHARP_CFLAGS
+and GDATASHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- if false; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GDATASHARP_CFLAGS
+and GDATASHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ GDATASHARP_CFLAGS=$pkg_cv_GDATASHARP_CFLAGS
+ GDATASHARP_LIBS=$pkg_cv_GDATASHARP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+ if false; then
HAVE_GDATASHARP_1_5_TRUE=
HAVE_GDATASHARP_1_5_FALSE='#'
else
@@ -16856,8 +17259,8 @@ fi
else
- GDATASHARP_1_5_OR_HIGHER_CFLAGS=$pkg_cv_GDATASHARP_1_5_OR_HIGHER_CFLAGS
- GDATASHARP_1_5_OR_HIGHER_LIBS=$pkg_cv_GDATASHARP_1_5_OR_HIGHER_LIBS
+ GDATASHARP_CFLAGS=$pkg_cv_GDATASHARP_CFLAGS
+ GDATASHARP_LIBS=$pkg_cv_GDATASHARP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
if true; then
@@ -16871,11 +17274,11 @@ fi
fi
if true; then
- ENABLE_YOUTUBE_TRUE=
- ENABLE_YOUTUBE_FALSE='#'
+ HAVE_GDATA_TRUE=
+ HAVE_GDATA_FALSE='#'
else
- ENABLE_YOUTUBE_TRUE='#'
- ENABLE_YOUTUBE_FALSE=
+ HAVE_GDATA_TRUE='#'
+ HAVE_GDATA_FALSE=
fi
else
@@ -16888,19 +17291,18 @@ else
fi
if false; then
- ENABLE_YOUTUBE_TRUE=
- ENABLE_YOUTUBE_FALSE='#'
+ HAVE_GDATA_TRUE=
+ HAVE_GDATA_FALSE='#'
else
- ENABLE_YOUTUBE_TRUE='#'
- ENABLE_YOUTUBE_FALSE=
+ HAVE_GDATA_TRUE='#'
+ HAVE_GDATA_FALSE=
fi
fi
- GIOSHARP_REQUIRED=2.99
- GUDEVSHARP_REQUIRED=3.0
+ GNOMESHARP_REQUIRED=2.8
# Check whether --enable-gio was given.
if test "${enable_gio+set}" = set; then :
@@ -16919,7 +17321,77 @@ fi
if test "x$enable_gio" = "xyes"; then
- has_gio_sharp=no
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSHARP_BEANS" >&5
+$as_echo_n "checking for GTKSHARP_BEANS... " >&6; }
+
+if test -n "$GTKSHARP_BEANS_CFLAGS"; then
+ pkg_cv_GTKSHARP_BEANS_CFLAGS="$GTKSHARP_BEANS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-beans-2.0 >= \$GNOMESHARP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKSHARP_BEANS_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTKSHARP_BEANS_LIBS"; then
+ pkg_cv_GTKSHARP_BEANS_LIBS="$GTKSHARP_BEANS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-beans-2.0 >= \$GNOMESHARP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKSHARP_BEANS_LIBS=`$PKG_CONFIG --libs "gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+ GTKSHARP_BEANS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED" 2>&1`
+ else
+ GTKSHARP_BEANS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTKSHARP_BEANS_PKG_ERRORS" >&5
+
+ enable_gio=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ enable_gio=no
+else
+ GTKSHARP_BEANS_CFLAGS=$pkg_cv_GTKSHARP_BEANS_CFLAGS
+ GTKSHARP_BEANS_LIBS=$pkg_cv_GTKSHARP_BEANS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ enable_gio=yes
+fi
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIOSHARP" >&5
@@ -16929,12 +17401,12 @@ if test -n "$GIOSHARP_CFLAGS"; then
pkg_cv_GIOSHARP_CFLAGS="$GIOSHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-sharp-3.0 >= \$GIOSHARP_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gio-sharp-3.0 >= $GIOSHARP_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-sharp-2.0 >= 2.22.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gio-sharp-2.0 >= 2.22.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GIOSHARP_CFLAGS=`$PKG_CONFIG --cflags "gio-sharp-3.0 >= $GIOSHARP_REQUIRED" 2>/dev/null`
+ pkg_cv_GIOSHARP_CFLAGS=`$PKG_CONFIG --cflags "gio-sharp-2.0 >= 2.22.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16946,12 +17418,12 @@ if test -n "$GIOSHARP_LIBS"; then
pkg_cv_GIOSHARP_LIBS="$GIOSHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-sharp-3.0 >= \$GIOSHARP_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gio-sharp-3.0 >= $GIOSHARP_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-sharp-2.0 >= 2.22.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gio-sharp-2.0 >= 2.22.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GIOSHARP_LIBS=`$PKG_CONFIG --libs "gio-sharp-3.0 >= $GIOSHARP_REQUIRED" 2>/dev/null`
+ pkg_cv_GIOSHARP_LIBS=`$PKG_CONFIG --libs "gio-sharp-2.0 >= 2.22.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16972,32 +17444,111 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GIOSHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-sharp-3.0 >= $GIOSHARP_REQUIRED" 2>&1`
+ GIOSHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-sharp-2.0 >= 2.22.3" 2>&1`
else
- GIOSHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-sharp-3.0 >= $GIOSHARP_REQUIRED" 2>&1`
+ GIOSHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-sharp-2.0 >= 2.22.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GIOSHARP_PKG_ERRORS" >&5
- has_gio_sharp=no
+ enable_gio=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- has_gio_sharp=no
+ enable_gio=no
else
GIOSHARP_CFLAGS=$pkg_cv_GIOSHARP_CFLAGS
GIOSHARP_LIBS=$pkg_cv_GIOSHARP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- has_gio_sharp=yes
+ enable_gio="$enable_gio"
fi
- if test "x$has_gio_sharp" = "xno"; then
- as_fn_error $? "gio-sharp-3.0 was not found or is not up to date. Please install gio-sharp-3.0 of at least version $GIOSHARP_REQUIRED, or disable GIO support by passing --disable-gio" "$LINENO" 5
- fi
- if test "x$enable_gio_hardware" = "xyes"; then
+ asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
+ for asm in $asms; do
+ FILENAME=`basename $asm`
+ if [ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]; then
+ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
+ [ -r "$asm.config" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
+ [ -r "$asm.mdb" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
+ SEENBEFORE="$SEENBEFORE $FILENAME"
+ fi
+ done
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB_2_22" >&5
+$as_echo_n "checking for GLIB_2_22... " >&6; }
+
+if test -n "$GLIB_2_22_CFLAGS"; then
+ pkg_cv_GLIB_2_22_CFLAGS="$GLIB_2_22_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.22\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.22") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIB_2_22_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.22" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GLIB_2_22_LIBS"; then
+ pkg_cv_GLIB_2_22_LIBS="$GLIB_2_22_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.22\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.22") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIB_2_22_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.22" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GLIB_2_22_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.22" 2>&1`
+ else
+ GLIB_2_22_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.22" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GLIB_2_22_PKG_ERRORS" >&5
- has_gudev_sharp=no
+ enable_gio=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ enable_gio=no
+else
+ GLIB_2_22_CFLAGS=$pkg_cv_GLIB_2_22_CFLAGS
+ GLIB_2_22_LIBS=$pkg_cv_GLIB_2_22_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ enable_gio="$enable_gio"
+fi
+
+ if test "x$enable_gio_hardware" = "xyes"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUDEV_SHARP" >&5
@@ -17007,12 +17558,84 @@ if test -n "$GUDEV_SHARP_CFLAGS"; then
pkg_cv_GUDEV_SHARP_CFLAGS="$GUDEV_SHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-sharp-3.0 >= \$GUDEVSHARP_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gudev-sharp-3.0 >= $GUDEVSHARP_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-sharp-1.0 >= 0.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gudev-sharp-1.0 >= 0.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GUDEV_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gudev-sharp-1.0 >= 0.1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GUDEV_SHARP_LIBS"; then
+ pkg_cv_GUDEV_SHARP_LIBS="$GUDEV_SHARP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-sharp-1.0 >= 0.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gudev-sharp-1.0 >= 0.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GUDEV_SHARP_LIBS=`$PKG_CONFIG --libs "gudev-sharp-1.0 >= 0.1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+ GUDEV_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gudev-sharp-1.0 >= 0.1" 2>&1`
+ else
+ GUDEV_SHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gudev-sharp-1.0 >= 0.1" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GUDEV_SHARP_PKG_ERRORS" >&5
+
+ enable_gio_hardware=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ enable_gio_hardware=no
+else
+ GUDEV_SHARP_CFLAGS=$pkg_cv_GUDEV_SHARP_CFLAGS
+ GUDEV_SHARP_LIBS=$pkg_cv_GUDEV_SHARP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ enable_gio_hardware="$enable_gio"
+fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GKEYFILE_SHARP" >&5
+$as_echo_n "checking for GKEYFILE_SHARP... " >&6; }
+
+if test -n "$GKEYFILE_SHARP_CFLAGS"; then
+ pkg_cv_GKEYFILE_SHARP_CFLAGS="$GKEYFILE_SHARP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gkeyfile-sharp >= 0.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gkeyfile-sharp >= 0.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GUDEV_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gudev-sharp-3.0 >= $GUDEVSHARP_REQUIRED" 2>/dev/null`
+ pkg_cv_GKEYFILE_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gkeyfile-sharp >= 0.1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17020,16 +17643,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$GUDEV_SHARP_LIBS"; then
- pkg_cv_GUDEV_SHARP_LIBS="$GUDEV_SHARP_LIBS"
+if test -n "$GKEYFILE_SHARP_LIBS"; then
+ pkg_cv_GKEYFILE_SHARP_LIBS="$GKEYFILE_SHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-sharp-3.0 >= \$GUDEVSHARP_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gudev-sharp-3.0 >= $GUDEVSHARP_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gkeyfile-sharp >= 0.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gkeyfile-sharp >= 0.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GUDEV_SHARP_LIBS=`$PKG_CONFIG --libs "gudev-sharp-3.0 >= $GUDEVSHARP_REQUIRED" 2>/dev/null`
+ pkg_cv_GKEYFILE_SHARP_LIBS=`$PKG_CONFIG --libs "gkeyfile-sharp >= 0.1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17050,36 +17673,33 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GUDEV_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gudev-sharp-3.0 >= $GUDEVSHARP_REQUIRED" 2>&1`
+ GKEYFILE_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gkeyfile-sharp >= 0.1" 2>&1`
else
- GUDEV_SHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gudev-sharp-3.0 >= $GUDEVSHARP_REQUIRED" 2>&1`
+ GKEYFILE_SHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gkeyfile-sharp >= 0.1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$GUDEV_SHARP_PKG_ERRORS" >&5
+ echo "$GKEYFILE_SHARP_PKG_ERRORS" >&5
- has_gudev_sharp=no
+ enable_gio_hardware=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- has_gudev_sharp=no
+ enable_gio_hardware=no
else
- GUDEV_SHARP_CFLAGS=$pkg_cv_GUDEV_SHARP_CFLAGS
- GUDEV_SHARP_LIBS=$pkg_cv_GUDEV_SHARP_LIBS
+ GKEYFILE_SHARP_CFLAGS=$pkg_cv_GKEYFILE_SHARP_CFLAGS
+ GKEYFILE_SHARP_LIBS=$pkg_cv_GKEYFILE_SHARP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- has_gudev_sharp=yes
+ enable_gio_hardware="$enable_gio_hardware"
fi
- if test "x$has_gudev_sharp" = "xno"; then
- as_fn_error $? "gudev-sharp-3.0 was not found or is not up to date. Please install gudev-sharp-3.0 of at least version $GUDEVSHARP_REQUIRED, or disable GIO Hardware support by passing --disable-gio-hardware" "$LINENO" 5
- fi
-
if test "x$enable_gio_hardware" = "xno"; then
GUDEV_SHARP_LIBS=''
+ GKEYFILE_SHARP_LIBS=''
fi
fi
- if true; then
+ if test "x$enable_gio" = "xyes"; then
ENABLE_GIO_TRUE=
ENABLE_GIO_FALSE='#'
else
@@ -17543,23 +18163,23 @@ fi
- GTKSHARP3_REQUIRED=2.99.1
+ GTKSHARP2_REQUIRED=2.12.10
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIBSHARP" >&5
-$as_echo_n "checking for GLIBSHARP... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSHARP" >&5
+$as_echo_n "checking for GTKSHARP... " >&6; }
-if test -n "$GLIBSHARP_CFLAGS"; then
- pkg_cv_GLIBSHARP_CFLAGS="$GLIBSHARP_CFLAGS"
+if test -n "$GTKSHARP_CFLAGS"; then
+ pkg_cv_GTKSHARP_CFLAGS="$GTKSHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-3.0 >= \$GTKSHARP3_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-sharp-3.0 >= $GTKSHARP3_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= \$GTKSHARP2_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GLIBSHARP_CFLAGS=`$PKG_CONFIG --cflags "glib-sharp-3.0 >= $GTKSHARP3_REQUIRED" 2>/dev/null`
+ pkg_cv_GTKSHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17567,16 +18187,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$GLIBSHARP_LIBS"; then
- pkg_cv_GLIBSHARP_LIBS="$GLIBSHARP_LIBS"
+if test -n "$GTKSHARP_LIBS"; then
+ pkg_cv_GTKSHARP_LIBS="$GTKSHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-3.0 >= \$GTKSHARP3_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-sharp-3.0 >= $GTKSHARP3_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= \$GTKSHARP2_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GLIBSHARP_LIBS=`$PKG_CONFIG --libs "glib-sharp-3.0 >= $GTKSHARP3_REQUIRED" 2>/dev/null`
+ pkg_cv_GTKSHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17597,22 +18217,22 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLIBSHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-sharp-3.0 >= $GTKSHARP3_REQUIRED" 2>&1`
+ GTKSHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED" 2>&1`
else
- GLIBSHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-sharp-3.0 >= $GTKSHARP3_REQUIRED" 2>&1`
+ GTKSHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$GLIBSHARP_PKG_ERRORS" >&5
+ echo "$GTKSHARP_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (glib-sharp-3.0 >= $GTKSHARP3_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (gtk-sharp-2.0 >= $GTKSHARP2_REQUIRED) were not met:
-$GLIBSHARP_PKG_ERRORS
+$GTKSHARP_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
-and GLIBSHARP_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GTKSHARP_CFLAGS
+and GTKSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -17623,34 +18243,36 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
-and GLIBSHARP_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GTKSHARP_CFLAGS
+and GTKSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- GLIBSHARP_CFLAGS=$pkg_cv_GLIBSHARP_CFLAGS
- GLIBSHARP_LIBS=$pkg_cv_GLIBSHARP_LIBS
+ GTKSHARP_CFLAGS=$pkg_cv_GTKSHARP_CFLAGS
+ GTKSHARP_LIBS=$pkg_cv_GTKSHARP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
+
+
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSHARP" >&5
-$as_echo_n "checking for GTKSHARP... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIBSHARP" >&5
+$as_echo_n "checking for GLIBSHARP... " >&6; }
-if test -n "$GTKSHARP_CFLAGS"; then
- pkg_cv_GTKSHARP_CFLAGS="$GTKSHARP_CFLAGS"
+if test -n "$GLIBSHARP_CFLAGS"; then
+ pkg_cv_GLIBSHARP_CFLAGS="$GLIBSHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-3.0 >= \$GTKSHARP3_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= \$GTKSHARP2_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-sharp-2.0 >= $GTKSHARP2_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTKSHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED" 2>/dev/null`
+ pkg_cv_GLIBSHARP_CFLAGS=`$PKG_CONFIG --cflags "glib-sharp-2.0 >= $GTKSHARP2_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17658,16 +18280,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$GTKSHARP_LIBS"; then
- pkg_cv_GTKSHARP_LIBS="$GTKSHARP_LIBS"
+if test -n "$GLIBSHARP_LIBS"; then
+ pkg_cv_GLIBSHARP_LIBS="$GLIBSHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-3.0 >= \$GTKSHARP3_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-sharp-2.0 >= \$GTKSHARP2_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-sharp-2.0 >= $GTKSHARP2_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTKSHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED" 2>/dev/null`
+ pkg_cv_GLIBSHARP_LIBS=`$PKG_CONFIG --libs "glib-sharp-2.0 >= $GTKSHARP2_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17688,22 +18310,22 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKSHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED" 2>&1`
+ GLIBSHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-sharp-2.0 >= $GTKSHARP2_REQUIRED" 2>&1`
else
- GTKSHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED" 2>&1`
+ GLIBSHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-sharp-2.0 >= $GTKSHARP2_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$GTKSHARP_PKG_ERRORS" >&5
+ echo "$GLIBSHARP_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gtk-sharp-3.0 >= $GTKSHARP3_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (glib-sharp-2.0 >= $GTKSHARP2_REQUIRED) were not met:
-$GTKSHARP_PKG_ERRORS
+$GLIBSHARP_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables GTKSHARP_CFLAGS
-and GTKSHARP_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
+and GLIBSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -17714,24 +18336,22 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables GTKSHARP_CFLAGS
-and GTKSHARP_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GLIBSHARP_CFLAGS
+and GLIBSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- GTKSHARP_CFLAGS=$pkg_cv_GTKSHARP_CFLAGS
- GTKSHARP_LIBS=$pkg_cv_GTKSHARP_LIBS
+ GLIBSHARP_CFLAGS=$pkg_cv_GLIBSHARP_CFLAGS
+ GLIBSHARP_LIBS=$pkg_cv_GLIBSHARP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
- gtk_sharp_version=$(pkg-config --modversion gtk-sharp-3.0)
-
-
+ gtk_version="2"
@@ -18579,14 +19199,6 @@ else
fi
if false; then
- HAVE_DBUS_GLIB_TRUE=
- HAVE_DBUS_GLIB_FALSE='#'
-else
- HAVE_DBUS_GLIB_TRUE='#'
- HAVE_DBUS_GLIB_FALSE=
-fi
-
- if false; then
ENABLE_GNOME_TRUE=
ENABLE_GNOME_FALSE='#'
else
@@ -18597,7 +19209,7 @@ fi
fi
- LIBMTP_REQUIRED=1.1.0
+ LIBMTP_REQUIRED=0.3.0
# Check whether --enable-mtp was given.
if test "${enable_mtp+set}" = set; then :
@@ -18688,6 +19300,30 @@ fi
if test "x$enable_libmtp" = "xyes"; then
LIBMTP_SO_MAP=$(basename $(find $($PKG_CONFIG --variable=libdir libmtp) -maxdepth 1 -regex '.*libmtp\.so\.[0-9][0-9]*$' | sort | tail -n 1))
+ ac_fn_c_check_member "$LINENO" "struct LIBMTP_track_struct" "modificationdate" "ac_cv_member_struct_LIBMTP_track_struct_modificationdate" "#include <libmtp.h>
+"
+if test "x$ac_cv_member_struct_LIBMTP_track_struct_modificationdate" = xyes; then :
+ LIBMTP_HAS_MODDATE=yes
+else
+ LIBMTP_HAS_MODDATE=no
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether LIBMTP_FILETYPE_FOLDER enum value is defined" >&5
+$as_echo_n "checking whether LIBMTP_FILETYPE_FOLDER enum value is defined... " >&6; }
+ if ac_fn_c_compute_int "$LINENO" "LIBMTP_FILETYPE_FOLDER" "LIBMTP_HAS_FOLDER" "#include <libmtp.h>"; then :
+
+else
+ LIBMTP_HAS_FOLDER=no
+fi
+
+ if test "x$LIBMTP_HAS_FOLDER" = "xno"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
fi
if test "x$enable_libmtp" = "xyes"; then
@@ -18698,6 +19334,22 @@ else
ENABLE_MTP_FALSE=
fi
+ if test "$LIBMTP_HAS_MODDATE" = "yes"; then
+ LIBMTP_TRACK_STRUCT_HAS_MODDATE_TRUE=
+ LIBMTP_TRACK_STRUCT_HAS_MODDATE_FALSE='#'
+else
+ LIBMTP_TRACK_STRUCT_HAS_MODDATE_TRUE='#'
+ LIBMTP_TRACK_STRUCT_HAS_MODDATE_FALSE=
+fi
+
+ if test "$LIBMTP_HAS_FOLDER" = "0"; then
+ LIBMTP_FILETYPE_ENUM_HAS_FOLDER_TRUE=
+ LIBMTP_FILETYPE_ENUM_HAS_FOLDER_FALSE='#'
+else
+ LIBMTP_FILETYPE_ENUM_HAS_FOLDER_TRUE='#'
+ LIBMTP_FILETYPE_ENUM_HAS_FOLDER_FALSE=
+fi
+
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -19358,6 +20010,8 @@ fi
+ LIBINDICATESHARP_REQUIRED=0.4.1
+
# Check whether --enable-soundmenu was given.
if test "${enable_soundmenu+set}" = set; then :
enableval=$enable_soundmenu; enable_soundmenu=$enableval
@@ -19367,45 +20021,23 @@ else
fi
- if test "x$enable_soundmenu" = "xyes"; then
- ENABLE_SOUNDMENU_TRUE=
- ENABLE_SOUNDMENU_FALSE='#'
-else
- ENABLE_SOUNDMENU_TRUE='#'
- ENABLE_SOUNDMENU_FALSE=
-fi
-
-
-
-
- UBUNTUONESHARP_REQUIRED=0.9.2
-
- # Check whether --enable-ubuntuone was given.
-if test "${enable_ubuntuone+set}" = set; then :
- enableval=$enable_ubuntuone; enable_ubuntuone=$enableval
-else
- enable_ubuntuone=no
-
-fi
-
-
- if test "x$enable_ubuntuone" = "xyes"; then
- has_ubuntuonesharp=no
+ if test "x$enable_soundmenu" = "xyes"; then
+ has_indicatesharp=no
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UBUNTUONESHARP" >&5
-$as_echo_n "checking for UBUNTUONESHARP... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATESHARP" >&5
+$as_echo_n "checking for INDICATESHARP... " >&6; }
-if test -n "$UBUNTUONESHARP_CFLAGS"; then
- pkg_cv_UBUNTUONESHARP_CFLAGS="$UBUNTUONESHARP_CFLAGS"
+if test -n "$INDICATESHARP_CFLAGS"; then
+ pkg_cv_INDICATESHARP_CFLAGS="$INDICATESHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ubuntuone-sharp-1.0 >= \$UBUNTUONESHARP_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ubuntuone-sharp-1.0 >= $UBUNTUONESHARP_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-sharp-0.1 >= \$LIBINDICATESHARP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_UBUNTUONESHARP_CFLAGS=`$PKG_CONFIG --cflags "ubuntuone-sharp-1.0 >= $UBUNTUONESHARP_REQUIRED" 2>/dev/null`
+ pkg_cv_INDICATESHARP_CFLAGS=`$PKG_CONFIG --cflags "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -19413,16 +20045,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$UBUNTUONESHARP_LIBS"; then
- pkg_cv_UBUNTUONESHARP_LIBS="$UBUNTUONESHARP_LIBS"
+if test -n "$INDICATESHARP_LIBS"; then
+ pkg_cv_INDICATESHARP_LIBS="$INDICATESHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ubuntuone-sharp-1.0 >= \$UBUNTUONESHARP_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ubuntuone-sharp-1.0 >= $UBUNTUONESHARP_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-sharp-0.1 >= \$LIBINDICATESHARP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_UBUNTUONESHARP_LIBS=`$PKG_CONFIG --libs "ubuntuone-sharp-1.0 >= $UBUNTUONESHARP_REQUIRED" 2>/dev/null`
+ pkg_cv_INDICATESHARP_LIBS=`$PKG_CONFIG --libs "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -19443,77 +20075,72 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- UBUNTUONESHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ubuntuone-sharp-1.0 >= $UBUNTUONESHARP_REQUIRED" 2>&1`
+ INDICATESHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED" 2>&1`
else
- UBUNTUONESHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ubuntuone-sharp-1.0 >= $UBUNTUONESHARP_REQUIRED" 2>&1`
+ INDICATESHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$UBUNTUONESHARP_PKG_ERRORS" >&5
+ echo "$INDICATESHARP_PKG_ERRORS" >&5
- has_ubuntuonesharp=no
+ has_indicatesharp=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- has_ubuntuonesharp=no
+ has_indicatesharp=no
else
- UBUNTUONESHARP_CFLAGS=$pkg_cv_UBUNTUONESHARP_CFLAGS
- UBUNTUONESHARP_LIBS=$pkg_cv_UBUNTUONESHARP_LIBS
+ INDICATESHARP_CFLAGS=$pkg_cv_INDICATESHARP_CFLAGS
+ INDICATESHARP_LIBS=$pkg_cv_INDICATESHARP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- has_ubuntuonesharp=yes
+ has_indicatesharp=yes
fi
- if test "x$has_ubuntuonesharp" = "xno"; then
- as_fn_error $? "ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone" "$LINENO" 5
- fi
fi
- if test "x$enable_ubuntuone" = "xyes"; then
- ENABLE_UBUNTUONE_TRUE=
- ENABLE_UBUNTUONE_FALSE='#'
+ if test "x$has_indicatesharp" = "xyes"; then
+ HAVE_INDICATESHARP_TRUE=
+ HAVE_INDICATESHARP_FALSE='#'
else
- ENABLE_UBUNTUONE_TRUE='#'
- ENABLE_UBUNTUONE_FALSE=
+ HAVE_INDICATESHARP_TRUE='#'
+ HAVE_INDICATESHARP_FALSE=
fi
+ if test "x$enable_soundmenu" = "xyes"; then
+ ENABLE_SOUNDMENU_TRUE=
+ ENABLE_SOUNDMENU_FALSE='#'
+else
+ ENABLE_SOUNDMENU_TRUE='#'
+ ENABLE_SOUNDMENU_FALSE=
+fi
- BOO_REQUIRED=0.8.1
- # Check whether --enable-boo was given.
-if test "${enable_boo+set}" = set; then :
- enableval=$enable_boo;
+ # Check whether --enable-ubuntuone was given.
+if test "${enable_ubuntuone+set}" = set; then :
+ enableval=$enable_ubuntuone; enable_ubuntuone=$enableval
else
- enable_boo=no
+ enable_ubuntuone=no
fi
- if test "x$enable_boo" = "xno"; then
- if false; then
- HAVE_BOO_TRUE=
- HAVE_BOO_FALSE='#'
-else
- HAVE_BOO_TRUE='#'
- HAVE_BOO_FALSE=
-fi
-
- else
+ if test "x$enable_ubuntuone" = "xyes"; then
+ has_ubuntuonesharp=no
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BOO" >&5
-$as_echo_n "checking for BOO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UBUNTUONESHARP" >&5
+$as_echo_n "checking for UBUNTUONESHARP... " >&6; }
-if test -n "$BOO_CFLAGS"; then
- pkg_cv_BOO_CFLAGS="$BOO_CFLAGS"
+if test -n "$UBUNTUONESHARP_CFLAGS"; then
+ pkg_cv_UBUNTUONESHARP_CFLAGS="$UBUNTUONESHARP_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"boo >= \$BOO_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "boo >= $BOO_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ubuntuone-sharp-1.0 >= 0.9.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ubuntuone-sharp-1.0 >= 0.9.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BOO_CFLAGS=`$PKG_CONFIG --cflags "boo >= $BOO_REQUIRED" 2>/dev/null`
+ pkg_cv_UBUNTUONESHARP_CFLAGS=`$PKG_CONFIG --cflags "ubuntuone-sharp-1.0 >= 0.9.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -19521,16 +20148,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$BOO_LIBS"; then
- pkg_cv_BOO_LIBS="$BOO_LIBS"
+if test -n "$UBUNTUONESHARP_LIBS"; then
+ pkg_cv_UBUNTUONESHARP_LIBS="$UBUNTUONESHARP_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"boo >= \$BOO_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "boo >= $BOO_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ubuntuone-sharp-1.0 >= 0.9.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ubuntuone-sharp-1.0 >= 0.9.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BOO_LIBS=`$PKG_CONFIG --libs "boo >= $BOO_REQUIRED" 2>/dev/null`
+ pkg_cv_UBUNTUONESHARP_LIBS=`$PKG_CONFIG --libs "ubuntuone-sharp-1.0 >= 0.9.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -19551,55 +20178,38 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BOO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "boo >= $BOO_REQUIRED" 2>&1`
+ UBUNTUONESHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ubuntuone-sharp-1.0 >= 0.9.2" 2>&1`
else
- BOO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "boo >= $BOO_REQUIRED" 2>&1`
+ UBUNTUONESHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ubuntuone-sharp-1.0 >= 0.9.2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$BOO_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (boo >= $BOO_REQUIRED) were not met:
-
-$BOO_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+ echo "$UBUNTUONESHARP_PKG_ERRORS" >&5
-Alternatively, you may set the environment variables BOO_CFLAGS
-and BOO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+ has_ubuntuonesharp=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables BOO_CFLAGS
-and BOO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+ has_ubuntuonesharp=no
else
- BOO_CFLAGS=$pkg_cv_BOO_CFLAGS
- BOO_LIBS=$pkg_cv_BOO_LIBS
+ UBUNTUONESHARP_CFLAGS=$pkg_cv_UBUNTUONESHARP_CFLAGS
+ UBUNTUONESHARP_LIBS=$pkg_cv_UBUNTUONESHARP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-
+ has_ubuntuonesharp=yes
fi
+ if test "x$has_ubuntuonesharp" = "xno"; then
+ as_fn_error $? "ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone" "$LINENO" 5
+ fi
+ fi
- if true; then
- HAVE_BOO_TRUE=
- HAVE_BOO_FALSE='#'
+ if test "x$enable_ubuntuone" = "xyes"; then
+ ENABLE_UBUNTUONE_TRUE=
+ ENABLE_UBUNTUONE_FALSE='#'
else
- HAVE_BOO_TRUE='#'
- HAVE_BOO_FALSE=
+ ENABLE_UBUNTUONE_TRUE='#'
+ ENABLE_UBUNTUONE_FALSE=
fi
- fi
ENABLE_GAPLESS="no"
@@ -19705,9 +20315,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
- # needed so autoconf doesn't complain before checking the existence of glib-2.0 in configure.ac
-
-
for ac_header in locale.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
@@ -20415,7 +21022,6 @@ $as_echo "$LINGUAS" >&6; }
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
< $srcdir/po/POTFILES.in > po/POTFILES
-
CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS'
@@ -20440,13 +21046,8 @@ ENABLE_RELEASE=$enable_release
if test "x$enable_release" = "xyes"; then
GMCS_FLAGS="-define:RELEASE"
else
- GMCS_FLAGS=""
+ GMCS_FLAGS="-warnaserror"
fi
-#FIXME: add "-warnaserror" back above!
-
-#TODO: for simplicity, just remove langversion and use .NET 4.0 moving forward
-GMCS_FLAGS="$GMC_FLAGS -langversion:3"
-
if false; then
@@ -20750,6 +21351,10 @@ if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FAL
as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_GDK_2_22_TRUE}" && test -z "${HAVE_GDK_2_22_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GDK_2_22\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${EXTERNAL_NOTIFY_SHARP_TRUE}" && test -z "${EXTERNAL_NOTIFY_SHARP_FALSE}"; then
as_fn_error $? "conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20758,6 +21363,14 @@ if test -z "${EXTERNAL_NOTIFY_SHARP_TRUE}" && test -z "${EXTERNAL_NOTIFY_SHARP_F
as_fn_error $? "conditional \"EXTERNAL_NOTIFY_SHARP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_BOO_TRUE}" && test -z "${HAVE_BOO_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_BOO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_BOO_TRUE}" && test -z "${HAVE_BOO_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_BOO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then
as_fn_error $? "conditional \"BUILD_DOCS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20794,16 +21407,16 @@ if test -z "${HAVE_GDATASHARP_1_5_TRUE}" && test -z "${HAVE_GDATASHARP_1_5_FALSE
as_fn_error $? "conditional \"HAVE_GDATASHARP_1_5\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${ENABLE_YOUTUBE_TRUE}" && test -z "${ENABLE_YOUTUBE_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_YOUTUBE\" was never defined.
+if test -z "${HAVE_GDATA_TRUE}" && test -z "${HAVE_GDATA_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GDATA\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GDATASHARP_1_5_TRUE}" && test -z "${HAVE_GDATASHARP_1_5_FALSE}"; then
as_fn_error $? "conditional \"HAVE_GDATASHARP_1_5\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${ENABLE_YOUTUBE_TRUE}" && test -z "${ENABLE_YOUTUBE_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_YOUTUBE\" was never defined.
+if test -z "${HAVE_GDATA_TRUE}" && test -z "${HAVE_GDATA_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GDATA\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_GIO_TRUE}" && test -z "${ENABLE_GIO_FALSE}"; then
@@ -20874,10 +21487,6 @@ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_F
as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_DBUS_GLIB_TRUE}" && test -z "${HAVE_DBUS_GLIB_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_DBUS_GLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${ENABLE_GNOME_TRUE}" && test -z "${ENABLE_GNOME_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_GNOME\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20886,6 +21495,14 @@ if test -z "${ENABLE_MTP_TRUE}" && test -z "${ENABLE_MTP_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_MTP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${LIBMTP_TRACK_STRUCT_HAS_MODDATE_TRUE}" && test -z "${LIBMTP_TRACK_STRUCT_HAS_MODDATE_FALSE}"; then
+ as_fn_error $? "conditional \"LIBMTP_TRACK_STRUCT_HAS_MODDATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LIBMTP_FILETYPE_ENUM_HAS_FOLDER_TRUE}" && test -z "${LIBMTP_FILETYPE_ENUM_HAS_FOLDER_FALSE}"; then
+ as_fn_error $? "conditional \"LIBMTP_FILETYPE_ENUM_HAS_FOLDER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${LIBMTP_SIZEOF_TIME_T_64_TRUE}" && test -z "${LIBMTP_SIZEOF_TIME_T_64_FALSE}"; then
as_fn_error $? "conditional \"LIBMTP_SIZEOF_TIME_T_64\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20930,6 +21547,10 @@ if test -z "${HAVE_MEEGO_TRUE}" && test -z "${HAVE_MEEGO_FALSE}"; then
as_fn_error $? "conditional \"HAVE_MEEGO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_INDICATESHARP_TRUE}" && test -z "${HAVE_INDICATESHARP_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_INDICATESHARP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${ENABLE_SOUNDMENU_TRUE}" && test -z "${ENABLE_SOUNDMENU_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_SOUNDMENU\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20938,14 +21559,6 @@ if test -z "${ENABLE_UBUNTUONE_TRUE}" && test -z "${ENABLE_UBUNTUONE_FALSE}"; th
as_fn_error $? "conditional \"ENABLE_UBUNTUONE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_BOO_TRUE}" && test -z "${HAVE_BOO_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_BOO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_BOO_TRUE}" && test -z "${HAVE_BOO_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_BOO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${ENABLE_GAPLESS_TRUE}" && test -z "${ENABLE_GAPLESS_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_GAPLESS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21355,7 +21968,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by banshee $as_me 2.9.0, which was
+This file was extended by banshee $as_me 2.6.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21421,7 +22034,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-banshee config.status 2.9.0
+banshee config.status 2.6.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -23338,7 +23951,7 @@ ${PACKAGE}-${VERSION}
C Compiler: ${CC}
Mono C# Compiler: ${MCS} ${GMCS_FLAGS}
Mono Runtime: ${MONO}
- Gtk#: ${gtk_sharp_version}
+ Gtk#: ${gtk_version}
Video/Graphics:
Graphics System: ${GRAPHICS_SUBSYSTEM}
@@ -23359,14 +23972,14 @@ ${PACKAGE}-${VERSION}
Extra Features:
Web Browser: ${have_libwebkit} (webkit-1.0 >= $WEBKIT_MIN_VERSION, libsoup-2.4 >= $SOUP_MIN_VERSION)
+ GNOME Proxy ${have_libsoup_gnome} (libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION)
+ Boo Scripting: ${enable_boo}
DAAP: ${enable_daap}
- GIO Backend: ${enable_gio} (gio-sharp >= $GIOSHARP_REQUIRED)
- GIO Hardware: ${enable_gio_hardware} (gudev-sharp >= $GUDEVSHARP_REQUIRED)
- YouTube: ${enable_youtube} (gdata-sharp >= $GDATASHARP_REQUIRED_VERSION)
+ GIO Backend: ${enable_gio} (glib >= 2.22, gio-sharp >= 2.22.3, and gtk-sharp-beans)
+ GIO Hardware: ${enable_gio_hardware} (gudev-sharp, gkeyfile-sharp)
+ YouTube: ${enable_youtube} (gdata-sharp >= 1.4)
Sound Menu: ${enable_soundmenu}
- Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp >= $UBUNTUONESHARP_REQUIRED)
+ Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp >= 0.3.2)
UPnP: ${enable_upnp} (mono-upnp >= $MONOUPNP_REQUIRED)
- Boo Scripting: ${enable_boo} (boo >= $BOO_REQUIRED)
Build/Development:
Unit Tests: ${do_tests} (nunit >= ${NUNIT_REQUIRED})
diff --git a/configure.ac b/configure.ac
index 6c91fb9..f36063e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
dnl Granularly define the version components
dnl Remember to also update the Display Version
m4_define([banshee_version_major], [2])
-m4_define([banshee_version_minor], [9])
-m4_define([banshee_version_micro], [0])
+m4_define([banshee_version_minor], [6])
+m4_define([banshee_version_micro], [1])
dnl this can sometimes differ manually
-m4_define([banshee_display_version], ["2.9"])
+m4_define([banshee_display_version], ["2.6.1"])
dnl set to 0 when doing an official release
m4_define([banshee_version_pre_release], [0])
@@ -51,8 +51,6 @@ SHAMROCK_EXPAND_LIBDIR
SHAMROCK_EXPAND_BINDIR
SHAMROCK_EXPAND_DATADIR
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.22)
-
dnl libbanshee/native dependencies (required)
BANSHEE_CHECK_LIBBANSHEE
BANSHEE_CHECK_GSTREAMER
@@ -66,17 +64,17 @@ dnl User help
SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(2.8.2)
-SHAMROCK_FIND_MONO_2_0_COMPILER_OR_HIGHER
+SHAMROCK_CHECK_MONO_MODULE(2.4.3)
+SHAMROCK_FIND_MONO_2_0_COMPILER
SHAMROCK_FIND_MONO_RUNTIME
-SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
- Mono.Posix
- ICSharpCode.SharpZipLib
-])
+SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
-dnl In MeeGo we want the full name, but not in GNOME 3 (see bgo#596242)
+dnl Check for GNOME >= 2.28 to see if we should remove
+dnl 'Media Player' from the app Name, bgo#596242, except
+dnl in MeeGo where GNOME >= 2.28, but we want the full name
+PKG_CHECK_MODULES(GNOME_2_28, gnome-desktop-2.0 >= 2.28, HAVE_GNOME_2_28=yes, HAVE_GNOME_2_28=no)
PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel, HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
-if "x$HAVE_MEEGO_PANEL" = "xyes"; then
+if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then
BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
else
BANSHEE_DESKTOP_NAME="_Name=Banshee"
@@ -91,6 +89,10 @@ fi
AC_SUBST(MEEGO_PANELS_DIR)
+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 DBus Sharp libraries
BANSHEE_CHECK_DBUS_SHARP
@@ -100,6 +102,9 @@ BANSHEE_CHECK_MONO_ADDINS
dnl notify-sharp library
BANSHEE_CHECK_NOTIFY_SHARP
+dnl Boo
+BANSHEE_CHECK_BOO
+
dnl Monodoc (optional through --disable-docs)
SHAMROCK_CHECK_MONODOC
@@ -109,7 +114,7 @@ BANSHEE_CHECK_LIBWEBKIT
dnl gdata (optional through --disable-youtube)
BANSHEE_CHECK_YOUTUBE
-dnl gio#
+dnl gtk#-beans and gio#
BANSHEE_CHECK_GIO_SHARP
dnl Moonlight (optional through --enable-moonlight)
@@ -140,7 +145,6 @@ if test "x$enable_gnome" = "xyes"; then
AM_CONDITIONAL(ENABLE_GNOME, true)
else
AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
- AM_CONDITIONAL(HAVE_DBUS_GLIB, false)
AM_CONDITIONAL(ENABLE_GNOME, false)
fi
@@ -167,9 +171,6 @@ BANSHEE_CHECK_SOUNDMENU
dnl Ubuntu One Music Store (optional)
BANSHEE_CHECK_UBUNTUONE
-dnl Boo (optional)
-BANSHEE_CHECK_BOO
-
dnl Gapless, if we have a new-enough playbin2
ENABLE_GAPLESS="no"
AC_ARG_ENABLE(gapless-playback,
@@ -198,13 +199,8 @@ AC_SUBST(ENABLE_RELEASE)
if test "x$enable_release" = "xyes"; then
GMCS_FLAGS="-define:RELEASE"
else
- GMCS_FLAGS=""
+ GMCS_FLAGS="-warnaserror"
fi
-#FIXME: add "-warnaserror" back above!
-
-#TODO: for simplicity, just remove langversion and use .NET 4.0 moving forward
-GMCS_FLAGS="$GMC_FLAGS -langversion:3"
-
AC_SUBST(GMCS_FLAGS)
AM_CONDITIONAL(HYENA_PKG_CONFIG, false)
@@ -372,7 +368,7 @@ ${PACKAGE}-${VERSION}
C Compiler: ${CC}
Mono C# Compiler: ${MCS} ${GMCS_FLAGS}
Mono Runtime: ${MONO}
- Gtk#: ${gtk_sharp_version}
+ Gtk#: ${gtk_version}
Video/Graphics:
Graphics System: ${GRAPHICS_SUBSYSTEM}
@@ -393,14 +389,14 @@ ${PACKAGE}-${VERSION}
Extra Features:
Web Browser: ${have_libwebkit} (webkit-1.0 >= $WEBKIT_MIN_VERSION, libsoup-2.4 >= $SOUP_MIN_VERSION)
+ GNOME Proxy ${have_libsoup_gnome} (libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION)
+ Boo Scripting: ${enable_boo}
DAAP: ${enable_daap}
- GIO Backend: ${enable_gio} (gio-sharp >= $GIOSHARP_REQUIRED)
- GIO Hardware: ${enable_gio_hardware} (gudev-sharp >= $GUDEVSHARP_REQUIRED)
- YouTube: ${enable_youtube} (gdata-sharp >= $GDATASHARP_REQUIRED_VERSION)
+ GIO Backend: ${enable_gio} (glib >= 2.22, gio-sharp >= 2.22.3, and gtk-sharp-beans)
+ GIO Hardware: ${enable_gio_hardware} (gudev-sharp, gkeyfile-sharp)
+ YouTube: ${enable_youtube} (gdata-sharp >= 1.4)
Sound Menu: ${enable_soundmenu}
- Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp >= $UBUNTUONESHARP_REQUIRED)
+ Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp >= 0.3.2)
UPnP: ${enable_upnp} (mono-upnp >= $MONOUPNP_REQUIRED)
- Boo Scripting: ${enable_boo} (boo >= $BOO_REQUIRED)
Build/Development:
Unit Tests: ${do_tests} (nunit >= ${NUNIT_REQUIRED})
diff --git a/data/Makefile.am b/data/Makefile.am
index ffbf9ff..8c84cc4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,20 +16,11 @@ addin-xml-strings.cs: $(ADDIN_XML_FILES) $(top_srcdir)/build/addin-xml-string-ex
@echo " GEN $@"
$(MONO) $(top_srcdir)/build/addin-xml-string-extractor.exe $(ADDIN_XML_FILES) > $@
- at INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
-dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = banshee.appdata.xml.in
-
all: addin-xml-strings.cs
EXTRA_DIST = \
$(dbusservice_in_files) \
- addin-xml-strings.cs \
- $(appdata_in_files)
-
-CLEANFILES = \
- $(appdata_DATA)
+ addin-xml-strings.cs
DISTCLEANFILES = \
$(dbusservice_DATA)
diff --git a/data/Makefile.in b/data/Makefile.in
index 3d89bf6..56c3c68 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -52,8 +52,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data
-DIST_COMMON = $(dist_appdata_DATA) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/org.bansheeproject.Banshee.service.in \
$(srcdir)/org.bansheeproject.CollectionIndexer.service.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -143,9 +142,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(dbusservicedir)" \
- "$(DESTDIR)$(appdatadir)"
-DATA = $(dbusservice_DATA) $(dist_appdata_DATA)
+am__installdirs = "$(DESTDIR)$(dbusservicedir)"
+DATA = $(dbusservice_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -246,15 +244,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -263,6 +270,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -277,6 +286,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -284,6 +295,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -480,16 +493,9 @@ dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
# Generate a fake source file containing strings for
# translation that are found in our .addin.xml files
ADDIN_XML_FILES = $(shell find $(top_srcdir)/src -name \*.addin.xml | grep -v /obj/)
-appdatadir = $(datadir)/appdata
-dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = banshee.appdata.xml.in
EXTRA_DIST = \
$(dbusservice_in_files) \
- addin-xml-strings.cs \
- $(appdata_in_files)
-
-CLEANFILES = \
- $(appdata_DATA)
+ addin-xml-strings.cs
DISTCLEANFILES = \
$(dbusservice_DATA)
@@ -561,27 +567,6 @@ uninstall-dbusserviceDATA:
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir)
-install-dist_appdataDATA: $(dist_appdata_DATA)
- @$(NORMAL_INSTALL)
- @list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
- done
-
-uninstall-dist_appdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -778,7 +763,7 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(appdatadir)"; do \
+ for dir in "$(DESTDIR)$(dbusservicedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -803,7 +788,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -834,7 +818,7 @@ info: info-recursive
info-am:
-install-data-am: install-dbusserviceDATA install-dist_appdataDATA
+install-data-am: install-dbusserviceDATA
install-dvi: install-dvi-recursive
@@ -878,7 +862,7 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-dbusserviceDATA uninstall-dist_appdataDATA
+uninstall-am: uninstall-dbusserviceDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
install-am install-strip tags-recursive
@@ -888,23 +872,20 @@ uninstall-am: uninstall-dbusserviceDATA uninstall-dist_appdataDATA
ctags ctags-recursive distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-dbusserviceDATA \
- install-dist_appdataDATA install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-dbusserviceDATA uninstall-dist_appdataDATA
+ install-data-am install-dbusserviceDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-dbusserviceDATA
addin-xml-strings.cs: $(ADDIN_XML_FILES) $(top_srcdir)/build/addin-xml-string-extractor.exe
@echo " GEN $@"
$(MONO) $(top_srcdir)/build/addin-xml-string-extractor.exe $(ADDIN_XML_FILES) > $@
- at INTLTOOL_XML_RULE@
-
all: addin-xml-strings.cs
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/data/audio-profiles/Makefile.in b/data/audio-profiles/Makefile.in
index 2d489bd..5d26659 100644
--- a/data/audio-profiles/Makefile.in
+++ b/data/audio-profiles/Makefile.in
@@ -201,15 +201,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -218,6 +227,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -232,6 +243,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -239,6 +252,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/data/banshee.appdata.xml b/data/banshee.appdata.xml
deleted file mode 100644
index 851d089..0000000
--- a/data/banshee.appdata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="desktop">banshee.desktop</id>
- <licence>CC0</licence>
- <description>
-
- <p>Banshee is an open source multimedia management and playback application for GNOME, Mac and Windows.</p>
- <p xml:lang="cs">Banshee je svobodná aplikace s otevřeným kódem sloužící ke správě a přehrávání multimédií v GNOME, na Macu a ve Windows.</p>
- <p xml:lang="es">Banshee es una aplicación de software libre para GNOME, Mac y Windows para gestionar y reproducir archivos multimedia.</p>
- <p xml:lang="id">Banshee adalah aplikasi manajemen dan pemutar multimedia yang sumbernya terbuka bagi GNOME, Mac, dan Windows.</p>
- <p xml:lang="lt">Banshee yra atviro kodo daugialypės terpės tvarkymo ir grojimo programa GNOME, Mac ir Windows aplinkoms.</p>
- <p xml:lang="pl">Banshee to program open source do zarządzania i odtwarzania multimediów dla systemów GNOME, Mac i Windows.</p>
- <p xml:lang="pt_BR">Banshee é um gerenciador de multimídia de código aberto e aplicativo de reprodução para o GNOME, Mac e Windows.</p>
-
- <p>Play your music and videos. Stay entertained and up to date with podcasts and video podcasts. Sync your Android, iPod, and other devices. We think you'll love Banshee!</p>
- <p xml:lang="cs">Přehrávejte si svoji hudbu a videa. Mějte k dispozici nepřetržitou zábavu s vždy aktuálními podcasty a videopodcasty. Synchronizujte vše se svými zařízeními Android, iPod a dalšími. Věříme, že budete Banshee milovat.</p>
- <p xml:lang="es">Reproduzca su música y sus vídeos. Entreténgase y mantenga al día sus podcasts de sonido y de vídeo. Sincronice su dispositivo Android, iPod y otros. ¡Seguro que le gustará Banshee!</p>
- <p xml:lang="id">Putar musik dan video Anda. Tetaplah terhibur dan mutakhir dengan podcast dan podcast video. Selaraskan Android, iPod, dan perangkat lain Anda. Kami rasa Anda akan mencintai Banshee!</p>
- <p xml:lang="lt">Grokite muziką ir filmus. Linksminkitės bei žinokite naujienas iš tinklalaidžių. Sinchronizuokite su Android, iPod ir kitais įrenginiais. Mes manome, kad jums patiks Banshee!</p>
- <p xml:lang="pl">Funkcje programu Banshee obejmują odtwarzanie muzyki i nagrań wideo, podcastów dźwiękowych i wideo oraz synchronizowanie kolekcji z urządzeniami Android, iPod i wieloma innymi.</p>
- <p xml:lang="pt_BR">Reproduza suas músicas e vídeos. Fique entretido e mantenha-se atualizado com podcasts de áudio e video. Sincronize seu Android, iPod, e outros dispositivos. Acreditamos que você irá amar o Banshee!</p>
- </description>
- <screenshots>
- <screenshot width="450" type="default" height="335">http://banshee.fm/theme/images/slides/scaled/music-450.png</screenshot>
- <screenshot width="600" height="432">http://download.banshee.fm/shots/banshee-190-track-actions.png</screenshot>
- </screenshots>
- <url type="homepage">http://banshee.fm/</url>
- <updatecontact>banshee-list_at_gnome.org</updatecontact>
-</application>
\ No newline at end of file
diff --git a/data/banshee.appdata.xml.in b/data/banshee.appdata.xml.in
deleted file mode 100644
index e19c5d1..0000000
--- a/data/banshee.appdata.xml.in
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 Banshee Contributors <banshee-list at gnome.org> -->
-<application>
- <id type="desktop">banshee.desktop</id>
- <licence>CC0</licence><!-- licence of this file, not the program -->
- <description>
- <!-- Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -->
- <_p>
- Banshee is an open source multimedia management and playback application
- for GNOME, Mac and Windows.
- </_p>
-
- <_p>
- Play your music and videos. Stay entertained and up to date with podcasts
- and video podcasts. Sync your Android, iPod, and other devices. We think
- you'll love Banshee!
- </_p>
- </description>
- <screenshots>
- <screenshot type="default" width="450" height="335">http://banshee.fm/theme/images/slides/scaled/music-450.png</screenshot>
- <screenshot width="600" height="432">http://download.banshee.fm/shots/banshee-190-track-actions.png</screenshot>
- </screenshots>
- <url type="homepage">http://banshee.fm/</url>
- <updatecontact>banshee-list_at_gnome.org</updatecontact>
-</application>
diff --git a/data/desktop-files/Makefile.in b/data/desktop-files/Makefile.in
index f89a7a6..1b42e99 100644
--- a/data/desktop-files/Makefile.in
+++ b/data/desktop-files/Makefile.in
@@ -202,15 +202,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -219,6 +228,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -233,6 +244,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -240,6 +253,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/data/desktop-files/common.desktop.in b/data/desktop-files/common.desktop.in
index 505d747..02f263f 100644
--- a/data/desktop-files/common.desktop.in
+++ b/data/desktop-files/common.desktop.in
@@ -3,7 +3,6 @@ Version=1.0
_GenericName=Media Player
_X-GNOME-FullName=Banshee Media Player
_Comment=Play and organize your media collection
-_Keywords=Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;
Icon=media-player-banshee
StartupNotify=true
Terminal=false
diff --git a/data/icon-theme-hicolor/Makefile.in b/data/icon-theme-hicolor/Makefile.in
index 3469e28..99339bd 100644
--- a/data/icon-theme-hicolor/Makefile.in
+++ b/data/icon-theme-hicolor/Makefile.in
@@ -171,15 +171,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -188,6 +197,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -202,6 +213,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -209,6 +222,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/docs/Banshee/Makefile.in b/docs/Banshee/Makefile.in
index 8544a13..58f6c35 100644
--- a/docs/Banshee/Makefile.in
+++ b/docs/Banshee/Makefile.in
@@ -202,15 +202,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -219,6 +228,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -233,6 +244,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -240,6 +253,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/docs/Hyena/Makefile.in b/docs/Hyena/Makefile.in
index 3da21be..218e988 100644
--- a/docs/Hyena/Makefile.in
+++ b/docs/Hyena/Makefile.in
@@ -202,15 +202,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -219,6 +228,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -233,6 +244,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -240,6 +253,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/docs/Makefile.in b/docs/Makefile.in
index f4c842c..28a1b2b 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -211,15 +211,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -228,6 +237,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -242,6 +253,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,6 +262,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/extras/Makefile.in b/extras/Makefile.in
index 07c47b5..b4026a9 100644
--- a/extras/Makefile.in
+++ b/extras/Makefile.in
@@ -211,15 +211,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -228,6 +237,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -242,6 +253,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,6 +262,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/extras/metrics/Makefile.in b/extras/metrics/Makefile.in
index 86b2329..b3443dd 100644
--- a/extras/metrics/Makefile.in
+++ b/extras/metrics/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -448,14 +463,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -570,7 +586,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -578,7 +594,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -586,7 +601,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -605,7 +620,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -644,7 +659,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -901,12 +915,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/help/C/add-podcast.page b/help/C/add-podcast.page
new file mode 100644
index 0000000..fc70a77
--- /dev/null
+++ b/help/C/add-podcast.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="add-podcast">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play podcasts in Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>What is a Podcast?</title>
+
+ <p>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.</p>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Add a Podcast</title>
+
+ <p>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 <gui>Copy link</gui>.
+ </p>
+
+ <p>In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the
+ upper right hand corner, from the menu choose <guiseq><gui>Media</gui><gui>
+ Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut <keyseq>
+ <key>Shift</key><key>Control</key><key>F</key></keyseq>.
+ </p>
+
+ <p>Banshee will then allow you to choose how you want to download new podcasts
+ from a drop down menu. Your choices include:</p>
+
+ <list>
+ <item><p>Download the Most Recent Episode (This will automatically
+ download the last episode that was released).</p></item>
+ <item><p>Download All Episodes (This will download all episodes).</p></item>
+ <item><p>Let Me Decide Which Episodes to Download (This will allow you
+ to choose which episodes you would like to download).</p></item>
+ </list>
+
+ <p>After you have added a Podcast feed, Banshee will display:</p>
+
+ <list>
+ <item><p><gui>Name</gui>: (Name of the specific episode)</p></item>
+ <item><p><gui>Podcast</gui>: (Name of the Podcast)</p></item>
+ <item><p><gui>Published</gui> (Date the episode was published or released)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/C/add-radio.page b/help/C/add-radio.page
new file mode 100644
index 0000000..f2612cf
--- /dev/null
+++ b/help/C/add-radio.page
@@ -0,0 +1,71 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="add-radio">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play internet radio stations in Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Internet Radio</title>
+
+ <section id="radiodescription">
+ <title>What is Internet Radio?</title>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Add Radio Station</title>
+
+ <p>To add an internet radio station to Banshee, press <gui>Add Station</gui>
+ in the upper right hand corner of Banshee or, from the menu, choose <guiseq>
+ <gui>Media</gui><gui>Add Station</gui></guiseq>.
+ </p>
+
+ <p>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 <gui>Copy Link</gui>.
+ </p>
+
+
+ <p>Banshee will prompt you to enter the <gui>Station Genre</gui>.
+ Choose the kind of music the internet radio station plays from the available
+ drop down selections. You will then need to enter the <gui>Station Name</gui>.
+ Enter a name for the radio station. Then press tab or use your mouse to select
+ the <gui>Stream URL</gui> field to paste the URL of the radio station.
+ Using your mouse right click and choose <gui>Paste</gui> or press <keyseq>
+ <key>Control</key><key>V</key></keyseq>.</p>
+
+ <p>You can optionally also fill out the fields for
+ <gui>Station Creator</gui>, <gui>Description</gui>, and <gui>Rating</gui>.
+ </p>
+
+ <p>Then press <gui>Save</gui> to save the internet radio station in Banshee.
+ </p>
+
+ </section>
+
+</page>
diff --git a/help/C/extensions.page b/help/C/advanced.page
similarity index 53%
copy from help/C/extensions.page
copy to help/C/advanced.page
index 7f891db..3f9906c 100644
--- a/help/C/extensions.page
+++ b/help/C/advanced.page
@@ -1,16 +1,16 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
type="guide" style="2column"
- id="extensions">
+ id="advanced">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Get help for advanced actions.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -19,16 +19,14 @@
-->
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
+
+ <title>Advanced Options and Help</title>
- <title><app>Banshee</app> extensions</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Keyboard Shortcuts</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Keyboard Shortcuts</title>
</section>
-
+
</page>
diff --git a/help/C/amazon.page b/help/C/amazon.page
index b812fa5..008cb8e 100644
--- a/help/C/amazon.page
+++ b/help/C/amazon.page
@@ -5,17 +5,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Sync and purchase music from the Amazon MP3 Store.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -25,63 +21,63 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Amazon MP3 Store</title>
+
+ <p>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.
+ </p>
+
+ <note style="important">
+ <p>Banshee uses an Amazon affiliate code for all music purchases. All
+ money made via this affiliate code is donated to the GNOME Foundation.
+ </p>
+ </note>
+
<section id="amazon-browser">
- <title>Purchase Amazon MP3s in your web browser</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Purchase Amazon MP3s in your web browser</title>
+
+ <p>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.
+ </p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Buy Amazon MP3s in Banshee</title>
+
+ <p>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.
+ </p>
</section>
-
+
<section id="amazon-manual">
- <title>Import Amazon MP3s manually</title>
-
+ <title>Import Amazon MP3s manually</title>
+
<p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ extension .amz is downloaded and saved to your hard drive. To import
+ music purchased manually from Amazon, in Banshee choose
+ <guiseq><gui>Media</gui> <gui>Import Media</gui></guiseq> 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.
+ </p>
+
<note style="warning">
- <p>Amazon .amz files are only active for a short time. If you do not
+ <p>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.</p>
+ 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.
+ </p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/C/emusic.page b/help/C/emusic.page
new file mode 100644
index 0000000..4f8e068
--- /dev/null
+++ b/help/C/emusic.page
@@ -0,0 +1,14 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic" style="task"
+ id="emusic-import">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music purchased from eMusic.</desc>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Import your eMusic tracks</title>
+
+</page>
diff --git a/help/C/extensions.page b/help/C/extensions.page
index 7f891db..25be9c1 100644
--- a/help/C/extensions.page
+++ b/help/C/extensions.page
@@ -1,34 +1,40 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
type="guide" style="2column"
- id="extensions">
+ id="extend">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Add additional functionality to Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Banshee Extensions</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Official Banshee Extensions</title>
</info>
+ <title>Manage extensions for Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Community Banshee Extensions</title>
+ </info>
+ <title>Add community built extensions for Banshee</title>
</section>
+
</page>
diff --git a/help/C/import.page b/help/C/import.page
index 056a478..a980342 100644
--- a/help/C/import.page
+++ b/help/C/import.page
@@ -4,10 +4,9 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
- <revision pkgversion="1.6" version="1.6" date="2010-07-15"
- status="review"/>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Add music and videos from your computer to your Banshee library.</desc>
+ <revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
@@ -16,24 +15,19 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
<title>Import music & videos</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>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.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui
- style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>To import music or video files on your computer, choose <guiseq><gui>Media</gui>
+ <gui>Import Media</gui></guiseq>. A dialog will appear with a number of choices.</p>
- <note style="tip">
+ <note>
<p>Plugins may add additional import choices. See <link xref="#plugins"/>
below.</p>
</note>
@@ -65,29 +59,25 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>You can safely import from a folder you have already imported
from without worrying about duplicate entries in your library.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Import from a Playlist</title>
+ <p>You can also import music from playlists. Most playlist files end
+ in <em>m3u</em>. To import from a playlist, from the Banshee menu
+ choose <guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and
+ locate the playlist file in your folder, select it and press
+ <gui>Import</gui>.
+ </p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Plugins may add additional import choices. The following additional
- sources will be available if the appropriate plugins are enabled:</p>
-
+ <title>Additional Import Sources</title>
+ <p>Plugins may add additional import choices. The following additional
+ sources will be available if the appropriate plugins are enabled:</p>
</section>
-
+
</page>
diff --git a/help/C/index.page b/help/C/index.page
index c177234..db50b51 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -4,8 +4,7 @@
id="index">
<info>
- <revision pkgversion="1.6" version="0.1" date="2010-01-22"
- status="incomplete"/>
+ <revision pkgversion="1.6" version="0.1" date="2010-01-22" status="incomplete"/>
<revision pkgversion="2.6" version="0.2" date="2012-11-25" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -15,39 +14,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Banshee Media Player</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Add, Remove & Play</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Manage & Sort</title>
</section>
-
+
<section id="sync" style="2column">
<title>Sync your media with a portable music player</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Add additional functionality to Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Advanced options and help</title>
+ <title>Advanced options and help</title>
</section>
</page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index ac69906..b24e9cb 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -5,15 +5,13 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>
+ Introduction to the <app>Banshee Media Player</app>.
+ </desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -25,25 +23,28 @@
<title>Introduction</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
- <p><app>Banshee</app> includes features to import your media, manage its
- metadata, and play your music and videos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>
+ <app>Banshee</app> 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.
+ </p>
+ <p>
+ <app>Banshee</app> includes features to import your media, manage its
+ metadata, and play your music and videos.
+ </p>
+ <p>
+ 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.
+ </p>
+<!--
<figure>
<title><gui>Banshee Media Player</gui> window</title>
<desc><app>Banshee Media Player</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png"
- style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/C/itunes-import.page b/help/C/itunes-import.page
new file mode 100644
index 0000000..9475b6b
--- /dev/null
+++ b/help/C/itunes-import.page
@@ -0,0 +1,14 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic" style="task"
+ id="itunes-import">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>iTunes</app> media player.</desc>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Import your <app>iTunes</app> library</title>
+
+</page>
diff --git a/help/C/keyboard-shortcuts.page b/help/C/keyboard-shortcuts.page
deleted file mode 100644
index 24b5ffe..0000000
--- a/help/C/keyboard-shortcuts.page
+++ /dev/null
@@ -1,154 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
- type="topic" style="task"
- id="keyboard-shortcuts">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Play or Pause the current song</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Play the next song</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Play the previous song</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Move the focus to the search box</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Open import media dialog</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Playlists</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Create New Playlist</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Mark the selected episodes as old</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interface</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Toggle full-screen mode</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Select all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Unselect all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Previous Song (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Next Song (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
- </p></td>
- <td><p>Toggle Play / Pause (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/C/keyboardshortcuts.page b/help/C/keyboardshortcuts.page
new file mode 100644
index 0000000..cafa4cb
--- /dev/null
+++ b/help/C/keyboardshortcuts.page
@@ -0,0 +1,145 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic" style="task"
+ id="keyboardshortcuts">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Keyboard Shortcuts</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Control Banshee using Keyboard Shortcuts</title>
+
+ <section id="playbackcontrol">
+
+ <title>Playback Control</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Space Bar</p></td> <td><p>Play or Pause the current song</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Play the next song</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Play the previous song</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Library Interaction</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>
+ Move the focus to the search box</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Open import media dialog</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Playlists</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>
+ Create New Playlist</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>
+ Mark the selected episodes as old</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interface</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>
+ Toggle full-screen mode</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>
+ Select all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>
+ Unselect all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>
+ Hide Banshee Window (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Play Previous Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Play Next Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Toggle Play / Pause (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/C/lastfm.page b/help/C/lastfm.page
index d3c22ee..25cd618 100644
--- a/help/C/lastfm.page
+++ b/help/C/lastfm.page
@@ -4,18 +4,14 @@
id="lastfm">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Enable Last.fm, song reporting and Last.fm radio.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -25,112 +21,102 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Last.fm</title>
-
+ <title>Last.fm</title>
+
<p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ 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.</p>
+
<section id="enable-lastfm">
- <title>Enable Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link
- href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Enable Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>To enable Banshee to report the songs you play on your computer to Last.fm,
+ sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences.
+ Enter your username and press the <gui>Log in to Last.fm</gui> button. You
+ will be directed to a Last.fm webpage in your browser to grant Banshee access.
+ Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</gui> button
+ to complete the process.
+ </p>
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Listen to Last.fm Radio</title>
<p>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.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+ 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.
+ </p>
+
+ <p>In Banshee's sources pane 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 <gui>Play</gui> button
+ in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio
+ station. You can also press the <gui>Next</gui> button in Banshee,
+ <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq>
+ to play the next song in your radio station queue.
+ </p>
+
</section>
-
+
</page>
diff --git a/help/C/manage-coverart.page b/help/C/manage-coverart.page
new file mode 100644
index 0000000..bbfd36d
--- /dev/null
+++ b/help/C/manage-coverart.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="coverart">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Manage or change your albums cover art.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Cover art</title>
+
+ <p></p>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/C/manage-playlists.page b/help/C/manage-playlists.page
index ca97014..c67a071 100644
--- a/help/C/manage-playlists.page
+++ b/help/C/manage-playlists.page
@@ -1,159 +1,147 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
type="topic" style="task"
- id="manage-playlists">
+ id="playlists">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Create and manage playlists.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Playlists</title>
-
- <p>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.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+ <title>Playlists</title>
+
+ <p>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.
+ </p>
+
+ <p>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.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>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.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>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.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>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.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Normal Playlists</title>
+
+ <p>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.
+ </p>
+
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key>
+ <key>N</key></keyseq>, from the menu choosing <guiseq><gui>Media</gui>
+ <gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
+ to add to the playlist. Select the track(s), right click them, and choose
+ <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
+ 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 <gui>Music</gui>. As you drag it over <gui>Music</gui>,
+ a new option <gui><em>New Playlist</em></gui> will appear and you can drop
+ the track(s) over <gui><em>New Playlist</em></gui> to add them to the
+ playlist. You can repeat this process until you have added all the tracks
+ you want in the playlist.
+ </p>
+
+ <p>To give your playlist its own name, select the playlist and right click
+ on the playlist and press <gui>Rename Playlist</gui> and enter the name
+ of your playlist.
+ </p>
+
+ <p>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.
+ </p>
+
+ <p>To remove a track from the playlist, select the track(s) you wish to
+ remove. Press the <key>Delete</key>, from the menu choose
+ <guiseq><gui>Edit</gui><gui>Remove from Playlist</gui></guiseq> or right
+ click the track(s) with your mouse and press <gui>Remove from Playlist</gui>.
+ </p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Smart Playlist</title>
+
+ <p>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.
+ </p>
+
+ <p>To create a new Smart Playlist, from the menu choose <guiseq>
+ <gui>Media</gui><gui>New Smart Playlist</gui></guiseq>. 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:
+ </p>
+
<list>
<item><p>is</p></item>
- <item><p>is not</p></item>
+ <item><p>is not</p></item>
<item><p>less than</p></item>
- <item><p>more than</p></item>
+ <item><p>more than</p></item>
<item><p>at most</p></item>
- <item><p>at least</p></item>
+ <item><p>at least</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>You can also press the <gui>+</gui> 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:
+ </p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Year</gui></p></td>
- <td><p><gui>is</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Year</gui></p></td> <td><p><gui>is</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Rating</gui></p></td>
- <td><p><gui>is</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Rating</gui></p></td> <td><p><gui>is</gui></p></td>
+ <td><p><gui></gui>5 stars</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>You can then optionally select how many songs are included by pressing
+ the <gui>Limit</gui> to checkbox and choosing the number of songs to be
+ included.
+ </p>
+
+ <p>Banshee also includes smart playlists already created for
+ you. Press the <gui>Open in editor</gui> button to view how the playlist
+ created was or to modify it. If you press <gui>Create and save</gui> the
+ playlist will be automatically generated and saved for you. The following
+ playlists are included:
+ </p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Favorites (Songs rated four and five stars)</p>
- </item>
- <item>
- <p>Recent Favorites (Songs listened to often in the past week)</p>
- </item>
- <item>
- <p>Recently Added (Songs imported within the last week)</p>
- </item>
- <item>
- <p>Unheard (Songs that have not been played or skipped)</p>
- </item>
- <item>
- <p>Neglected Favorites (Favorites not played in over two months)</p>
- </item>
- <item>
- <p>700 MB of Favorites (A data CD worth of favorite songs)</p>
- </item>
- <item>
- <p>80 Minutes of Favorites (An audio CD worth of favorite songs)</p>
- </item>
- <item>
- <p>Unrated (Songs that haven't been rated)</p>
- </item>
+ <title>Banshee Smart Playlists</title>
+ <item><p>Favorites (Songs rated four and five stars)</p></item>
+ <item><p>Recent Favorites (Songs listened to often in the past week)
+ </p></item>
+ <item><p>Recently Added (Songs imported within the last week)</p></item>
+ <item><p>Unheard (Songs that have not been played or skipped)</p></item>
+ <item><p>Neglected Favorites (Favorites not played in over two months)
+ </p></item>
+ <item><p>700 MB of Favorites (A data CD worth of favorite songs)</p></item>
+ <item><p>80 Minutes of Favorites (An audio CD worth of favorite songs)
+ </p></item>
+ <item><p>Unrated (Songs that haven't been rated)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/C/manage-tags.page b/help/C/manage-tags.page
index 67713a0..f69f414 100644
--- a/help/C/manage-tags.page
+++ b/help/C/manage-tags.page
@@ -1,17 +1,18 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
type="topic" style="task"
- id="manage-tags">
+ id="tags">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Edit and change music tags and metadata.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -20,51 +21,61 @@
-->
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
+
+ <title>Music Metadata</title>
- <title>Music metadata</title>
+ <section id="metadata">
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis
- comments for OGG Vorbis files.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
-
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>A dialog box will appear that shows the song's metadata and allow you to
- change or update it. The default fields displayed include:</p>
-
- <list>
- <item><p><gui>Track Title</gui></p></item>
- <item><p><gui>Track Artist</gui></p></item>
- <item><p><gui>Album Title</gui></p></item>
- <item><p><gui>Genre</gui></p></item>
- <item><p><gui>Track Number</gui></p></item>
- <item><p><gui>Disc Number</gui></p></item>
- <item><p><gui>Year</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>Music metadata</title>
+
+ <p>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
+ <link xref="import"/>.</p>
+
+ <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and
+ Vorbis comments for OGG Vorbis files.</p>
+
+ <p>If you have imported songs that do not contain metadata,
+ <app>Banshee</app> will display <gui>Unknown</gui> for most fields
+ in the library. </p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Edit Your Metadata</title>
+
+ <p>You can change and edit the metadata of your songs. Select the song or
+ songs you want to update and hit the <key>E</key>, choose
+ <guiseq><gui>Edit</gui><gui>Edit Track Information</gui></guiseq> from the menu, or use
+ your mouse and right click on the files and select
+ <gui>Edit Track Information</gui>.
+ </p>
+
+ <p>A dialog box will appear that shows the song's metadata and allow you to
+ change or update it. The default fields displayed include:</p>
+
+ <list>
+ <item><p><gui>Track Title</gui></p></item>
+ <item><p><gui>Track Artist</gui></p></item>
+ <item><p><gui>Album Title</gui></p></item>
+ <item><p><gui>Genre</gui></p></item>
+ <item><p><gui>Track Number</gui></p></item>
+ <item><p><gui>Disc Number</gui></p></item>
+ <item><p><gui>Year</gui></p></item>
+ </list>
+
+ <p>Update the song's information. If you have selected multiple songs to
+ edit press the right arrow icon to the right of the <gui>Track Title</gui>
+ field or press the <gui>Forward</gui> button at the bottom of the dialog
+ when finished with each song. When you have completed editing all metadata,
+ press <gui>Save</gui>.
+ </p>
+
</section>
</page>
diff --git a/help/C/play-queue.page b/help/C/play-queue.page
index 5ae2738..e8b267a 100644
--- a/help/C/play-queue.page
+++ b/help/C/play-queue.page
@@ -1,99 +1,86 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
type="topic" style="task"
- id="play-queue">
+ id="queue">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Add media to your play queue.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Play queue</title>
-
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
-
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
-
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
-
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
-
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui
- style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
-
+ <title>Play Queue</title>
+
+ <p>The <gui>Play Queue</gui> 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.</p>
+
+<section id="addqueue">
+
+ <title>Add Music to the Play Queue</title>
+
+ <p>From your music library, you will need to select the music tracks or albums
+ you want to add to the play queue.
+ </p>
+
+ <p>To add an entire album to the Play Queue, using your mouse press and hold
+ the album and drag the album over <gui>Play Queue</gui> in the far left
+ window pane.
+ </p>
+
+ <p>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 <gui>Play Queue</gui>
+ in the far left window pane, or right click the track and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+ <p>You can select multiple files by using your mouse and pressing
+ <key>Control</key> and choosing each file with your mouse or
+ select a range of files by
+ pressing <key>Shift</key> and clicking twice to select that range of files. You can then
+ drag and drop it over the <gui>Play Queue</gui>
+ in the far left window pane or right click the tracks and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+</section>
+
+<section id="reorderqueue">
+
+ <title>Organize Your Play Queue</title>
+
+ <p>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.
+ </p>
+
+</section>
+
+<section id="removequeue">
+
+ <title>Removing Tracks from the Play Queue</title>
+
+ <p>You can remove an individual track, a group of tracks, or clear your entire
+ play queue.
+ </p>
+
+ <p>To remove an individual track or group of tracks, select the track
+ with your mouse and then press <key>Delete</key>.
+ </p>
+
+ <p>To clear your entire Play Queue, press the <gui>Clear</gui> button in the
+ upper right hand corner of the Play Queue.
+ </p>
+
+</section>
+
</page>
diff --git a/help/C/play.page b/help/C/play.page
index 88308da..7e1e1bb 100644
--- a/help/C/play.page
+++ b/help/C/play.page
@@ -5,23 +5,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Play your videos and music files.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26"
- status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -30,120 +20,82 @@
-->
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Play your music</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <title>Play Your Media</title>
+
+ <section id="playmusic">
+ <title>Play your music</title>
+
+ <p>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.</p>
+
+ <p>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.
+ </p>
+
+ <p>To start playing a song, use your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
+ browser and using your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
+ and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
+ <p>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.
+ </p>
+
</section>
- <section id="play-video">
- <title>Play a video</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+ <section id="playvideo">
+ <title>Play a video</title>
+
+ <p>Your imported videos are listed alphabetically. To play a video,
+ choose the video you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>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.</p>
+
</section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
+
+ <section id="playpodcast">
+ <title>Play a Podcast</title>
+
+ <p>Podcasts shows you all Podcasts you're subscribed to, all Podcast
+ shows available, and the Podcast browser lists all Podcasts in order of
newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <p>To play a Podcast,
+ choose the Podcast you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
</section>
-
- <section id="play-radio">
- <title>Play an internet radio station</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- </section>
-
+
+ <section id="playradio">
+ <title>Play an internet radio station</title>
+
+ <p>The Radio source shows you all internet radio stations you have added
+ to Banshee alphabetically.
+ </p>
+
+ <p>To play an internet radio station,
+ choose the radio station you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ </section>
+
</page>
diff --git a/help/C/podcast.page b/help/C/podcast.page
deleted file mode 100644
index 9f6f70d..0000000
--- a/help/C/podcast.page
+++ /dev/null
@@ -1,119 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
- xmlns:e="http://projectmallard.org/experimental/"
- type="topic" style="task"
- id="podcast">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/C/radio.page b/help/C/radio.page
deleted file mode 100644
index 3d3a9e8..0000000
--- a/help/C/radio.page
+++ /dev/null
@@ -1,137 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
- xmlns:e="http://projectmallard.org/experimental/"
- type="topic" style="task"
- id="radio">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/C/rb-import.page b/help/C/rb-import.page
new file mode 100644
index 0000000..dba5693
--- /dev/null
+++ b/help/C/rb-import.page
@@ -0,0 +1,14 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic" style="task"
+ id="rb-import">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>Rhythmbox</app> music player.</desc>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+ <title>Import your <app>Rhythmbox</app> library</title>
+
+</page>
diff --git a/help/C/search.page b/help/C/search.page
index e5f6d0f..c8cb808 100644
--- a/help/C/search.page
+++ b/help/C/search.page
@@ -11,11 +11,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -25,100 +21,99 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
+ <title>Searching your Banshee Library</title>
+
+ <p>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.</p>
+
+ <p>To perform a search of your media in Banshee, press the <key>S</key> or
+ click the <gui>Search</gui> box in the upper right hand corner of the Library
+ view in Banshee.
+ </p>
+
+ <p>A search query consists of some basic terms, for example,
+ <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
+ Banshee will search all metadata fields including Track Title, Album Title,
+ Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
+ and <em>matthews</em> will be returned. Search terms are case insensitive, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ all mean the same thing when searching.</p>
+
+<section id="operators">
+ <title>Basic Operators</title>
+ <p>Operators can be placed between any two search words or placed before a
+ search word. The default operation is <gui>AND</gui> and is used when
+ no other operators are used between two search terms. Because it is the
default, there is no explicit AND operator.</p>
-
- <p>Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together,
+
+ <p>Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together,
these three operations can yield very powerful queries to help you search
your media.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Logical Operators and Examples</title>
<p>The following is a list of logical operators and examples of the search
results when searching using them.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operator</gui></p></td>
- <td><p><gui>Description</gui></p></td>
+ <td><p><gui>Operator</gui></p></td> <td><p><gui>Description</gui></p></td>
</tr>
<tr>
- <td><p><em>default</em>, <em>white space</em></p></td>
- <td><p>Search for two terms with a space between the two
- words or terms.</p></td>
+ <td><p><em>default</em>, <em>white space</em></p></td> <td><p>
+ Search for two terms with a space between the two words or terms.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Search results will be two songs with either result in any
- field.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>
+ Search results will be two songs with either result in any field.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>
+ Do not display search results with any search term that follows the
+ operator of NOT, not,<key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Examples of logical operations include:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Query</gui></p></td>
- <td><p><gui>Description</gui></p></td>
+ <td><p><gui>Query</gui></p></td> <td><p><gui>Description</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Matches any fields in a track containing both <em>dave</em> and
+ <td><p>dave matthews</p></td> <td><p>
+ Matches any fields in a track containing both <em>dave</em> and
<em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave, matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave or matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
- </tr>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave | matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
- </tr>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Displays all tracks whose fields do not contain
- <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>
+ Displays all tracks whose fields do not contain <em>dave
+ matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>For more information on performing more complex search queries,
+ see the <link xref="adv-search"/> page.</p>
+
</section>
-
+
</page>
diff --git a/help/C/sort.page b/help/C/sort.page
index 2badbb8..8860be3 100644
--- a/help/C/sort.page
+++ b/help/C/sort.page
@@ -11,11 +11,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -29,32 +25,31 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Adding Columns</title>
+
<p>As your library grows, you may want to change your library view to add
- additional information about the songs in your library or change the way you
- can view and sort your songs, artists or albums.</p>
-
+ additional information about the songs in your library or change the way
+ you can view and sort your songs, artists or albums.</p>
+
<p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+ to give you more information about the songs and also allow you to sort
+ by. By default, Banshee displays columns for songs including
+ <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>.
+ 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.
+ </p>
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Sorting Columns</title>
+ <p>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 <gui>Artist</gui> column header and Banshee will
+ automatically sort that column alphabetically. Clicking the
+ <gui>Artist</gui> column again will sort the column in reverse alphabetical
+ order.</p>
</section>
-
+
</page>
diff --git a/help/C/sync.page b/help/C/sync.page
index 8f2a014..f25019d 100644
--- a/help/C/sync.page
+++ b/help/C/sync.page
@@ -5,17 +5,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Sync your media to a portable media player or smartphone.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -25,128 +21,130 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>Sync</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Sync</title>
+
+ <p>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.
+ </p>
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Device Support</title>
+ <p>Banshee supports almost all modern portable music players and
+ smartphones with the notable exception of the Apple iPhone, iPad and
+ iPod Touch.</p>
+
+ <p>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.
+ </p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Music</p></item>
- <item><p>Audiobooks</p></item>
- <item><p>Videos</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>From the dropdown menu next to each of the media, choose from:</p>
-
- <list>
- <item><p>Manage manually</p></item>
- <item><p>Sync entire library</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Sync Your Music</title>
+ <p>You can choose to manage the media on your portable music
+ by having Banshee automatically sync it or manage your music and media
+ manually.
+ </p>
+
+ <p>Choose your device from the Banshee menu and then choose how you want
+ to sync your media, including:
+ </p>
+ <list>
+ <item><p>Music</p></item>
+ <item><p>Audiobooks</p></item>
+ <item><p>Videos</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>From the dropdown menu next to each of the media, choose from:
+ </p>
+ <list>
+ <item><p>Manage manually</p></item>
+ <item><p>Sync entire library</p></item>
+ </list>
+
+ <note style="warning">
+ <p>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.
+ </p>
+ </note>
+
+ <p>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.
+ </p>
+
+ <p>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.
+ </p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Sync Your Entire Library</title>
+ <p>You can drag and drop media to your portable music player from 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.
+ </p>
+
+ <p>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.
+ </p>
+
+ <note style="tip">
+ <p>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 <gui>Disconnect</gui>.
+ </p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Play Music From Your Portable Music Player</title>
+ <p>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.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Deleting files from your portable music player will permanently remove
- the files and you will not be able to recover them.</p>
- </note>
-
+ <title>Remove Music From your Portable Music Player</title>
+ <p>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 <gui>Delete</gui> or from the
+ menu choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Deleting files from your portable music player will permanently remove
+ the files and you will not be able to recover them.
+ </p>
+ </note>
+
</section>
+
</page>
diff --git a/help/C/ui.page b/help/C/ui.page
index 7034fbc..ec58c59 100644
--- a/help/C/ui.page
+++ b/help/C/ui.page
@@ -5,112 +5,81 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
+ <desc>
+ An overview of <app>Banshee's</app> user interface.
</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
-->
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Introduction to the Banshee User Interface</title>
<figure>
<title><gui>Banshee Media Player</gui> window</title>
<desc><app>Banshee Media Player</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png"
- style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshee</app> library interface</p>
</media>
</figure>
-
- <section id="context">
- <title>Sources</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
+
+<section id="context">
+ <title>Sources</title>
+ <p>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.
+ </p>
+
+ <note style="tip">
+ <p>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.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Library Browser</title>
+ <p>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.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Now Playing View</title>
+ <p>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.</p>
+
+ <p>To change Now Playing to hide the Banshee user interface and use the full
+ screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui>
+ button in the upper right hand corner of Banshee, or choose
+ <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen
+ mode.</p>
+
+</section>
+
+<section id="library">
+ <title>Library</title>
+ <p>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.
+ </p>
+</section>
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index 194278d..94219ba 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -3,23 +3,27 @@ include $(top_srcdir)/build/gnome-doc-utils.make
DOC_ID = banshee
DOC_INCLUDES = legal.xml
-DOC_FIGURES = \
- main-window.png
+DOC_FIGURES =
DOC_PAGES = \
+ add-podcast.page \
+ add-radio.page \
+ advanced.page \
amazon.page \
+ emusic.page \
extensions.page \
import.page \
index.page \
introduction.page \
- keyboard-shortcuts.page \
+ itunes-import.page \
+ keyboardshortcuts.page \
lastfm.page \
+ manage-coverart.page \
manage-playlists.page \
manage-tags.page \
play-queue.page \
play.page \
- podcast.page \
- radio.page \
+ rb-import.page \
search.page \
sort.page \
sync.page \
diff --git a/help/Makefile.in b/help/Makefile.in
index 5f908ca..92a392d 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -196,15 +196,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -213,6 +222,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -227,6 +238,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -234,6 +247,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -527,23 +542,26 @@ top_srcdir = @top_srcdir@
@HAVE_GNOME_DOC_UTILS_TRUE at _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
@HAVE_GNOME_DOC_UTILS_TRUE at DOC_ID = banshee
@HAVE_GNOME_DOC_UTILS_TRUE at DOC_INCLUDES = legal.xml
- at HAVE_GNOME_DOC_UTILS_TRUE@DOC_FIGURES = \
- at HAVE_GNOME_DOC_UTILS_TRUE@ main-window.png
-
+ at HAVE_GNOME_DOC_UTILS_TRUE@DOC_FIGURES =
@HAVE_GNOME_DOC_UTILS_TRUE at DOC_PAGES = \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ add-podcast.page \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ add-radio.page \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ advanced.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ amazon.page \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ emusic.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ extensions.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ import.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ index.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ introduction.page \
- at HAVE_GNOME_DOC_UTILS_TRUE@ keyboard-shortcuts.page \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ itunes-import.page \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ keyboardshortcuts.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ lastfm.page \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ manage-coverart.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ manage-playlists.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ manage-tags.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ play-queue.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ play.page \
- at HAVE_GNOME_DOC_UTILS_TRUE@ podcast.page \
- at HAVE_GNOME_DOC_UTILS_TRUE@ radio.page \
+ at HAVE_GNOME_DOC_UTILS_TRUE@ rb-import.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ search.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ sort.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ sync.page \
diff --git a/help/ca/add-podcast.page b/help/ca/add-podcast.page
new file mode 100644
index 0000000..faec383
--- /dev/null
+++ b/help/ca/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="ca">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Afegeix, elimina i reprodueix podcasts al Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>Què és un Podcast?</title>
+
+ <p>Els Podcasts són programes enregistrats, similars als programes de ràdio, que es troben disponibles a Internet als quals us podeu subscriure. En subscriure-us a un Podcast des del Banshee, cada cop que es publica un nou programa, el Banshee baixarà el Podcast automàticament perquè el pugueu escoltar.</p>
+
+ <p>Hi ha Podcasts gairebé de qualsevol tema, incloent-hi música, pel·lícules, Linux, i molt més. Cerqueu a Internet utilitzant el vostre cercador preferit amb termes com ara «pel·lícula podcast» i obtindreu un conjunt de resultats per a escollir.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Afegiu un Podcast</title>
+
+ <p>Per a afegir un Podcast al Banshee primer heu de visitar la pàgina del Podcast a Internet amb un navegador web. Gairebé tots els Podcasts tenen un botó o enllaç per subscriure's. Copieu l'enllaç a la subscripció al Podcast. A la majoria de navegadors web, podeu fer clic a l'enllaç amb el botó dret del ratolí i seleccionar <gui>Copia l'enllaç</gui>.</p>
+
+ <p>Al Bansee, premeu i seleccioneu <gui>Subscriviu-vos al podcast</gui> a la part superior dreta, des del menú escolliu <guiseq><gui>Elements multimèdia</gui> <gui>Subscriviu-vos al podcast</gui></guiseq> o utilitzeu la drecera de teclat <keyseq><key>tecla de majúscules</key><key>control</key><key>F</key></keyseq>.</p>
+
+ <p>El Banshee us permetrà escollir com voleu baixar els Podcasts nous des del menú desplegable. Les opcions inclouen:</p>
+
+ <list>
+ <item><p>Baixa l'episodi més recent (es baixarà l'últim episodi que s'ha publicat)</p></item>
+ <item><p>Baixa tots els episodis.</p></item>
+ <item><p>Deixeu-me decidir quins episodis baixar.</p></item>
+ </list>
+
+ <p>Un cop hàgiu afegit un canal Podcast, el Banshee mostrarà:</p>
+
+ <list>
+ <item><p><gui>Nom</gui>: (nom de l'episodi específic)</p></item>
+ <item><p><gui>Podcast</gui>: (nom del Podcast)</p></item>
+ <item><p><gui>Publicat</gui> (data en que l'episodi es va publicar)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/ca/add-radio.page b/help/ca/add-radio.page
new file mode 100644
index 0000000..0b309b0
--- /dev/null
+++ b/help/ca/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="ca">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Afegiu, suprimiu i reproduïu emissores de ràdio al Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Ràdio per Internet</title>
+
+ <section id="radiodescription">
+ <title>Què és la ràdio per Internet?</title>
+
+ <p>Les emissores de ràdio per Internet són similars a les emissores de ràdio convencionals, fent possible a una persona o organització emetre música en viu mitjançant Internet. Les emissores de ràdio per Internet poden emetre al mateix temps que una emissió de ràdio convencional, possibiliten als amateurs emetre el seu propi contingut, permeten emetre a les emissores de ràdio comercials, que inclouen DJs en viu o fins i tot anuncis.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Afegiu una emissora de ràdio</title>
+
+ <p>Per a afegir una emissora de ràdio per Internet al Banshee, premeu <gui>Afegeix una emissora</gui> a la cantonada superior dreta del Banshee o, des del menú, seleccioneu <guiseq><gui>Elements multimèdia</gui><gui>Afegeix una emissora</gui></guiseq>.</p>
+
+ <p>Des de la pàgina d'Internet de l'emissora de ràdio, copieu l'enllaç del flux a l'URL del vostre navegador. A la majoria de navegadors, podeu fer clic amb el botó dret a l'enllaç i prémer <gui>Copia l'enllaç</gui>.</p>
+
+
+ <p>El Banshee us demanarà introduir el <gui>Gènere de l'emissora</gui>. Seleccioneu el tipus de música que l'emissora de ràdio per Internet emet de la llista desplegable. A continuació, caldrà que introduïu el <gui>Nom de l'emissora</gui>. Introduïu un nom per a l'emissora de ràdio. Llavors, premeu la tecla de tabulació o utilitzeu el ratolí per a seleccionar el diàleg <gui>URL del flux:</gui> i enganxeu l'URL de l'emissora de ràdio. Utilitzant el botó dret del ratolí i seleccioneu <gu [...]
+
+ <p>Podeu opcionalment omplir els camps <gui>creador de l'emissora</gui>, <gui>descripció</gui>, i <gui>valoració</gui>.</p>
+
+ <p>Llavors premeu <gui>Desa</gui> per a desar l'emissora de ràdio per Internet al Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/ca/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/ca/advanced.page
index 468ad23..3dd37aa 100644
--- a/help/zh_CN/extensions.page
+++ b/help/ca/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="ca">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Obtingueu ajuda per a accions avançades.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Opcions avançades i ajuda</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Dreceres de teclat</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Dreceres de teclat</title>
</section>
-
+
</page>
diff --git a/help/ca/amazon.page b/help/ca/amazon.page
index a184488..210c2a1 100644
--- a/help/ca/amazon.page
+++ b/help/ca/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Sincronitza i compra música de la botiga Amazon MP3.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Botiga Amazon MP3</title>
+
+ <p>El Banshee permet baixar i importar música de la botiga Amazon MP3. Podeu importar manualment fitxers de música, comprar música des del navegador web o des de dins del Banshee. Amazon només ven música en format MP3 en certs països i depenent de la vostra ubicació, és possible que no pugueu comprar d'Amazon MP3.</p>
+
+ <note style="important">
+ <p>El Banshee utilitza un codi d'afiliació per totes compres de música. Totes les comissions de venda obtingudes amb el codi d'afiliació són donades a la Fundació GNOME.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Compreu música de l'Amazon MP3 des del navegador</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Compreu música de l'Amazon MP3 des del navegador</title>
+
+ <p>La música comprada a la botiga d'Amazon MP3 pot ser baixada i importada al Banshee automàticament. El Banshee s'associa el mateix amb l'extensió .amz que Amazon utilitza per les compres de MP3. Quan compreu música a Amazon, el navegador web baixarà el fitxer .amz i el Banshee l'obrirà automàticament i començarà a baixar i importar la música.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Compreu d'Amazon MP3 des del Banshee</title>
+
+ <p>Podeu també cercar cançons a Amazon des del Banshee. Seleccioneu la botiga Amazon MP3 des del menú esquerre del Banshee. Es carregarà la botiga Amazon MP3 com si estiguéssiu a un navegador web. Podeu cercar a Amazon per la música que voleu comprar, i després d'entrar les credencials a Amazon, comprar-la tan sols amb un clic. El Banshee baixarà i importarà automàticament la compra a la biblioteca.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Importeu música d'Amazon MP3 manualment</title>
-
- <p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ <title>Importeu música d'Amazon MP3 manualment</title>
+
+ <p>Quan compreu música d'Amazon des d'un navegador web, un fitxer amb l'extensió .amz es baixa i es desa al disc dur. Per a importar manualment música comprada des d'Amazon, des del menú del Banshee seleccioneu <guiseq><gui>Elements multimèdia</gui><gui>Importa elements multimèdia</gui></guiseq> i seleccioneu el fitxer *.amz a importar. A continuació, el Banshee obrirà aquest fitxer i es connectarà a la botiga MP3 i començarà la baixada.</p>
+
<note style="warning">
<p>Els fitxers Amazon .amz només són vàlids per un període curt de temps. Si no baixeu la música ràpidament, el fitxer caducarà i no podreu baixar la música d'Amazon. Amazon no publica durant quant de temps els fitxers són vàlids. Es recomana que baixeu i importeu qualsevol compra d'Amazon abans d'una hora de fer la compra.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 0bf240e..29c89e1 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -312,7 +312,7 @@ msgstr ""
"mostrarà quan espai ocupen els fitxers d'àudio, vídeo, altres i l'espai "
"lliure. En la part inferior el Banshee mostrarà quants elements totals estan "
"emmagatzemats en el reproductor de música portable, a quantes hores o dies "
-"de reproducció és equivalent, i l'espai total utilitzat."
+"de reproducció es equivalent, i l'espai total utilitzat."
#: C/sync.page:100(title)
msgid "Sync Your Entire Library"
@@ -565,7 +565,7 @@ msgstr "<em>per defecte</em>, <em>espai en blanc</em>"
#: C/search.page:65(p)
msgid "Search for two terms with a space between the two words or terms."
-msgstr "Cerca dos termes amb un espai entre les dues paraules o termes."
+msgstr "Cerca dos termes amb un espai entre les dos paraules o termes."
#: C/search.page:69(p)
msgid "OR, or, <key>|</key>, <key>,</key>"
@@ -766,7 +766,7 @@ msgid ""
"available, and the Podcast browser lists all Podcasts in order of newest "
"first."
msgstr ""
-"Podcasts mostra tots els Podcasts als quals esteu subscrits, tots els Podcasts "
+"Podcasts mostra tots els Podcasts als que esteu subscrits, tots els Podcasts "
"mostra els disponibles, i les llistes de navegació de Podcast mostren tots els Podcast ordenats pels "
"més recents."
@@ -886,7 +886,7 @@ msgid ""
"list you wish those files to be in the queue."
msgstr ""
"La cua de reproducció s'organitza per l'ordre que s'afegeixen les cançons. "
-"Les primeres cançons o àlbums que afegiu a la cua seran els primers a ser "
+"Les primeres cançons o àlbums que afegiu a la cua seran els primers en ser "
"reproduïts. Podeu tornar a ordenar la vostra cua de reproducció utilitzant "
"el ratolí per arrossegar i deixar anar una cançó o cançons a la llista. "
"Escolliu la cançó o cançons que voleu tornar a ordenar, i deixeu-les anar "
@@ -1108,7 +1108,7 @@ msgstr ""
"<gui>Música</gui>. Quan arrossegueu sobre <gui>Música</gui>, apareixerà una "
"nova opció <gui><em>Llista de reproducció nova</em></gui>, podeu deixar anar "
"les cançons sobre <gui><em>Llista de reproducció nova</em></gui> per afegir-"
-"les a la llista de reproducció. Podeu repetir aquest procés fins a afegir "
+"les a la llista de reproducció. Podeu repetir aquest procés fins afegir "
"totes les cançons que voleu a la llista de reproducció."
#: C/manage-playlists.page:56(p)
@@ -1366,7 +1366,7 @@ msgid ""
"gui> button to complete the process."
msgstr ""
"Per a habilitar al Banshee a enviar informes de les cançons que escolteu a "
-"l'ordinador a Last.fm, entreu al Last.fm des de les preferències <gui>Específic "
+"l'ordinador a Last.fm, entreu al Last.fm des les preferències <gui>Específic "
"de la font</gui> al Banshee. Introduïu el nom d'usuari i premeu el botó "
"<gui>Entra a Last.fm</gui>. El sistema us portarà a la pàgina web Last.fm "
"perquè autoritzeu l'accés al Banshee. Premeu l'enllaç <gui>Yes, allow "
@@ -1416,7 +1416,7 @@ msgstr ""
"Units, Regne Unit i Alemanya. Els residents d'altres països hauran de pagar "
"un compte premium amb Last.fm per escoltar la ràdio. Els membres premium, en "
"tots els països, disposen també de les característiques premium: escoltar "
-"llistes de reproducció i emissores musicals a les quals heu entrat o heu "
+"llistes de reproducció i emissores musicals a les que heu entrat o heu "
"etiquetat."
#: C/lastfm.page:80(p)
@@ -1712,8 +1712,8 @@ msgid ""
"choices."
msgstr ""
"Per a importar fitxers de música o vídeo, escolliu <guiseq><gui>Elements "
-"multimèdia</gui><gui>Importa elements multimèdia</gui></guiseq>. Un diàleg "
-"apareixerà amb diverses opcions."
+"multimèdia</gui><gui>Importa elements multimèdia</gui></guiseq>. Una diàleg "
+"apareixerà amb diversos opcions."
#: C/import.page:31(p)
msgid ""
@@ -1734,7 +1734,7 @@ msgid ""
"choose a folder to import from."
msgstr ""
"Escolliu aquesta opció per a importar tots els fitxers de música i vídeo "
-"d'una carpeta específica, incloent-hi totes les subcarpetes. Una capsa de "
+"d'una carpeta específica, incloent-hi totes els subcarpetes. Una capsa de "
"diàleg us demanarà des de quina carpeta voleu importar."
#: C/import.page:43(gui)
@@ -2152,7 +2152,7 @@ msgstr "<gui>Podcast</gui>: (nom del Podcast)"
#: C/add-podcast.page:75(p)
msgid "<gui>Published</gui> (Date the episode was published or released)"
-msgstr "<gui>Publicat</gui> (data en què l'episodi es va publicar)"
+msgstr "<gui>Publicat</gui> (data en que l'episodi es va publicar)"
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
diff --git a/help/ca/emusic.page b/help/ca/emusic.page
new file mode 100644
index 0000000..ee2f4a5
--- /dev/null
+++ b/help/ca/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="ca">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importa la música comprada des d'eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importeu les cançons d'eMusic</title>
+
+</page>
diff --git a/help/ca/extensions.page b/help/ca/extensions.page
index 78b9730..3d60b78 100644
--- a/help/ca/extensions.page
+++ b/help/ca/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="ca">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="ca">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Afegiu funcionalitat addicional al Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Extensions del Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Extensions oficials del Banshee</title>
</info>
+ <title>Gestiona les extensions pel Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Extensions de la comunitat pel Banshee</title>
+ </info>
+ <title>Afegiu extensions de la comunitat pel Banshee</title>
</section>
+
</page>
diff --git a/help/ca/import.page b/help/ca/import.page
index 9329084..35be3e9 100644
--- a/help/ca/import.page
+++ b/help/ca/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Afegiu música i vídeos des del vostre ordinador a la biblioteca del Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,30 +14,23 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Importació de música i vídeos</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>Podeu importar música i vídeos ja emmagatzemats a l'ordinador cap al Banshee. Els fitxers importats apareixeran a les fonts i podreu editar-los i gestionar-los com qualsevol altre element multimèdia del Banshee.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>Per a importar fitxers de música o vídeo, escolliu <guiseq><gui>Elements multimèdia</gui><gui>Importa elements multimèdia</gui></guiseq>. Una diàleg apareixerà amb diversos opcions.</p>
- <note style="tip">
+ <note>
<p>Els connectors poden afegir opcions d'importació addicionals. Vegeu <link xref="#plugins"/> a baix.</p>
</note>
<terms>
<item>
<title><gui>Carpetes locals</gui></title>
- <p>Escolliu aquesta opció per a importar tots els fitxers de música i vídeo d'una carpeta específica, incloent-hi totes les subcarpetes. Una capsa de diàleg us demanarà des de quina carpeta voleu importar.</p>
+ <p>Escolliu aquesta opció per a importar tots els fitxers de música i vídeo d'una carpeta específica, incloent-hi totes els subcarpetes. Una capsa de diàleg us demanarà des de quina carpeta voleu importar.</p>
</item>
<item>
<title><gui>Fitxers locals</gui></title>
@@ -53,27 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Podeu importar de forma segura una carpeta que ja heu importat sense preocupar-vos que es produeixin entrades duplicades a la biblioteca.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Importa des d'una llista de reproducció</title>
+ <p>Podeu també importar música de les llistes de reproducció. La majoria de fitxers de llistes de reproducció acaben amb <em>m3u</em>. Per a importar des d'una llista de reproducció, des del menú del Banshee seleccioneu <guiseq><gui>Elements multimèdia</gui><gui>Importa la llista de reproducció</gui></guiseq> i cerqueu el fitxer de la llista de reproducció a la carpeta, seleccioneu-lo i premeu <gui>Importa</gui>.</p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Els connectors poden afegir opcions d'importació addicionals. Les següents fonts addicionals estaran disponibles si els connectors apropiats estan habilitats:</p>
-
+ <title>Fonts d'importació addicionals</title>
+ <p>Els connectors poden afegir opcions d'importació addicionals. Les següents fonts addicionals estaran disponibles si els connectors apropiats estan habilitats:</p>
</section>
-
+
</page>
diff --git a/help/ca/index.page b/help/ca/index.page
index fd48de5..9a46fa8 100644
--- a/help/ca/index.page
+++ b/help/ca/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Reproductor multimèdia Banshee</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Afegiu, suprimiu i reproduïu</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Gestió i ordenació</title>
</section>
-
+
<section id="sync" style="2column">
<title>Sincronitzeu els elements multimèdia amb un reproductor de música portable</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Afegiu funcionalitat addicional al Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Opcions avançades i ajuda</title>
+ <title>Opcions avançades i ajuda</title>
</section>
</page>
diff --git a/help/ca/introduction.page b/help/ca/introduction.page
index 7669da7..8310486 100644
--- a/help/ca/introduction.page
+++ b/help/ca/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>Introducció al <app>reproductor multimèdia Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>Introducció</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p>El <app>Banshee</app> és un reproductor multimèdia que permet reproduir música, vídeos i altres elements multimèdia així com sincronitzar-se amb dispositius portàtils per tal que us pugeu emportar la música.</p>
<p>El <app>Banshee</app> permet importar elements multimèdia, gestionar les metadades, i reproduir música i vídeos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>El Banshee també us ajuda a mantenir sincronitzada la música i vídeos en dispositius de reproducció habituals, com ara reproductors d'àudio digitals o telèfons intel·ligents. El Banshee és compatible amb dispositius populars, incloent-hi la majoria de reproductors iPod, Sandisk, Creative MP3 i telèfons amb Android.</p>
+<!--
<figure>
- <title>Finestra del <gui>reproductor multimèdia Banshee</gui></title>
- <desc><app>Reproductor multimèdia Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Biblioteca de l'interfície del <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/ca/itunes-import.page b/help/ca/itunes-import.page
new file mode 100644
index 0000000..fe3d386
--- /dev/null
+++ b/help/ca/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="ca">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importa la música i les categoritzacions del reproductor multimèdia <app>iTunes</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importació de la biblioteca de l'<app>iTunes</app></title>
+
+</page>
diff --git a/help/ca/keyboard-shortcuts.page b/help/ca/keyboard-shortcuts.page
deleted file mode 100644
index 2a303a6..0000000
--- a/help/ca/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="ca">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acció</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Reprodueix o posa en pausa la cançó actual</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Reprodueix la cançó següent</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Reprodueix la cançó anterior</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acció</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Mou el focus a la capsa de cerca</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Obre la capsa de diàleg d'importació d'elements multimèdia</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Llistes de reproducció</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acció</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Crea una nova llista de reproducció</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acció</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Marca els episodis seleccionats com a antics</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interfície</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acció</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Commuta el mode de pantalla completa</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Selecciona totes les cançons en la vista de la llista de reproducció</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Maj</key><key>A</key></keyseq></p>
- </td>
- <td><p>Desselecciona totes les cançons en la vista de la llista de reproducció</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Botó esquerre del ratolí</key></keyseq>
- </p></td>
- <td><p>Reprodueix la cançó anterior (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Botó dret del ratolí</key></keyseq>
- </p></td>
- <td><p>Reprodueix la cançó següent (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Botó central del ratolí</key></keyseq>
- </p></td>
- <td><p>Commuta entre reproducció o pausa (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/ca/keyboardshortcuts.page b/help/ca/keyboardshortcuts.page
new file mode 100644
index 0000000..c3c540e
--- /dev/null
+++ b/help/ca/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="ca">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Dreceres de teclat</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Controleu el Banshee utilitzant dreceres de teclat</title>
+
+ <section id="playbackcontrol">
+
+ <title>Control de reproducció</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Barra espaiadora</p></td> <td><p>Reprodueix o posa en pausa la cançó actual</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Reprodueix la cançó següent</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Reprodueix la cançó anterior</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Interacció amb la biblioteca</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>control</key><key>F</key></keyseq></p></td> <td><p>Mou el focus a la capsa de cerca</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Obre la capsa de diàleg d'importació d'elements multimèdia</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Llistes de reproducció</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>Crea una nova llista de reproducció</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Marca els episodis seleccionats com a antics</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interfície</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Commuta el mode de pantalla completa</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>Selecciona totes les cançons en la vista de la llista de reproducció</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Maj</key><key>A</key></keyseq></p>
+ </td> <td><p>Desselecciona totes les cançons en la vista de la llista de reproducció</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>Amaga la finestra del Banshee (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Botó esquerre del ratolí</key></keyseq>
+ </p></td> <td><p>Reprodueix la cançó anterior (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Botó dret del ratolí</key></keyseq>
+ </p></td> <td><p>Reprodueix la cançó següent (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Botó central del ratolí</key></keyseq>
+ </p></td> <td><p>Commuta entre reproducció o pausa (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/ca/lastfm.page b/help/ca/lastfm.page
index f1476ca..7c4a6c6 100644
--- a/help/ca/lastfm.page
+++ b/help/ca/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="ca">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Habiliteu l'informe de cançons i l'emissora Last.fm.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,74 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>Last.fm és un popular servei en línia amb versions gratuïtes i de pagament. Last.fm ofereix informació d'artistes musicals i àlbums i si creeu un perfil d'usuari a Last.fm us permet fer un seguiment gratuïtament de la música que escolteu al Banshee. Si us subscriviu com a membre de pagament, podeu també escoltar fluxos de música de Last.Fm des de diferents clients, incloent-hi el Banshee. Last.fm ofereix múltiples canals de fluxos, incloent-hi recomanacions musicals basades en els v [...]
+
<section id="enable-lastfm">
- <title>Habiliteu Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Habiliteu Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>Per a habilitar al Banshee a enviar informes de les cançons que escolteu a l'ordinador a Last.fm, entreu al Last.fm des les preferències <gui>Específic de la font</gui> al Banshee. Introduïu el nom d'usuari i premeu el botó <gui>Entra a Last.fm</gui>. El sistema us portarà a la pàgina web Last.fm perquè autoritzeu l'accés al Banshee. Premeu l'enllaç <gui>Yes, allow access</gui> al navegador i el sistema us portarà a una pàgina que mostra un missatge que diu que el Banshee té accés a [...]
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
- <p>L'emissora de ràdio de Last.fm és gratuïta per als residents dels Estats Units, Regne Unit i Alemanya. Els residents d'altres països hauran de pagar un compte premium amb Last.fm per escoltar la ràdio. Els membres premium, en tots els països, disposen també de les característiques premium: escoltar llistes de reproducció i emissores musicals a les quals heu entrat o heu etiquetat.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+ <title>Escolteu l'emissora de ràdio Last.fm</title>
+ <p>L'emissora de ràdio de Last.fm és gratuïta per als residents dels Estats Units, Regne Unit i Alemanya. Els residents d'altres països hauran de pagar un compte premium amb Last.fm per escoltar la ràdio. Els membres premium, en tots els països, disposen també de les característiques premium: escoltar llistes de reproducció i emissores musicals a les que heu entrat o heu etiquetat.</p>
+
+ <p>Al menú contextual esquerre del Banshee, ara disposeu d'una secció Last.fm, incloent-hi les emissores de ràdio Last.fm. Us cal una connexió activa a Internet per a escoltar la ràdio Last.fm. Escolliu l'emissora de ràdio que voleu escoltar i el Banshee es comunicarà amb Last.fm per a omplir les cançons per aquesta emissora de ràdio. Premeu el botó <gui>Reprodueix</gui> al Banshee o la tecla <key>barra espaiadora</key> per començar el flux de l'emissora de ràdio Last.fm. Podeu també p [...]
+
</section>
-
+
</page>
diff --git a/help/ca/manage-coverart.page b/help/ca/manage-coverart.page
new file mode 100644
index 0000000..74ff5c8
--- /dev/null
+++ b/help/ca/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="ca">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Gestió i modificació de les cobertes dels àlbums.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Cobertes</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/ca/manage-playlists.page b/help/ca/manage-playlists.page
index 01e7906..fad811a 100644
--- a/help/ca/manage-playlists.page
+++ b/help/ca/manage-playlists.page
@@ -1,144 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="ca">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="ca">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Creació i gestió de llistes de reproducció.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Llistes de reproducció</title>
-
+ <title>Llistes de reproducció</title>
+
<p>Les llistes de reproducció us permeten crear i desar llistes de cançons per ser reproduïdes en un ordre específic. Les llistes de reproducció són una manera còmode de crear llistes amb les vostres cançons preferides o per dividir la biblioteca en llistes més petites més fàcils de navegar. Alguns reproductors portables multimèdia permeten transferir llistes de reproducció perquè les pugueu utilitzar en aquests dispositius.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>El Banshee disposa de llistes de reproducció normals, que inclouen les cançons que afegiu. També disposa de llistes de reproducció intel·ligents, que es basen en els hàbits de reproducció, música preferida i d'altres.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>Una llista de reproducció normal és una llista de cançons a la que afegiu cançons i que gestioneu manualment. Podeu crear llistes de cançons del vostre artista preferit des de múltiples àlbums, per les cançons més noves que preferiu, o per escoltar mentre feu exercici.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>Podeu canviar l'ordre a una llista de reproducció arrossegant i deixant anar la cançó a la nova posició a la llista de reproducció. Les cançons només es poden tornar a ordenar quan la llista de reproducció no està ordenada per cap columna. Per deixar d'ordenar per una columna, premeu sobre la columna fins que la fletxa d'amunt o avall no es mostri i la columna quedi en blanc, llavors torneu a ordenar la llista de reproducció.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>Les llistes de reproducció intel·ligents us permeten generar ràpidament una llista de reproducció dinàmica basada en un nombre de variables predeterminat. Podeu crear ràpidament una llista de reproducció nova basant-vos en un artista específic, en els preferits o d'altres.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Llistes de reproducció normals</title>
+
+ <p>Una llista de reproducció normal és una llista de cançons a la que afegiu cançons i que gestioneu manualment. Podeu crear llistes de cançons del vostre artista preferit des de múltiples àlbums, per les cançons més noves que preferiu, o per escoltar mentre feu exercici.</p>
+
+ <p>Podeu crear una nova llista de reproducció prement <keyseq><key>Control</key><key>N</key></keyseq>, des del menú escollint <guiseq><gui>Menú</gui><gui>Llista de reproducció nova</gui></guiseq> o cercant les cançons que us agradaria afegir a la llista de reproducció. Escolliu les cançons, feu clic amb el botó dret del ratolí, i escolliu <guiseq><gui>Afegeix a la llista de reproducció</gui><gui>Llista de reproducció nova</gui></guiseq>.També podeu arrossegar i deixar anar a una llis [...]
+
+ <p>Per a anomenar una llista de reproducció, escolliu la llista de reproducció i feu clic amb el botó dret del ratolí sobre la llista de reproducció i premeu <gui>Canvia el nom</gui> i introduïu el nom de la llista de reproducció.</p>
+
+ <p>Podeu canviar l'ordre a una llista de reproducció arrossegant i deixant anar la cançó a la nova posició a la llista de reproducció. Les cançons només es poden tornar a ordenar quan la llista de reproducció no està ordenada per cap columna. Per deixar d'ordenar per una columna, premeu sobre la columna fins que la fletxa d'amunt o avall no es mostri i la columna quedi en blanc, llavors torneu a ordenar la llista de reproducció.</p>
+
+ <p>Per a suprimir una cançó de la llista de reproducció, seleccioneu la cançó que voleu suprimir. Premeu la tecla <key>suprimir</key>, des del menú escolliu <guiseq><gui>Edita</gui><gui>Suprimeix de la llista de reproducció</gui></guiseq> o feu clic amb el botó dret a les cançons amb el ratolí i premeu <gui>Suprimeix de la llista de reproducció</gui>.</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Llistes de reproducció intel·ligents</title>
+
+ <p>Les llistes de reproducció intel·ligents us permeten generar ràpidament una llista de reproducció dinàmica basada en un nombre de variables predeterminat. Podeu crear ràpidament una llista de reproducció nova basant-vos en un artista específic, en els preferits o d'altres.</p>
+
+ <p>Per a crear una llista intel·ligent nova, des del menú escolliu <guiseq><gui>Elements multimèdia</gui><gui>Llista de reproducció intel·ligent nova</gui></guiseq>. Es mostrarà una capsa de diàleg per a crear una llista de reproducció intel·ligent nova. Introduïu el nom de la llista de reproducció i llavors escolliu el criteri en què es basarà la llista de reproducció. Podeu escollir qualsevol camp inclòs a les metadades de la cançó, com ara l'àlbum, l'artista, o l'any. Establiu els [...]
+
<list>
<item><p>és</p></item>
- <item><p>no és</p></item>
+ <item><p>no és</p></item>
<item><p>menys que</p></item>
- <item><p>més que</p></item>
+ <item><p>més que</p></item>
<item><p>com a màxim</p></item>
- <item><p>com a mínim</p></item>
+ <item><p>com a mínim</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>Podeu també prémer el botó <gui>+</gui> i afegir una consulta addicional a la llista de reproducció intel·ligent. Per exemple, podeu crear una llista de reproducció intel·ligent que inclogui cançons del 2010 i que hàgiu valorat amb 5 estrelles. Per a crear aquesta llista de reproducció seleccionaríeu:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Any</gui></p></td>
- <td><p><gui>és</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Any</gui></p></td> <td><p><gui>és</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Valoració</gui></p></td>
- <td><p><gui>és</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Valoració</gui></p></td> <td><p><gui>és</gui></p></td>
+ <td><p><gui/>5 estrelles</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>Llavors podeu opcionalment seleccionar quantes cançons s'inclouen pressionant <gui>Limita</gui> a la casella de selecció i seleccionant el nombre de cançons a incloure.</p>
+
+ <p>Banshee també inclou llistes de reproducció intel·ligents que ja han estat creades per defecte. Premeu el botó <gui>Obre en l'editor</gui> per a veure els criteris de creació de la llista de reproducció intel·ligent o per a modificar-los. Si premeu <gui>Crea i desa</gui> la llista de reproducció es generarà i desarà automàticament. Les següents llistes de reproducció es troben ja creades: </p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Preferits (cançons amb una valoració de quatre i cinc estrelles)</p>
- </item>
- <item>
- <p>Preferits recents (cançons que es van escoltar freqüentment la setmana passada)</p>
- </item>
- <item>
- <p>Afegits recentment (cançons importades durant l'última setmana)</p>
- </item>
- <item>
- <p>No escoltats (cançons que no s'han reproduït o s'han omès)</p>
- </item>
- <item>
- <p>Preferits abandonats (preferits que no s'han reproduït des de fa més de dos mesos)</p>
- </item>
- <item>
- <p>700 MB de preferits (un CD de dades ple de cançons preferides)</p>
- </item>
- <item>
- <p>80 minuts de preferits (un CD d'àudio ple de cançons preferides)</p>
- </item>
- <item>
- <p>Sense valoració (cançons que no han estat valorades)</p>
- </item>
+ <title>Llistes de reproducció intel·ligents del Banshee</title>
+ <item><p>Preferits (cançons amb una valoració de quatre i cinc estrelles)</p></item>
+ <item><p>Preferits recents (cançons que es van escoltar freqüentment la setmana passada)</p></item>
+ <item><p>Afegits recentment (cançons importades durant l'última setmana)</p></item>
+ <item><p>No escoltats (cançons que no s'han reproduït o s'han omès)</p></item>
+ <item><p>Preferits abandonats (preferits que no s'han reproduït des de fa més de dos mesos)</p></item>
+ <item><p>700 MB de preferits (un CD de dades ple de cançons preferides)</p></item>
+ <item><p>80 minuts de preferits (un CD d'àudio ple de cançons preferides)</p></item>
+ <item><p>Sense valoració (cançons que no han estat valorades)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/ca/manage-tags.page b/help/ca/manage-tags.page
index bb8b14b..cb1bd29 100644
--- a/help/ca/manage-tags.page
+++ b/help/ca/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="ca">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="ca">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Edició i modificació de les etiquetes i metadades de la música.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,49 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Metadades de la música</title>
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Alguns formats de metadades populars són ID3v1 i ID3v2 per a fitxers MP3 i els comentaris de Vorbis per a fitxers OGG Vorbis.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
+ <section id="metadata">
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>Apareixerà una capsa de diàleg que mostra les metadades de la cançó i us permet canviar-les o actualitzar-les. Els camps mostrats per defecte inclouen:</p>
-
- <list>
- <item><p><gui>Títol de la cançó</gui></p></item>
- <item><p><gui>Artista de la cançó</gui></p></item>
- <item><p><gui>Títol de l'àlbum</gui></p></item>
- <item><p><gui>Gènere</gui></p></item>
- <item><p><gui>Número de la cançó</gui></p></item>
- <item><p><gui>Número del disc</gui></p></item>
- <item><p><gui>Any</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>Metadades de la música</title>
+
+ <p>La música digital conté metadades que emmagatzemen informació als fitxers d'àudio incloent-hi l'artista, l'àlbum, l'any d'enregistrament, el gènere i molt més. Gairebé tota la música comprada a través d'Internet ja inclou les metadades incrustades i si importeu la música des de CD, el Banshee inclourà les metadades a l'extreure el CD si estan disponibles. Per a més informació sobre l'extracció de CD, incloent-hi metadades vegeu <link xref="import"/>.</p>
+
+ <p>Alguns formats de metadades populars són ID3v1 i ID3v2 per a fitxers MP3 i els comentaris de Vorbis per a fitxers OGG Vorbis.</p>
+
+ <p>Si heu importat cançons que no contenen metadades, el <app>Banshee</app> mostrarà <gui>Desconegut</gui> per a la majoria dels camps de la biblioteca.</p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Edició de les metadades</title>
+
+ <p>Podeu canviar i editar les metadades de les cançons. Seleccioneu la cançó o cançons que voleu actualitzar i premeu la tecla <key>E</key>, seleccioneu <guiseq><gui>Edita</gui><gui>Edita la informació de la cançó</gui></guiseq> des del menú, o utilitzeu el ratolí i feu clic amb el botó dret sobre els fitxers i seleccioneu <gui>Edita la informació de la cançó</gui>.</p>
+
+ <p>Apareixerà una capsa de diàleg que mostra les metadades de la cançó i us permet canviar-les o actualitzar-les. Els camps mostrats per defecte inclouen:</p>
+
+ <list>
+ <item><p><gui>Títol de la cançó</gui></p></item>
+ <item><p><gui>Artista de la cançó</gui></p></item>
+ <item><p><gui>Títol de l'àlbum</gui></p></item>
+ <item><p><gui>Gènere</gui></p></item>
+ <item><p><gui>Número de la cançó</gui></p></item>
+ <item><p><gui>Número del disc</gui></p></item>
+ <item><p><gui>Any</gui></p></item>
+ </list>
+
+ <p>Actualitzeu la informació de la cançó. Si heu escollit múltiples cançons per a editar premeu la icona de la fletxa dreta a la dreta del camp <gui>Títol de la cançó</gui> o premeu el botó <gui>Endavant</gui> a la part superior de la capsa de diàleg quan hàgiu finalitzat amb cada cançó. Un cop hàgiu completat l'edició de totes les metadades, premeu <gui>Desa</gui>.</p>
+
</section>
</page>
diff --git a/help/ca/play-queue.page b/help/ca/play-queue.page
index e5a57ef..9900294 100644
--- a/help/ca/play-queue.page
+++ b/help/ca/play-queue.page
@@ -1,96 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="ca">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="ca">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Afegiu elements multimèdia a la cua de reproducció.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
+ <title>Cua de reproducció</title>
+
+ <p>La <gui>cua de reproducció</gui> us permet afegir música per reproduir en ordre seqüencial. Podeu afegir moltes cançons, el que us permetrà escoltar hores de música sense parar. Podeu afegir cançons individuals o àlbums sencers, i ordenar-los després.</p>
+
+<section id="addqueue">
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
+ <title>Afegiu música a la cua de reproducció</title>
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
+ <p>Des de la biblioteca de música, heu d'escollir les cançons o àlbums que voleu afegir a la llista de reproducció.</p>
+
+ <p>Per afegir un àlbum sencer a la llista de reproducció, utilitzeu el ratolí prement sobre l'àlbum i deixant-lo anar sobre <gui>la cua de reproducció</gui> a la subfinestra de l'esquerra.</p>
+
+ <p>Podeu afegir cançons a la cua de reproducció individualment o en grup. Per a afegir un únic fitxer, arrossegueu i deixeu anar el fitxer sobre <gui>la cua de reproducció</gui> en la subfinestra de l'esquerra, o feu clic a la cançó i escolliu <gui>Afegeix a la cua de reproducció</gui>.</p>
+
+ <p>Podeu escollir múltiples fitxers usant el ratolí i prement <key>control</key> i escollint cada fitxer amb el ratolí o seleccionant un rang de fitxers prement la <key>tecla de majúscules</key> dos cops per seleccionar el rang. A continuació, podeu arrossegar-los i deixar-los anar sobre la <gui>cua de reproducció</gui> a la subfinestra de l'esquerra o fent clic amb el botó dret i escollint <gui>Afegeix a la cua de reproducció</gui>.</p>
+
+</section>
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
+<section id="reorderqueue">
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
+ <title>Organitzeu la cua de reproducció</title>
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+ <p>La cua de reproducció s'organitza per l'ordre que s'afegeixen les cançons. Les primeres cançons o àlbums que afegiu a la cua seran els primers en ser reproduïts. Podeu tornar a ordenar la vostra cua de reproducció utilitzant el ratolí per arrossegar i deixar anar una cançó o cançons a la llista. Escolliu la cançó o cançons que voleu tornar a ordenar, i deixeu-les anar sobre el número o lloc que voleu que les cançons tinguin a la cua.</p>
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>Suprimiu cançons de la llista de reproducció</title>
+ <p>Podeu suprimir una cançó individualment, un grup de cançons, o buidar la cua de reproducció completament.</p>
+
+ <p>Per a suprimir una cançó o un grup de cançons, escolliu la cançó amb el ratolí i llavors premeu la <key>tecla de supressió</key>.</p>
+
+ <p>Per a buidar completament la cua de reproducció, premeu el botó <gui>Buida</gui> a la part superior dreta de la cua de reproducció.</p>
+
+</section>
+
</page>
diff --git a/help/ca/play.page b/help/ca/play.page
index faebaa0..6c8911e 100644
--- a/help/ca/play.page
+++ b/help/ca/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Reproduïu els vostres fitxers amb vídeo i música.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Reproducció de la música</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>Reproducció de vídeo</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+
+ <title>Reproducció d'elements multimèdia</title>
+
+ <section id="playmusic">
+ <title>Reproducció de la música</title>
+
+ <p>Per a reproduir música al Banshee escolliu la font de la música. La biblioteca de música mostrarà tots els artistes de la biblioteca, cobertes per cada àlbum i la llista de les cançons que hi ha a la biblioteca.</p>
+
+ <p>Escolliu l'àlbum o cançó que desitgeu reproduir de la llista d'artistes, àlbums o utilitzeu la barra de cerca de la part superior dreta del Banshee.</p>
+
+ <p>Per començar a reproduir una cançó, utilitzeu el ratolí fent doble clic al nom de la cançó, premeu la tecla <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
+
+ <p>Podeu començar a reproduir un àlbum escollint-lo al navegador d'àlbums i fent doble clic amb el ratolí al nom de la cançó, prement la tecla <key>barra espaiadora</key>, o seleccionant <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui> </guiseq> des del menú del Banshee.</p>
+
+ <p>Per a reproduir totes les cançons d'un artista, escolliu l'artista al navegador d'artistes i premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
+
+ <p>El Banshee també mostra els àlbums favorits (els que més reproduïu), els últims elements favorits, o els àlbums recentment afegits o sense escoltar. Escolliu l'àlbum que voleu escoltar i seleccioneu les cançons a reproduir.</p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>Reproducció de vídeo</title>
+
+ <p>Els vídeos importats es mostren alfabèticament. Per a reproduir un vídeo, escolliu de la llista el vídeo que voleu reproduir i premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
+
+ <p>El Banshee també mostra els vídeos favorits (els que més reproduïu) i els vídeos no reproduïts. Escolliu el vídeo que voleu reproduir de la llista.</p>
+
</section>
-
- <section id="play-radio">
- <title>Escolteu una emissora de ràdio Internet</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>Reproducció d'un Podcast</title>
+
+ <p>Podcasts mostra tots els Podcasts als que esteu subscrits, tots els Podcasts mostra els disponibles, i les llistes de navegació de Podcast mostren tots els Podcast ordenats pels més recents.</p>
+
+ <p>Per a reproduir un Podcast, escolliu de la llista el que voleu reproduir i premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>Escolteu una emissora de ràdio Internet</title>
+
+ <p>La font de ràdio mostra ordenades alfabèticament totes les emissores Internet que heu afegit al Banshee.</p>
+
+ <p>Per a reproduir una emissora de ràdio, escolliu de la llista l'emissora que voleu escoltar i premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
+
+ </section>
+
</page>
diff --git a/help/ca/podcast.page b/help/ca/podcast.page
deleted file mode 100644
index 432f6d5..0000000
--- a/help/ca/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="ca">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/ca/radio.page b/help/ca/radio.page
deleted file mode 100644
index 5d810e2..0000000
--- a/help/ca/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="ca">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/ca/rb-import.page b/help/ca/rb-import.page
new file mode 100644
index 0000000..e0099da
--- /dev/null
+++ b/help/ca/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="ca">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importeu la música i les categoritzacions del reproductor de música <app>Rhythmbox</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importació la biblioteca del <app>Rhythmbox</app></title>
+
+</page>
diff --git a/help/ca/search.page b/help/ca/search.page
index 8467d29..8848a5f 100644
--- a/help/ca/search.page
+++ b/help/ca/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,90 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Cercant a la biblioteca</title>
+
+ <p>El Banshee disposa d'un llenguatge de cerca potent. Podeu cercar a la biblioteca de forma ràpida i senzilla utilitzant termes de cerca bàsics o bé realitzant cerques detallades amb la terminologia de cerca avançada del Banshee.</p>
+
+ <p>Per a realitzar cerques dels vostres elements multimèdia al Banshee, premeu la tecla <key>S</key> o feu clic en la capsa <gui>Cerca</gui> a la part superior dreta de la vista biblioteca al Banshee.</p>
+
+ <p>Una consulta de cerca consisteix d'algunes termes bàsics, per exemple, <em>lluís llach</em>. En introduir <em>lluís llach</em> en la capsa de cerca, el Banshee cercarà a tots els camps de metadades, incloent-hi el títol de la cançó, el títol de l'àlbum, l'artista, l'any, etc. Qualsevol cançó que inclogui en les seves metadades <em>lluís</em> i <em>llach</em> serà retornada. La cerca de termes no diferència entre majúscules i minúscules. Els termes <em>lluís</em>, <em>Lluís</em>, i < [...]
+
+<section id="operators">
+ <title>Operadors bàsics</title>
+ <p>Els operadors poden col·locar-se entre dues paraules de cerca o col·locar-se abans d'una paraula de cerca. L'operació per defecte és <gui>AND</gui> i s'utilitza quan cap altre operador es emprat entre dos termes de cerca. Atès que és el predeterminat, l'operador AND no existeix explícitament.</p>
+
<p>Altres operadors bàsics són l'<gui>OR</gui> i el <gui>NOT</gui>. Junts, aquests tres operadors permeten consultes molt potents per ajudar-vos a cercar als elements multimèdia.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Operadors lògics i exemples</title>
<p>A continuació es mostra una llista d'operadors lògics i exemples de resultats de cerques realitzes amb operadors lògics.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operador</gui></p></td>
- <td><p><gui>Descripció</gui></p></td>
+ <td><p><gui>Operador</gui></p></td> <td><p><gui>Descripció</gui></p></td>
</tr>
<tr>
- <td><p><em>per defecte</em>, <em>espai en blanc</em></p></td>
- <td><p>Cerca dos termes amb un espai entre les dues paraules o termes.</p></td>
+ <td><p><em>per defecte</em>, <em>espai en blanc</em></p></td> <td><p>Cerca dos termes amb un espai entre les dos paraules o termes.</p></td>
</tr>
<tr>
- <td><p>O, o, <key>|</key>, <key>,</key></p></td>
- <td><p>Els resultats de la cerca seran dues cançons que continguin qualsevol dels termes en qualsevol camp.</p></td>
+ <td><p>O, o, <key>|</key>, <key>,</key></p></td> <td><p>Els resultats de la cerca seran dues cançons que continguin qualsevol dels termes en qualsevol camp.</p></td>
</tr>
<tr>
- <td><p>NO, no,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NO, no,<key>-</key></p></td> <td><p>Exclou dels resultats de la cerca qualsevol terme que aparegui després de l'operador NO, no, <key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Els exemples d'operacions lògiques inclouen:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Consulta</gui></p></td>
- <td><p><gui>Descripció</gui></p></td>
+ <td><p><gui>Consulta</gui></p></td> <td><p><gui>Descripció</gui></p></td>
</tr>
<tr>
- <td><p>lluís llach</p></td>
- <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> i <em>llach</em> (ambdós) en qualsevol dels camps.</p></td>
+ <td><p>lluís llach</p></td> <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> i <em>llach</em> (ambdós) en qualsevol dels camps.</p></td>
</tr>
<tr>
- <td><p>lluís, llach</p></td>
- <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> o <em>llach</em> en qualsevol dels camps.</p></td>
+ <td><p>lluís, llach</p></td> <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> o <em>llach</em> en qualsevol dels camps.</p></td>
</tr>
<tr>
- <td><p>lluís o llach</p></td>
- <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> o <em>llach</em> en qualsevol dels camps.</p></td>
- </tr>
+ <td><p>lluís o llach</p></td> <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> o <em>llach</em> en qualsevol dels camps.</p></td>
+ </tr>
<tr>
- <td><p>lluís | llach</p></td>
- <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> o <em>llach</em> en qualsevol dels camps.</p></td>
- </tr>
+ <td><p>lluís | llach</p></td> <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> o <em>llach</em> en qualsevol dels camps.</p></td>
+ </tr>
<tr>
- <td><p>-"lluís llach"</p></td>
- <td><p>Mostra totes les cançons que no contenen <em>lluís llach</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"lluís llach"</p></td> <td><p>Mostra totes les cançons que no contenen <em>lluís llach</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Per a més informació sobre com realitzar consultes de cerca complexes, vegeu la pàgina <link xref="adv-search"/>.</p>
+
</section>
-
+
</page>
diff --git a/help/ca/sort.page b/help/ca/sort.page
index 5e1a5f3..de3f26d 100644
--- a/help/ca/sort.page
+++ b/help/ca/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Afegiu columnes</title>
+
<p>A mida que la biblioteca creix, potser voleu canviar la vostra vista biblioteca per afegir informació addicional sobre les cançons o canviar la manera que podeu veure o ordenar la vista biblioteca per a cançons, artistes o àlbums.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>Podeu afegir columnes addicionals a la vista biblioteca del <app>Banshee</app> per disposar de més informació sobre les cançons, a més de poder-les ordenar. Per defecte, per a cançons, el Banshee mostra les columnes <gui>Nom</gui>, <gui>Artista</gui>, <gui>Àlbum</gui> i <gui>Temps</gui>. Per a afegir columnes addicionals, feu un clic amb el botó dret del ratolí a qualsevol de les columnes i el Banshee mostrarà totes les columnes disponibles. Feu clic a la casella de selecció al cost [...]
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Ordenació de columnes</title>
+ <p>Podeu ordenar la biblioteca utilitzant el ratolí fent clic a qualsevol de les columnes mostrades en la vista biblioteca. Si voleu ordenar la biblioteca per artista, feu clic a la capçalera de la columna <gui>Artista</gui> i el Banshee ordenarà automàticament la columna alfabèticament. Fent clic a la columna <gui>Artista</gui> de nou ordenarà la columna en ordre alfabètic invers.</p>
</section>
-
+
</page>
diff --git a/help/ca/sync.page b/help/ca/sync.page
index f9a232f..ff65c29 100644
--- a/help/ca/sync.page
+++ b/help/ca/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Sincronitzeu els elements multimèdia amb reproductors multimèdia o telèfons intel·ligents.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Sincronització</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Sincronització</title>
+
+ <p>El Banshee permet la sincronització de música amb reproductors multimèdia portàtils i telèfons intel·ligents. Podeu afegir-hi cançons, àlbums, llistes de producció o permetre que el Banshee mantingui sincronitzada la biblioteca sencera. Després que el reproductor es connecta a l'ordinador, podeu també reproduir cançons del vostre reproductor al Banshee. Quan sincronitzeu la música amb un format sense pèrdua, com ara el FLAC, el Banshee convertirà automàticament la música a un format [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Compatibilitat amb dispositius</title>
+ <p>El Banshee és compatible amb la majoria de reproductors de música portables moderns i telèfons intel·ligents amb les excepcions de l'iPhone, l'iPad i l'iPod Touch d'Apple.</p>
+
+ <p>Quan connecteu un dispositiu, el Banshee el mostrarà al menú esquerre. En prémer la icona del dispositiu anireu a la pàgina inicial del dispositiu mostrant-se les preferències de sincronització.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Música</p></item>
- <item><p>Audiollibres</p></item>
- <item><p>Vídeos</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>Des del menú desplegable al costat de cada element multimèdia, escolliu:</p>
-
- <list>
- <item><p>Gestiona manualment</p></item>
- <item><p>Sincronitza la biblioteca sencera</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Sincronització de la música</title>
+ <p>Podeu escollir gestionar els elements multimèdia al dispositiu portable permetent al Banshee sincronitzar-se automàticament o gestionant la música i elements multimèdia manualment.</p>
+
+ <p>Escolliu el dispositiu des del menú del Banshee i llavors trieu com voleu sincronitzar els elements multimèdia, incloent-hi:</p>
+ <list>
+ <item><p>Música</p></item>
+ <item><p>Audiollibres</p></item>
+ <item><p>Vídeos</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>Des del menú desplegable al costat de cada element multimèdia, escolliu:</p>
+ <list>
+ <item><p>Gestiona manualment</p></item>
+ <item><p>Sincronitza la biblioteca sencera</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Si escolliu sincronitzar la biblioteca sencera automàticament amb el reproductor multimèdia portàtil assegureu-vos que el reproductor multimèdia té prou espai. Si la biblioteca és més gran que l'espai del que disposeu al reproductor multimèdia portàtil, el Banshee sincronitzarà els elements multimèdia fins que el reproductor estigui ple i llavors s'aturarà.</p>
+ </note>
+
+ <p>Si heu creat llistes de reproducció o llistes de reproducció intel·ligents en la biblioteca de música, es mostraran també com a opció de sincronització per a la música. Això pot ser útil quan creu llistes de reproducció intel·ligents, ja que el seu contingut s'actualitza automàticament basant-se en les regles de la llista de reproducció, i el Banshee sincronitzarà la nova llista de reproducció amb el dispositiu cada cop que el connecteu.</p>
+
+ <p>El Banshee mostrarà l'espai total del disc dur del reproductor de música portable en un gràfic a la part inferior central del Banshee. El gràfic mostrarà quan espai ocupen els fitxers d'àudio, vídeo, altres i l'espai lliure. En la part inferior el Banshee mostrarà quants elements totals estan emmagatzemats en el reproductor de música portable, a quantes hores o dies de reproducció es equivalent, i l'espai total utilitzat.</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Sincronització de la biblioteca sencera</title>
+ <p>Podeu arrossegar i deixar anar elements multimèdia al reproductor de música portable des del Banshee. Seleccioneu el fitxer o fitxers que voleu copiar al reproductor de música portable i llavors mantingueu premut el botó dret del ratolí i deixeu anar els fitxers a la icona del reproductor de música portable al Banshee. Això copiarà els fitxers al dispositiu.</p>
+
+ <p>Si la vostra biblioteca de música està codificada en un format que no és compatible amb el reproductor de música portable, com ara OGG o FLAC, i disposeu dels còdecs necessaris instal·lats, el Banshee pot automàticament convertir aquests fitxers a MP3 en transferir-los al reproductor de música portable. Consulteu la documentació de la vostra distribució de Linux per a obtenir els còdecs necessaris, ja que està fora de l'abast d'aquesta ajuda i varia per a cada distribució.</p>
+
+ <note style="tip">
+ <p>És possible que us calgui expulsar el dispositiu per a carregar els fitxers correctament al reproductor de música portable. Per a expulsar el vostre dispositiu al Banshee, utilitzeu el ratolí per fer clic amb el botó dret del ratolí sobre el dispositiu al menú del Banshee i premeu <gui>Desconnecta</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Reproducció de la música des del reproductor de música portable</title>
+ <p>Podeu reproduir música emmagatzemada en el reproductor de música portable directament al Banshee. Seleccioneu el reproductor al menú de l'esquera del Banshee i es mostrarà la biblioteca del reproductor de música portable. A continuació, podeu reproduir la música al Banshee de la mateixa manera que la música de la biblioteca.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>A l'esborrar fitxers del reproductor de música portable es suprimiran permanentment els fitxers i no podreu recuperar-los.</p>
- </note>
-
+ <title>Suprimeix la música des del reproductor de música portable</title>
+ <p>Per a suprimir cançons emmagatzemades al reproductor de música portable, seleccioneu el reproductor al Banshee per a visualitzar a la biblioteca. A continuació, seleccioneu les cançons que voleu suprimir i feu clic amb el botó dret del ratolí i seleccioneu "Suprimeix" o des del menú seleccioneu <guiseq><gui>Edita</gui><gui>Suprimeix</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>A l'esborrar fitxers del reproductor de música portable es suprimiran permanentment els fitxers i no podreu recuperar-los.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/ca/ui.page b/help/ca/ui.page
index ae9516c..2edd94b 100644
--- a/help/ca/ui.page
+++ b/help/ca/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>Una perspectiva general de la interfície d'usuari del <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Introducció a la interfície d'usuari del Banshee</title>
<figure>
<title>Finestra del <gui>reproductor multimèdia Banshee</gui></title>
<desc><app>Reproductor multimèdia Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Biblioteca de l'interfície del <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Fonts</title>
+ <p>Les fonts de música i vídeo es mostren a l'esquerra del Banshee. Les fonts us donen accés ràpid a la cua de reproducció, música, vídeos, Amazon, Last.fm, Poscasts i d'altres.</p>
+
+ <note style="tip">
+ <p>Les opcions de menú canvien depenent de la font que heu triat. Per exemple, per a usar el menú per a importar un Podcast, haureu d'escollir la font Podcast. L'opció del menú per a importar un Podcast no està disponible quan es visualitza la biblioteca de vídeo o música.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Navegador de la biblioteca</title>
+ <p>Quan escolliu una font de música o vídeo des de «Fonts», el Banshee mostrarà el contingut al navegador de la biblioteca. Depenent de la font que escolliu, el Banshee pot reproduir la música, la biblioteca de vídeos, les subscripcions Podcast, o fins i tot, mostrar la botiga de música d'Amazon perquè pugueu comprar música.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Vista Reproducció ara</title>
+ <p>Quan utilitzeu el Banshee en mode de pantalla completa, el mode «Reproducció ara» amaga la biblioteca per a donar més espai per a visualitzar la música o el vídeo que esteu reproduint. Quan escolteu música, el mode «Reproducció ara» us mostrarà el nom de l'artista, l'àlbum i la coberta si estan disponibles. Si esteu reproduint un vídeo, el Banshee us mostrarà el vídeo.</p>
+
+ <p>Per a què la Reproducció ara amagui l'interfície d'usuari del Banshee i utilitzi el mode a pantalla completa, podeu prémer <key>F</key>, el botó <gui>Pantalla completa</gui> a la part superior dreta del Banshee, o seleccionar <guiseq><gui>Visualitza</gui><gui>Pantalla completa</gui></guiseq> per a iniciar el mode pantalla completa.</p>
+
+</section>
+
+<section id="library">
+ <title>Biblioteca</title>
+ <p>La vista biblioteca al Banshee canvia depenent de la font que heu escollit. La biblioteca mostrarà les cobertes, artistes i llistes de cançons. La biblioteca Podcast mostrarà les subscripcions a Podcasts, que estan baixats o sense acabar de baixar o bé Podcasts antics. Vegeu la pàgina d'ajuda per a cada font per a obtenir informació detallada de com gestionar cada font.</p>
+</section>
- <section id="context">
- <title>Fonts</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/cs/add-podcast.page b/help/cs/add-podcast.page
new file mode 100644
index 0000000..b36b971
--- /dev/null
+++ b/help/cs/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="cs">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Přidávejte, odebírejte a přehrávejte podcasty v Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasty</title>
+
+ <section id="podcastdescription">
+ <title>Co je to podcast</title>
+
+ <p>Podcast je zaznamenaný program, podobně jako program rádia, který je dostupný na Internetu a vy jej můžete odebírat. Když jste v přehrávači Banshee přihlášeni k odběru nějakého podcastu, tak pokaždé když je vydán nový program, Banshee jej automaticky stáhne a nabídne vám jej k poslechu.</p>
+
+ <p>Existují podcasty s téměř jakýmkoliv tématem, včetně hudby, filmů, Linuxu a dalších věcí. Hledejte na Internetu svým oblíbeným vyhledávačem. K hledání použijte výraz typu „film podcast“ (respektive anglicky „movie podcast“, protože nabídka podcastů v angličtině je daleko větší) a můžete si vybírat.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Přidávání podcastů</title>
+
+ <p>Když chcete do přehrávače Banshee přidat podcast, musíte nejprve ve svém prohlížeči navštívit domovskou stránku onoho podcastu na Intenetu. Většina podcastů má tlačítko nebo odkaz pro přihlášení k odběru podcastu. Zkopírujte odkaz do přihlášení k podcastu. Ve většině webových prohlížečů jde kliknout pravým tlačítkem na odkaz a zvolit <gui>Kopírovat odkaz</gui>.</p>
+
+ <p>V Banshee zmáčkněte <gui>Přidat podcast</gui> v pravém horním rohu nebo zvolte z nabídky <guiseq><gui>Média</gui><gui>Přidat podcast…</gui></guiseq> a nebo použijte klávesovou zkratku <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
+
+ <p>Pak si v Banshee můžete v rozbalovací nabídce zvolit, jak chcete nové podcasty stahovat. Na výběr je:</p>
+
+ <list>
+ <item><p>Stáhnout nejnovější díl (automaticky stáhne poslední vydaný díl)</p></item>
+ <item><p>Stáhnout všechny díly (automaticky stáhne všechny díly)</p></item>
+ <item><p>Nechat mě vybrat díly ke stažení (nabídne vám ke zvolení, které díly si přejete stáhnout)</p></item>
+ </list>
+
+ <p>Po té, co kanál podcastu přidáte, Banshee zobrazí:</p>
+
+ <list>
+ <item><p><gui>Název</gui>: (název konkrétního dílu)</p></item>
+ <item><p><gui>Podcast</gui>: (název podcastu)</p></item>
+ <item><p><gui>Zveřejněno</gui>: (datum, kdy byl díl zveřejněn nebo vydán)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/cs/add-radio.page b/help/cs/add-radio.page
new file mode 100644
index 0000000..1ca9805
--- /dev/null
+++ b/help/cs/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="cs">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Přidávejte, odebírejte a přehrávejte stanice Internetových rádií v Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Internetové rádio</title>
+
+ <section id="radiodescription">
+ <title>Co je to Internetové rádio?</title>
+
+ <p>Internetová rádiová stanice je podobná běžné rádiové stanici, umožňuje poslouchat individuální nebo společné proudové vysílání hudby živě přes Internet. Internetová rádiová stanice může být proud vysílání souběžný ke klasické rádiové stanici, amatérské hromadné vysílání něčí vlastní stanice nebo komerční Internetová rádiová stanice včetně živých diskžokejů, a také reklam.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Přidávání rádiových stanic</title>
+
+ <p>Když chcete do přehrávače Banshee přidat Internetovou rádiovou stanici, zmáčkněte <gui>Přidat stanici</gui> v pravém horním rohu nebo v nabídce zvolte <guiseq><gui>Média</gui><gui>Přidat stanici</gui></guiseq>.</p>
+
+ <p>Z webové stránky stanice zkopírujte ve svém webovém prohlížeči odkaz na jejich adresu URL proudu. Ve většině prohlížečů to jde udělat kliknutím pravým tlačítkem na odkaz a zmáčknutím <gui>Kopírovat odkaz</gui>.</p>
+
+
+ <p>Banshee vás vyzve k zadání <gui>Žánru stanice</gui>. Z dostupných voleb v rozbalovacím seznamu zvolte druh hudby, kterou stanice hraje. Pak budete muset vyplnit <gui>Název stanice</gui>. Zadejte, jak se rádiová stanice jmenuje. Po té zmáčkněte tabulátor nebo použijte myš k zaměření pole <gui>Adresa URL proudu</gui> a vložte do něj adresu URL stanice. Použijte k tomu pravé tlačítko myši a položku <gui>Vložit</gui> nebo zmáčkněte <keyseq><key>Control</key><key>V</key></keyseq>.</p>
+
+ <p>Volitelně můžete také vyplnit pole <gui>Tvůrce stanice</gui>, <gui>Popis</gui> a <gui>Hodnocení</gui>.</p>
+
+ <p>Nakonec zmáčkněte <gui>Uložit</gui> a tím se Internetová rádiová stanice do Banshee uloží.</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/cs/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/cs/advanced.page
index 468ad23..2c7b265 100644
--- a/help/zh_CN/extensions.page
+++ b/help/cs/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="cs">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Získejte nápovědu k pokročilým akcím.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Pokročilé volby a nápověda</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Klávesové zkratky</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Klávesové zkratky</title>
</section>
-
+
</page>
diff --git a/help/cs/amazon.page b/help/cs/amazon.page
index 40f6be2..a520659 100644
--- a/help/cs/amazon.page
+++ b/help/cs/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Synchronizujte a nakupujte hudbu z obchodu s MP3 Amazon.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,37 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Obchod s MP3 Amazon</title>
-
- <p>Přehrávač <app>Banshee</app> podporuje stahování a import hudby z obchodu s MP3 Amazon. Můžete ručně importovat hudební soubory Amazon, nakupovat hudbu ve svém webovém prohlížeči nebo nakupovat hudbu přímo v <app>Banshee</app>. Amazon nabízí hudbu k prodeji ve formátu MP3 jen v některých zemích a to, zda budete moci v obchodě Amazon nakupovat MP3 závisí na tom, kde se nacházíte.</p>
-
- <note style="important">
- <p>Přehrávač <app>Banshee</app> používá k nákupu veškeré hudby partnerský kód Amazon. Všechny peníze, které projdou přes tento partnerský kód jsou darovány nadaci GNOME Foundation.</p>
- </note>
-
+ <title>Obchod s MP3 Amazon</title>
+
+ <p>Přehrávač Banshee podporuje stahování a import hudby z obchodu s MP3 Amazon. Můžete ručně importovat hudební soubory Amazon, nakupovat hudbu ve svém webovém prohlížeči nebo nakupovat hudbu přímo v Banshee. Amazon nabízí hudbu k prodeji ve formátu MP3 jen v některých zemích a to, zda budete moci v obchodě Amazon nakupovat MP3 závisí na tom, kde se nacházíte.</p>
+
+ <note style="important">
+ <p>Přehrávač Banshee používá k nákupu veškeré hudby partnerský kód Amazon. Všechny peníze, které projdou přes tento partnerský kód jsou darovány nadaci GNOME Foundation.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Nákup MP3 z obchodu Amazon ve webovém prohlížeči</title>
-
- <p>Hudba zakoupená z obchodu s MP3 Amazon může být automaticky stahována a importována do přehrávače <app>Banshee</app>. <app>Banshee</app> se přidruží k souborům .amz, které Amazon poskytuje pro zakoupené MP3. Když v obchodě Amazon nakoupíte hudbu, váš webový prohlížeč stáhne soubor .amz a <app>Banshee</app> jej automaticky otevře a začne hudbu stahovat a importovat.</p>
-
+ <title>Nákup MP3 z obchodu Amazon ve webovém prohlížeči</title>
+
+ <p>Hudba zakoupená z obchodu s MP3 Amazon může být automaticky stahována a importována do přehrávače Banshee. Banshee se přidruží k souborům .amz, které Amazon poskytuje pro zakoupené MP3. Když v obchodě Amazon nakoupíte hudbu, váš webový prohlížeč stáhne soubor .amz a Banshee jej automaticky otevře a začne hudbu stahovat a importovat.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Nákup MP3 z obchodu Amazon v <app>Banshee</app></title>
-
- <p>V rámci přehrávače <app>Banshee</app> můžete také v obchodě Amazon skladby hledat. V nabídce vlevo zvolte Obchod s MP3 Amazon. Tím se načte obchod s MP3 Amazon stejně jako ve webovém prohlížeči. Můžete v něm vyhledávat hudbu, kterou si přejete koupit a po přihlášení do obchodu Amazon si ji můžete jediným kliknutím i koupit. <app>Banshee</app> váš nákup automaticky stáhne a naimportuje do kolekce.</p>
-
+ <title>Nákup MP3 z obchodu Amazon v Banshee</title>
+
+ <p>V rámci přehrávače Banshee můžete také v obchodě Amazon skladby hledat. V nabídce vlevo zvolte Obchod s MP3 Amazon. Tím se načte obchod s MP3 Amazon stejně jako ve webovém prohlížeči. Můžete v něm vyhledávat hudbu, kterou si přejete koupit a po přihlášení do obchodu Amazon si ji můžete jediným kliknutím i koupit. Banshee váš nákup automaticky stáhne a naimportuje do kolekce.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Ruční import MP3 z obchodu Amazon</title>
-
- <p>Když nákup v obchodě Amazon provedete přes webový prohlížeč, soubor s příponou .amz se stáhne a uloží na váš pevný disk. Pokud chcete zakoupenou hudbu ručně naimporotvat z obchodu Amazon, v nabídce <app>Banshee</app> zvolte <guiseq><gui>Média</gui> <gui>Importovat média</gui></guiseq> a vyberte soubor *.amz, který se má importovat. Přehrávač <app>Banshee</app> tento soubor otevře a připojí se do obchodu s MP3 Amazon, aby provedl stažení.</p>
-
+ <title>Ruční import MP3 z obchodu Amazon</title>
+
+ <p>Když nákup v obchodě Amazon provedete přes webový prohlížeč, soubor s příponou .amz se stáhne a uloží na váš pevný disk. Pokud chcete zakoupenou hudbu ručně naimporotvat z obchodu Amazon, zvolte v Banshee z nabídky <guiseq><gui>Média</gui><gui>Importovat média</gui></guiseq> a vyberte soubor *.amz, který se má importovat. Banshee tento soubor otevře a připojí se do obchodu s MP3 Amazon, aby provedla stažení.</p>
+
<note style="warning">
<p>Soubory Amazon .amz jsou platné jen pro krátkou dobu. Pokud stažení neprovedete rychle, vyprší souboru platnost a vy nebudete moci svoji hudbu z obchodu Amazon stáhnout. Amazon nezveřejňuje, jak dlouho jsou soubory platné. Je doporučováno stažení a import zakoupené hudby z obchodu Amazon provést v rozmezí hodiny.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/cs/cs.po b/help/cs/cs.po
index e50dc69..ac3c8b4 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -2,438 +2,382 @@
# Copyright (C) 2011 banshee's COPYRIGHT HOLDER
# This file is distributed under the same license as the banshee package.
#
-# Marek Černocký <marek at manet.cz>, 2011, 2012, 2013.
+# Marek Černocký <marek at manet.cz>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: banshee master\n"
-"POT-Creation-Date: 2013-06-09 06:42+0000\n"
-"PO-Revision-Date: 2013-07-25 10:54+0200\n"
+"POT-Creation-Date: 2012-02-09 05:55+0000\n"
+"PO-Revision-Date: 2012-03-26 09:54+0200\n"
"Last-Translator: Marek Černocký <marek at manet.cz>\n"
"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
-"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.6\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:35(None) C/introduction.page:44(None)
-msgid ""
-"@@image: 'figures/main-window.png'; md5=a4b2814f0dce9333bceb0d05e910a796"
-msgstr ""
-"@@image: 'figures/main-window.png'; md5=a4b2814f0dce9333bceb0d05e910a796"
+#: 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:9(desc)
-msgid "An overview of the <app>Banshee</app> user interface."
+#: C/ui.page:8(desc)
+msgid "An overview of <app>Banshee's</app> user interface."
msgstr "Přehled uživatelského rozhraní přehrávače <app>Banshee</app>."
#: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name)
-#: C/search.page:12(name) C/radio.page:14(name) C/podcast.page:15(name)
-#: C/play.page:14(name) C/play-queue.page:18(name) C/manage-tags.page:12(name)
-#: C/manage-playlists.page:12(name) C/lastfm.page:12(name)
-#: C/keyboard-shortcuts.page:10(name) C/introduction.page:10(name)
-#: C/index.page:11(name) C/import.page:12(name) C/extensions.page:11(name)
-#: C/amazon.page:11(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/radio.page:15(email) C/podcast.page:16(email)
-#: C/play.page:15(email) C/play-queue.page:19(email)
-#: C/manage-tags.page:13(email) C/manage-playlists.page:13(email)
-#: C/lastfm.page:13(email) C/keyboard-shortcuts.page:11(email)
-#: C/introduction.page:11(email) C/index.page:12(email)
-#: C/import.page:13(email) C/extensions.page:12(email) C/amazon.page:12(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 at gnome.org"
msgstr "pcutler at gnome.org"
-#: C/ui.page:16(name) C/sync.page:16(name) C/sort.page:16(name)
-#: C/radio.page:18(name) C/play.page:22(name) C/play-queue.page:13(name)
-#: C/lastfm.page:16(name) C/introduction.page:14(name) C/index.page:19(name)
-#: C/import.page:20(name) C/amazon.page:15(name)
-msgid "Aruna Sankaranarayanan"
-msgstr "Aruna Sankaranarayanan"
-
-#: C/ui.page:17(email) C/sync.page:17(email) C/sort.page:17(email)
-#: C/search.page:17(email) C/radio.page:19(email) C/play.page:23(email)
-#: C/play-queue.page:14(email) C/lastfm.page:17(email)
-#: C/introduction.page:15(email) C/index.page:20(email)
-#: C/import.page:21(email) C/amazon.page:16(email)
-msgid "aruna.evam at gmail.com"
-msgstr "aruna.evam at gmail.com"
-
-#: C/ui.page:29(title)
-msgid "The <app>Banshee</app> user interface"
-msgstr "Uživatelské rozhraní <app>Banshee</app>"
-
-#: C/ui.page:32(title) C/introduction.page:41(title)
+#: C/ui.page:24(title)
+msgid "Introduction to the Banshee User Interface"
+msgstr "Úvod do uživatelského rozhraní Banshee"
+
+#: C/ui.page:27(title) C/introduction.page:43(title)
msgid "<gui>Banshee Media Player</gui> window"
msgstr "Okno <gui>Multimediálního přehrávače Banshee</gui>"
-#: C/ui.page:33(app) C/introduction.page:42(app)
+#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title)
msgid "Banshee Media Player"
msgstr "Multimediální přehrávač Banshee"
-#: C/ui.page:36(p) C/introduction.page:45(p)
+#: C/ui.page:30(p) C/introduction.page:46(p)
msgid "<app>Banshee</app> library interface"
msgstr "Rozhraní kolekce <app>Banshee</app>"
-#: C/ui.page:41(title)
+#: C/ui.page:35(title)
msgid "Sources"
msgstr "Zdroje"
-#: C/ui.page:43(p)
+#: C/ui.page:36(p)
msgid ""
-"Your music and video sources are shown on the left in <app>Banshee</app>. "
-"The sources give you quick access to your <gui>Play Queue</gui>, <gui>Music</"
-"gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>, <gui>Last.fm</gui>, "
-"<gui>Podcasts</gui> and more."
+"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 ""
-"Vaše zdroje hudby a videí jsou zobrazeny v levé části okna <app>Banshee</"
-"app>. Zdroje vám poskytují rychlý přístup k <gui>Frontě přehrávání</gui>, "
-"<gui>Hudbě</gui>, <gui>Videím</gui>, <gui>Obchodu s MP3 Amazon</gui>, "
-"<gui>Last.fm</gui>, <gui>Podcastům</gui> a dalším."
+"Vaše zdroje hudby a videí jsou zobrazeny v levé části okna Banshee. Zdroje "
+"vám poskytují rychlý přístup k frontě přehrávání, hudbě, videím, službám "
+"Amazon a Last.fm, podcastům a dalším."
-#: C/ui.page:49(p)
+#: 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 "
-"<gui>Podcasts</gui> source. The menu option for importing a podcast is not "
-"available when viewing the video or music library."
+"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 ""
"Volby nabídky se mění podle toho, který zdroj máte zvolen. Pokud například "
-"chcete použít nabídku pro import podcastu, musíte zvolit zdroj "
-"<gui>Podcasty</gui>. Volba nabídky pro import podcastu není dostupná, když "
-"si prohlížíte video nebo hudební kolekci."
+"chcete použít nabídku pro import podcastu, musíte zvolit zdroj podcastů. "
+"Volba nabídky pro import podcastu není dostupná, když si prohlížíte video "
+"nebo hudební kolekci."
-#: C/ui.page:58(title)
-msgid "Library browser"
+#: C/ui.page:50(title)
+msgid "Library Browser"
msgstr "Procházení kolekcí"
-#: C/ui.page:60(p)
-msgid ""
-"When you select a music or video source from Sources, <app>Banshee</app> "
-"will display your content in the library browser. Depending on the source "
-"you choose, <app>Banshee</app> can display your music or video library, "
-"podcast subscriptions or even the Amazon Music Store to allow you to buy "
-"music."
-msgstr ""
-"Když ve zdrojích vyberete zdroj hudby nebo videa, přehrávač <app>Banshee</"
-"app> zobrazí váš obsah v prohlížeči kolekce. Podle toho, jaký zdroj jste "
-"zvolili, může <app>Banshee</app> zobrazit vaši kolekci hudby nebo videa, "
-"odběry podcastů nebo i hudební obchod Amazon, kde můžete hudbu nakupovat."
-
-#: C/ui.page:68(title)
-msgid "<gui>Now Playing</gui> view"
-msgstr "<gui>Právě se přehrává</gui>"
-
-#: C/ui.page:70(p)
-msgid ""
-"Helpful when using <app>Banshee</app> in full screen mode, the <gui>Now "
-"Playing</gui> mode hides the library to give you a larger view of the music "
-"or video you are watching. When listening to music, the <gui>Now Playing</"
-"gui> view will show you the artist name, album and cover art if available. "
-"If you are watching a video, <app>Banshee</app> will display the video."
-msgstr ""
-"Pokud používáte přehrávač <app>Banshee</app> v režimu celé obrazovky, režim "
-"<gui>Právě se přehrává</gui> skryje kolekci, abyste získali větší pohled na "
-"hudbu nebo video, které sledujete. Když posloucháte hudbu, <gui>Právě se "
-"přehrává</gui> zobrazí jméno umělce, album a přebal (pokud je dostupný). "
-"Když sledujete video, bude <app>Banshee</app> zobrazovat video."
-
-#: C/ui.page:77(p)
-msgid ""
-"To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app> "
-"user interface and view your media in full screen mode instead, you can do "
-"any of the following:"
-msgstr ""
-"Přepnout se do režimu <gui>Právě se přehrává</gui> a skrýt tak uživatelské "
-"rozhraní <app>Banshee</app> a místo něj zobrazit svá média přes celou "
-"obrazovku, můžete následovně:"
-
-#: C/ui.page:83(p)
-msgid "Double-click the view with your mouse."
-msgstr "Dvojitě myší klikněte na zobrazení."
-
-#: C/ui.page:86(p)
-msgid "Press <key>F</key>."
-msgstr "Zmáčkněte <key>F</key>."
-
-#: C/ui.page:89(p)
-msgid "Press <key>F11</key>."
-msgstr "Zmáčkněte <key>F11</key>."
-
-#: C/ui.page:92(p)
-msgid ""
-"Press the <gui style=\"button\">Fullscreen</gui> button in the upper right "
-"hand corner of <app>Banshee</app>."
-msgstr ""
-"Zmáčkněte tlačítko <gui style=\"button\">Celá obrazovka</gui> v pravém "
-"horním rohu <app>Banshee</app>."
-
-#: C/ui.page:96(p)
+#: C/ui.page:51(p)
msgid ""
-"Select <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem"
-"\">Fullscreen</gui></guiseq>."
+"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 ""
-"Vyberte <guiseq><gui style=\"menu\">Zobrazit</gui><gui style=\"menuitem"
-"\">Celá obrazovka</gui></guiseq>."
+"Když ve zdrojích vyberete zdroj hudby nebo videa, přehrávač Banshee zobrazí "
+"váš obsah v prohlížeči kolekce. Podle toho, jaký zdroj jste zvolili, může "
+"Banshee zobrazit vaši kolekci hudby nebo videa, odběry podcastů nebo i "
+"hudební obchod Amazon, kde můžete hudbu nakupovat."
-#: C/ui.page:104(title)
-msgid "Libraries"
+#: C/ui.page:58(title)
+msgid "Now Playing View"
+msgstr "Právě se přehrává"
+
+#: 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 ""
+"Pokud používáte přehrávač Banshee v režimu celé obrazovky, režim Právě se "
+"přehrává skryje kolekci, abyste získali větší pohled na hudbu nebo video, "
+"které sledujete. Když posloucháte hudbu, Právě se přehrává zobrazí jméno "
+"umělce, album a přebal (pokud je dostupný). Když sledujete video, bude "
+"Banshee zobrazovat video."
+
+#: 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 <key>F</key>, press the <gui>Fullscreen</gui> "
+"button in the upper right hand corner of Banshee, or choose "
+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen "
+"mode."
+msgstr ""
+"Pokud chcete zapnout režim Právě se přehrává, aby se skrylo uživatelské "
+"rozhraní Banshee a použil režim celé obrazovky, zmáčkněte <key>F</key> nebo "
+"tlačítko <gui>Celá obrazovka</gui> v pravém horním rohu přehrávače Banshee a "
+"nebo zvolte <guiseq><gui>Zobrazit</gui><gui>Celá obrazovka</gui></guiseq>."
+
+#: C/ui.page:74(title)
+msgid "Library"
msgstr "Kolekce"
-#: C/ui.page:106(p)
+#: C/ui.page:75(p)
msgid ""
-"The <gui>Libraries</gui> view in <app>Banshee</app> will change depending on "
-"the Source you have chosen. For example, the <gui>Music</gui> library will "
-"display cover art, artists in your library, and list of songs and the "
-"<gui>Podcasts</gui> library will display your podcast subscriptions, "
-"podcasts that are downloaded or not downloaded, and all, new or old "
-"podcasts. Please see the help page of each source for detailed information "
+"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 ""
-"Zobrazení <gui>Kolekcí</gui> se v přehrávači <app>Banshee</app> mění v "
-"závislosti na zdroji, který máte zvolen. Kolekce <gui>Hudba</gui> zobrazí "
-"přebal, umělce a seznam skladeb. Kolekce <gui>Podcasty</gui> zobrazí vaše "
-"odběry podcastů, podcasty, které jsou staženy a které ne, a všechny, nové "
-"nebo staré podcasty. Na další podrobné informace o správě toho kterého "
-"zdroje se prosím podívejte na stránku s nápovědou příslušného zdroje."
+"Zobrazení kolekce se v přehrávači Banshee mění v závislosti na zdroji, který "
+"máte zvolen. Hudební kolekce zobrazí přebal, umělce a seznam skladeb. "
+"Kolekce podcastu zobrazí vaše odběry podcastů, podcasty, které jsou staženy "
+"a které ne, a všechny, nové nebo staré podcasty. Na další podrobné informace "
+"o správě toho kterého zdroje se prosím podívejte na stránku s nápovědou "
+"příslušného zdroje."
#: C/sync.page:9(desc)
msgid "Sync your media to a portable media player or smartphone."
msgstr "Synchronizujte svá média s přenosnými přehrávači a smartfony."
-#: C/sync.page:28(title)
+#: C/sync.page:24(title)
msgid "Sync"
msgstr "Synchronizace"
-#: C/sync.page:30(p)
+#: C/sync.page:26(p)
msgid ""
-"<app>Banshee</app> supports syncing your music to portable media players and "
+"Banshee supports syncing your music to portable media players and "
"smartphones. You can add specific music tracks, albums or playlist or allow "
-"<app>Banshee</app> 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 <app>Banshee</app>. When syncing "
-"music in a lossless format, such as FLAC, <app>Banshee</app> 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 ""
-"Přehrávač <app>Banshee</app> podporuje synchronizaci vaší hudby do "
-"přenosných multimediálních přehrávačů a smartfonů. Můžete přidávat konkrétní "
-"hudební stopy, alba nebo seznamy skladeb nebo dovolit <app>Banshee</app> "
-"udržovat váš hudební přehrávač synchronizovaný s určitou z kolekcí. Po "
-"připojení vašeho přehrávače k počítači z něj můžet v <app>Banshee</app> také "
-"skladby přehrávat. Když synchronizujete hudbu v bezeztrátovém formátu (jako "
-"je FLAC) bude <app>Banshee</app>, pokud máte nainstalovaný správný kodek, "
-"překódovávat vaši hudbu do ztrátového formátu (jako je Ogg nebo MP3)."
-
-#: C/sync.page:40(title)
-msgid "Device support"
+"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 ""
+"Přehrávač Banshee podporuje synchronizaci vaší hudby do přenosných "
+"multimediálních přehrávačů a smartfonů. Můžete přidávat konkrétní hudební "
+"stopy, alba nebo seznamy skladeb nebo dovolit Banshee udržovat váš hudební "
+"přehrávač synchronizovaný s určitou z kolekcí. Po připojení vašeho "
+"přehrávače k počítači můžete na něm také v Banshee přehrávat skladby. Když "
+"synchronizujete hudbu v bezeztrátovém formátu (jako je FLAC) bude Banshee, "
+"pokud máte nainstalovaný správný kodek, překódovávat vaši hudbu do "
+"ztrátového formátu (jako je Ogg nebo MP3)."
+
+#: C/sync.page:37(title)
+msgid "Device Support"
msgstr "Podpora zařízení"
-#: C/sync.page:42(p)
+#: C/sync.page:38(p)
msgid ""
-"<app>Banshee</app> supports almost all modern portable music players and "
-"smartphones with the notable exception of the Apple iPhone, iPad and iPod "
-"Touch."
+"Banshee supports almost all modern portable music players and smartphones "
+"with the notable exception of the Apple iPhone, iPad and iPod Touch."
msgstr ""
-"<app>Banshee</app> podporuje téměř všechny moderní přenosné hudební "
-"přehrávače a smartfony se známými výjimkami týkajícími se Apple iPhone, iPad "
-"a iPod Touch."
+"Banshee podporuje téměř všechny moderní přenosné hudební přehrávače a "
+"smartfony se známými výjimkami týkajícími se Apple iPhone, iPad a iPod Touch."
-#: C/sync.page:46(p)
+#: C/sync.page:42(p)
msgid ""
-"When you plug your device in, <app>Banshee</app> will display it in the left "
-"menu. Pressing the device icon will take you to your device home page in "
-"<app>Banshee</app> displaying your sync preferences."
+"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 ""
-"Když své zařízení připojíte, přehrávač <app>Banshee</app> jej zobrazí v "
-"nabídce vlevo. Zmáčknutím ikony zařízení se přenesete na domovskou stránku "
-"svého zařízení v <app>Banshee</app>, která zobrazuje vaše předvolby "
-"synchronizace."
+"Když své zařízení připojíte, přehrávač Banshee jej zobrazí v nabídce vlevo. "
+"Zmáčknutím ikony zařízení se přenesete na domovskou stránku svého zařízení v "
+"Banshee, která zobrazuje vaše předvolby synchronizace."
-#: C/sync.page:53(title)
-msgid "Sync your music"
+#: C/sync.page:50(title)
+msgid "Sync Your Music"
msgstr "Synchronizace vaší hudby"
-#: C/sync.page:55(p)
+#: C/sync.page:51(p)
msgid ""
-"You can choose to manage the media on your portable music by having "
-"<app>Banshee</app> automatically sync it or manage your music and media "
-"manually."
+"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 ""
-"Můžete zvolit, aby přehrávač <app>Banshee</app> synchronizoval média na "
-"vašem přenosném přehrávači automaticky nebo můžete svoji hudbu a média "
-"spravovat ručně."
+"Můžete zvolit, aby přehrávač Banshee synchronizoval média na vašem přenosném "
+"přehrávači automaticky nebo můžete svoji hudbu a média spravovat ručně."
-#: C/sync.page:59(p)
+#: C/sync.page:56(p)
msgid ""
-"Choose your device from the <app>Banshee</app> menu and then choose how you "
-"want to sync your media, including:"
+"Choose your device from the Banshee menu and then choose how you want to "
+"sync your media, including:"
msgstr ""
-"Zvolte v nabídce <app>Banshee</app> své zařízení a pak zvolte, jak chcete "
+"Zvolte v nabídce Banshee své zařízení a pak zvolte, jak chcete "
"synchronizovat svá média, včetně:"
-#: C/sync.page:63(p)
+#: C/sync.page:60(p)
msgid "Music"
msgstr "hudby"
-#: C/sync.page:64(p)
+#: C/sync.page:61(p)
msgid "Audiobooks"
msgstr "mluvených knih"
-#: C/sync.page:65(p)
+#: C/sync.page:62(p)
msgid "Videos"
msgstr "videí"
-#: C/sync.page:66(p) C/podcast.page:31(title)
-#: C/keyboard-shortcuts.page:90(title)
-msgid "Podcasts"
-msgstr "Podcasty"
+#: C/sync.page:63(p)
+msgid "Podcast"
+msgstr "podcastů"
-#: C/sync.page:69(p)
+#: C/sync.page:66(p)
msgid "From the dropdown menu next to each of the media, choose from:"
msgstr "Z rozbalovací nabídky u každého média zvolte z:"
-#: C/sync.page:72(p)
+#: C/sync.page:69(p)
msgid "Manage manually"
msgstr "Spravovat ručně"
-#: C/sync.page:73(p)
+#: C/sync.page:70(p)
msgid "Sync entire library"
msgstr "Synchronizovat celou kolekci"
-#: C/sync.page:77(p)
+#: 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, "
-"<app>Banshee</app> will sync media until your player is full and then stop."
+"Banshee will sync media until your player is full and then stop."
msgstr ""
-"Pokud zvolíte synchronizaci celé své kolekce s přenosným přehrávačem "
+"Pokud zvolíte synchronizaci své celé kolekce s přenosným přehrávačem "
"automaticky, ujistěte se, že váš přenosný multimediální přehrávač má "
"dostatek úložného místa. V případě, že je kolekce větší než dostupné místo v "
-"přehrávači, <app>Banshee</app> bude média synchronizovat dokud se přehrávač "
-"nezaplní a pak synchronizaci ukončí."
+"přehrávači, Banshee bude média synchronizovat dokud se přehrávač nezaplní a "
+"pak synchronizaci ukončí."
-#: C/sync.page:84(p)
+#: 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 <app>Banshee</app> "
-"will sync the new playlist to your device every time you plug it in."
+"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 ""
"Jestliže máte ve své kolekci vytvořen seznam skladeb nebo chytrý seznam "
"skladeb, bude rovněž zobrazen jako volba synchronizace pro hudbu. To může "
-"být užitečné, když vytváříte chytré seznamy skladeb. Chytré seznamy skladeb "
-"budou automaticky aktualizovány, když je přidán nový obsah podle pravidel "
-"seznamu skladeb a <app>Banshee</app> synchronizuje nový seznam skladeb do "
+"být užitečné, když vytváříte chytré seznamy skladeb tak, že chytré seznamy "
+"skladeb budou automaticky aktualizovány, když je přidán nový obsah podle "
+"pravidel seznamu skladeb a Banshee synchronizuje nový seznam skladeb do "
"zařízení pokaždé, když jej připojíte."
-#: C/sync.page:90(p)
+#: C/sync.page:89(p)
msgid ""
-"<app>Banshee</app> will display the total hard drive space of your portable "
-"music player in a graph in the bottom center of <app>Banshee</app>. The "
-"graph will show you how much space is taken by audio files, video, other and "
-"free space. Directly below that <app>Banshee</app> 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."
+"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 ""
-"Přehrávač <app>Banshee</app> bude zobrazovat celkové místo na disku vašeho "
-"přenosného multimediálního přehrávače v grafu dole uprostřed hlavního okna. "
-"Graf vám ukáže, kolik prostoru zabírají zvukové soubory, videa, ostatní "
-"soubory a volné místo. Přímo pod ním <app>Banshee</app> zobrazuje, kolik "
-"položek celkem je na vašem přenosném přehrávači uloženo, kolika hodinám či "
-"dnům poslechu to odpovídá a celkové obsazené místo."
+"Přehrávač Banshee bude zobrazovat celkové místo na disku vašeho přenosného "
+"multimediálního přehrávače v grafu dole uprostřed okna Banshee. Graf vám "
+"ukáže, kolik prostoru zabírají zvukové soubory, videa, ostatní soubory a "
+"volné místo. Přímo pod ním Banshee zobrazuje, kolik položek celkem je na "
+"vašem přenosném přehrávači uloženo, kolika hodinám či dnům poslechu to "
+"odpovídá a celkové obsazené místo."
#: C/sync.page:100(title)
-msgid "Sync your entire library"
-msgstr "Synchronizovat celou kolekci"
+msgid "Sync Your Entire Library"
+msgstr "Synchronizace celé vaší kolekce"
-#: C/sync.page:102(p)
+#: C/sync.page:101(p)
msgid ""
-"You can drag and drop media to your portable music player from <app>Banshee</"
-"app>. 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 <app>Banshee</app>. This will copy the "
-"files to your device."
+"You can drag and drop media to your portable music player from 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 ""
-"Média z <app>Banshee</app> do přenosného hudebního přehrávače můžete "
-"přenášet způsobem táhni a upusť. Vyberte soubor či soubory, které chcete "
-"překopírovat do přehrávače a zmáčkněte a držte pravé tlačítko myši a "
-"přetáhněte soubor(y) na ikonu přenosného multimediálního přehrávače v "
-"<app>Banshee</app>. Tím se soubory do vašeho zařízení překopírují."
+"Média z Banshee do přenosného hudebního přehrávače můžete přenášet způsobem "
+"táhni a pusť. Vyberte soubor či soubory, které chcete překopírovat do "
+"přehrávače a zmáčkněte a držte pravé tlačítko myši a přetáhněte soubor(y) na "
+"ikonu přenosného multimediálního přehrávače v Banshee. Tím se soubory do "
+"vašeho zařízení překopírují."
#: 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, <app>Banshee</app> can automatically transcode these files to MP3 "
-"when transferring to your portable media player. Check with your Linux "
+"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 ""
"V případě, že je vaše hudební kolekce kódována ve formátu, který váš hudební "
-"přehrávač nepodporuje, třeba OGG nebo FLAC, a máte nainstalovány patřičné "
-"kodeky, umí <app>Banshee</app> soubory při přenosu do vašeho přenosného "
-"multimediálního přehrávač automaticky překódovat do MP3. To jak "
-"zkontrolovat, zda vaše distribuce obsahuje potřebné kodeky, je mimo rámec "
-"této příručky a liší se distribuci od distribuce."
+"přehrávač nepodporuje, třeba OGG nebo FLAC, a máte nainstalován patřičný "
+"kodek, umí Banshee soubory při přenosu do vašeho přenosného multimediálního "
+"přehrávač automaticky překódovat do MP3. To jak zkontrolovat, zda vaše "
+"distribuce obsahuje potřebné kodeky, je mimo rámec této příručky a liší se "
+"distribuci od distribuce."
-#: C/sync.page:116(p)
+#: 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 <app>Banshee</app>, using "
-"your mouse right click the device in the <app>Banshee</app> menu and press "
-"<gui style=\"menuitem\">Disconnect</gui>."
+"portable music player. To eject your device in Banshee, using your mouse "
+"right click the device in the Banshee menu and press <gui>Disconnect</gui>."
msgstr ""
"Aby se soubory do přenosného multimediálního přehrávače správně načetly, "
-"může být zapotřebí zařízení „vysunout“. V <app>Banshee</app> k tomu použijte "
-"kliknutí pravým tlačítkem myši na zařízení a v nabídce zmáčkněte <gui style="
-"\"menuitem\">Odpojit</gui>."
+"může být zapotřebí zařízení „vysunout“. V Banshee k tomu použijte kliknutí "
+"pravým tlačítkem myši na zařízení a v nabídce zmáčkněte <gui>Odpojit</gui>."
-#: C/sync.page:125(title)
-msgid "Play music from your portable music player"
+#: C/sync.page:127(title)
+msgid "Play Music From Your Portable Music Player"
msgstr "Přehrávání hudby z vašeho přenosného hudebního přehrávače"
-#: C/sync.page:127(p)
+#: C/sync.page:128(p)
msgid ""
-"You can play music stored on your portable music player directly in "
-"<app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the "
-"left and your portable music player's library will be displayed. You can "
-"then play music in <app>Banshee</app> just as you would music in your own "
-"library."
+"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 ""
-"Hudbu uloženou na svém přenosném multimediálním přehrávači můžete v "
-"<app>Banshee</app> rovnou přehrávat. V nabídce nalevo zvolte svůj přehrávač "
-"a zobrazí se kolekce vašeho přenosného přehrávače. Hudbu pak můžete "
-"přehrávat úplně stejně, jako ze své vlastní kolekce."
+"Hudbu uloženou na svém přenosném multimediálním přehrávači můžete v Banshee "
+"rovnou přehrávat. V nabídce nalevo zvolte svůj přehrávač a zobrazí se "
+"kolekce vašeho přenosného přehrávače. Hudbu pak můžete přehrávat úplně "
+"stejně, jako ze své vlastní kolekce."
-#: C/sync.page:136(title)
-msgid "Remove music from your portable music player"
+#: C/sync.page:135(title)
+msgid "Remove Music From your Portable Music Player"
msgstr "Odstraňování hudby z vašeho přenosného hudebního přehrávače"
-#: C/sync.page:138(p)
+#: C/sync.page:136(p)
msgid ""
"To remove songs stored on your portable music player, choose your player in "
-"<app>Banshee</app> to view its library. Then choose the tracks you would "
-"like to remove and right click the tracks and choose <gui style=\"menuitem"
-"\">Delete</gui> or from the menu choose <guiseq><gui style=\"menu\">Edit</"
-"gui><gui style=\"menuitem\">Delete</gui></guiseq>."
+"Banshee to view its library. Then choose the tracks you would like to remove "
+"and right click the tracks and choose <gui>Delete</gui> or from the menu "
+"choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
msgstr ""
"Pokud chcete odstranit skladbu uloženou ve svém přenosném multimediálním "
-"přehrávači, zvolte v <app>Banshee</app> zobrazení jeho kolekce. Po té "
-"vyberte stopy, které si přejete odstranit, klikněte na ně pravým tlačítkem a "
-"zvolte <gui style=\"menuitem\">Odstranit</gui> nebo v nabídce zvolte "
-"<guiseq><gui style=\"menu\">Upravit</gui> <gui style=\"menuitem\">Odstranit</"
-"gui></guiseq>."
+"přehrávači, zvolte v Banshee zobrazení jeho kolekce. Po té zvolte stopu, "
+"kterou si přejete odstranit, klikněte na ni pravým tlačítkem a zvolte "
+"<gui>Odstranit</gui> nebo v nabídce zvolte <guiseq><gui>Upravit</"
+"gui><gui>Odstranit</gui></guiseq>."
-#: C/sync.page:146(p)
+#: C/sync.page:142(p)
msgid ""
"Deleting files from your portable music player will permanently remove the "
"files and you will not be able to recover them."
@@ -445,15 +389,15 @@ msgstr ""
msgid "Sort your media and add additional columns."
msgstr "Řaďte si svá média a přidávejte další sloupce."
-#: C/sort.page:28(title)
+#: C/sort.page:24(title)
msgid "Sort your media"
msgstr "Řazení vašich médií"
-#: C/sort.page:32(title)
-msgid "Adding columns"
+#: C/sort.page:28(title)
+msgid "Adding Columns"
msgstr "Přidávání sloupců"
-#: C/sort.page:34(p)
+#: C/sort.page:30(p)
msgid ""
"As your library grows, you may want to change your library view to add "
"additional information about the songs in your library or change the way you "
@@ -463,113 +407,106 @@ msgstr ""
"informací o skladbách ve vaší kolekci nebo změnou způsobu, jak můžete "
"zobrazit a seřadit své skladby, umělce a alba."
-#: C/sort.page:38(p)
+#: C/sort.page:34(p)
msgid ""
"You can add additional columns to the library view in <app>Banshee</app> to "
"give you more information about the songs and also allow you to sort by. By "
-"default, <app>Banshee</app> displays columns for songs including <gui>Name</"
-"gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To add "
-"additional columns, using your mouse right click on any of the columns and "
-"<app>Banshee</app> 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."
+"default, Banshee displays columns for songs including <gui>Name</gui>, "
+"<gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. 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 ""
"Do zobrazení v přehrávači <app>Banshee</app> můžete přidávat další sloupce, "
"abyste měli o skladbách více informací a mohli podle nich řadit. Jako "
-"výchozí zobrazuje <app>Banshee</app> pro skladby sloupce <gui>Název</gui>, "
-"<gui>Umělce</gui>, <gui>Album</gui> a <gui>Čas</gui>. Pokud chcete přidat "
-"další sloupce, použijte kliknutí pravým tlačítkem myši na libovolném sloupci "
-"a zobrazí se všechny dostupné sloupce, ze kterých si můžete vybírat. "
-"Klikněte na zaškrtávací políčko vedle názvu sloupce, který si přejete do "
-"zobrazení přidat."
-
-#: C/sort.page:50(title)
-msgid "Sorting columns"
+"výchozí sloupce pro skladby zobrazuje Banshee <gui>Název</gui>, <gui>Umělce</"
+"gui>, <gui>Album</gui> a <gui>Čas</gui>. Pokud chcete přidat další sloupce, "
+"použijte kliknutí pravým tlačítkem myši na libovolném sloupci a Banshee "
+"zobrazí všechny dostupné sloupce, ze kterých si můžete vybírat. Klikněte na "
+"zaškrtávací políčko vedle názvu sloupce, který si přejete do zobrazení "
+"přidat."
+
+#: C/sort.page:46(title)
+msgid "Sorting Columns"
msgstr "Řazení sloupců"
-#: C/sort.page:52(p)
+#: 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 <gui>Artist</gui> column header and <app>Banshee</app> will "
-"automatically sort that column alphabetically. Clicking the <gui>Artist</"
-"gui> column again will sort the column in reverse alphabetical order."
+"click the <gui>Artist</gui> column header and Banshee will automatically "
+"sort that column alphabetically. Clicking the <gui>Artist</gui> column again "
+"will sort the column in reverse alphabetical order."
msgstr ""
"Své kolekce si můžete řadit pomocí myši tak, že kliknete na některý ze "
"sloupců v zobrazení kolekce. Když si přejete seřadit svoji hudební kolekci "
-"podle umělce, klikněte na záhlaví sloupce <gui>Umělec</gui> a <app>Banshee</"
-"app> sloupec automaticky seřadí podle abecedy. Pokud na sloupce <gui>Umělec</"
-"gui> kliknete znovu, seřadí se abecedně v opačném pořadí."
+"podle umělce, klikněte na záhlaví sloupce <gui>Umělec</gui> a Banshee "
+"sloupec automaticky seřadí podle abecedy. Pokud na sloupce <gui>Umělec</gui> "
+"kliknete znovu, seřadí se abecedně v opačném pořadí."
#: C/search.page:9(desc)
msgid "Search your media and perfom basic queries."
msgstr "Prohledávejte svá média a provádějte základní dotazy."
-#: C/search.page:16(name)
-msgid "Aruna sankaranarayanan"
-msgstr "Aruna sankaranarayanan"
-
-#: C/search.page:28(title)
-msgid "Searching your <app>Banshee</app> library"
-msgstr "Prohledávání vaší kolekce <app>Banshee</app>"
+#: C/search.page:24(title)
+msgid "Searching your Banshee Library"
+msgstr "Prohledávání vaší kolekce Banshee"
-#: C/search.page:30(p)
+#: C/search.page:26(p)
msgid ""
-"<app>Banshee</app> features a powerful search language. You can search your "
-"library quickly and easily with basic search terms or perform detailed "
-"searches with the <app>Banshee</app> advanced search terminology."
+"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 ""
-"Součástí funkcí <app>Banshee</app> je mocný vyhledávací jazyk. Své kolekce "
-"můžete prohledávat rychle a snadno pomocí základní vyhledávacích výrazů nebo "
-"provádět podrobné hledání pomocí pokročilé vyhledávací terminologie "
-"<app>Banshee</app>."
+"Součástí funkcí Banshee je mocný vyhledávací jazyk. Své kolekce můžete "
+"prohledávat rychle a snadno pomocí základní vyhledávacích výrazů nebo "
+"provádět podrobné hledání pomocí pokročilé vyhledávací terminologie Banshee."
-#: C/search.page:34(p)
+#: C/search.page:30(p)
msgid ""
-"To perform a search of your media in <app>Banshee</app>, press the <key>S</"
-"key> or click the <gui>Search</gui> box in the upper right hand corner of "
-"the Library view in <app>Banshee</app>."
+"To perform a search of your media in Banshee, press the <key>S</key> or "
+"click the <gui>Search</gui> box in the upper right hand corner of the "
+"Library view in Banshee."
msgstr ""
-"Když chcete ve svých médiích v přehrávači <app>Banshee</app> vyhledávat, "
-"zmáčkněte <key>S</key> nebo klikněte do pole <gui>Hledat svoji hudbu</gui> v "
-"pravém horním rohu zobrazení knihovny."
+"Když chcete ve svých médiích v přehrávači Banshee vyhledávat, zmáčkněte "
+"<key>S</key> nebo klikněte do pole <gui>Hledat svoji hudbu</gui> v pravém "
+"horním rohu zobrazení knihovny."
-#: C/search.page:38(p)
+#: C/search.page:35(p)
msgid ""
"A search query consists of some basic terms, for example, <em>dave matthews</"
-"em>. By entering <em>dave matthews</em> in the search box, <app>Banshee</"
-"app> will search all metadata fields including Track Title, Album Title, "
-"Album Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
-"<em>matthews</em> will be returned. Search terms are case insensitive, "
-"meaning you do not have to capitalize. <em>dave</em>, <em>Dave</em>, and "
-"<em>DAVE</em> all mean the same thing when searching."
+"em>. By entering <em>dave matthews</em> in the search box, Banshee will "
+"search all metadata fields including Track Title, Album Title, Album Artist, "
+"Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</"
+"em> will be returned. Search terms are case insensitive, meaning you don't "
+"have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean "
+"the same thing when searching."
msgstr ""
"Vyhledávací dotazy se skládají z nějakých základních výrazů, například "
"<em>wabi daněk</em>. Zadáním <em>wabi daněk</em> do vyhledávacího pole bude "
-"<app>Banshee</app> hledat ve všech polích metadat, včetně názvu stopy, názvu "
-"alba, umělce alba, roku atd. Jakákoliv stopa, jejíž data obsahují <em>wabi</"
-"em> a <em>daněk</em>, bude vrácena jako výsledek. Vyhledávací výrazy neberou "
-"ohled na velikost písmen, takže se velikostí písmen nemusíte zabývat. "
-"<em>wabi</em>, <em>Wabi</em> i <em>WABI</em> mají pro hledání stejnou "
-"hodnotu."
-
-#: C/search.page:47(title)
-msgid "Basic operators"
+"Banshee hledat ve všech polích metadat, včetně názvu stopy, názvu alba, "
+"umělce alba, roku atd. Jakákoliv stopa, jejíž data obsahují <em>wabi</em> a "
+"<em>daněk</em>, bude vrácena jako výsledek. Vyhledávací výrazy neberou ohled "
+"na velikost písmen, takže se velikostí písmen nemusíte zabývat. <em>wabi</"
+"em>, <em>Wabi</em> i <em>WABI</em> mají pro hledání stejnou hodnotu."
+
+#: C/search.page:43(title)
+msgid "Basic Operators"
msgstr "Základní operátory"
-#: C/search.page:49(p)
+#: 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 <gui>AND</gui> and is used when no "
-"other operators are used between two search terms. Since it is the default, "
-"there is no explicit AND operator."
+"other operators are used between two search terms. Because it is the "
+"default, there is no explicit AND operator."
msgstr ""
"Mezi libovolná dvě hledaná slova nebo před hledané slovo lze umisťovat "
"operátory. Výchozím operátorem je <gui>AND</gui>, který znamená „a zároveň“ "
"a je použit jako výchozí, když mezi slovy žádný operátor zadán není. Protože "
"je výchozí, není pro něj žádný symbol AND definován."
-#: C/search.page:54(p)
+#: C/search.page:49(p)
msgid ""
"Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together, "
"these three operations can yield very powerful queries to help you search "
@@ -579,11 +516,11 @@ msgstr ""
"tři operátory spolu dohromady umí sestavit velmi mocné dotazy, které vám "
"pomohou s hledáním médií."
-#: C/search.page:61(title)
-msgid "Logical operators and examples"
+#: C/search.page:56(title)
+msgid "Logical Operators and Examples"
msgstr "Logické operátory a příklady"
-#: C/search.page:63(p)
+#: C/search.page:57(p)
msgid ""
"The following is a list of logical operators and examples of the search "
"results when searching using them."
@@ -591,57 +528,57 @@ msgstr ""
"Následuje seznam logických operátorů a příkladů výsledků hledání při jejich "
"použití."
-#: C/search.page:68(gui)
+#: C/search.page:62(gui)
msgid "Operator"
msgstr "Operátor"
-#: C/search.page:69(gui) C/search.page:93(gui)
+#: C/search.page:62(gui) C/search.page:84(gui)
msgid "Description"
msgstr "Popis"
-#: C/search.page:72(p)
+#: C/search.page:65(p)
msgid "<em>default</em>, <em>white space</em>"
msgstr "<em>výchozí</em>, <em>bílý znak</em>"
-#: C/search.page:73(p)
+#: C/search.page:65(p)
msgid "Search for two terms with a space between the two words or terms."
msgstr "Hledá dva výrazy s mezerou mezi dvěma slovy nebo výrazy."
-#: C/search.page:77(p)
+#: C/search.page:69(p)
msgid "OR, or, <key>|</key>, <key>,</key>"
msgstr "OR, or, <key>|</key>, <key>,</key>"
-#: C/search.page:78(p)
+#: C/search.page:69(p)
msgid "Search results will be two songs with either result in any field."
msgstr ""
"Výsledkem hledání budou skladby s alespoň z jedním z výrazů v libovolném "
"poli."
-#: C/search.page:82(p)
+#: C/search.page:73(p)
msgid "NOT, not,<key>-</key>"
msgstr "NOT, not,<key>-</key>"
-#: C/search.page:83(p)
+#: C/search.page:73(p)
msgid ""
"Do not display search results with any search term that follows the operator "
-"of NOT, not,<key>-</key>"
+"of NOT, not,<key>-</key>."
msgstr ""
"Nezobrazovat výsledky hledání s libovolným výrazem, který následuje po "
-"operátoru NOT, not nebo <key>-</key>"
+"operátoru NOT, not nebo <key>-</key>."
-#: C/search.page:88(p)
+#: C/search.page:80(p)
msgid "Examples of logical operations include:"
msgstr "Příklady použití logických operátorů:"
-#: C/search.page:92(gui)
+#: C/search.page:84(gui)
msgid "Query"
msgstr "Dotaz"
-#: C/search.page:96(p)
+#: C/search.page:87(p)
msgid "dave matthews"
msgstr "wabi daněk"
-#: C/search.page:97(p)
+#: C/search.page:87(p)
msgid ""
"Matches any fields in a track containing both <em>dave</em> and "
"<em>matthews</em>."
@@ -649,11 +586,11 @@ msgstr ""
"Odpovídají taková pole ve stopě, která obsahují jak <em>wabi</em>, tak "
"<em>daněk</em>."
-#: C/search.page:101(p)
+#: C/search.page:92(p)
msgid "dave, matthews"
msgstr "wabi, daněk"
-#: C/search.page:102(p) C/search.page:107(p) C/search.page:112(p)
+#: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p)
msgid ""
"Matches any fields in a track containing either <em>dave</em> or "
"<em>matthews</em>."
@@ -661,768 +598,327 @@ msgstr ""
"Odpovídají taková pole ve stopě, která obsahují buď <em>wabi</em> nebo "
"<em>daněk</em> (nebo obojí)."
-#: C/search.page:106(p)
+#: C/search.page:97(p)
msgid "dave or matthews"
msgstr "wabi or daněk"
-#: C/search.page:111(p)
+#: C/search.page:102(p)
msgid "dave | matthews"
msgstr "wabi | daněk"
-#: C/search.page:116(p)
+#: C/search.page:107(p)
msgid "-\"dave matthews\""
msgstr "-\"wabi daněk\""
-#: C/search.page:117(p)
+#: C/search.page:107(p)
msgid "Displays all tracks whose fields do not contain <em>dave matthews</em>."
msgstr "Zobrazí všechny stopy, jejichž pole neobsahují <em>wabi daněk</em>."
-#: C/radio.page:10(desc)
-msgid "Add, remove and play internet radio stations in <app>Banshee</app>."
-msgstr ""
-"Přidávejte, odebírejte a přehrávejte stanice Internetových rádií v "
-"<app>Banshee</app>."
-
-#: C/radio.page:30(title)
-msgid "Internet radio"
-msgstr "Internetové rádio"
-
-#: C/radio.page:33(title)
-msgid "What is internet radio?"
-msgstr "Co je to Internetové rádio?"
-
-#: C/radio.page:35(p)
-msgid ""
-"Internet radio stations are similar to regular radio stations, allowing an "
-"individual or an organization to stream music live over the internet. "
-"Internet radio stations can be a simultaneous stream of a regular radio "
-"station, amateurs broadcasting their own station, or commercial radio "
-"stations that include live DJs and even commercials."
-msgstr ""
-"Internetová rádiová stanice je podobná běžné rádiové stanici, umožňuje "
-"poslouchat individuální nebo společné proudové vysílání hudby živě přes "
-"Internet. Internetová rádiová stanice může být proud vysílání souběžný ke "
-"klasické rádiové stanici, amatérské hromadné vysílání něčí vlastní stanice "
-"nebo komerční Internetová rádiová stanice včetně živých diskžokejů a také "
-"reklam."
-
-#: C/radio.page:44(title)
-msgid "Add radio station"
-msgstr "Přidávání rádiové stanice"
-
-#: C/radio.page:46(p)
-msgid ""
-"Search for internet radio stations using your favourite search engine. You "
-"can specify genres, channel frequencies, names of stations and other details "
-"to narrow down your search. Many radio stations display either a button or a "
-"link to listen to their stream. In most web-browsers, you can right click on "
-"the link and choose <gui style=\"menuitem\">Copy Link</gui>."
-msgstr ""
-"Pomocí svého oblíbeného vyhledávače si najděte stanici internetového rádia. "
-"Můžete hledat podle žánru, frekvencí kanálu, názvu stanice a další věcí, "
-"abyste našli nejpřesněji, co chcete. Řada rádiových stanic zveřejňuje na svém "
-"webu tlačítko nebo odkaz pro poslech jejich vysílání. Ve většině webových "
-"prohížečů pak na odkaz stačí kliknout pravým tlačítkem a zvolit <gui style="
-"\"menuitem\">Kopírovat adresu odkazu</gui>."
-
-#: C/radio.page:54(title)
-msgid "To add an internet radio station to <app>Banshee</app>:"
-msgstr "Když chcete do <app>Banshee</app> přidat rádiovou stanici:"
-
-#: C/radio.page:56(p)
-msgid ""
-"Select <gui>Radio</gui> in the menu on the left hand side of your window, "
-"then click on <gui style=\"menuitem\">Add Station</gui> on the upper right "
-"hand corner of <app>Banshee</app>. Or, you can select <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">Add Station</gui></guiseq> from "
-"the menu."
-msgstr ""
-"V nabídce v levé části svého okna vyberte <gui>Rádio</gui> a pak klikněte na "
-"<gui style=\"menuitem\">Přidat stanici</gui> v pravém horním rohu "
-"<app>Banshee</app>. Nebo můžete v nabídce zvolit <guiseq><gui style=\"menu"
-"\">Média</gui> <gui style=\"menuitem\">Přidat stanici</gui></guiseq>."
-
-#: C/radio.page:63(p)
-msgid ""
-"You will need to enter some details about the radio station that you wish to "
-"add. The first three fields are mandatory:"
-msgstr ""
-"Budete muset uvést některé další údaje o rádiové stanici, kterou si přejete "
-"přidat. První tři pole jsou povinná:"
-
-#: C/radio.page:67(p)
-msgid ""
-"In the <gui style=\"menuitem\">Station Genre</gui> text box, describe the "
-"type of music the internet radio station plays by creating an appropriate "
-"label, or choose a label from the available drop down selections."
-msgstr ""
-"Do textového pole <gui style=\"menuitem\">Žánr stanice</gui> zadejte popis "
-"typu hudby, kterou stanice internetového rádia hraje, aby se vytvořil "
-"správný štítek. Případně můžete vybírat ze štítků v rozbalovací nabídce."
-
-#: C/radio.page:73(p)
-msgid ""
-"In the <gui style=\"input\">Station Name</gui> text box, enter a name for "
-"the radio station."
-msgstr ""
-"Do textového pole <gui style=\"input\">Název stanice</gui> zadejte název "
-"radiostanice."
-
-#: C/radio.page:77(p)
+#: C/search.page:114(p)
msgid ""
-"In the <gui style=\"input\">Stream URL</gui> field, enter or paste the URL "
-"of the stream by right clicking and selecting <gui style=\"menuitem\">Paste</"
-"gui> or pressing <keyseq><key>Control</key><key>V</key></keyseq>."
+"For more information on performing more complex search queries, see the "
+"<link xref=\"adv-search\"/> page."
msgstr ""
-"Do pole <gui style=\"input\">Adresa URL vysílání</gui> napiště adresu URL "
-"vysílání, případně ji můžete vložit ze schránky kliknutím pravým tlačítkem a "
-"volbou <gui style=\"menuitem\">Vložit</gui> nebo zmáčknutím "
-"<keyseq><key>Ctrl</key><key>V</key></keyseq>."
+"Více informací o provádění komplexnějších vyhledávacích dotazů najdete na "
+"stránce <link xref=\"adv-search\"/>."
-#: C/radio.page:85(p)
+#: C/rb-import.page:8(desc)
msgid ""
-"You can also fill out the fields for <gui style=\"input\">Station Creator</"
-"gui>, <gui style=\"input\">Description</gui>, and <gui style=\"input"
-"\">Rating</gui>."
+"Import music and categorizations from the <app>Rhythmbox</app> music player."
msgstr ""
-"Volitelně můžete také vyplnit pole <gui style=\"input\">Tvůrce stanice</"
-"gui>, <gui style=\"input\">Popis</gui> a <gui style=\"input\">Hodnocení</"
-"gui>."
-
-#: C/radio.page:91(p)
-msgid ""
-"Finally, click <gui style=\"button\">Save</gui> to save the internet radio "
-"station in <app>Banshee</app>."
-msgstr ""
-"Nakonec zmáčkněte <gui style=\"button\">Uložit</gui> a tím se internetová "
-"rádiová stanice do Banshee uloží."
-
-#: C/radio.page:99(title)
-msgid "Play a radio station"
-msgstr "Přehrávání rádiové stanice"
-
-#: C/radio.page:101(p)
-msgid ""
-"To <link xref=\"play\">play</link> a radio station, double click on the "
-"radio station. Alternatively, right click on the station and select <gui "
-"style=\"menuitem\">Play</gui> or select the radio station and choose "
-"<guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem\">Play</"
-"gui></guiseq>."
-msgstr ""
-"<link xref=\"play\">Přehrávání</link> rádiové stanice spustíte dvojitým "
-"kliknutím na ni. Další možností je na ni kliknout pravým tlačítkem a vybrat "
-"<gui style=\"menuitem\">Přehrát</gui> nebo ji vybrat a zvolit <guiseq><gui "
-"style=\"menu\">Přehrát</gui><gui style=\"menuitem\">Přehrát</gui></guiseq>."
-
-#. Not sure about play queue and play after current track
-#: C/radio.page:109(p)
-msgid ""
-"To add a radio station to the <gui style=\"menuitem\" xref=\"play-queue"
-"\">Play Queue</gui>, you can right click on the station and select <gui "
-"style=\"menuitem\">Add to Play Queue</gui>. This will play the radio station "
-"when the queue has finished playing all media which is ahead of the station "
-"in the <gui>Play Queue</gui>."
-msgstr ""
-"Když chcete přidat rádiovou stanici do <gui style=\"menuitem\" xref=\"play-"
-"queue\">Fronty přehrávání</gui>, klikněte na ni pravým tlačítkem a vyberte "
-"<gui style=\"menuitem\">Přidat do fronty přehrávání</gui>. Přehrávat se "
-"začne, až se přehrají všechna média, která jsou ve <gui>Frontě přehrávání</"
-"gui> před přidanou stanicí."
-
-#: C/radio.page:115(p)
-msgid ""
-"You can also right click the station and select <gui style=\"menuitem\">Play "
-"after Current Track</gui> to add the radio station to the queue after the "
-"track that is currently playing."
-msgstr ""
-"Můžete také na stanici kliknout pravým tlačítkem a vybrat <gui style="
-"\"menuitem\">Přehrát po aktuální stopě</gui>, aby se přidala hned za stopu, "
-"která je právě přehrávána."
-
-#: C/radio.page:120(p)
-msgid ""
-"<gui style=\"menuitem\">Play after Current Track</gui> may not work on some "
-"<app>Banshee</app> installations."
-msgstr ""
-"<gui style=\"menuitem\">Přehrát po aktuální stopě</gui> nemusí v některých "
-"instalacích <app>Banshee</app> fungovat."
-
-#: C/radio.page:127(title)
-msgid "Remove a radio station"
-msgstr "Odebrání rádiové stanice"
-
-#: C/radio.page:129(p)
-msgid ""
-"To remove a radio station from <app>Banshee</app>, you can right click on "
-"the radio station and select <gui style=\"menuitem\">Remove</gui>, or "
-"alternatively, you can select the station with your mouse and press "
-"<key>Delete</key>. When you are prompted for confirmation, click the <gui "
-"style=\"button\">Remove</gui> button to remove the radio station."
-msgstr ""
-"Když chcete rádiovou stanici z <app>Banshee</app> odstranit, klikněte na ni "
-"pravým tlačítkem a vyberte <gui style=\"menuitem\">Odstranit</gui>. Případně "
-"ji můžete myší vybrat a pak zmáčknout <key>Delete</key>. V obou případech "
-"budete požádáni o potvrzení, ve kterém klikněte na tlačítko <gui style="
-"\"button\">Odstranit</gui> a odstranění stanice se provede."
-
-#: C/podcast.page:11(desc)
-msgid "Add, remove and play podcasts in <app>Banshee</app>."
-msgstr "Přidávejte, odebírejte a přehrávejte podcasty v <app>Banshee</app>."
-
-#: C/podcast.page:19(name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/podcast.page:20(email)
-msgid "kittykat3756 at gmail.com"
-msgstr "kittykat3756 at gmail.com"
-
-#: C/podcast.page:34(title)
-msgid "What is a podcast?"
-msgstr "Co je to podcast"
-
-#: C/podcast.page:36(p)
-msgid ""
-"Podcasts are recorded programs, similar to radio programs, that are "
-"available on the internet and allow you to subscribe to them. When you "
-"subscribe to a podcast in <app>Banshee</app>, each time a new program is "
-"released, <app>Banshee</app> will automatically download the podcast to your "
-"library."
-msgstr ""
-"Podcast je zaznamenaný program, podobně jako program rádia, který je "
-"dostupný na Internetu a vy jej můžete odebírat. Když jste v přehrávači "
-"<app>Banshee</app> přihlášeni k odběru nějakého podcastu, tak pokaždé když "
-"je vydán nový program, <app>Banshee</app> jej automaticky stáhne a nabídne "
-"vám jej k poslechu."
-
-#: C/podcast.page:42(p)
-msgid ""
-"Podcasts have been made on almost any subject, including music, movies, "
-"Linux and more. Search the internet using your favorite search engine with a "
-"search term such as \"Linux podcast\" and you will be presented with many "
-"options to choose from."
-msgstr ""
-"Existují podcasty s téměř jakýmkoliv tématem, včetně hudby, filmů, Linuxu a "
-"dalších věcí. Hledejte na Internetu svým oblíbeným vyhledávačem. K hledání "
-"použijte výraz typu „film podcast“ (respektive anglicky „movie podcast“, "
-"protože nabídka podcastů v angličtině je daleko větší) a můžete si vybírat."
+"Importujte hudbu a rozdělení do kategorií z multimediálního přehrávače "
+"<app>Rhythmbox</app>."
-#: C/podcast.page:50(title)
-msgid "Add a podcast"
-msgstr "Přidávání podcastů"
-
-#: C/podcast.page:52(p)
-msgid ""
-"To add a podcast to <app>Banshee</app>, you will first need to visit the "
-"podcast home page. Most podcasts will have a button or link displayed to "
-"subscribe to the podcast. Copy the link to the podcast subscription feed. In "
-"most web browsers, you can right click on the link and choose <gui style="
-"\"menuitem\">Copy link</gui>."
-msgstr ""
-"Když chcete do přehrávače <app>Banshee</app> přidat podcast, musíte nejprve "
-"ve svém prohlížeči navštívit domovskou stránku onoho podcastu na Intenetu. "
-"Většina podcastů má tlačítko nebo odkaz pro přihlášení k odběru podcastu. "
-"Zkopírujte odkaz do přihlášení k podcastu. Ve většině webových prohlížečů "
-"jde kliknout pravým tlačítkem na odkaz a zvolit <gui>Kopírovat adresu "
-"odkazu</gui>."
-
-#: C/podcast.page:58(p)
-msgid ""
-"In <app>Banshee</app>, click <gui style=\"menuitem\">Podcast</gui> in the "
-"menu on the left side of the window. Then, click <gui style=\"menuitem"
-"\">Subscribe to Podcasts</gui> in the right half of the toolbar, from the "
-"menu choose <guiseq><gui style=\"menu\">Media</gui><gui style=\"menuitem"
-"\">Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
-"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
-msgstr ""
-"V <app>Banshee</app> klikněte v nabídce v na levé straně okna na <gui style="
-"\"menuitem\">Podcast</gui>. Pak klikněte na <gui style=\"menuitem"
-"\">Přihlásit se k podcastu</gui> v pravé polovině nástrojové lišty nebo v "
-"nabídce vyberte <guiseq><gui style=\"menu\">Média</gui><gui style=\"menuitem"
-"\">Přihlásit se k podcastu</gui></guiseq> a nebo zmáčkněte klávesovou zkratku "
-"<keyseq><key>Shift</key><key>Ctrl</key><key>F</key></keyseq>."
-
-#: C/podcast.page:65(p)
-msgid ""
-"By default, the podcasts will not be downloaded, so you will only be able to "
-"listen to them while you are connected to the internet. When you subscribe "
-"to a new podcast, you will be able to select the following options:"
-msgstr ""
-"Podcast se standardně nestahuje, takže jej bude moci poslouchat, jen když "
-"budete připojeni k Internetu. Po přihlášení k novému podcastu si můžete "
-"nastavit následující volby:"
-
-#: C/podcast.page:71(p)
-msgid ""
-"Select <gui style=\"checkbox\">Download new episodes</gui> to automatically "
-"download any new episodes to your computer so that you can access them when "
-"you do not have an internet connection."
-msgstr ""
-"Vyberte <gui style=\"checkbox\">Stahovat nové díly</gui>, pokud chcete, aby "
-"se nové díly automaticky stahovaly do vašeho počítače a byly tak přístupné i "
-"ve chvílích, kdy nejste připojeni k Internetu."
-
-#: C/podcast.page:76(p)
-msgid ""
-"Select <gui style=\"menuitem\">Archive all episodes except the newest one</"
-"gui> to have only the newest episode displayed."
-msgstr ""
-"Vyberte <gui style=\"menuitem\">Archivovat všechny díly vyjma nejnovějšího</"
-"gui>, pokud chcete mít zobrazen jen nejnovější díl."
-
-#: C/podcast.page:81(p)
-msgid ""
-"After you have added a podcast feed, <app>Banshee</app> will display the "
-"name of the podcast, the title of each episode and the date that it was "
-"published on."
-msgstr ""
-"Po té, co máte přidán kanál podcastu, bude <app>Banshee</app> zobrazovat "
-"název podcastu, název každého dílu a datum, kdy byl zveřejněn."
-
-#: C/podcast.page:85(p)
-msgid ""
-"Once a podcast has been archived, it will be removed from the <gui>New "
-"Items</gui> list, but it will still appear in the <gui>All Items</gui> list."
-msgstr ""
-"Jakmile je podcast archivován, je odstraněn ze seznamu <gui>Nové položky</"
-"gui>, ale stále se vyskytuje v seznamu <gui>Všechny položky</gui>."
-
-#: C/podcast.page:90(p)
-msgid ""
-"You can edit the subscription options the <gui style=\"menuitem\">Podcast "
-"Properties</gui>, which can be accessed by right clicking on the "
-"corresponding podcast name in the podcast list or by right clicking on any "
-"episode of that podcast."
-msgstr ""
-"Volby odběru můžete upravovat ve <gui style=\"menuitem\">Vlastnostech "
-"podcastu</gui>, do kterých se dostanete po kliknutí pravým tlačítkem na "
-"příslušný název podcastu v seznamu nebo po kliknutí pravým tlačítkem na "
-"libovolný díl z tohoto podcastu."
-
-#: C/podcast.page:99(title) C/play.page:121(title)
-msgid "Play a podcast"
-msgstr "Přehrávání podcastu"
-
-#: C/podcast.page:101(p)
-msgid ""
-"To <link xref=\"play\">play</link> a podcast episode, double click on the "
-"episode or select it, then select <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq>. You can also add the "
-"episode to the <gui xref=\"play-queue\">Play Queue</gui> by right clicking "
-"on the episode and selecting <gui style=\"menuitem\">Add to Play Queue</gui>."
-msgstr ""
-"Díl podcastu <link xref=\"play\">přehrajete</link> dvojitým kliknutím na něj "
-"nebo jej vyberte a pak zvolte <guiseq><gui style=\"menu\">Přehrát</gui><gui "
-"style=\"menuitem\">Přehrát</gui></guiseq>. Díl můžete také přidat do <gui "
-"xref=\"play-queue\">Fronty přehrávání</gui> kliknutím pravým tlačítkem a "
-"volbou <gui style=\"menuitem\">Přidat do fronty přehrávání</gui>."
-
-#: C/podcast.page:110(title)
-msgid "Remove a podcast"
-msgstr "Odebírání podcastů"
-
-#: C/podcast.page:112(p)
-msgid ""
-"To remove a podcast, right click on the podcast in the podcast list and "
-"select <gui style=\"menuitem\">Unsubscribe and Delete</gui>. This will "
-"unsubscribe you from receiving podcast updates and will delete all the "
-"episodes of the podcast from your library."
-msgstr ""
-"Když chcete podcast odstranit, klikněte na něj pravým tlačítkem v seznamu "
-"podcastů a vyberte <gui style=\"menuitem\">Odhlásit a odstranit</gui>. Tím "
-"se odhlásíte od příjmu aktualizací podcastu a z vaší kolekce budou smazány "
-"všechny díly daného podcastu."
+#: C/rb-import.page:12(title)
+msgid "Import your <app>Rhythmbox</app> library"
+msgstr "Import vaší kolekce <app>Rhythmbox</app>"
#: C/play.page:9(desc)
msgid "Play your videos and music files."
msgstr "Přehrávejte svá videa a hudební soubory."
-#: C/play.page:18(name) C/index.page:15(name)
-msgid "Sindhu S"
-msgstr "Sindhu S"
-
-#: C/play.page:19(email) C/index.page:16(email)
-msgid "sindhus at live.in"
-msgstr "sindhus at live.in"
-
-#: C/play.page:34(title)
-msgid "Play your media"
+#: C/play.page:24(title)
+msgid "Play Your Media"
msgstr "Přehrávání vašich médií"
-#: C/play.page:37(title)
+#: C/play.page:27(title)
msgid "Play your music"
msgstr "Přehrávání vaší hudby"
-#: C/play.page:39(p)
+#: C/play.page:29(p)
msgid ""
-"To play music in <app>Banshee</app>, 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."
+"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 ""
-"Když si chcete v <app>Banshee</app> přehrát hudbu, zvolte zdroj Hudba. "
-"Hudební knihovna vám zobrazí všechny umělce ve vaší hudební kolekci, přebaly "
-"pro každé z alb a seznam skladeb ve vaší kolekci."
+"Když si chcete v Banshee přehrát hudbu, zvolte zdroj Hudba. Hudební knihovna "
+"vám zobrazí všechny umělce ve vaší hudební kolekci, přebaly pro každé z alb "
+"a seznam skladeb ve vaší kolekci."
-#: C/play.page:43(p)
+#: 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 <app>Banshee</app>."
+"or use the search bar in the upper right hand corner of Banshee."
msgstr ""
"Vyberte album nebo skladbu, které si přejete přehrát, ze seznamu umělců, alb "
-"nebo použijte vyhledávací pole v pravém horním rohu <app>Banshee</app>."
+"nebo použijte vyhledávací pole v pravém horním rohu Banshee."
-#: C/play.page:47(p)
+#: C/play.page:37(p)
msgid ""
"To start playing a song, use your mouse to double click the song name, press "
-"the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
+"gui></guiseq> from the Banshee menu."
msgstr ""
"K započetí přehrávání skladby použijte dvojité kliknutí myší na název "
-"skladby nebo zmáčkněte <key>mezerník</key> a nebo zvolte <guiseq><gui style="
-"\"menu\">Přehrát</gui> <gui style=\"menuitem\">Přehrát</gui></guiseq> z "
-"nabídky <app>Banshee</app>."
+"skladby nebo zmáčkněte <key>mezerník</key> a nebo zvolte "
+"<guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee."
-#: C/play.page:53(p)
+#: C/play.page:42(p)
msgid ""
"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 "
-"<key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</gui><gui "
-"style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> menu."
+"<key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></"
+"guiseq> from the Banshee menu."
msgstr ""
"Můžete spustit i přehrávání alba výběrem alba v prohlížeči alba a dvojitým "
"kliknutím na název skladby, zmáčknutím <key>mezerníku</key> nebo volbou "
-"<guiseq><gui style=\"menu\">Přehrát</gui> <gui style=\"menuitem\">Přehrát</"
-"gui></guiseq> z nabídky <app>Banshee</app>."
+"<guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee."
-#: C/play.page:59(p)
+#: C/play.page:48(p)
msgid ""
"To play all songs by one artist, choose the artist in the artist browser and "
-"press the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
"Pro přehrání všech skladeb od jednoho umělce zvolte umělce v prohlížeči "
-"umělců a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui style=\"menu"
-"\">Přehrát</gui> <gui style=\"menuitem\">Přehrát</gui></guiseq> z nabídky "
-"<app>Banshee</app>."
+"umělců a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui>Přehrát</"
+"gui><gui>Přehrát</gui></guiseq> z nabídky Banshee."
-#: C/play.page:65(p)
-msgid ""
-"<app>Banshee</app> 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 ""
-"Přehrávač <app>Banshee</app> také zobrazuje vaše oblíbená alba (to jsou ta, "
-"která nejčastěji přehráváte), nedávno oblíbenou, nedávno přidanou a "
-"neposlouchanou hudbu. Jedno z toho si zvolte k poslechu a můžete přehrávat "
-"jednotlivé skladby."
-
-#: C/play.page:69(p)
-msgid ""
-"<app>Banshee</app> can be used to play music in a random order using the "
-"<gui style=\"menuitem\">Shuffle</gui> mode. Enable the mode in <guiseq><gui "
-"style=\"menu\">Playback</gui><gui style=\"menuitem\">Shuffle</gui></guiseq>, "
-"followed by a shuffle type selection."
-msgstr ""
-"<app>Banshee</app> můžete používat k přehrávání hudby v náhodném pořadí "
-"pomocí režimu <gui style=\"menuitem\">Náhodné pořadí</gui>. Zapnete jej "
-"výběrem <guiseq><gui style=\"menu\">Přehrát</gui> <gui style=\"menuitem"
-"\">Náhodné pořadí</gui></guiseq> a následně volbou typu náhodného pořadí."
-
-#: C/play.page:77(gui)
-msgid "By Song"
-msgstr "Podle skladby"
-
-#: C/play.page:78(p)
-msgid "Play tracks in a random order."
-msgstr "Přehraje stopy v náhodném pořadí."
-
-#: C/play.page:81(gui)
-msgid "By Artist"
-msgstr "Podle umělce"
-
-#: C/play.page:82(p)
-msgid "Play tracks by different artists every time."
-msgstr "Přehraje stopy tak, aby se neopakovali umělci."
-
-#: C/play.page:85(gui)
-msgid "By Album"
-msgstr "Podle alba"
-
-#: C/play.page:86(p)
-msgid "Play tracks from different albums every time."
-msgstr "Přehraje stopy tak, aby se neopakovaly ze stejných alb."
-
-#: C/play.page:89(gui)
-msgid "By Rating"
-msgstr "Podle hodnocení"
-
-#: C/play.page:90(p)
-msgid "Play tracks with higher ratings more often than unrated ones."
-msgstr ""
-"Přehraje stopy tak, aby se lépe hodnocené vyskytovaly častěji než "
-"nehodnocené."
-
-#: C/play.page:92(p)
-msgid "If there are no rated tracks, the tracks are played in a random order."
-msgstr ""
-"Pokud nejsou žádné hodnocené stopy k dispozici, budou se stopy přehrávat v "
-"náhodném pořadí."
-
-#: C/play.page:97(gui)
-msgid "By Score"
-msgstr "Podle bodování"
-
-#: C/play.page:98(p)
+#: C/play.page:53(p)
msgid ""
-"Tracks that you play frequently are scored higher and played more often."
+"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 ""
-"Stopy, které jsou přehrávány často, jsou ohodnoceny více body a tím častěji "
-"přehrávány."
+"Přehrávač Banshee také zobrazuje vaše oblíbená alba (to jsou ta, které "
+"nejčastěji přehráváte), nedávno oblíbenou, nedávno přidanou a neposlouchanou "
+"hudbu. Jedno z toho si zvolte k poslechu a můžete přehrávat jednotlivé "
+"skladby."
-#: C/play.page:106(title)
+#: C/play.page:61(title)
msgid "Play a video"
msgstr "Přehrávání videa"
-#: C/play.page:108(p)
+#: 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 <key>Space</key>, or "
-"choose <guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem"
-"\">Play</gui></guiseq> from the <app>Banshee</app> menu."
+"video you wish to play from the list and press the <key>Spacebar</key>, or "
+"choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee "
+"menu."
msgstr ""
"Videa, která jste naimportovali, jsou seřazená abecedně. Když chcete video "
"přehrávat, vyberte jej v seznamu a zmáčkněte <key>mezerník</key> nebo zvolte "
-"<guiseq><gui style=\"menu\">Přehrát</gui> <gui style=\"menuitem\">Přehrát</"
-"gui></guiseq> z nabídky <app>Banshee</app>."
+"<guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee."
-#: C/play.page:114(p)
+#: C/play.page:68(p)
msgid ""
-"<app>Banshee</app> also shows your Favorite videos (those you watch the "
-"most) and Unwatched videos. Choose one and you can play a video from the "
-"list."
+"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 ""
-"Přehrávač <app>Banshee</app> také zobrazuje vaše oblíbená videa (to jsou ta, "
-"která sledujete nejčastěji) a nezhlédnutá videa. Jedno z toho si zvolte a "
-"můžete si přehrávat videa ze seznamu."
+"Přehrávač Banshee také zobrazuje vaše oblíbená videa (to jsou ta, která "
+"sledujete nejčastěji) a nezhlédnutá videa. Jedno z toho si zvolte a můžete "
+"si přehrávat videa ze seznamu."
+
+#: C/play.page:74(title)
+msgid "Play a Podcast"
+msgstr "Přehrávání podcastu"
-#: C/play.page:123(p)
+#: C/play.page:76(p)
msgid ""
-"Podcasts shows you all podcasts you are subscribed to, all podcast shows "
-"available, and the podcast browser lists all podcasts in order of newest "
+"Podcasts shows you all Podcasts you're subscribed to, all Podcast shows "
+"available, and the Podcast browser lists all Podcasts in order of newest "
"first."
msgstr ""
"Zdroj Podcasty vám zobrazuje všechny podcasty, které odebíráte, všechny "
"podcasty, které jsou dostupné, a prohlížeč podcastů vypisuje všechny "
"podcasty v pořadí od nejnovějšího."
-#: C/play.page:127(p)
+#: C/play.page:80(p)
msgid ""
-"To play a podcast, choose the podcast you wish to play from the list and "
-"press the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"To play a Podcast, choose the Podcast you wish to play from the list and "
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
"Když chcete poslouchat podcast, vyberte jej v seznamu a zmáčkněte "
-"<key>mezerník</key> nebo zvolte <guiseq><gui style=\"menu\">Přehrát</"
-"gui><gui style=\"menuitem\">Přehrát</gui></guiseq> z nabídky <app>Banshee</"
-"app>."
+"<key>mezerník</key> nebo zvolte <guiseq><gui>Přehrát</gui><gui>Přehrát</"
+"gui></guiseq> z nabídky Banshee."
-#: C/play.page:136(title)
+#: C/play.page:88(title)
msgid "Play an internet radio station"
msgstr "Přehrávání stanice internetového rádia"
-#: C/play.page:138(p)
+#: C/play.page:90(p)
msgid ""
"The Radio source shows you all internet radio stations you have added to "
-"<app>Banshee</app> alphabetically."
+"Banshee alphabetically."
msgstr ""
"Zdroj Rádio vám zobrazuje abecedně všechny Internetové rádiové stanice, "
-"které máte do přehrávače <app>Banshee</app> přidány."
+"které máte do přehrávače Banshee přidány."
-#: C/play.page:141(p)
+#: 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 <key>Space</key>, or choose <guiseq><gui style="
-"\"menu\">Playback</gui><gui style=\"menuitem\">Play</gui></guiseq> from the "
-"<app>Banshee</app> menu."
+"from the list and press the <key>Spacebar</key>, or choose "
+"<guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
"Když chcete Internetovou rádiovou stanici poslouchat, vyberte ji v seznamu a "
-"zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui style=\"menu"
-"\">Přehrát</gui> <gui style=\"menuitem\">Přehrát</gui></guiseq> z nabídky "
-"<app>Banshee</app>."
+"zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui>Přehrát</"
+"gui><gui>Přehrát</gui></guiseq> z nabídky Banshee."
#: C/play-queue.page:9(desc)
-msgid "Add media to your <gui>Play Queue</gui>."
-msgstr "Přidávejte média do své <gui>Fronty přehrávání</gui>."
+msgid "Add media to your play queue."
+msgstr "Přidávejte média do své fronty přehrávání."
-#: C/play-queue.page:15(years)
-msgid "2013"
-msgstr "2013"
-
-#: C/play-queue.page:24(title)
-msgid "Play queue"
+#: C/play-queue.page:18(title)
+msgid "Play Queue"
msgstr "Fronta přehrávání"
-#: C/play-queue.page:26(p)
+#: C/play-queue.page:20(p)
msgid ""
-"The <gui>Play Queue</gui> can be used to play tracks in a sequential order. "
-"You can add many tracks to the <gui>Play Queue</gui> and listen to hours of "
-"music non-stop. You can add individual tracks or entire albums, and sort or "
-"re-order them as you wish."
+"The <gui>Play Queue</gui> 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 ""
"<gui>Fronta přehrávání</gui> vám umožňuje přidávat hudbu, kterou postupně "
"chcete přehrát. Můžete si přidat hromadu stop a hodiny pak hudbu poslouchat "
"bez přestávky. Můžete přidávat samostatné stopy nebo i celá alba a řadit je "
"a přeuspořádávat."
-#: C/play-queue.page:32(title)
-msgid "Add music to the <gui>Play Queue</gui>"
-msgstr "Přidávání hudby do <gui>Fronty přehrávání</gui>"
+#: C/play-queue.page:26(title)
+msgid "Add Music to the Play Queue"
+msgstr "Přidávání hudby do fronty přehrávání"
-#: C/play-queue.page:34(p)
+#: 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 <gui>Play Queue</gui>."
+"you want to add to the play queue."
msgstr ""
"Ve své hudební kolekci si musíte vybrat hudební stopy nebo alba, která do "
-"<gui>Fronty přehrávání</gui> chcete přidat."
+"fronty přehrávání chcete přidat."
-#: C/play-queue.page:37(p)
+#: C/play-queue.page:32(p)
msgid ""
-"To add an entire album to the <gui>Play Queue</gui>, use your mouse to press "
-"and hold the album and drag and drop it over <gui>Play Queue</gui> in the "
-"far left window pane."
+"To add an entire album to the Play Queue, using your mouse press and hold "
+"the album and drag the album over <gui>Play Queue</gui> in the far left "
+"window pane."
msgstr ""
-"Pokud chcete přidat do <gui>Fronty přehrávání</gui> celé album, použijte "
-"svou myš. Zmáčkněte a držte album a přetáhněte jej na <gui>Frontu "
-"přehrávání</gui> v levém panelu."
+"Pokud chcete přidat do fronty přehrávání celé album, použijte svou myš. "
+"Zmáčkněte a držte album a přetáhněte jej na <gui>Frontu přehrávání</gui> v "
+"levém panelu."
-#: C/play-queue.page:41(p)
+#: C/play-queue.page:37(p)
msgid ""
-"You can add music tracks to the <gui>Play Queue</gui> individually or as a "
-"group. To add an individual file, drag and drop it over the <gui>Play Queue</"
-"gui> in the far left window pane, or right click the track and choose <gui "
-"style=\"menuitem\">Add to Play Queue</gui>."
+"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 <gui>Play Queue</gui> in "
+"the far left window pane, or right click the track and choose <gui>Add to "
+"Play Queue</gui>."
msgstr ""
-"Hudební stopy můžete do <gui>Fronty přehrávání</gui> přidávat jednotlivě "
-"nebo po skupinách. Jednotlivý soubor přidáte postupem táhni a upusť do "
-"<gui>Fronty přehrávání</gui> v levém panelu okna nebo klikněte na stopu "
-"pravým tlačítkem a zvolte <gui style=\"menuitem\">Přidat do fronty "
-"přehrávání</gui>."
+"Hudební stopy můžete do fronty přehrávání přidávat jednotlivě nebo po "
+"skupinách. Jednotlivý soubor přidáte postupem táhni a pusť do <gui>Fronty "
+"přehrávání</gui> v levém panelu okna nebo klikněte na stopu pravým tlačítkem "
+"a zvolte <gui>Přidat do fronty přehrávání</gui>."
-#: C/play-queue.page:46(p)
+#: C/play-queue.page:43(p)
msgid ""
-"To select multiple tracks, select each track with your mouse while holding "
-"down <key>Ctrl</key> or select a range of files by pressing <key>Shift</key> "
-"and clicking twice to select that range of files. You can then drag and drop "
-"it over the <gui>Play Queue</gui> in the far left window pane or right click "
-"the tracks and choose <gui style=\"menuitem\">Add to Play Queue</gui>."
+"You can select multiple files by using your mouse and pressing <key>Control</"
+"key> and choosing each file with your mouse or select a range of files by "
+"pressing <key>Shift</key> and clicking twice to select that range of files. "
+"You can then drag and drop it over the <gui>Play Queue</gui> in the far left "
+"window pane or right click the tracks and choose <gui>Add to Play Queue</"
+"gui>."
msgstr ""
-"Více souborů můžete označit myší buď spolu se zmáčknutou klávesou "
+"Více souborů můžete označit svojí myší buď spolu se zmáčknutou klávesou "
"<key>Control</key> a vybíráním jednotlivých souborů nebo zmáčknutím "
"<key>Shift</key> a výběrem rozsahu. Výběr můžete do <gui>Fronty přehrávání</"
-"gui> přesunout postupem táhni a upusť nebo na něj kliknout pravým tlačítkem "
-"a zvolit <gui style=\"menuitem\">Přidat do fronty přehrávání</gui>."
+"gui> přesunout pomocí táhni a pusť nebo na něj kliknout pravým tlačítkem a "
+"zvolit <gui>Přidat do fronty přehrávání</gui>."
#: C/play-queue.page:56(title)
-msgid "Organize your <gui>Play Queue</gui>"
-msgstr "Uspořádání vaší <gui>Fronty přehrávání</gui>"
+msgid "Organize Your Play Queue"
+msgstr "Uspořádání vaší fronty přehrávání"
#: C/play-queue.page:58(p)
msgid ""
-"Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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."
+"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 ""
-"Vaše <gui>Fronta přehrávání</gui> je uspořádána tak, jak jste do ní stopy "
-"přidávali. Stopa nebo album, které jste přidali jako první, budou jako první "
-"přehrány. Pořadí ve <gui>Frontě přehrávání</gui> můžete měnit myší "
-"přetahování stop nebo skupin stop v seznamu. Vyberte stopu či stopy, u které "
-"chcete změnit pořadí, zmáčkněte tlačítko myši, držte jej a táhněte v seznamu "
-"na nové místo. Tam tlačítko pusťte."
+"Vaše fronta přehrávání je uspořádána tak, jak jste do ní stopy přidávali. "
+"Stopa nebo album, které jste přidali jako první, budou jako první přehrány. "
+"Pořadí ve frontě můžete měnit myší přetahování stop nebo skupin stop v "
+"seznamu. Vyberte stopu či stopy, u které chcete změnit pořadí, zmáčkněte "
+"tlačítko myši, držte jej a táhněte v seznamu na nové místo. Tam tlačítko "
+"pusťte."
-#: C/play-queue.page:68(title)
-msgid "Removing tracks from the <gui>Play Queue</gui>"
-msgstr "Odstraňování stop z <gui>Fronty přehrávání</gui>"
+#: C/play-queue.page:70(title)
+msgid "Removing Tracks from the Play Queue"
+msgstr "Odstraňování stop z fronty přehrávání"
-#: C/play-queue.page:70(p)
+#: C/play-queue.page:72(p)
msgid ""
"You can remove an individual track, a group of tracks, or clear your entire "
-"<gui>Play Queue</gui>:"
-msgstr ""
-"Můžete odstraňovat jednotlivé stopy, skupiny stop nebo vymazat celou "
-"<gui>Frontu přehrávání</gui>."
-
-#: C/play-queue.page:75(p)
-msgid ""
-"To remove an individual track, select the track with your mouse and then "
-"press <key>Delete</key>."
-msgstr ""
-"Když chcete odstranit jednotlivou stopu, vyberte ji myší a zmáčkněte "
-"<key>Delete</key>."
-
-#: C/play-queue.page:79(p)
-msgid ""
-"To remove multiple tracks, select each track with your mouse while holding "
-"down <key>Ctrl</key>. Once all the desired tracks have been selected, press "
-"<key>Delete</key>."
+"play queue."
msgstr ""
-"Když chcete odstranit více stop, vyberte je pomocí myši za současného držní "
-"klávesy <key>Ctrl</key>. Až máte všechny požadované stopy označené, "
-"zmáčkněte <key>Delete</key>."
+"Můžete odstraňovat jednotlivé stopy, skupiny stop nebo vymazat celou frontu."
-#: C/play-queue.page:83(p)
+#: C/play-queue.page:76(p)
msgid ""
-"If you accidentally select a track you do not want to remove, hold down "
-"<key>Ctrl</key> and select the track again with your mouse, to unselect it."
+"To remove an individual track or group of tracks, select the track with your "
+"mouse and then press <key>Delete</key>."
msgstr ""
-"V případě, že omylem označíte stopu, kterou odstranit nechcete, držte "
-"zmáčknutou klávesu <key>Ctrl</key> a vyberte ji myší znovu – označení se "
-"zruší."
+"Když chcete odstranit jednotlivou stopu nebo skupinu stop, vyberte stopu "
+"myši a zmáčkněte <key>Delete</key>."
-#: C/play-queue.page:89(p)
+#: C/play-queue.page:80(p)
msgid ""
-"To clear your entire <gui>Play Queue</gui>, press the <gui style=\"button"
-"\">Clear</gui> button in the upper right hand corner of the <gui>Play Queue</"
-"gui> or press <keyseq><key>Ctrl</key><key>A</key></keyseq> and press "
-"<key>Delete</key>."
+"To clear your entire Play Queue, press the <gui>Clear</gui> button in the "
+"upper right hand corner of the Play Queue."
msgstr ""
-"Když chcete vymazat celou <gui>Frontu přehrávání</gui>, zmáčkněte tlačítko "
-"<gui style=\"button\">Vyprázdnit</gui> v pravém horním rohu <gui>Fronty "
-"přehrávání</gui> nebo zmáčkněte <keyseq><key>Ctrl</key><key>A</key></keyseq> "
-"a <key>Delete</key>."
+"Když chcete vymazat celou frontu přehrávání, zmáčkněte tlačítko "
+"<gui>Vyprázdnit</gui> v pravém horním rohu fronty přehrávání."
-#: C/manage-tags.page:9(desc)
+#: C/manage-tags.page:10(desc)
msgid "Edit and change music tags and metadata."
msgstr "Upravujte a měňte hudební štítky a metadata."
-#: C/manage-tags.page:24(title)
+#: C/manage-tags.page:25(title)
+msgid "Music Metadata"
+msgstr "Hudební metadata"
+
+#: C/manage-tags.page:29(title)
msgid "Music metadata"
msgstr "Hudební metadata"
-#: C/manage-tags.page:26(p)
+#: 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, <app>Banshee</app> will include the "
-"metadata when ripping the CD if available. For more information on ripping "
-"CDs and including the metadata see the <link xref=\"import\"/>."
+"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 <link xref=\"import\"/>."
msgstr ""
"Hudba v digitální podobě obsahuje metadata, která uchovávají v souboru "
"informace jako je umělec, album, rok nahrávky, žánr a další. Většina hudby "
"šířené po Internetu má metadata již vložena a když si hudbu importujete z "
-"CD, a metadata jsou na CD k dispozici, <app>Banshee</app> je vloží. Více "
-"informací o extrahování dat z CD a vkládání metadat podává kapitola <link "
-"xref=\"import\"/>."
+"CD, a metadata jsou na CD k dispozici, Banshee je vloží. Více informací o "
+"extrahování dat z CD a vkládání metadat podává kapitola <link xref=\"import"
+"\"/>."
-#: C/manage-tags.page:33(p)
+#: C/manage-tags.page:39(p)
msgid ""
"Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis "
"comments for OGG Vorbis files."
@@ -1430,34 +926,33 @@ msgstr ""
"Populárními formáty metadat pro soubory MP3 jsou ID3v1 a ID3v2 a pro soubory "
"OGG Vorbis komentáře Vorbis."
-#: C/manage-tags.page:36(p)
+#: C/manage-tags.page:42(p)
msgid ""
-"If you have imported songs that do not contain metadata,<app>Banshee</app> "
+"If you have imported songs that do not contain metadata, <app>Banshee</app> "
"will display <gui>Unknown</gui> for most fields in the library."
msgstr ""
"Pokud máte naimportovány skladby, které metadata neobsahují, bude přehrávač "
"<app>Banshee</app> u většiny polí v kolekci uvádět <gui>Neznámý</gui>."
-#: C/manage-tags.page:40(title)
-msgid "Edit your metadata"
+#: C/manage-tags.page:50(title)
+msgid "Edit Your Metadata"
msgstr "Úpravy vašich metadat"
-#: C/manage-tags.page:42(p)
+#: 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 <key>E</key>, choose <guiseq><gui style=\"menu"
-"\">Edit</gui><gui style=\"menuitem\">Edit Track Information</gui></guiseq> "
-"from the menu, or use your mouse and right click on the files and select "
-"<gui style=\"menuitem\">Edit Track Information</gui>."
+"you want to update and hit the <key>E</key>, choose <guiseq><gui>Edit</"
+"gui><gui>Edit Track Information</gui></guiseq> from the menu, or use your "
+"mouse and right click on the files and select <gui>Edit Track Information</"
+"gui>."
msgstr ""
"Metadata můžete u svých skladeb měnit a upravovat. Vyberte skladbu či "
"skladby, které chcete aktualizovat a zmáčkněte <key>E</key> nebo zvolte v "
-"nabídce <guiseq><gui style=\"menu\">Upravit</gui> <gui style=\"menuitem"
-"\">Upravit informace o stopě</gui></guiseq> a nebo použijte u souboru pravé "
-"tlačítko myši a vyberte <gui style=\"menuitem\">Upravit informace o stopě</"
-"gui>."
+"nabídce <guiseq><gui>Upravit</gui><gui>Upravit informace o stopě</gui></"
+"guiseq> a nebo použijte u souboru pravé tlačítko myši a vyberte <gui>Upravit "
+"informace o stopě</gui>."
-#: C/manage-tags.page:49(p)
+#: 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:"
@@ -1465,57 +960,57 @@ msgstr ""
"Objeví se dialogové okno, které zobrazuje metadata skladby a umožňuje vám je "
"měnit a aktualizovat. Výchozí zobrazená pole jsou:"
-#: C/manage-tags.page:53(gui)
+#: C/manage-tags.page:63(gui)
msgid "Track Title"
msgstr "Název stopy"
-#: C/manage-tags.page:54(gui)
+#: C/manage-tags.page:64(gui)
msgid "Track Artist"
msgstr "Umělec stopy"
-#: C/manage-tags.page:55(gui)
+#: C/manage-tags.page:65(gui)
msgid "Album Title"
msgstr "Název alba"
-#: C/manage-tags.page:56(gui)
+#: C/manage-tags.page:66(gui)
msgid "Genre"
msgstr "Žánr"
-#: C/manage-tags.page:57(gui)
+#: C/manage-tags.page:67(gui)
msgid "Track Number"
msgstr "Číslo stopy"
-#: C/manage-tags.page:58(gui)
+#: C/manage-tags.page:68(gui)
msgid "Disc Number"
msgstr "Číslo disku"
-#: C/manage-tags.page:59(gui) C/manage-playlists.page:107(gui)
+#: C/manage-tags.page:69(gui) C/manage-playlists.page:109(gui)
msgid "Year"
msgstr "Rok"
-#: C/manage-tags.page:62(p)
+#: 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 <gui>Track Title</gui> field "
-"or press the <gui style=\"button\">Forward</gui> button at the bottom of the "
-"dialog when finished with each song. When you have completed editing all "
-"metadata, press <gui style=\"button\">Save</gui>."
+"or press the <gui>Forward</gui> button at the bottom of the dialog when "
+"finished with each song. When you have completed editing all metadata, press "
+"<gui>Save</gui>."
msgstr ""
"Aktualizujte informace o skladbě. Pokud máte k úpravě vybráno více skladeb, "
"zmáčkněte po dokončení úprav každé ze skladeb ikonu se šipkou vpravo u pole "
-"<gui>Název stopy</gui> nebo tlačítko <gui style=\"button\">Vpřed</gui> v "
-"dolní části dialogového okna. Po dokončení úprav všech metadat zmáčkněte "
-"<gui style=\"button\">Uložit</gui>."
+"<gui>Název stopy</gui> nebo tlačítko <gui>Vpřed</gui> v dolní části "
+"dialogového okna. Po dokončení úprav všech metadat zmáčkněte <gui>Uložit</"
+"gui>."
-#: C/manage-playlists.page:9(desc)
+#: C/manage-playlists.page:10(desc)
msgid "Create and manage playlists."
msgstr "Vytvářejte a spravujte seznamy skladeb."
-#: C/manage-playlists.page:18(title) C/keyboard-shortcuts.page:73(title)
+#: C/manage-playlists.page:19(title) C/keyboardshortcuts.page:69(title)
msgid "Playlists"
msgstr "Seznamy skladeb"
-#: C/manage-playlists.page:20(p)
+#: 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 "
@@ -1529,22 +1024,22 @@ msgstr ""
"menších seznamů kvůli snazšímu procházení. Některé přenosné přehrávače "
"dokonce umožňují načíst seznamy skladeb, takže si je můžete brát na cesty."
-#: C/manage-playlists.page:26(p)
+#: C/manage-playlists.page:28(p)
msgid ""
-"<app>Banshee</app> supports normal playlists, which include songs you add to "
-"the playlist, as well as smart playlists. Smart Playlists are automatically "
+"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 ""
-"Přehrávač <app>Banshee</app> podporuje normální seznamy skladeb, které "
-"obsahují skladby, které jste do seznamu přidali a chytré seznamy skladeb. "
-"Chytré seznamy skladeb se generují automaticky na základě toho, co "
-"posloucháte, na základě vaší oblíbené hudby a dalších věcech."
+"Přehrávač Banshee podporuje normální seznamy skladeb, které obsahují "
+"skladby, které jste do seznamu přidali a chytré seznamy skladeb. Chytré "
+"seznamy skladeb se generují automaticky na základě toho, co posloucháte, na "
+"základě vaší oblíbené hudby a dalších věcech."
-#: C/manage-playlists.page:32(title)
-msgid "Normal playlists"
+#: C/manage-playlists.page:34(title)
+msgid "Normal Playlists"
msgstr "Normální seznamy skladeb"
-#: C/manage-playlists.page:34(p)
+#: 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 "
@@ -1556,46 +1051,42 @@ msgstr ""
"svého oblíbeného umělce z více alb, ze svých posledních oblíbených skladeb "
"nebo z motivačních skladeb pro poslech při cvičení."
-#: C/manage-playlists.page:39(p)
+#: C/manage-playlists.page:42(p)
msgid ""
"You can create a new playlist by pressing <keyseq><key>Control</key><key>N</"
-"key></keyseq>, from the menu choosing <guiseq><gui style=\"menu\">Media</"
-"gui><gui style=\"menuitem\">New Playlist</gui></guiseq> or by selecing the "
-"track(s) you would like to add to the playlist. Select the track(s), right "
-"click them, and choose <guiseq><gui style=\"menuitem\">Add to Playlist</"
-"gui><gui style=\"menuitem\">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you drag it over "
-"<gui>Music</gui>, a new option <gui style=\"menuitem\"><em>New Playlist</"
-"em></gui> will appear and you can drop the track(s) over <gui style="
-"\"menuitem\"><em>New Playlist</em></gui> to add them to the playlist. You "
-"can repeat this process until you have added all the tracks you want in the "
-"playlist."
+"key></keyseq>, from the menu choosing <guiseq><gui>Media</gui><gui>New "
+"Playlist</gui></guiseq> or by selecing the track(s) you would like to add to "
+"the playlist. Select the track(s), right click them, and choose "
+"<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you "
+"drag it over <gui>Music</gui>, a new option <gui><em>New Playlist</em></gui> "
+"will appear and you can drop the track(s) over <gui><em>New Playlist</em></"
+"gui> to add them to the playlist. You can repeat this process until you have "
+"added all the tracks you want in the playlist."
msgstr ""
"Nový seznam skladeb vytvoříte zmáčknutím <keyseq><key>Control</key><key>N</"
-"key></keyseq>, volbou <guiseq><gui style=\"menu\">Média</gui> <gui style="
-"\"menuitem\">Nový seznam skladeb</gui></guiseq> z nabídky nebo výběrem stopy "
-"či stop, které byste chtěli přidat. Vyberte stopu či stopy, klikněte na ně "
-"pravým tlačítkem a zvolte <guiseq><gui style=\"menuitem\">Přidat do seznamu "
-"skladeb</gui> <gui style=\"menuitem\">Nový seznam skladeb</gui></guiseq>. "
-"Můžete je také táhnout a pustit do nového seznamu tak, že je vyberete a "
-"táhnete do panelu v levé části na zdroj <gui>Hudba</gui>. Jak je přetáhnete "
-"na <gui>Hudba</gui>, objeví se nová volba <gui style=\"menuitem\"><em>Nový "
-"seznam skladeb</em></gui> a na tu je můžete upustit. Celý postup můžete "
-"libovolným uvedeným způsobem opakovat, dokud nepřidáte všechny stopy, které "
-"chcete."
+"key></keyseq>, volbou <guiseq><gui>Média</gui><gui>Nový seznam skladeb</"
+"gui></guiseq> z nabídky nebo výběrem stopy či stop, které byste chtěli "
+"přidat. Vyberte stopu či stopy, klikněte na ně pravým tlačítkem a zvolte "
+"<guiseq><gui>Přidat do seznamu skladeb</gui><gui>Nový seznam skladeb</gui></"
+"guiseq>. Můžete je také táhnout a pustit do nového seznamu tak, že je "
+"vyberete a táhnete do panelu v levé části na zdroj <gui>Hudba</gui>. Jak je "
+"přetáhnete na <gui>Hudba</gui>, objeví se nová volba <gui><em>Nový seznam "
+"skladeb</em></gui> a na tu je můžete upustit. Celý postup můžete libovolným "
+"uvedeným způsobem opakovat, dokud nepřidáte všechny stopy, které chcete."
#: 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 <gui style=\"menuitem\">Rename Playlist</gui> and "
-"enter the name of your playlist."
+"the playlist and press <gui>Rename Playlist</gui> and enter the name of your "
+"playlist."
msgstr ""
"Jestli chcete svému seznamu skladeb přidělit vlastní název, vyberte seznam "
-"skladeb, klikněte na něj pravým tlačítkem, zmáčkněte <gui style=\"menuitem"
-"\">Přejmenovat</gui> a zadejte pro seznam název."
+"skladeb, klikněte na něj pravým tlačítkem, zmáčkněte <gui>Přejmenovat</gui> "
+"a zadejte pro seznam název."
-#: C/manage-playlists.page:60(p)
+#: 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 "
@@ -1609,22 +1100,21 @@ msgstr ""
"zrušit, klikejte na jeho záhlaví dokud nezmizí šipka nahoru a dolů a seznam "
"skladeb nezmění pořadí."
-#: C/manage-playlists.page:66(p)
+#: C/manage-playlists.page:68(p)
msgid ""
"To remove a track from the playlist, select the track(s) you wish to remove. "
-"Press the <key>Delete</key>, from the menu choose <guiseq><gui style=\"menu"
-"\">Edit</gui><gui style=\"menuitem\">Remove from Playlist</gui></guiseq> or "
-"right click the track(s) with your mouse and press <gui style=\"menuitem"
-"\">Remove from Playlist</gui>."
+"Press the <key>Delete</key>, from the menu choose <guiseq><gui>Edit</"
+"gui><gui>Remove from Playlist</gui></guiseq> or right click the track(s) "
+"with your mouse and press <gui>Remove from Playlist</gui>."
msgstr ""
"Pokud chcete stopu ze seznamu skladeb odstranit, vyberte ji (nebo i více "
-"stop). Zmáčkněte <key>Delete</key> nebo v nabídce zvolte <guiseq><gui style="
-"\"menu\">Upravit</gui><gui style=\"menuitem\">Odstranit ze seznamu skladeb</"
-"gui></guiseq> a nebo klikněte na stopu(y) pravým tlačítkem myši a vyberte "
-"<gui style=\"menuitem\">Odstranit ze seznamu skladeb</gui>."
+"stop). Zmáčkněte <key>Delete</key> nebo v nabídce zvolte "
+"<guiseq><gui>Upravit</gui><gui>Odstranit ze seznamu skladeb</gui></guiseq> a "
+"nebo klikněte na stopu(y) pravým tlačítkem myši a vyberte <gui>Odstranit ze "
+"seznamu skladeb</gui>."
#: C/manage-playlists.page:76(title)
-msgid "Smart playlist"
+msgid "Smart Playlist"
msgstr "Chytré seznamy skladeb"
#: C/manage-playlists.page:78(p)
@@ -1638,309 +1128,244 @@ msgstr ""
"vytvořit seznam skladeb založený na určitém umělci, oblíbených skladbách a "
"dalším."
-#: C/manage-playlists.page:82(p)
+#: C/manage-playlists.page:83(p)
msgid ""
-"To create a new Smart Playlist, from the menu choose <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">New Smart Playlist</gui></"
-"guiseq>. 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:"
+"To create a new Smart Playlist, from the menu choose <guiseq><gui>Media</"
+"gui><gui>New Smart Playlist</gui></guiseq>. 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 ""
"Když chcete vytvořit nový chytrý seznam skladeb, zvolte z nabídky "
-"<guiseq><gui style=\"menu\">Média</gui> <gui style=\"menuitem\">Nový chytrý "
-"seznam skladeb</gui></guiseq>. Zobrazí se vám dialogové okno na vytvoření "
-"chytrého seznamu skladeb. Zadejte název svého seznamu a zvolte kritéria, na "
-"kterých má být seznam skladeb založen. Můžete volit z polí, které jsou "
-"součástí metadat skladby, jako je album, umělec nebo rok. Po zvolení "
-"kritéria zvolte jednu z následujících podmínek:"
-
-#: C/manage-playlists.page:92(p) C/manage-playlists.page:108(gui)
+"<guiseq><gui>Média</gui><gui>Nový chytrý seznam skladeb</gui></guiseq>. "
+"Zobrazí se vám dialogové okno na vytvoření chytrého seznamu skladeb. Zadejte "
+"název svého seznamu a zvolte kritéria, na kterých má být seznam skladeb "
+"založen. Můžete volit z polí, které jsou součástí metadat skladby, jako je "
+"album, umělec nebo rok. Po zvolení kritéria zvolte jednu z následujících "
+"podmínek:"
+
+#: C/manage-playlists.page:93(p) C/manage-playlists.page:109(gui)
#: C/manage-playlists.page:113(gui)
msgid "is"
msgstr "je"
-#: C/manage-playlists.page:93(p)
+#: C/manage-playlists.page:94(p)
msgid "is not"
msgstr "není"
-#: C/manage-playlists.page:94(p)
+#: C/manage-playlists.page:95(p)
msgid "less than"
msgstr "méně než"
-#: C/manage-playlists.page:95(p)
+#: C/manage-playlists.page:96(p)
msgid "more than"
msgstr "více než"
-#: C/manage-playlists.page:96(p)
+#: C/manage-playlists.page:97(p)
msgid "at most"
msgstr "nejvíce"
-#: C/manage-playlists.page:97(p)
+#: C/manage-playlists.page:98(p)
msgid "at least"
msgstr "nejméně"
-#: C/manage-playlists.page:100(p)
+#: C/manage-playlists.page:101(p)
msgid ""
-"You can also press the <gui style=\"button\">+</gui> 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:"
+"You can also press the <gui>+</gui> 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 ""
-"Můžete také zmáčknout tlačítko <gui style=\"button\">+</gui>, kterým přidáte "
-"do chytrého seznamu skladeb další dotaz. Například byste mohli vytvořit "
-"chytrý seznam skladeb, který bude obsahovat všechny skladby z roku 2010 a "
-"ohodnocené 5 hvězdičkami. Takovýto seznam skladeb vytvoříte navolením:"
+"Můžete také zmáčknout tlačítko <gui>+</gui>, kterým přidáte do chytrého "
+"seznamu skladeb další dotaz. Například byste mohli vytvořit chytrý seznam "
+"skladeb, který bude obsahovat všechny skladby z roku 2010 a ohodnocené 5 "
+"hvězdičkami. Takovýto seznam skladeb vytvoříte navolením:"
-#: C/manage-playlists.page:109(p)
+#: C/manage-playlists.page:110(gui)
msgid "2010"
msgstr "2010"
-#: C/manage-playlists.page:112(gui)
+#: C/manage-playlists.page:113(gui)
msgid "Rating"
msgstr "Hodnocení"
#: C/manage-playlists.page:114(p)
-msgid "5 stars"
-msgstr "5 hvězdiček"
+msgid "<gui/>5 stars"
+msgstr "<gui/>5 hvězdiček"
#: C/manage-playlists.page:118(p)
msgid ""
"You can then optionally select how many songs are included by pressing the "
-"<gui style=\"checkbox\">Limit to</gui> checkbox and choosing the number of "
-"songs to be included."
+"<gui>Limit</gui> to checkbox and choosing the number of songs to be included."
msgstr ""
"Volitelně můžete vybrat, jako moc skladeb má seznam obsahovat. Zaškrtněte "
-"políčko <gui style=\"checkbox\">Omezit na</gui> a zvolte počet skladeb, "
-"které se mají zahrnout."
+"políčko <gui>Omezit na</gui> a zvolte počet skladeb, které se mají zahrnout."
-#: C/manage-playlists.page:122(p)
+#: C/manage-playlists.page:123(p)
msgid ""
-"<app>Banshee</app> also includes smart playlists already created for you. "
-"Press the <gui style=\"button\">Open in editor</gui> button to view how the "
-"playlist created was or to modify it. If you press <gui style=\"button"
-"\">Create and save</gui> the playlist will be automatically generated and "
-"saved for you. The following playlists are included:"
+"Banshee also includes smart playlists already created for you. Press the "
+"<gui>Open in editor</gui> button to view how the playlist created was or to "
+"modify it. If you press <gui>Create and save</gui> the playlist will be "
+"automatically generated and saved for you. The following playlists are "
+"included:"
msgstr ""
-"Přehrávač <app>Banshee</app> pro vás již má připravené některé chytré "
-"seznamy skladeb. Zmáčknutím tlačítka <gui style=\"button\">Otevřít v "
-"editoru</gui> si můžete prohlédnout pravidla, na kterých je seznam skladeb "
-"postaven, nebo je i upravit. Když zmáčknete <gui style=\"button\">Vytvořit a "
-"uložit</gui>, bude pro vás seznam skladeb automaticky vygenerován a uložen. "
-"Předpřipravené jsou tyto seznamy skladeb:"
+"Přehrávač Banshee pro vás již má připravené některé chytré seznamy skladeb. "
+"Zmáčknutím tlačítka <gui>Otevřít v editoru</gui> si můžete prohlédnout "
+"pravidla, na kterých je seznam skladeb postaven, nebo je i upravit. Když "
+"zmáčknete <gui>Vytvořit a uložit</gui>, bude pro vás seznam skladeb "
+"automaticky vygenerován a uložen. Předpřipravené jsou tyto seznamy skladeb:"
-#: C/manage-playlists.page:130(title)
-msgid "<app>Banshee</app> smart playlists"
-msgstr "Chytré seznamy skladeb <app>Banshee</app>"
+#: C/manage-playlists.page:131(title)
+msgid "Banshee Smart Playlists"
+msgstr "Chytré seznamy skladeb Banshee"
#: C/manage-playlists.page:132(p)
msgid "Favorites (Songs rated four and five stars)"
msgstr "Oblíbené (skladby hodnocené čtyřmi a pěti hvězdičkami)"
-#: C/manage-playlists.page:135(p)
+#: C/manage-playlists.page:133(p)
msgid "Recent Favorites (Songs listened to often in the past week)"
msgstr "Nedávno oblíbené (skladby často poslouchané během minulého týdne)"
-#: C/manage-playlists.page:138(p)
+#: C/manage-playlists.page:135(p)
msgid "Recently Added (Songs imported within the last week)"
msgstr "Nedávno přidané (skladby importované během minulého týdne)"
-#: C/manage-playlists.page:141(p)
+#: C/manage-playlists.page:136(p)
msgid "Unheard (Songs that have not been played or skipped)"
msgstr "Neposlouchané (skladby, které nebyly přehrány nebo byly přeskočeny)"
-#: C/manage-playlists.page:144(p)
+#: C/manage-playlists.page:137(p)
msgid "Neglected Favorites (Favorites not played in over two months)"
msgstr ""
"Opomenuté oblíbené (skladby, které nebyly přehrané za poslední dva měsíce)"
-#: C/manage-playlists.page:147(p)
+#: C/manage-playlists.page:139(p)
msgid "700 MB of Favorites (A data CD worth of favorite songs)"
msgstr "700 MB oblíbených (oblíbené skladby stojící za jedno CD)"
-#: C/manage-playlists.page:150(p)
+#: C/manage-playlists.page:140(p)
msgid "80 Minutes of Favorites (An audio CD worth of favorite songs)"
msgstr "80 minut oblíbených (oblíbené skladby stojící za jedno CD)"
-#: C/manage-playlists.page:153(p)
+#: C/manage-playlists.page:142(p)
msgid "Unrated (Songs that haven't been rated)"
msgstr "Nehodnocené (skladby, které nebyly hodnoceny)"
+#: C/manage-coverart.page:9(desc)
+msgid "Manage or change your albums cover art."
+msgstr "Spravujte a měňte přebaly svých alb."
+
+#: C/manage-coverart.page:24(title)
+msgid "Cover art"
+msgstr "Přebal"
+
#: C/lastfm.page:9(desc)
msgid "Enable Last.fm, song reporting and Last.fm radio."
msgstr "Zapněte Last.fm, oznamování skladeb a rádio Last.fm."
-#: C/lastfm.page:28(title)
+#: C/lastfm.page:24(title)
msgid "Last.fm"
msgstr "Last.fm"
-#: C/lastfm.page:30(p)
+#: 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 "
-"<app>Banshee</app> for free. If you subscribe as a paying member, you can "
-"also listen to streaming music from Last.fm in various music clients, "
-"including <app>Banshee</app>. Last.fm offers multiple channels to stream, "
-"including recommended music for you based on your listening habits, your "
-"favorites and more."
+"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."
msgstr ""
"Last.fm je populární on-line služba, která nabízí placenou i neplacenou "
"verzi. Last.fm nabízí informace o zpěvácích a albech a když si vytvoříte "
-"uživatelský profil, umožní vám Last.fm zdarma evidovat hudbu, kterou "
-"posloucháte v <app>Banshee</app>. Pokud se zaregistrujete jako platící člen, "
-"můžete poslouchat i proudové vysílání hudby v různých klientech, včetně "
-"<app>Banshee</app>. Last.fm nabízí proudové vysílání více kanálů, včetně "
-"hudby doporučené pro vás na základě toho, co obvykle posloucháte, vašich "
-"oblíbených skladbách a dalších faktorech."
-
-#: C/lastfm.page:40(title)
+"uživatelský profil, umožní vám Last.fm sledovat hudbu, kterou posloucháte v "
+"Banshee zdarma. Pokud se zaregistrujete jako platící člen, můžete poslouchat "
+"i proudové vysílání hudby v různých klientech, včetně Banshee. Last.fm "
+"nabízí proudové vysílání více kanálů, včetně hudby doporučené pro vás na "
+"základě toho, co obvykle posloucháte, vašich oblíbených skladbách a dalších "
+"faktorech."
+
+#: C/lastfm.page:35(title)
msgid "Enable Last.fm"
msgstr "Zapnutí Last.fm"
-#: C/lastfm.page:42(p)
+#: C/lastfm.page:36(p)
msgid ""
"To get the most out of Last.fm, you will want to create a Last.fm profile. "
"Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> "
-"to create an account or choose <guiseq><gui style=\"menu\">Edit</gui><gui "
-"style=\"menuitem\">Preferences</gui></guiseq> from the <app>Banshee</app> "
-"menu. Once in the preferences select the <gui style=\"tab\">Source Specific</"
-"gui> tab, press the <gui style=\"menu\">Source</gui> drop down menu, choose "
-"<gui style=\"menuitem\">Last.fm</gui> and finally select the <em>Sign up for "
-"Last.fm</em> link."
+"to create an account or choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq> from the Banshee menu. Once in the preferences select the "
+"<gui>Source Specific</gui> tab, press the <gui>Source</gui> drop down menu, "
+"choose <gui>Last.fm</gui> and finally select the <em>Sign up for Last.fm</"
+"em> link."
msgstr ""
"Chcete-li získat z Last.fm co nejvíce, měli byste si založit profil Last.fm. "
"Pro vytvoření profilu navštivte <link href=\"http://www.last.fm/join"
-"\">http://www.last.fm/join</link> nebo zvolte <guiseq><gui style=\"menu"
-"\">Upravit</gui> <gui style=\"menuitem\">Předvolby</gui></guiseq> v nabíce "
-"<app>Banshee</app>. Zmáčkněte kartu <gui style=\"tab\">Dané zdrojem</gui>, zmáčkněte "
-"rozbalovací nabídku <gui style=\"menu\">Zdroj</gui>, ve které zvolte <gui "
-"style=\"menuitem\">Last.fm</gui>, a vyberte odkaz <em>Zaregistrovat se na "
+"\">http://www.last.fm/join</link> nebo zvolte <guiseq><gui>Upravit</"
+"gui><gui>Předvolby</gui></guiseq> v nabíce Banshee. Zmáčkněte kartu "
+"<gui>Dané zdrojem</gui>, zmáčkněte rozbalovací nabídku <gui>Zdroj</gui>, ve "
+"které zvolte <gui>Last.fm</gui>, a vyberte odkaz <em>Zaregistrovat se na "
"Last.fm</em>."
-#: C/lastfm.page:53(p)
+#: C/lastfm.page:45(p)
msgid ""
-"To enable <app>Banshee</app> to report the songs you play on your computer "
-"to Last.fm, sign in to Last.fm in <app>Banshee</app> in the <gui style=\"tab"
-"\">Source Specific</gui> preferences. Enter your username and press the <gui "
-"style=\"button\">Log in to Last.fm</gui> button. You will be directed to a "
-"Last.fm webpage in your browser to grant <app>Banshee</app> access. Press "
-"the <gui style=\"button\">Yes, allow access</gui> link in your browser and "
-"you will be redirected to a webpage that displays a message that "
-"<app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app> "
-"and press the <gui style=\"button\">Finish Logging In</gui> button to "
-"complete the process."
+"To enable Banshee to report the songs you play on your computer to Last.fm, "
+"sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences. "
+"Enter your username and press the <gui>Log in to Last.fm</gui> button. You "
+"will be directed to a Last.fm webpage in your browser to grant Banshee "
+"access. Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</"
+"gui> button to complete the process."
msgstr ""
"Abyste povolili oznamování skladeb, které si ve svém počítači přehráváte, "
-"službě Last.fm, musíte se v <app>Banshee</app> k Last.fm přihlásit v "
-"předvolbách <gui style=\"tab\">Dané zdrojem</gui>. Zadejte své uživatelské "
-"jméno a zmáčkněte tlačítko <gui style=\"button\">Přihlásit k Last.fm</gui>. "
-"Budete ve svém prohlížeči nasměrování na webovou stránku Last.fm, abyste "
-"mohli přehrávači Banshee udělit přístup. Zmáčkněte odkaz <gui style=\"button"
-"\">Ano, přidělit přístup</gui> a budete přesměrováni na webovou stránku, "
-"která zobrazí zprávu, že <app>Banshee</app> má nyní přístup k Last.fm. "
-"Vraťte se do <app>Banshee</app> a zmáčkněte tlačítko <gui style=\"button"
-"\">Dokončit přihlášení</gui>, čímž celou akci završíte."
-
-#: C/lastfm.page:68(title)
-msgid "Enable Last.fm song reporting from <app>Banshee</app>"
-msgstr "Povolení oznamování skladeb Last.fm z <app>Banshee</app>"
-
-#: C/lastfm.page:70(p)
-msgid ""
-"After you have successfully linked <app>Banshee</app> to your Last.fm "
-"profile you must ensure that you have enabled <app>Banshee</app> to report "
-"your songs. To enable <app>Banshee</app> to report the songs to your Last.fm "
-"profile go to <app>Banshee</app> and select preferences, then select the "
-"<gui style=\"tab\">Source Specific</gui> tab, select <gui style=\"menuitem"
-"\">Last.fm</gui> from the dropdown, and press the <gui style=\"checkbox"
-"\">Enable Song Reporting From <app>Banshee</app></gui> checkbox. If you have "
-"an active internet connection <app>Banshee</app> will now send Last.fm "
+"službě Last.fm, musíte se v Banshee k Last.fm přihlásit v předvolbách "
+"<gui>Dané zdrojem</gui>. Zadejte své uživatelské jméno a zmáčkněte tlačítko "
+"<gui>Přihlásit k Last.fm</gui>. Budete ve svém prohlížeči nasměrování na "
+"webovou stránku Last.fm, abyste mohli přehrávači Banshee udělit přístup. "
+"Zmáčkněte odkaz <gui>Ano, přidělit přístup</gui> a budete přesměrováni na "
+"webovou stránku, která zobrazí zprávu, že Banshee má nyní přístup k Last.fm. "
+"Vraťte se do Banshee a zmáčkněte tlačítko <gui>Dokončit přihlášení</gui>, "
+"čímž celou akci završíte."
+
+#: C/lastfm.page:58(title)
+msgid "Enable Last.fm Song Reporting"
+msgstr "Povolení oznamování skladeb z Last.fm"
+
+#: C/lastfm.page:59(p)
+msgid ""
+"After you have successfully linked Banshee to your Last.fm profile you must "
+"ensure that you have enabled Banshee to report your songs. To enable Banshee "
+"to report the songs to your Last.fm profile go to Banshee's preferences, "
+"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
+"the dropdown, and press the <gui>Enable Song Reporting</gui> 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 (although we recommend that you use the Metadata Fixer extension "
"to correct your files instead)."
msgstr ""
-"Když máte přehrávač <app>Banshee</app> úspěšně propojený s profilem Last.fm, "
-"ujistěte se, že jste v <app>Banshee</app> povolili oznamování svých skladeb. "
+"Když máte přehrávač Banshee úspěšně propojený s profilem Last.fm, ujistěte "
+"se, že jste v Banshee povolili oznamování svých skladeb.\n"
"Pro oznamování skladeb do svého profilu Last.fm přejděte v předvolbách na "
-"kartu <gui style=\"tab\">Dané zdrojem</gui>, v rozbalovacím seznamu vyberte "
-"<gui style=\"menuitem\">Last.fm</gui> a zaškrtněte políčko <gui style="
-"\"checkbox\">Povolit oznamování skladeb</gui>. V případě, že máte funkční "
-"internetové připojení, bude od teď přehrávač <app>Banshee</app> zasílat na "
-"Last.fm informace o skladbách, které přehráváte. Pokud si chcete historii "
+"kartu <gui>Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui>Last.fm</"
+"gui> a zaškrtněte políčko <gui>Povolit oznamování skladeb</gui>. V případě, "
+"že máte aktivní internetové připojení, bude od teď přehrávač Banshee zasílat "
+"na Last.fm informace o skladbách, které přehráváte. Pokud si chcete historii "
"přehrávání prohlédnout, navštivte svůj profil na webových stránkách Last.fm. "
"Když bude některý umělec, název skladby nebo název alba nesprávný, Last.fm "
"vaše hudební metadata automaticky aktualizuje (místo toho ale pro opravy "
"souborů spíše doporučujeme rozšíření Opravář metadat)."
-#: C/lastfm.page:87(title)
-msgid "Enable Last.fm song reporting from your device"
-msgstr "Povolení oznamování skladeb Last.fm z vašeho zařízení"
-
-#: C/lastfm.page:89(p)
-msgid ""
-"After successfully linking <app>Banshee</app> to your Last.fm profile and "
-"enabling <app>Banshee</app> to report songs to Last.fm you can also enable "
-"scrobbling from a connected device. <app>Banshee</app> will, upon connection "
-"of your device, attempt to scrobble the songs you have played since the "
-"device was last connected and submit them to Last.fm."
-msgstr ""
-"Po úspěšném propojení <app>Banshee</app> s vaším profilem na Last.fm a po "
-"povolení <app>Banshee</app> oznamovat skladby na Last.fm, můžete povolit "
-"také sdílení seznamů skladeb (scrobbling) z připojených zařízení. Po "
-"připojení vašeho zařízení se <app>Banshee</app> pokusí zjistit, které "
-"skladby jste přehrávali od posledního připojení zařízení, a odešle je na "
-"Last.fm."
-
-#: C/lastfm.page:95(p)
-msgid ""
-"To enable scrobbling of a connected device go to <app>Banshee</app> and "
-"select Preferences, select the <gui style=\"tab\">Source Specific</gui> tab, "
-"select <gui style=\"menuitem\">Last.fm</gui> from the dropdown, and press "
-"the <gui style=\"checkbox\">Enable Song Reporting From Device</gui> "
-"checkbox. If you have an active internet connection <app>Banshee</app> will, "
-"upon connection of your device, now attempt to gather information regarding "
-"the songs that you have played since it was last connected."
-msgstr ""
-"Jestli chcete sdílení seznamů skladeb z připojených zařízení zapnout, jděte "
-"do předvoleb <app>Banshee</app>, vyberte <gui style=\"tab\">Dané zdrojem</"
-"gui>, v rozbalovacím seznamu vyberte <gui style=\"menuitem\">Last.fm</gui> a "
-"zaškrtněte políčko <gui style=\"checkbox\">Povolit oznamování skladeb ze "
-"zařízení</gui>. Pokud máte funkční internetové připojení, bude se "
-"<app>Banshee</app> po připojení vašeho zařízení pokoušet sesbírat informace "
-"týkající se skladeb, které jste přehrávali od doby, kdy bylo zařízení "
-"naposledy připojeno."
-
-#: C/lastfm.page:103(p)
-msgid ""
-"As with regular <app>Banshee</app> scrobbling submissions Last.fm will "
-"automatically update your music metadata if any of your artist, title, or "
-"album information is incorrect (although we again recommend that you use the "
-"Metadata Fixer extension to correct your files instead)."
-msgstr ""
-"Současně s pravidelným zasíláním seznamů skladem z <app>Banshee</app> na "
-"Last.fm se budou aktualizovat vaše hudbení metadata a to v situaci, kdy je "
-"údaj o umělci, názvu nebo albu uveden nesprávně (ačkoliv místo této funkce "
-"vám doporučujeme používat rozšíření Opravář metadat, které opravuje vaše "
-"soubory)."
-
-#: C/lastfm.page:108(p)
-msgid ""
-"Please note that currently <app>Banshee</app> only supports this feature "
-"with Apple products that are supported by the AppleDevice extension."
-msgstr ""
-"Vezměte prosím na vědomí, že v současnosti <app>Banshee</app> podporuje tuto "
-"funkci jen u produktů společnosti Apple, které jsou podporovány rozšířením "
-"AppleDevice."
-
-#: C/lastfm.page:114(title)
-msgid "Listen to Last.fm radio"
+#: C/lastfm.page:75(title)
+msgid "Listen to Last.fm Radio"
msgstr "Poslech rádia Last.fm"
-#: C/lastfm.page:116(p)
+#: C/lastfm.page:76(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 "
@@ -1954,206 +1379,219 @@ msgstr ""
"prémiovým funkcím: poslech seznamů skladeb a stanic hudby, kterou mají rádi "
"nebo si ji označili."
-#: C/lastfm.page:122(p)
+#: C/lastfm.page:83(p)
msgid ""
-"In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will communicate "
-"with Last.fm to populate songs for that radio station. Press the <gui style="
-"\"button\">Play</gui> button in <app>Banshee</app> or <key>Space</key> to "
-"start streaming a Last.fm radio station. You can also press the <gui style="
-"\"button\">Next</gui> button in <app>Banshee</app>, <key>N</key> or choose "
-"<guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem\">Next</"
-"gui></guiseq> to play the next song in your radio station queue."
+"In Banshee's sources pane 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 <gui>Play</gui> button in Banshee or "
+"<key>Spacebar</key> to start streaming a Last.fm radio station. You can also "
+"press the <gui>Next</gui> button in Banshee, <key>N</key> or choose "
+"<guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in "
+"your radio station queue."
msgstr ""
"V panelu zdrojů na levé straně budete mít oddíl Last.fm zahrnující vaše "
"rádiové stanice Last.fm. Abyste mohli rádio Last.fm poslouchat, potřebujete "
"aktivní internetové připojení. Zvolte rádiovou stanici, kterou si přejete "
-"poslouchat a přehrávač <app>Banshee</app> bude komunikovat se službou Last."
-"fm, aby šířil skladby příslušné rádiové stanice. Pro spuštění proudového "
-"vysílání zmáčkněte tlačítko <gui style=\"button\">Přehrát aktuální položku</"
-"gui> nebo klávesu <key>mezerník</key>. Můžete také zmáčknout tlačítko <gui "
-"style=\"button\">Přehrát následující položku</gui>, klávesu <key>N</key> "
-"nebo zvolit <guiseq><gui style=\"menu\">Přehrát</gui> <gui style=\"menuitem"
-"\">Následující</gui></guiseq>, čímž docílíte přehrávání následující skladby "
-"ve frontě rádiové stanice."
-
-#: C/keyboard-shortcuts.page:7(desc)
-msgid "Keyboard shortcuts"
+"poslouchat a přehrávač Banshee bude komunikovat se službou Last.fm, aby "
+"šířil skladby příslušné rádiové stanice. Pro spuštění proudového vysílání "
+"zmáčkněte tlačítko <gui>Přehrát aktuální položku</gui> nebo klávesu "
+"<key>mezerník</key>. Můžete také zmáčknout tlačítko <gui>Přehrát následující "
+"položku</gui>, klávesu <key>N</key> nebo zvolit <guiseq><gui>Přehrát</"
+"gui><gui>Následující</gui></guiseq>, čímž docílíte přehrávání následující "
+"skladby ve frontě rádiové stanice."
+
+#: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title)
+#: C/advanced.page:29(title)
+msgid "Keyboard Shortcuts"
msgstr "Klávesové zkratky"
-#: C/keyboard-shortcuts.page:24(title)
-msgid "Control <app>Banshee</app> using keyboard shortcuts"
-msgstr "Ovládání <app>Banshee</app> pomocí klávesových zkratek"
+#: C/keyboardshortcuts.page:24(title)
+msgid "Control Banshee using Keyboard Shortcuts"
+msgstr "Ovládání Banshee pomocí klávesových zkratek"
-#: C/keyboard-shortcuts.page:27(title)
-msgid "Playback control"
+#: C/keyboardshortcuts.page:28(title)
+msgid "Playback Control"
msgstr "Ovládání přehrávání"
-#: C/keyboard-shortcuts.page:31(gui) C/keyboard-shortcuts.page:55(gui)
-#: C/keyboard-shortcuts.page:77(gui) C/keyboard-shortcuts.page:94(gui)
-#: C/keyboard-shortcuts.page:111(gui)
+#: 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 "Klávesa"
-#: C/keyboard-shortcuts.page:32(gui) C/keyboard-shortcuts.page:56(gui)
-#: C/keyboard-shortcuts.page:78(gui) C/keyboard-shortcuts.page:95(gui)
-#: C/keyboard-shortcuts.page:112(gui)
+#: 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 "Akce"
-#: C/keyboard-shortcuts.page:35(key)
-msgid "Space"
-msgstr "mezerník"
+#: C/keyboardshortcuts.page:35(p)
+msgid "Space Bar"
+msgstr "Mezerník"
-#: C/keyboard-shortcuts.page:36(p)
+#: C/keyboardshortcuts.page:35(p)
msgid "Play or Pause the current song"
msgstr "Přehrát nebo pozastavit aktuální skladbu"
-#: C/keyboard-shortcuts.page:39(key) C/keyboard-shortcuts.page:81(key)
+#: C/keyboardshortcuts.page:38(p) C/keyboardshortcuts.page:76(key)
msgid "N"
msgstr "N"
-#: C/keyboard-shortcuts.page:40(p)
+#: C/keyboardshortcuts.page:38(p)
msgid "Play the next song"
msgstr "Přehrát následující skladbu"
-#: C/keyboard-shortcuts.page:43(key)
+#: C/keyboardshortcuts.page:41(p)
msgid "B"
msgstr "B"
-#: C/keyboard-shortcuts.page:44(p)
+#: C/keyboardshortcuts.page:41(p)
msgid "Play the previous song"
msgstr "Přehrát předchozí skladbu"
-#: C/keyboard-shortcuts.page:51(title)
-msgid "Library interaction"
+#: C/keyboardshortcuts.page:49(title)
+msgid "Library Interaction"
msgstr "Práce s kolekcí"
-#: C/keyboard-shortcuts.page:59(p)
-msgid "<key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq>"
+#: C/keyboardshortcuts.page:56(p)
+msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
-#: C/keyboard-shortcuts.page:61(p)
+#: C/keyboardshortcuts.page:56(p)
msgid "Move the focus to the search box"
msgstr "Přenést zaměření na vyhledávací pole"
-#: C/keyboard-shortcuts.page:64(key) C/keyboard-shortcuts.page:81(key)
-#: C/keyboard-shortcuts.page:119(key) C/keyboard-shortcuts.page:123(key)
-#: C/keyboard-shortcuts.page:128(key) C/keyboard-shortcuts.page:133(key)
-#: C/keyboard-shortcuts.page:139(key) C/keyboard-shortcuts.page:145(key)
+#: C/keyboardshortcuts.page:60(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 "Control"
-#: C/keyboard-shortcuts.page:64(key)
+#: C/keyboardshortcuts.page:60(key)
msgid "I"
msgstr "I"
-#: C/keyboard-shortcuts.page:65(p)
+#: C/keyboardshortcuts.page:61(p)
msgid "Open import media dialog"
msgstr "Otevřít dialogové okno importu médií"
-#: C/keyboard-shortcuts.page:82(p)
+#: C/keyboardshortcuts.page:76(p)
msgid "Create New Playlist"
msgstr "Vytvořit nový seznam skladeb"
-#: C/keyboard-shortcuts.page:98(key)
+#: C/keyboardshortcuts.page:86(title) C/add-podcast.page:26(title)
+msgid "Podcasts"
+msgstr "Podcasty"
+
+#: C/keyboardshortcuts.page:93(key)
msgid "Y"
msgstr "Y"
-#: C/keyboard-shortcuts.page:99(p)
+#: C/keyboardshortcuts.page:93(p)
msgid "Mark the selected episodes as old"
msgstr "Označit vybraný díl jako starý"
-#: C/keyboard-shortcuts.page:107(title)
+#: C/keyboardshortcuts.page:103(title)
msgid "Interface"
msgstr "Rozhraní"
-#: C/keyboard-shortcuts.page:115(key)
+#: C/keyboardshortcuts.page:110(key)
msgid "F"
msgstr "F"
-#: C/keyboard-shortcuts.page:116(p)
+#: C/keyboardshortcuts.page:110(p)
msgid "Toggle full-screen mode"
msgstr "Přepnout režim celé obrazovky"
-#: C/keyboard-shortcuts.page:119(key) C/keyboard-shortcuts.page:123(key)
+#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
msgid "A"
msgstr "A"
-#: C/keyboard-shortcuts.page:120(p)
+#: C/keyboardshortcuts.page:114(p)
msgid "Select all songs in playlist view"
msgstr "Vybrat všechny skladby zobrazené v seznamu skladeb"
-#: C/keyboard-shortcuts.page:123(key)
+#: C/keyboardshortcuts.page:118(key)
msgid "Shift"
msgstr "Shift"
-#: C/keyboard-shortcuts.page:125(p)
+#: C/keyboardshortcuts.page:119(p)
msgid "Unselect all songs in playlist view"
msgstr "Zrušit výběr všech skladeb zobrazených v seznamu skladeb"
-#: C/keyboard-shortcuts.page:128(key)
+#: C/keyboardshortcuts.page:123(key)
msgid "W"
msgstr "W"
-#: C/keyboard-shortcuts.page:129(p)
-msgid ""
-"Hide <app>Banshee</app> Window (Requires Notification Area Plug-in Enabled)"
+#: C/keyboardshortcuts.page:123(p)
+msgid "Hide Banshee Window (Requires Notification Area Plug-in Enabled"
msgstr ""
-"Skrýt okno <app>Banshee</app> (vyžaduje aktivovaný zásuvný modul Ikona "
-"oznamovací oblasti)"
+"Skrýt okno Banshee (vyžaduje aktivovaný zásuvný modul Ikona oznamovací "
+"oblasti)"
-#: C/keyboard-shortcuts.page:133(key)
+#: C/keyboardshortcuts.page:127(key)
msgid "Left Mouse Button"
msgstr "Levé tlačítko myši"
-#: C/keyboard-shortcuts.page:135(p)
+#: C/keyboardshortcuts.page:128(p)
msgid "Play Previous Song (Requires Notification Area Plug-in Enabled"
msgstr ""
"Přehrát předchozí skladbu (vyžaduje aktivovaný zásuvný modul Ikona "
"oznamovací oblasti)"
-#: C/keyboard-shortcuts.page:139(key)
+#: C/keyboardshortcuts.page:132(key)
msgid "Right Mouse Button"
msgstr "Pravé tlačítko myši"
-#: C/keyboard-shortcuts.page:141(p)
+#: C/keyboardshortcuts.page:133(p)
msgid "Play Next Song (Requires Notification Area Plug-in Enabled"
msgstr ""
"Přehrát následující skladbu (vyžaduje aktivovaný zásuvný modul Ikona "
"oznamovací oblasti)"
-#: C/keyboard-shortcuts.page:145(key)
+#: C/keyboardshortcuts.page:137(key)
msgid "Middle Mouse Button"
msgstr "Prostřední tlačítko myši"
-#: C/keyboard-shortcuts.page:147(p)
+#: C/keyboardshortcuts.page:138(p)
msgid "Toggle Play / Pause (Requires Notification Area Plug-in Enabled"
msgstr ""
"Přepnout přehrávání/pozastavení (vyžaduje aktivovaný zásuvný modul Ikona "
"oznamovací oblasti)"
+#: C/itunes-import.page:8(desc)
+msgid ""
+"Import music and categorizations from the <app>iTunes</app> media player."
+msgstr ""
+"Importujte hudbu a rozdělení do kategorií ze svého multimediálního "
+"přehrávače <app>iTunes</app>."
+
+#: C/itunes-import.page:12(title)
+msgid "Import your <app>iTunes</app> library"
+msgstr "Import vaší kolekce <app>iTunes</app>"
+
#: C/introduction.page:8(desc)
-msgid "Introduction to the <app>Banshee</app> media player."
-msgstr "Úvod do multimediálního přehrávače <app>Banshee</app>."
+msgid "Introduction to the <app>Banshee Media Player</app>."
+msgstr "Úvod do <app>Multimediálního přehrávače Banshee</app>."
-#: C/introduction.page:26(title)
+#: C/introduction.page:24(title)
msgid "Introduction"
msgstr "Úvod"
-#: C/introduction.page:28(p)
+#: C/introduction.page:26(p)
msgid ""
"<app>Banshee</app> is a media player that allows you to play your music, "
-"videos and other media, as well as sync it with portable devices to take "
-"your media on the go."
+"videos, and other media as well sync it with portable devices to take your "
+"media on the go."
msgstr ""
"<app>Banshee</app> je multimediální přehrávač, který umí přehrávat hudbu, "
"videa a další média a navíc je synchronizovat s přenosnými zařízeními, "
"abyste je měli k dispozici i na cestách."
-#: C/introduction.page:32(p)
+#: C/introduction.page:31(p)
msgid ""
"<app>Banshee</app> includes features to import your media, manage its "
"metadata, and play your music and videos."
@@ -2163,79 +1601,77 @@ msgstr ""
#: C/introduction.page:35(p)
msgid ""
-"<app>Banshee</app> also helps you sync your music and videos to popular "
-"portable devices, such as digital audio players and smartphones. "
-"<app>Banshee</app> supports popular devices including most iPods, Sandisk "
-"and Creative MP3 players, and Android powered phones."
+"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 ""
-"<app>Banshee</app> vám také pomůže se synchronizací vaší hudby a videí s "
-"populárními přenosnými zařízeními, jako jsou digitální přenosné přehrávače a "
-"smartfony. <app>Banshee</app> podporuje populární zařízení včetně většiny "
-"přehrávačů MP3 iPod, Sandisk a Creative a telefonů se systémem Android."
-
-#: C/index.page:31(title)
-msgid "<app>Banshee</app> media player"
-msgstr "Hudební přehrávač <app>Banshee</app>"
+"Banshee vám také pomůže se synchronizací vaší hudby a videí s populárními "
+"přenosnými zařízeními, jako jsou digitální přenosné přehrávače a smartfony. "
+"Banshee podporuje populární zařízení včetně většiny přehrávačů MP3 iPod, "
+"Sandisk a Creative a telefonů se systémem Android."
-#: C/index.page:34(title)
-msgid "Add, remove & play"
+#: C/index.page:24(title)
+msgid "Add, Remove & Play"
msgstr "Přidávání, odebírání a přehrávání"
-#: C/index.page:38(title)
-msgid "Manage & sort"
+#: C/index.page:28(title)
+msgid "Manage & Sort"
msgstr "Správa a řazení"
-#: C/index.page:42(title)
+#: C/index.page:32(title)
msgid "Sync your media with a portable music player"
msgstr "Synchronizace vašich médií s přenosnými hudebními přehrávači"
-#: C/index.page:46(title)
-msgid "Add additional functionality to <app>Banshee</app>"
-msgstr "Přidávání dalších funkcí do <app>Banshee</app>"
+#: C/index.page:36(title)
+msgid "Add additional functionality to Banshee"
+msgstr "Přidávání dalších funkcí do Banshee"
-#: C/index.page:50(title)
+#: C/index.page:40(title)
msgid "Advanced options and help"
msgstr "Pokročilé volby a nápověda"
-#: C/import.page:7(desc)
-msgid ""
-"Add music and videos from your computer to your <app>Banshee</app> library."
-msgstr ""
-"Přidávejte hudbu a videa ze svého počítače do své kolekce <app>Banshee</app>."
+#: C/index.page:44(title)
+msgid "Common Problems"
+msgstr "Obvyklé problémy"
+
+#: C/import.page:8(desc)
+msgid "Add music and videos from your computer to your Banshee library."
+msgstr "Přidávejte hudbu a videa ze svého počítače do své kolekce Banshee."
-#: C/import.page:16(name)
+#: C/import.page:15(name)
msgid "Shaun McCance"
msgstr "Shaun McCance"
-#: C/import.page:17(email)
+#: C/import.page:16(email)
msgid "shaunm at gnome.org"
msgstr "shaunm at gnome.org"
-#: C/import.page:26(title)
+#: C/import.page:21(title)
msgid "Import music & videos"
msgstr "Import hudby a videa"
-#: C/import.page:28(p)
+#: C/import.page:23(p)
msgid ""
-"You can import music and videos stored on your computer into <app>Banshee</"
-"app>. Imported files appear in your sources and can be edited and managed "
-"like any other media in <app>Banshee</app>."
+"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 ""
-"Do přehrávače <app>Banshee</app> můžete importovat hudbu a videa uložená na "
-"svém počítači. Importované soubory se objeví ve vašich zdrojích a lze je v "
-"<app>Banshee</app> upravovat a spravovat podobně jako ostatní média."
+"Do přehrávače Banshee můžete importovat hudbu a videa uložená na svém "
+"počítači. Importované soubory se objeví ve vašich zdrojích a lze je v "
+"Banshee upravovat a spravovat podobně jako ostatní média."
-#: C/import.page:32(p)
+#: C/import.page:27(p)
msgid ""
-"To import music or video files on your computer, choose <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">Import Media</gui></guiseq>. A "
-"dialog wil appear with a number of choices."
+"To import music or video files on your computer, choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq>. A dialog will appear with a number of "
+"choices."
msgstr ""
"Pokud chcete zvukové nebo video soubory ve svém počítači importovat, zvolte "
-"<guiseq><gui style=\"menu\">Média</gui><gui style=\"menuitem\">Importovat "
-"média</gui></guiseq>. Objeví se dialogové okno s několika volbami."
+"<guiseq><gui>Média</gui><gui>Importovat média</gui></guiseq>. Objeví se "
+"dialogové okno s několika volbami."
-#: C/import.page:37(p)
+#: C/import.page:31(p)
msgid ""
"Plugins may add additional import choices. See <link xref=\"#plugins\"/> "
"below."
@@ -2243,11 +1679,11 @@ msgstr ""
"Zásuvné moduly mohou přidat další volby importu. Viz <link xref=\"#plugins\"/"
"> dále."
-#: C/import.page:43(gui)
+#: C/import.page:37(gui)
msgid "Local Folders"
msgstr "Místní složky"
-#: C/import.page:44(p)
+#: 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 "
@@ -2257,11 +1693,11 @@ msgstr ""
"určité složky a jejích podsložek. Budete v dialogovém okně dotázáni na volbu "
"složky, ze které se má importovat."
-#: C/import.page:49(gui)
+#: C/import.page:43(gui)
msgid "Local Files"
msgstr "Místní soubory"
-#: C/import.page:50(p)
+#: 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."
@@ -2270,11 +1706,11 @@ msgstr ""
"soubory, které si vyberete. Budete v dialogovém okně dotázáni na volbu "
"souboru či souborů, které se mají importovat."
-#: C/import.page:55(gui)
+#: C/import.page:49(gui)
msgid "Home Folder"
msgstr "Domovská složka"
-#: C/import.page:56(p)
+#: 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."
@@ -2282,11 +1718,11 @@ msgstr ""
"Tuto volbu vyberte, když chcete importovat všechny zvukové a video soubory z "
"celé vaší domovské složky, včetně souborů v podsložkách."
-#: C/import.page:60(gui)
+#: C/import.page:54(gui)
msgid "Videos From Photos Folder"
msgstr "Videa ze složky fotografií"
-#: C/import.page:61(p)
+#: C/import.page:55(p)
msgid ""
"Many digital cameras can take short videos, and photo-management "
"applications often download these videos directly into your Photos folder. "
@@ -2298,7 +1734,7 @@ msgstr ""
"vyberte, když chcete importovat libovolná videa, která jsou uložena ve vaší "
"složce Obrázky."
-#: C/import.page:69(p)
+#: 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."
@@ -2306,30 +1742,28 @@ msgstr ""
"Bez problémů můžete importovat ze složky, ze které jste již dříve "
"importovali, aniž byste se museli obávat duplicity ve své kolekci."
-#: C/import.page:74(title)
-msgid "Import from a playlist"
+#: C/import.page:68(title)
+msgid "Import from a Playlist"
msgstr "Import ze seznamu skladeb"
-#: C/import.page:76(p)
+#: C/import.page:69(p)
msgid ""
"You can also import music from playlists. Most playlist files end in "
-"<em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu "
-"choose <guiseq><gui style=\"menu\">Media</gui><gui style=\"menuitem\">Import "
-"Playlist</gui></guiseq> and locate the playlist file in your folder, select "
-"it and press <gui style=\"button\">Import</gui>."
+"<em>m3u</em>. To import from a playlist, from the Banshee menu choose "
+"<guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and locate the "
+"playlist file in your folder, select it and press <gui>Import</gui>."
msgstr ""
"Hudbu můžete importovat také ze seznamů skladeb. Většina souborů se seznamy "
"skladeb má příponu <em>m3u</em>. Pokud chcete importovat ze seznamu skladeb, "
-"v nabídce <app>Banshee</app> zvolte <guiseq><gui style=\"menu\">Média</gui> "
-"<gui style=\"menuitem\">Importovat seznam skladeb</gui></guiseq> a nejděte "
-"ve složce správný seznam, vyberte jej a zmáčkněte <gui style=\"button"
-"\">Importovat</gui>."
+"v nabídce Banshee zvolte <guiseq><gui>Média</gui><gui>Importovat seznam "
+"skladeb</gui></guiseq> a nejděte ve složce správný seznam, vyberte jej a "
+"zmáčkněte <gui>Importovat</gui>."
-#: C/import.page:86(title)
-msgid "Additional import sources"
+#: C/import.page:78(title)
+msgid "Additional Import Sources"
msgstr "Další zdroje pro import"
-#: C/import.page:88(p)
+#: 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:"
@@ -2338,114 +1772,127 @@ msgstr ""
"budou dostupné, pokud jsou zapnuté příslušné zásuvné moduly:"
#: C/extensions.page:8(desc)
-msgid "Add additional functionality to <app>Banshee</app>."
-msgstr "Přidejte do <app>Banshee</app> další funkce."
+msgid "Add additional functionality to Banshee."
+msgstr "Přidejte do Banshee další funkce."
#: C/extensions.page:23(title)
-msgid "<app>Banshee</app> extensions"
-msgstr "Rozšíření <app>Banshee</app>"
+msgid "Banshee Extensions"
+msgstr "Rozšíření Banshee"
#: C/extensions.page:27(title)
-msgid "Official <app>Banshee</app> extensions"
-msgstr "Oficiální rozšíření <app>Banshee</app>"
+msgid "Official Banshee Extensions"
+msgstr "Oficiální rozšíření Banshee"
-#: C/extensions.page:30(title)
-msgid "Manage extensions for <app>Banshee</app>"
-msgstr "Správa rozšíření pro <app>Banshee</app>"
+#: C/extensions.page:29(title)
+msgid "Manage extensions for Banshee"
+msgstr "Správa rozšíření pro Banshee"
-#: C/amazon.page:8(desc)
+#: C/extensions.page:34(title)
+msgid "Community Banshee Extensions"
+msgstr "Komunitní rozšíření Banshee"
+
+#: C/extensions.page:36(title)
+msgid "Add community built extensions for Banshee"
+msgstr "Přidávání rozšíření pro Banshee vytvořených komunitou."
+
+#: C/emusic.page:8(desc)
+msgid "Import music purchased from eMusic."
+msgstr "Importujte hudbu zakoupenou z eMusic."
+
+#: C/emusic.page:12(title)
+msgid "Import your eMusic tracks"
+msgstr "Import vašich stop eMusic"
+
+#: C/amazon.page:9(desc)
msgid "Sync and purchase music from the Amazon MP3 Store."
msgstr "Synchronizujte a nakupujte hudbu z obchodu s MP3 Amazon."
-#: C/amazon.page:28(title)
-msgid "Amazon MP3 store"
+#: C/amazon.page:24(title)
+msgid "Amazon MP3 Store"
msgstr "Obchod s MP3 Amazon"
-#: C/amazon.page:30(p)
+#: C/amazon.page:26(p)
msgid ""
-"<app>Banshee</app> 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 <app>Banshee</app>. 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 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 ""
-"Přehrávač <app>Banshee</app> podporuje stahování a import hudby z obchodu s "
-"MP3 Amazon. Můžete ručně importovat hudební soubory Amazon, nakupovat hudbu "
-"ve svém webovém prohlížeči nebo nakupovat hudbu přímo v <app>Banshee</app>. "
-"Amazon nabízí hudbu k prodeji ve formátu MP3 jen v některých zemích a to, "
-"zda budete moci v obchodě Amazon nakupovat MP3 závisí na tom, kde se "
-"nacházíte."
+"Přehrávač Banshee podporuje stahování a import hudby z obchodu s MP3 Amazon. "
+"Můžete ručně importovat hudební soubory Amazon, nakupovat hudbu ve svém "
+"webovém prohlížeči nebo nakupovat hudbu přímo v Banshee. Amazon nabízí hudbu "
+"k prodeji ve formátu MP3 jen v některých zemích a to, zda budete moci v "
+"obchodě Amazon nakupovat MP3 závisí na tom, kde se nacházíte."
-#: C/amazon.page:37(p)
+#: C/amazon.page:34(p)
msgid ""
-"<app>Banshee</app> uses an Amazon affiliate code for all music purchases. "
-"All money made via this affiliate code is donated to the GNOME Foundation."
+"Banshee uses an Amazon affiliate code for all music purchases. All money "
+"made via this affiliate code is donated to the GNOME Foundation."
msgstr ""
-"Přehrávač <app>Banshee</app> používá k nákupu veškeré hudby partnerský kód "
-"Amazon. Všechny peníze, které projdou přes tento partnerský kód jsou "
-"darovány nadaci GNOME Foundation."
+"Přehrávač Banshee používá k nákupu veškeré hudby partnerský kód Amazon. "
+"Všechny peníze, které projdou přes tento partnerský kód jsou darovány nadaci "
+"GNOME Foundation."
-#: C/amazon.page:43(title)
+#: C/amazon.page:40(title)
msgid "Purchase Amazon MP3s in your web browser"
msgstr "Nákup MP3 z obchodu Amazon ve webovém prohlížeči"
-#: C/amazon.page:45(p)
+#: C/amazon.page:42(p)
msgid ""
-"Music purchased from the Amazon MP3 store can be automatically downloaded "
-"and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app> "
-"will automatically open it and begin the download and import the music."
+"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 ""
"Hudba zakoupená z obchodu s MP3 Amazon může být automaticky stahována a "
-"importována do přehrávače <app>Banshee</app>. <app>Banshee</app> se přidruží "
-"k souborům .amz, které Amazon poskytuje pro zakoupené MP3. Když v obchodě "
-"Amazon nakoupíte hudbu, váš webový prohlížeč stáhne soubor .amz a "
-"<app>Banshee</app> jej automaticky otevře a začne hudbu stahovat a "
-"importovat."
-
-#: C/amazon.page:54(title)
-msgid "Buy Amazon MP3s in <app>Banshee</app>"
-msgstr "Nákup MP3 z obchodu Amazon v <app>Banshee</app>"
-
-#: C/amazon.page:56(p)
-msgid ""
-"You can also search for songs on Amazon within <app>Banshee</app>. Choose "
-"the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and "
-"import your purchase into the library."
-msgstr ""
-"V rámci přehrávače <app>Banshee</app> můžete také v obchodě Amazon skladby "
-"hledat. V nabídce vlevo zvolte Obchod s MP3 Amazon. Tím se načte obchod s "
-"MP3 Amazon stejně jako ve webovém prohlížeči. Můžete v něm vyhledávat hudbu, "
-"kterou si přejete koupit a po přihlášení do obchodu Amazon si ji můžete "
-"jediným kliknutím i koupit. <app>Banshee</app> váš nákup automaticky stáhne "
-"a naimportuje do kolekce."
-
-#: C/amazon.page:66(title)
+"importována do přehrávače Banshee. Banshee se přidruží k souborům .amz, "
+"které Amazon poskytuje pro zakoupené MP3. Když v obchodě Amazon nakoupíte "
+"hudbu, váš webový prohlížeč stáhne soubor .amz a Banshee jej automaticky "
+"otevře a začne hudbu stahovat a importovat."
+
+#: C/amazon.page:51(title)
+msgid "Buy Amazon MP3s in Banshee"
+msgstr "Nákup MP3 z obchodu Amazon v Banshee"
+
+#: 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 your purchase into the "
+"library."
+msgstr ""
+"V rámci přehrávače Banshee můžete také v obchodě Amazon skladby hledat. V "
+"nabídce vlevo zvolte Obchod s MP3 Amazon. Tím se načte obchod s MP3 Amazon "
+"stejně jako ve webovém prohlížeči. Můžete v něm vyhledávat hudbu, kterou si "
+"přejete koupit a po přihlášení do obchodu Amazon si ji můžete jediným "
+"kliknutím i koupit. Banshee váš nákup automaticky stáhne a naimportuje do "
+"kolekce."
+
+#: C/amazon.page:63(title)
msgid "Import Amazon MP3s manually"
msgstr "Ruční import MP3 z obchodu Amazon"
-#: C/amazon.page:68(p)
+#: 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 <app>Banshee</app> choose <guiseq><gui "
-"style=\"menu\">Media</gui><gui style=\"menuitem\">Import Media</gui></"
-"guiseq> from the menu and select the *.amz file to be imported. "
-"<app>Banshee</app> will then open this file and connect to the Amazon MP3 "
-"store to begin the download."
+"purchased manually from Amazon, in Banshee choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq> 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 ""
"Když nákup v obchodě Amazon provedete přes webový prohlížeč, soubor s "
"příponou .amz se stáhne a uloží na váš pevný disk. Pokud chcete zakoupenou "
-"hudbu ručně naimporotvat z obchodu Amazon, v nabídce <app>Banshee</app> "
-"zvolte <guiseq><gui>Média</gui> <gui>Importovat média</gui></guiseq> a "
-"vyberte soubor *.amz, který se má importovat. Přehrávač <app>Banshee</app> "
-"tento soubor otevře a připojí se do obchodu s MP3 Amazon, aby provedl stažení."
+"hudbu ručně naimporotvat z obchodu Amazon, zvolte v Banshee z nabídky "
+"<guiseq><gui>Média</gui><gui>Importovat média</gui></guiseq> a vyberte "
+"soubor *.amz, který se má importovat. Banshee tento soubor otevře a připojí "
+"se do obchodu s MP3 Amazon, aby provedla stažení."
-#: C/amazon.page:78(p)
+#: 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 "
@@ -2459,6 +1906,203 @@ msgstr ""
"platné. Je doporučováno stažení a import zakoupené hudby z obchodu Amazon "
"provést v rozmezí hodiny."
+#: C/advanced.page:8(desc)
+msgid "Get help for advanced actions."
+msgstr "Získejte nápovědu k pokročilým akcím."
+
+#: C/advanced.page:23(title)
+msgid "Advanced Options and Help"
+msgstr "Pokročilé volby a nápověda"
+
+#: C/add-radio.page:11(desc)
+msgid "Add, remove and play internet radio stations in Banshee."
+msgstr ""
+"Přidávejte, odebírejte a přehrávejte stanice Internetových rádií v Banshee."
+
+#: C/add-radio.page:26(title)
+msgid "Internet Radio"
+msgstr "Internetové rádio"
+
+#: C/add-radio.page:29(title)
+msgid "What is Internet Radio?"
+msgstr "Co je to Internetové rádio?"
+
+#: 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 broadcasting their own station, or commercial internet radio "
+"stations that include live DJs and even commercials."
+msgstr ""
+"Internetová rádiová stanice je podobná běžné rádiové stanici, umožňuje "
+"poslouchat individuální nebo společné proudové vysílání hudby živě přes "
+"Internet. Internetová rádiová stanice může být proud vysílání souběžný ke "
+"klasické rádiové stanici, amatérské hromadné vysílání něčí vlastní stanice "
+"nebo komerční Internetová rádiová stanice včetně živých diskžokejů, a také "
+"reklam."
+
+#: C/add-radio.page:41(title)
+msgid "Add Radio Station"
+msgstr "Přidávání rádiových stanic"
+
+#: C/add-radio.page:43(p)
+msgid ""
+"To add an internet radio station to Banshee, press <gui>Add Station</gui> in "
+"the upper right hand corner of Banshee or, from the menu, choose "
+"<guiseq><gui>Media</gui><gui>Add Station</gui></guiseq>."
+msgstr ""
+"Když chcete do přehrávače Banshee přidat Internetovou rádiovou stanici, "
+"zmáčkněte <gui>Přidat stanici</gui> v pravém horním rohu nebo v nabídce "
+"zvolte <guiseq><gui>Média</gui><gui>Přidat stanici</gui></guiseq>."
+
+#: 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 <gui>Copy Link</gui>."
+msgstr ""
+"Z webové stránky stanice zkopírujte ve svém webovém prohlížeči odkaz na "
+"jejich adresu URL proudu. Ve většině prohlížečů to jde udělat kliknutím "
+"pravým tlačítkem na odkaz a zmáčknutím <gui>Kopírovat odkaz</gui>."
+
+#: C/add-radio.page:54(p)
+msgid ""
+"Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
+"kind of music the internet radio station plays from the available drop down "
+"selections. You will then need to enter the <gui>Station Name</gui>. Enter a "
+"name for the radio station. Then press tab or use your mouse to select the "
+"<gui>Stream URL</gui> field to paste the URL of the radio station. Using "
+"your mouse right click and choose <gui>Paste</gui> or press "
+"<keyseq><key>Control</key><key>V</key></keyseq>."
+msgstr ""
+"Banshee vás vyzve k zadání <gui>Žánru stanice</gui>. Z dostupných voleb v "
+"rozbalovacím seznamu zvolte druh hudby, kterou stanice hraje. Pak budete "
+"muset vyplnit <gui>Název stanice</gui>. Zadejte, jak se rádiová stanice "
+"jmenuje. Po té zmáčkněte tabulátor nebo použijte myš k zaměření pole "
+"<gui>Adresa URL proudu</gui> a vložte do něj adresu URL stanice. Použijte k "
+"tomu pravé tlačítko myši a položku <gui>Vložit</gui> nebo zmáčkněte "
+"<keyseq><key>Control</key><key>V</key></keyseq>."
+
+#: C/add-radio.page:62(p)
+msgid ""
+"You can optionally also fill out the fields for <gui>Station Creator</gui>, "
+"<gui>Description</gui>, and <gui>Rating</gui>."
+msgstr ""
+"Volitelně můžete také vyplnit pole <gui>Tvůrce stanice</gui>, <gui>Popis</"
+"gui> a <gui>Hodnocení</gui>."
+
+#: C/add-radio.page:66(p)
+msgid ""
+"Then press <gui>Save</gui> to save the internet radio station in Banshee."
+msgstr ""
+"Nakonec zmáčkněte <gui>Uložit</gui> a tím se Internetová rádiová stanice do "
+"Banshee uloží."
+
+#: C/add-podcast.page:11(desc)
+msgid "Add, remove and play podcasts in Banshee."
+msgstr "Přidávejte, odebírejte a přehrávejte podcasty v Banshee."
+
+#: C/add-podcast.page:29(title)
+msgid "What is a Podcast?"
+msgstr "Co je to podcast"
+
+#: 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 ""
+"Podcast je zaznamenaný program, podobně jako program rádia, který je "
+"dostupný na Internetu a vy jej můžete odebírat. Když jste v přehrávači "
+"Banshee přihlášeni k odběru nějakého podcastu, tak pokaždé když je vydán "
+"nový program, Banshee jej automaticky stáhne a nabídne vám jej k poslechu."
+
+#: 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 ""
+"Existují podcasty s téměř jakýmkoliv tématem, včetně hudby, filmů, Linuxu a "
+"dalších věcí. Hledejte na Internetu svým oblíbeným vyhledávačem. K hledání "
+"použijte výraz typu „film podcast“ (respektive anglicky „movie podcast“, "
+"protože nabídka podcastů v angličtině je daleko větší) a můžete si vybírat."
+
+#: C/add-podcast.page:44(title)
+msgid "Add a Podcast"
+msgstr "Přidávání podcastů"
+
+#: 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 <gui>Copy link</gui>."
+msgstr ""
+"Když chcete do přehrávače Banshee přidat podcast, musíte nejprve ve svém "
+"prohlížeči navštívit domovskou stránku onoho podcastu na Intenetu. Většina "
+"podcastů má tlačítko nebo odkaz pro přihlášení k odběru podcastu. Zkopírujte "
+"odkaz do přihlášení k podcastu. Ve většině webových prohlížečů jde kliknout "
+"pravým tlačítkem na odkaz a zvolit <gui>Kopírovat odkaz</gui>."
+
+#: C/add-podcast.page:53(p)
+msgid ""
+"In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the upper "
+"right hand corner, from the menu choose <guiseq><gui>Media</gui><gui> "
+"Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
+"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
+msgstr ""
+"V Banshee zmáčkněte <gui>Přidat podcast</gui> v pravém horním rohu nebo "
+"zvolte z nabídky <guiseq><gui>Média</gui><gui>Přidat podcast…</gui></guiseq> "
+"a nebo použijte klávesovou zkratku <keyseq><key>Shift</key><key>Control</"
+"key><key>F</key></keyseq>."
+
+#: 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 ""
+"Pak si v Banshee můžete v rozbalovací nabídce zvolit, jak chcete nové "
+"podcasty stahovat. Na výběr je:"
+
+#: C/add-podcast.page:63(p)
+msgid ""
+"Download the Most Recent Episode (This will automatically download the last "
+"episode that was released)."
+msgstr "Stáhnout nejnovější díl (automaticky stáhne poslední vydaný díl)"
+
+#: C/add-podcast.page:65(p)
+msgid "Download All Episodes (This will download all episodes)."
+msgstr "Stáhnout všechny díly (automaticky stáhne všechny díly)"
+
+#: 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 ""
+"Nechat mě vybrat díly ke stažení (nabídne vám ke zvolení, které díly si "
+"přejete stáhnout)"
+
+#: C/add-podcast.page:70(p)
+msgid "After you have added a Podcast feed, Banshee will display:"
+msgstr "Po té, co kanál podcastu přidáte, Banshee zobrazí:"
+
+#: C/add-podcast.page:73(p)
+msgid "<gui>Name</gui>: (Name of the specific episode)"
+msgstr "<gui>Název</gui>: (název konkrétního dílu)"
+
+#: C/add-podcast.page:74(p)
+msgid "<gui>Podcast</gui>: (Name of the Podcast)"
+msgstr "<gui>Podcast</gui>: (název podcastu)"
+
+#: C/add-podcast.page:75(p)
+msgid "<gui>Published</gui> (Date the episode was published or released)"
+msgstr "<gui>Zveřejněno</gui>: (datum, kdy byl díl zveřejněn nebo vydán)"
+
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
msgid "translator-credits"
diff --git a/help/cs/emusic.page b/help/cs/emusic.page
new file mode 100644
index 0000000..a9c708d
--- /dev/null
+++ b/help/cs/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="cs">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importujte hudbu zakoupenou z eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import vašich stop eMusic</title>
+
+</page>
diff --git a/help/cs/extensions.page b/help/cs/extensions.page
index 345cce3..f3da754 100644
--- a/help/cs/extensions.page
+++ b/help/cs/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="cs">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="cs">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Přidejte do <app>Banshee</app> další funkce.</desc>
+ <desc>Přidejte do Banshee další funkce.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Rozšíření <app>Banshee</app></title>
+ <title>Rozšíření Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Oficiální rozšíření <app>Banshee</app></title>
+ <title type="link">Oficiální rozšíření Banshee</title>
</info>
+ <title>Správa rozšíření pro Banshee</title>
+ </section>
- <title>Správa rozšíření pro <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Komunitní rozšíření Banshee</title>
+ </info>
+ <title>Přidávání rozšíření pro Banshee vytvořených komunitou.</title>
</section>
+
</page>
diff --git a/help/cs/import.page b/help/cs/import.page
index d8f4263..b717ef5 100644
--- a/help/cs/import.page
+++ b/help/cs/import.page
@@ -3,7 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Přidávejte hudbu a videa ze svého počítače do své kolekce <app>Banshee</app>.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Přidávejte hudbu a videa ze svého počítače do své kolekce Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -13,20 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Import hudby a videa</title>
- <p>Do přehrávače <app>Banshee</app> můžete importovat hudbu a videa uložená na svém počítači. Importované soubory se objeví ve vašich zdrojích a lze je v <app>Banshee</app> upravovat a spravovat podobně jako ostatní média.</p>
+ <p>Do přehrávače Banshee můžete importovat hudbu a videa uložená na svém počítači. Importované soubory se objeví ve vašich zdrojích a lze je v Banshee upravovat a spravovat podobně jako ostatní média.</p>
- <p>Pokud chcete zvukové nebo video soubory ve svém počítači importovat, zvolte <guiseq><gui style="menu">Média</gui><gui style="menuitem">Importovat média</gui></guiseq>. Objeví se dialogové okno s několika volbami.</p>
+ <p>Pokud chcete zvukové nebo video soubory ve svém počítači importovat, zvolte <guiseq><gui>Média</gui><gui>Importovat média</gui></guiseq>. Objeví se dialogové okno s několika volbami.</p>
- <note style="tip">
+ <note>
<p>Zásuvné moduly mohou přidat další volby importu. Viz <link xref="#plugins"/> dále.</p>
</note>
@@ -49,22 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Bez problémů můžete importovat ze složky, ze které jste již dříve importovali, aniž byste se museli obávat duplicity ve své kolekci.</p>
</note>
-
+
<section id="import-playlist">
<title>Import ze seznamu skladeb</title>
-
- <p>Hudbu můžete importovat také ze seznamů skladeb. Většina souborů se seznamy skladeb má příponu <em>m3u</em>. Pokud chcete importovat ze seznamu skladeb, v nabídce <app>Banshee</app> zvolte <guiseq><gui style="menu">Média</gui> <gui style="menuitem">Importovat seznam skladeb</gui></guiseq> a nejděte ve složce správný seznam, vyberte jej a zmáčkněte <gui style="button">Importovat</gui>.</p>
-
+ <p>Hudbu můžete importovat také ze seznamů skladeb. Většina souborů se seznamy skladeb má příponu <em>m3u</em>. Pokud chcete importovat ze seznamu skladeb, v nabídce Banshee zvolte <guiseq><gui>Média</gui><gui>Importovat seznam skladeb</gui></guiseq> a nejděte ve složce správný seznam, vyberte jej a zmáčkněte <gui>Importovat</gui>.</p>
</section>
-
+
<section id="plugins">
<title>Další zdroje pro import</title>
-
- <p>Zásuvné moduly mohou doplnit další volby importu. Následující další zdroje budou dostupné, pokud jsou zapnuté příslušné zásuvné moduly:</p>
-
+ <p>Zásuvné moduly mohou doplnit další volby importu. Následující další zdroje budou dostupné, pokud jsou zapnuté příslušné zásuvné moduly:</p>
</section>
-
+
</page>
diff --git a/help/cs/index.page b/help/cs/index.page
index 245f43b..2bfdfb4 100644
--- a/help/cs/index.page
+++ b/help/cs/index.page
@@ -12,20 +12,16 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Hudební přehrávač <app>Banshee</app></title>
+ <title>Multimediální přehrávač Banshee</title>
<section id="media" style="2column">
<title>Přidávání, odebírání a přehrávání</title>
@@ -34,17 +30,17 @@
<section id="manage" style="2column">
<title>Správa a řazení</title>
</section>
-
+
<section id="sync" style="2column">
<title>Synchronizace vašich médií s přenosnými hudebními přehrávači</title>
</section>
<section id="extensions" style="2column">
- <title>Přidávání dalších funkcí do <app>Banshee</app></title>
+ <title>Přidávání dalších funkcí do Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Pokročilé volby a nápověda</title>
+ <title>Pokročilé volby a nápověda</title>
</section>
</page>
diff --git a/help/cs/introduction.page b/help/cs/introduction.page
index cec8627..0745d0a 100644
--- a/help/cs/introduction.page
+++ b/help/cs/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Úvod do multimediálního přehrávače <app>Banshee</app>.</desc>
+ <desc>Úvod do <app>Multimediálního přehrávače Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -25,17 +21,15 @@
<title>Úvod</title>
<p><app>Banshee</app> je multimediální přehrávač, který umí přehrávat hudbu, videa a další média a navíc je synchronizovat s přenosnými zařízeními, abyste je měli k dispozici i na cestách.</p>
-
<p>Funkce <app>Banshee</app> zahrnují importování vašich médií, správu jejich metadat a přehrávání vaší hudby a videí.</p>
-
- <p><app>Banshee</app> vám také pomůže se synchronizací vaší hudby a videí s populárními přenosnými zařízeními, jako jsou digitální přenosné přehrávače a smartfony. <app>Banshee</app> podporuje populární zařízení včetně většiny přehrávačů MP3 iPod, Sandisk a Creative a telefonů se systémem Android.</p>
-
+ <p>Banshee vám také pomůže se synchronizací vaší hudby a videí s populárními přenosnými zařízeními, jako jsou digitální přenosné přehrávače a smartfony. Banshee podporuje populární zařízení včetně většiny přehrávačů MP3 iPod, Sandisk a Creative a telefonů se systémem Android.</p>
+<!--
<figure>
- <title>Okno <gui>Multimediálního přehrávače Banshee</gui></title>
- <desc><app>Multimediální přehrávač Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Rozhraní kolekce <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/cs/itunes-import.page b/help/cs/itunes-import.page
new file mode 100644
index 0000000..f61ce6c
--- /dev/null
+++ b/help/cs/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="cs">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importujte hudbu a rozdělení do kategorií ze svého multimediálního přehrávače <app>iTunes</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import vaší kolekce <app>iTunes</app></title>
+
+</page>
diff --git a/help/cs/keyboard-shortcuts.page b/help/cs/keyboard-shortcuts.page
deleted file mode 100644
index 25a1215..0000000
--- a/help/cs/keyboard-shortcuts.page
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="cs">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Klávesové zkratky</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Ovládání <app>Banshee</app> pomocí klávesových zkratek</title>
-
- <section id="playback-control">
- <title>Ovládání přehrávání</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Klávesa</gui></p></td>
- <td><p><gui>Akce</gui></p></td>
- </tr>
- <tr>
- <td><p><key>mezerník</key></p></td>
- <td><p>Přehrát nebo pozastavit aktuální skladbu</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Přehrát následující skladbu</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Přehrát předchozí skladbu</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Práce s kolekcí</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Klávesa</gui></p></td>
- <td><p><gui>Akce</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Přenést zaměření na vyhledávací pole</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Otevřít dialogové okno importu médií</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Seznamy skladeb</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Klávesa</gui></p></td>
- <td><p><gui>Akce</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Vytvořit nový seznam skladeb</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasty</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Klávesa</gui></p></td>
- <td><p><gui>Akce</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Označit vybraný díl jako starý</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Rozhraní</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Klávesa</gui></p></td>
- <td><p><gui>Akce</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Přepnout režim celé obrazovky</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Vybrat všechny skladby zobrazené v seznamu skladeb</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Zrušit výběr všech skladeb zobrazených v seznamu skladeb</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Skrýt okno <app>Banshee</app> (vyžaduje aktivovaný zásuvný modul Ikona oznamovací oblasti)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Levé tlačítko myši</key></keyseq>
- </p></td>
- <td><p>Přehrát předchozí skladbu (vyžaduje aktivovaný zásuvný modul Ikona oznamovací oblasti)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Pravé tlačítko myši</key></keyseq>
- </p></td>
- <td><p>Přehrát následující skladbu (vyžaduje aktivovaný zásuvný modul Ikona oznamovací oblasti)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Prostřední tlačítko myši</key></keyseq>
- </p></td>
- <td><p>Přepnout přehrávání/pozastavení (vyžaduje aktivovaný zásuvný modul Ikona oznamovací oblasti)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/cs/keyboardshortcuts.page b/help/cs/keyboardshortcuts.page
new file mode 100644
index 0000000..50484c3
--- /dev/null
+++ b/help/cs/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="cs">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Klávesové zkratky</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Ovládání Banshee pomocí klávesových zkratek</title>
+
+ <section id="playbackcontrol">
+
+ <title>Ovládání přehrávání</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Klávesa</gui></p></td> <td><p><gui>Akce</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Mezerník</p></td> <td><p>Přehrát nebo pozastavit aktuální skladbu</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Přehrát následující skladbu</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Přehrát předchozí skladbu</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Práce s kolekcí</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Klávesa</gui></p></td> <td><p><gui>Akce</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>Přenést zaměření na vyhledávací pole</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Otevřít dialogové okno importu médií</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Seznamy skladeb</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Klávesa</gui></p></td> <td><p><gui>Akce</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>Vytvořit nový seznam skladeb</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasty</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Klávesa</gui></p></td> <td><p><gui>Akce</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Označit vybraný díl jako starý</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Rozhraní</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Klávesa</gui></p></td> <td><p><gui>Akce</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Přepnout režim celé obrazovky</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>Vybrat všechny skladby zobrazené v seznamu skladeb</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>Zrušit výběr všech skladeb zobrazených v seznamu skladeb</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>Skrýt okno Banshee (vyžaduje aktivovaný zásuvný modul Ikona oznamovací oblasti)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Levé tlačítko myši</key></keyseq>
+ </p></td> <td><p>Přehrát předchozí skladbu (vyžaduje aktivovaný zásuvný modul Ikona oznamovací oblasti)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Pravé tlačítko myši</key></keyseq>
+ </p></td> <td><p>Přehrát následující skladbu (vyžaduje aktivovaný zásuvný modul Ikona oznamovací oblasti)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Prostřední tlačítko myši</key></keyseq>
+ </p></td> <td><p>Přepnout přehrávání/pozastavení (vyžaduje aktivovaný zásuvný modul Ikona oznamovací oblasti)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/cs/lastfm.page b/help/cs/lastfm.page
index 6bd6fd9..15e0a32 100644
--- a/help/cs/lastfm.page
+++ b/help/cs/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="cs">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Zapněte Last.fm, oznamování skladeb a rádio Last.fm.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,46 +19,67 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>Last.fm je populární on-line služba, která nabízí placenou i neplacenou verzi. Last.fm nabízí informace o zpěvácích a albech a když si vytvoříte uživatelský profil, umožní vám Last.fm zdarma evidovat hudbu, kterou posloucháte v <app>Banshee</app>. Pokud se zaregistrujete jako platící člen, můžete poslouchat i proudové vysílání hudby v různých klientech, včetně <app>Banshee</app>. Last.fm nabízí proudové vysílání více kanálů, včetně hudby doporučené pro vás na základě toho, co obvykl [...]
-
+ <title>Last.fm</title>
+
+ <p>Last.fm je populární on-line služba, která nabízí placenou i neplacenou verzi. Last.fm nabízí informace o zpěvácích a albech a když si vytvoříte uživatelský profil, umožní vám Last.fm sledovat hudbu, kterou posloucháte v Banshee zdarma. Pokud se zaregistrujete jako platící člen, můžete poslouchat i proudové vysílání hudby v různých klientech, včetně Banshee. Last.fm nabízí proudové vysílání více kanálů, včetně hudby doporučené pro vás na základě toho, co obvykle posloucháte, vašich [...]
+
<section id="enable-lastfm">
- <title>Zapnutí Last.fm</title>
-
- <p>Chcete-li získat z Last.fm co nejvíce, měli byste si založit profil Last.fm. Pro vytvoření profilu navštivte <link href="http://www.last.fm/join">http://www.last.fm/join</link> nebo zvolte <guiseq><gui style="menu">Upravit</gui> <gui style="menuitem">Předvolby</gui></guiseq> v nabíce <app>Banshee</app>. Zmáčkněte kartu <gui style="tab">Dané zdrojem</gui>, zmáčkněte rozbalovací nabídku <gui style="menu">Zdroj</gui>, ve které zvolte <gui style="menuitem">Last.fm</gui>, a vyberte odkaz [...]
-
- <p>Abyste povolili oznamování skladeb, které si ve svém počítači přehráváte, službě Last.fm, musíte se v <app>Banshee</app> k Last.fm přihlásit v předvolbách <gui style="tab">Dané zdrojem</gui>. Zadejte své uživatelské jméno a zmáčkněte tlačítko <gui style="button">Přihlásit k Last.fm</gui>. Budete ve svém prohlížeči nasměrování na webovou stránku Last.fm, abyste mohli přehrávači Banshee udělit přístup. Zmáčkněte odkaz <gui style="button">Ano, přidělit přístup</gui> a budete přesměrová [...]
-
+ <title>Zapnutí Last.fm</title>
+ <p>Chcete-li získat z Last.fm co nejvíce, měli byste si založit profil Last.fm. Pro vytvoření profilu navštivte <link href="http://www.last.fm/join">http://www.last.fm/join</link> nebo zvolte <guiseq><gui>Upravit</gui><gui>Předvolby</gui></guiseq> v nabíce Banshee. Zmáčkněte kartu <gui>Dané zdrojem</gui>, zmáčkněte rozbalovací nabídku <gui>Zdroj</gui>, ve které zvolte <gui>Last.fm</gui>, a vyberte odkaz <em>Zaregistrovat se na Last.fm</em>.</p>
+
+ <p>Abyste povolili oznamování skladeb, které si ve svém počítači přehráváte, službě Last.fm, musíte se v Banshee k Last.fm přihlásit v předvolbách <gui>Dané zdrojem</gui>. Zadejte své uživatelské jméno a zmáčkněte tlačítko <gui>Přihlásit k Last.fm</gui>. Budete ve svém prohlížeči nasměrování na webovou stránku Last.fm, abyste mohli přehrávači Banshee udělit přístup. Zmáčkněte odkaz <gui>Ano, přidělit přístup</gui> a budete přesměrováni na webovou stránku, která zobrazí zprávu, že Bansh [...]
+
</section>
-
- <section id="song-reporting">
- <title>Povolení oznamování skladeb Last.fm z <app>Banshee</app></title>
-
- <p>Když máte přehrávač <app>Banshee</app> úspěšně propojený s profilem Last.fm, ujistěte se, že jste v <app>Banshee</app> povolili oznamování svých skladeb. Pro oznamování skladeb do svého profilu Last.fm přejděte v předvolbách na kartu <gui style="tab">Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui style="menuitem">Last.fm</gui> a zaškrtněte políčko <gui style="checkbox">Povolit oznamování skladeb</gui>. V případě, že máte funkční internetové připojení, bude od teď přehrávač [...]
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Povolení oznamování skladeb Last.fm z vašeho zařízení</title>
-
- <p>Po úspěšném propojení <app>Banshee</app> s vaším profilem na Last.fm a po povolení <app>Banshee</app> oznamovat skladby na Last.fm, můžete povolit také sdílení seznamů skladeb (scrobbling) z připojených zařízení. Po připojení vašeho zařízení se <app>Banshee</app> pokusí zjistit, které skladby jste přehrávali od posledního připojení zařízení, a odešle je na Last.fm.</p>
-
- <p>Jestli chcete sdílení seznamů skladeb z připojených zařízení zapnout, jděte do předvoleb <app>Banshee</app>, vyberte <gui style="tab">Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui style="menuitem">Last.fm</gui> a zaškrtněte políčko <gui style="checkbox">Povolit oznamování skladeb ze zařízení</gui>. Pokud máte funkční internetové připojení, bude se <app>Banshee</app> po připojení vašeho zařízení pokoušet sesbírat informace týkající se skladeb, které jste přehrávali od doby, [...]
-
- <p>Současně s pravidelným zasíláním seznamů skladem z <app>Banshee</app> na Last.fm se budou aktualizovat vaše hudbení metadata a to v situaci, kdy je údaj o umělci, názvu nebo albu uveden nesprávně (ačkoliv místo této funkce vám doporučujeme používat rozšíření Opravář metadat, které opravuje vaše soubory).</p>
-
- <p>Vezměte prosím na vědomí, že v současnosti <app>Banshee</app> podporuje tuto funkci jen u produktů společnosti Apple, které jsou podporovány rozšířením AppleDevice.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Poslech rádia Last.fm</title>
-
+ <title>Poslech rádia Last.fm</title>
<p>Rádio Last.fm je zdarma pro obyvatele Spojených států, Velké Británie a Německa. Obyvatelé ostatních zemí si musí zaplatit prémiový účet, aby mohli rádio poslouchat. Prémiový členové ve všech zemích získají také přístup k prémiovým funkcím: poslech seznamů skladeb a stanic hudby, kterou mají rádi nebo si ji označili.</p>
-
- <p>V panelu zdrojů na levé straně budete mít oddíl Last.fm zahrnující vaše rádiové stanice Last.fm. Abyste mohli rádio Last.fm poslouchat, potřebujete aktivní internetové připojení. Zvolte rádiovou stanici, kterou si přejete poslouchat a přehrávač <app>Banshee</app> bude komunikovat se službou Last.fm, aby šířil skladby příslušné rádiové stanice. Pro spuštění proudového vysílání zmáčkněte tlačítko <gui style="button">Přehrát aktuální položku</gui> nebo klávesu <key>mezerník</key>. Může [...]
-
+
+ <p>V panelu zdrojů na levé straně budete mít oddíl Last.fm zahrnující vaše rádiové stanice Last.fm. Abyste mohli rádio Last.fm poslouchat, potřebujete aktivní internetové připojení. Zvolte rádiovou stanici, kterou si přejete poslouchat a přehrávač Banshee bude komunikovat se službou Last.fm, aby šířil skladby příslušné rádiové stanice. Pro spuštění proudového vysílání zmáčkněte tlačítko <gui>Přehrát aktuální položku</gui> nebo klávesu <key>mezerník</key>. Můžete také zmáčknout tlačítko [...]
+
</section>
-
+
</page>
diff --git a/help/cs/manage-coverart.page b/help/cs/manage-coverart.page
new file mode 100644
index 0000000..47b7a28
--- /dev/null
+++ b/help/cs/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="cs">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Spravujte a měňte přebaly svých alb.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Přebal</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/cs/manage-playlists.page b/help/cs/manage-playlists.page
index 9abc12f..2b75163 100644
--- a/help/cs/manage-playlists.page
+++ b/help/cs/manage-playlists.page
@@ -1,102 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="cs">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="cs">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Vytvářejte a spravujte seznamy skladeb.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Seznamy skladeb</title>
-
+ <title>Seznamy skladeb</title>
+
<p>Pomocí seznamů skladeb můžete vytvářet a ukládat seznamy hudebních stop, které se mají přehrát v zadaném pořadí. Seznamy skladeb jsou vhodné k vytváření seznamů vašich oblíbených skladeb nebo k rozdělení vaší kolekce do menších seznamů kvůli snazšímu procházení. Některé přenosné přehrávače dokonce umožňují načíst seznamy skladeb, takže si je můžete brát na cesty.</p>
-
- <p>Přehrávač <app>Banshee</app> podporuje normální seznamy skladeb, které obsahují skladby, které jste do seznamu přidali a chytré seznamy skladeb. Chytré seznamy skladeb se generují automaticky na základě toho, co posloucháte, na základě vaší oblíbené hudby a dalších věcech.</p>
-
+
+ <p>Přehrávač Banshee podporuje normální seznamy skladeb, které obsahují skladby, které jste do seznamu přidali a chytré seznamy skladeb. Chytré seznamy skladeb se generují automaticky na základě toho, co posloucháte, na základě vaší oblíbené hudby a dalších věcech.</p>
+
<section id="manual">
+
<title>Normální seznamy skladeb</title>
-
- <p>Normální seznam skladeb je seznam, do kterého můžete přidávat skladby a provádět jejich správu. Můžete chtít vytvořit svůj vlastní seznam skladeb svého oblíbeného umělce z více alb, ze svých posledních oblíbených skladeb nebo z motivačních skladeb pro poslech při cvičení.</p>
-
- <p>Nový seznam skladeb vytvoříte zmáčknutím <keyseq><key>Control</key><key>N</key></keyseq>, volbou <guiseq><gui style="menu">Média</gui> <gui style="menuitem">Nový seznam skladeb</gui></guiseq> z nabídky nebo výběrem stopy či stop, které byste chtěli přidat. Vyberte stopu či stopy, klikněte na ně pravým tlačítkem a zvolte <guiseq><gui style="menuitem">Přidat do seznamu skladeb</gui> <gui style="menuitem">Nový seznam skladeb</gui></guiseq>. Můžete je také táhnout a pustit do nového sez [...]
-
- <p>Jestli chcete svému seznamu skladeb přidělit vlastní název, vyberte seznam skladeb, klikněte na něj pravým tlačítkem, zmáčkněte <gui style="menuitem">Přejmenovat</gui> a zadejte pro seznam název.</p>
-
- <p>Pořadí seznamu skladeb můžete měnit přetahováním skladeb na nové pozice v seznamu. Skladby je možné přeuspořádávat, jen když seznam skladeb není seřazen podle žádného sloupce. Pokud potřebujete řazení podle sloupce zrušit, klikejte na jeho záhlaví dokud nezmizí šipka nahoru a dolů a seznam skladeb nezmění pořadí.</p>
-
- <p>Pokud chcete stopu ze seznamu skladeb odstranit, vyberte ji (nebo i více stop). Zmáčkněte <key>Delete</key> nebo v nabídce zvolte <guiseq><gui style="menu">Upravit</gui><gui style="menuitem">Odstranit ze seznamu skladeb</gui></guiseq> a nebo klikněte na stopu(y) pravým tlačítkem myši a vyberte <gui style="menuitem">Odstranit ze seznamu skladeb</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
+
+ <p>Normální seznam skladeb je seznam, do kterého můžete přidávat skladby a provádět jejich správu. Můžete chtít vytvořit svůj vlastní seznam skladeb svého oblíbeného umělce z více alb, ze svých posledních oblíbených skladeb nebo z motivačních skladeb pro poslech při cvičení.</p>
+
+ <p>Nový seznam skladeb vytvoříte zmáčknutím <keyseq><key>Control</key><key>N</key></keyseq>, volbou <guiseq><gui>Média</gui><gui>Nový seznam skladeb</gui></guiseq> z nabídky nebo výběrem stopy či stop, které byste chtěli přidat. Vyberte stopu či stopy, klikněte na ně pravým tlačítkem a zvolte <guiseq><gui>Přidat do seznamu skladeb</gui><gui>Nový seznam skladeb</gui></guiseq>. Můžete je také táhnout a pustit do nového seznamu tak, že je vyberete a táhnete do panelu v levé části na zdr [...]
+
+ <p>Jestli chcete svému seznamu skladeb přidělit vlastní název, vyberte seznam skladeb, klikněte na něj pravým tlačítkem, zmáčkněte <gui>Přejmenovat</gui> a zadejte pro seznam název.</p>
+
+ <p>Pořadí seznamu skladeb můžete měnit přetahováním skladeb na nové pozice v seznamu. Skladby je možné přeuspořádávat, jen když seznam skladeb není seřazen podle žádného sloupce. Pokud potřebujete řazení podle sloupce zrušit, klikejte na jeho záhlaví dokud nezmizí šipka nahoru a dolů a seznam skladeb nezmění pořadí.</p>
+
+ <p>Pokud chcete stopu ze seznamu skladeb odstranit, vyberte ji (nebo i více stop). Zmáčkněte <key>Delete</key> nebo v nabídce zvolte <guiseq><gui>Upravit</gui><gui>Odstranit ze seznamu skladeb</gui></guiseq> a nebo klikněte na stopu(y) pravým tlačítkem myši a vyberte <gui>Odstranit ze seznamu skladeb</gui>.</p>
+ </section>
+
+ <section id="smartplaylists">
<title>Chytré seznamy skladeb</title>
-
- <p>Chytré seznamy skladeb vám dovolují rychle generovat dynamické seznamy skladeb založené na několika přednastavených proměnných. Můžete rychle vytvořit seznam skladeb založený na určitém umělci, oblíbených skladbách a dalším.</p>
-
- <p>Když chcete vytvořit nový chytrý seznam skladeb, zvolte z nabídky <guiseq><gui style="menu">Média</gui> <gui style="menuitem">Nový chytrý seznam skladeb</gui></guiseq>. Zobrazí se vám dialogové okno na vytvoření chytrého seznamu skladeb. Zadejte název svého seznamu a zvolte kritéria, na kterých má být seznam skladeb založen. Můžete volit z polí, které jsou součástí metadat skladby, jako je album, umělec nebo rok. Po zvolení kritéria zvolte jednu z následujících podmínek:</p>
-
+
+ <p>Chytré seznamy skladeb vám dovolují rychle generovat dynamické seznamy skladeb založené na několika přednastavených proměnných. Můžete rychle vytvořit seznam skladeb založený na určitém umělci, oblíbených skladbách a dalším.</p>
+
+ <p>Když chcete vytvořit nový chytrý seznam skladeb, zvolte z nabídky <guiseq><gui>Média</gui><gui>Nový chytrý seznam skladeb</gui></guiseq>. Zobrazí se vám dialogové okno na vytvoření chytrého seznamu skladeb. Zadejte název svého seznamu a zvolte kritéria, na kterých má být seznam skladeb založen. Můžete volit z polí, které jsou součástí metadat skladby, jako je album, umělec nebo rok. Po zvolení kritéria zvolte jednu z následujících podmínek:</p>
+
<list>
<item><p>je</p></item>
- <item><p>není</p></item>
+ <item><p>není</p></item>
<item><p>méně než</p></item>
- <item><p>více než</p></item>
+ <item><p>více než</p></item>
<item><p>nejvíce</p></item>
- <item><p>nejméně</p></item>
+ <item><p>nejméně</p></item>
</list>
-
- <p>Můžete také zmáčknout tlačítko <gui style="button">+</gui>, kterým přidáte do chytrého seznamu skladeb další dotaz. Například byste mohli vytvořit chytrý seznam skladeb, který bude obsahovat všechny skladby z roku 2010 a ohodnocené 5 hvězdičkami. Takovýto seznam skladeb vytvoříte navolením:</p>
-
+
+ <p>Můžete také zmáčknout tlačítko <gui>+</gui>, kterým přidáte do chytrého seznamu skladeb další dotaz. Například byste mohli vytvořit chytrý seznam skladeb, který bude obsahovat všechny skladby z roku 2010 a ohodnocené 5 hvězdičkami. Takovýto seznam skladeb vytvoříte navolením:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Rok</gui></p></td>
- <td><p><gui>je</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Rok</gui></p></td> <td><p><gui>je</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Hodnocení</gui></p></td>
- <td><p><gui>je</gui></p></td>
- <td><p>5 hvězdiček</p></td>
+ <td><p><gui>Hodnocení</gui></p></td> <td><p><gui>je</gui></p></td>
+ <td><p><gui/>5 hvězdiček</p></td>
</tr>
</table>
-
- <p>Volitelně můžete vybrat, jako moc skladeb má seznam obsahovat. Zaškrtněte políčko <gui style="checkbox">Omezit na</gui> a zvolte počet skladeb, které se mají zahrnout.</p>
-
- <p>Přehrávač <app>Banshee</app> pro vás již má připravené některé chytré seznamy skladeb. Zmáčknutím tlačítka <gui style="button">Otevřít v editoru</gui> si můžete prohlédnout pravidla, na kterých je seznam skladeb postaven, nebo je i upravit. Když zmáčknete <gui style="button">Vytvořit a uložit</gui>, bude pro vás seznam skladeb automaticky vygenerován a uložen. Předpřipravené jsou tyto seznamy skladeb:</p>
-
+
+ <p>Volitelně můžete vybrat, jako moc skladeb má seznam obsahovat. Zaškrtněte políčko <gui>Omezit na</gui> a zvolte počet skladeb, které se mají zahrnout.</p>
+
+ <p>Přehrávač Banshee pro vás již má připravené některé chytré seznamy skladeb. Zmáčknutím tlačítka <gui>Otevřít v editoru</gui> si můžete prohlédnout pravidla, na kterých je seznam skladeb postaven, nebo je i upravit. Když zmáčknete <gui>Vytvořit a uložit</gui>, bude pro vás seznam skladeb automaticky vygenerován a uložen. Předpřipravené jsou tyto seznamy skladeb:</p>
+
<list>
- <title>Chytré seznamy skladeb <app>Banshee</app></title>
- <item>
- <p>Oblíbené (skladby hodnocené čtyřmi a pěti hvězdičkami)</p>
- </item>
- <item>
- <p>Nedávno oblíbené (skladby často poslouchané během minulého týdne)</p>
- </item>
- <item>
- <p>Nedávno přidané (skladby importované během minulého týdne)</p>
- </item>
- <item>
- <p>Neposlouchané (skladby, které nebyly přehrány nebo byly přeskočeny)</p>
- </item>
- <item>
- <p>Opomenuté oblíbené (skladby, které nebyly přehrané za poslední dva měsíce)</p>
- </item>
- <item>
- <p>700 MB oblíbených (oblíbené skladby stojící za jedno CD)</p>
- </item>
- <item>
- <p>80 minut oblíbených (oblíbené skladby stojící za jedno CD)</p>
- </item>
- <item>
- <p>Nehodnocené (skladby, které nebyly hodnoceny)</p>
- </item>
+ <title>Chytré seznamy skladeb Banshee</title>
+ <item><p>Oblíbené (skladby hodnocené čtyřmi a pěti hvězdičkami)</p></item>
+ <item><p>Nedávno oblíbené (skladby často poslouchané během minulého týdne)</p></item>
+ <item><p>Nedávno přidané (skladby importované během minulého týdne)</p></item>
+ <item><p>Neposlouchané (skladby, které nebyly přehrány nebo byly přeskočeny)</p></item>
+ <item><p>Opomenuté oblíbené (skladby, které nebyly přehrané za poslední dva měsíce)</p></item>
+ <item><p>700 MB oblíbených (oblíbené skladby stojící za jedno CD)</p></item>
+ <item><p>80 minut oblíbených (oblíbené skladby stojící za jedno CD)</p></item>
+ <item><p>Nehodnocené (skladby, které nebyly hodnoceny)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/cs/manage-tags.page b/help/cs/manage-tags.page
index d80f579..2016cda 100644
--- a/help/cs/manage-tags.page
+++ b/help/cs/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="cs">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="cs">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Upravujte a měňte hudební štítky a metadata.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,34 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Hudební metadata</title>
- <p>Hudba v digitální podobě obsahuje metadata, která uchovávají v souboru informace jako je umělec, album, rok nahrávky, žánr a další. Většina hudby šířené po Internetu má metadata již vložena a když si hudbu importujete z CD, a metadata jsou na CD k dispozici, <app>Banshee</app> je vloží. Více informací o extrahování dat z CD a vkládání metadat podává kapitola <link xref="import"/>.</p>
-
- <p>Populárními formáty metadat pro soubory MP3 jsou ID3v1 a ID3v2 a pro soubory OGG Vorbis komentáře Vorbis.</p>
+ <section id="metadata">
- <p>Pokud máte naimportovány skladby, které metadata neobsahují, bude přehrávač <app>Banshee</app> u většiny polí v kolekci uvádět <gui>Neznámý</gui>.</p>
+ <title>Hudební metadata</title>
+
+ <p>Hudba v digitální podobě obsahuje metadata, která uchovávají v souboru informace jako je umělec, album, rok nahrávky, žánr a další. Většina hudby šířené po Internetu má metadata již vložena a když si hudbu importujete z CD, a metadata jsou na CD k dispozici, Banshee je vloží. Více informací o extrahování dat z CD a vkládání metadat podává kapitola <link xref="import"/>.</p>
+
+ <p>Populárními formáty metadat pro soubory MP3 jsou ID3v1 a ID3v2 a pro soubory OGG Vorbis komentáře Vorbis.</p>
+
+ <p>Pokud máte naimportovány skladby, které metadata neobsahují, bude přehrávač <app>Banshee</app> u většiny polí v kolekci uvádět <gui>Neznámý</gui>.</p>
+
+ </section>
- <section id="edit-metadata">
+ <section id="editmetadata">
+
<title>Úpravy vašich metadat</title>
-
- <p>Metadata můžete u svých skladeb měnit a upravovat. Vyberte skladbu či skladby, které chcete aktualizovat a zmáčkněte <key>E</key> nebo zvolte v nabídce <guiseq><gui style="menu">Upravit</gui> <gui style="menuitem">Upravit informace o stopě</gui></guiseq> a nebo použijte u souboru pravé tlačítko myši a vyberte <gui style="menuitem">Upravit informace o stopě</gui>.</p>
-
- <p>Objeví se dialogové okno, které zobrazuje metadata skladby a umožňuje vám je měnit a aktualizovat. Výchozí zobrazená pole jsou:</p>
-
- <list>
- <item><p><gui>Název stopy</gui></p></item>
- <item><p><gui>Umělec stopy</gui></p></item>
- <item><p><gui>Název alba</gui></p></item>
- <item><p><gui>Žánr</gui></p></item>
- <item><p><gui>Číslo stopy</gui></p></item>
- <item><p><gui>Číslo disku</gui></p></item>
- <item><p><gui>Rok</gui></p></item>
- </list>
-
- <p>Aktualizujte informace o skladbě. Pokud máte k úpravě vybráno více skladeb, zmáčkněte po dokončení úprav každé ze skladeb ikonu se šipkou vpravo u pole <gui>Název stopy</gui> nebo tlačítko <gui style="button">Vpřed</gui> v dolní části dialogového okna. Po dokončení úprav všech metadat zmáčkněte <gui style="button">Uložit</gui>.</p>
-
+
+ <p>Metadata můžete u svých skladeb měnit a upravovat. Vyberte skladbu či skladby, které chcete aktualizovat a zmáčkněte <key>E</key> nebo zvolte v nabídce <guiseq><gui>Upravit</gui><gui>Upravit informace o stopě</gui></guiseq> a nebo použijte u souboru pravé tlačítko myši a vyberte <gui>Upravit informace o stopě</gui>.</p>
+
+ <p>Objeví se dialogové okno, které zobrazuje metadata skladby a umožňuje vám je měnit a aktualizovat. Výchozí zobrazená pole jsou:</p>
+
+ <list>
+ <item><p><gui>Název stopy</gui></p></item>
+ <item><p><gui>Umělec stopy</gui></p></item>
+ <item><p><gui>Název alba</gui></p></item>
+ <item><p><gui>Žánr</gui></p></item>
+ <item><p><gui>Číslo stopy</gui></p></item>
+ <item><p><gui>Číslo disku</gui></p></item>
+ <item><p><gui>Rok</gui></p></item>
+ </list>
+
+ <p>Aktualizujte informace o skladbě. Pokud máte k úpravě vybráno více skladeb, zmáčkněte po dokončení úprav každé ze skladeb ikonu se šipkou vpravo u pole <gui>Název stopy</gui> nebo tlačítko <gui>Vpřed</gui> v dolní části dialogového okna. Po dokončení úprav všech metadat zmáčkněte <gui>Uložit</gui>.</p>
+
</section>
</page>
diff --git a/help/cs/play-queue.page b/help/cs/play-queue.page
index c6ca1c9..1f60b3d 100644
--- a/help/cs/play-queue.page
+++ b/help/cs/play-queue.page
@@ -1,68 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="cs">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="cs">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Přidávejte média do své <gui>Fronty přehrávání</gui>.</desc>
+ <desc>Přidávejte média do své fronty přehrávání.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Fronta přehrávání</title>
-
+ <title>Fronta přehrávání</title>
+
<p><gui>Fronta přehrávání</gui> vám umožňuje přidávat hudbu, kterou postupně chcete přehrát. Můžete si přidat hromadu stop a hodiny pak hudbu poslouchat bez přestávky. Můžete přidávat samostatné stopy nebo i celá alba a řadit je a přeuspořádávat.</p>
+
+<section id="addqueue">
- <section id="add-queue">
- <title>Přidávání hudby do <gui>Fronty přehrávání</gui></title>
-
- <p>Ve své hudební kolekci si musíte vybrat hudební stopy nebo alba, která do <gui>Fronty přehrávání</gui> chcete přidat.</p>
-
- <p>Pokud chcete přidat do <gui>Fronty přehrávání</gui> celé album, použijte svou myš. Zmáčkněte a držte album a přetáhněte jej na <gui>Frontu přehrávání</gui> v levém panelu.</p>
-
- <p>Hudební stopy můžete do <gui>Fronty přehrávání</gui> přidávat jednotlivě nebo po skupinách. Jednotlivý soubor přidáte postupem táhni a upusť do <gui>Fronty přehrávání</gui> v levém panelu okna nebo klikněte na stopu pravým tlačítkem a zvolte <gui style="menuitem">Přidat do fronty přehrávání</gui>.</p>
-
- <p>Více souborů můžete označit myší buď spolu se zmáčknutou klávesou <key>Control</key> a vybíráním jednotlivých souborů nebo zmáčknutím <key>Shift</key> a výběrem rozsahu. Výběr můžete do <gui>Fronty přehrávání</gui> přesunout postupem táhni a upusť nebo na něj kliknout pravým tlačítkem a zvolit <gui style="menuitem">Přidat do fronty přehrávání</gui>.</p>
-
- </section>
-
- <section id="reorder-queue">
- <title>Uspořádání vaší <gui>Fronty přehrávání</gui></title>
+ <title>Přidávání hudby do fronty přehrávání</title>
- <p>Vaše <gui>Fronta přehrávání</gui> je uspořádána tak, jak jste do ní stopy přidávali. Stopa nebo album, které jste přidali jako první, budou jako první přehrány. Pořadí ve <gui>Frontě přehrávání</gui> můžete měnit myší přetahování stop nebo skupin stop v seznamu. Vyberte stopu či stopy, u které chcete změnit pořadí, zmáčkněte tlačítko myši, držte jej a táhněte v seznamu na nové místo. Tam tlačítko pusťte.</p>
+ <p>Ve své hudební kolekci si musíte vybrat hudební stopy nebo alba, která do fronty přehrávání chcete přidat.</p>
+
+ <p>Pokud chcete přidat do fronty přehrávání celé album, použijte svou myš. Zmáčkněte a držte album a přetáhněte jej na <gui>Frontu přehrávání</gui> v levém panelu.</p>
+
+ <p>Hudební stopy můžete do fronty přehrávání přidávat jednotlivě nebo po skupinách. Jednotlivý soubor přidáte postupem táhni a pusť do <gui>Fronty přehrávání</gui> v levém panelu okna nebo klikněte na stopu pravým tlačítkem a zvolte <gui>Přidat do fronty přehrávání</gui>.</p>
+
+ <p>Více souborů můžete označit svojí myší buď spolu se zmáčknutou klávesou <key>Control</key> a vybíráním jednotlivých souborů nebo zmáčknutím <key>Shift</key> a výběrem rozsahu. Výběr můžete do <gui>Fronty přehrávání</gui> přesunout pomocí táhni a pusť nebo na něj kliknout pravým tlačítkem a zvolit <gui>Přidat do fronty přehrávání</gui>.</p>
+
+</section>
- </section>
+<section id="reorderqueue">
- <section id="remove-queue">
- <title>Odstraňování stop z <gui>Fronty přehrávání</gui></title>
+ <title>Uspořádání vaší fronty přehrávání</title>
- <p>Můžete odstraňovat jednotlivé stopy, skupiny stop nebo vymazat celou <gui>Frontu přehrávání</gui>.</p>
+ <p>Vaše fronta přehrávání je uspořádána tak, jak jste do ní stopy přidávali. Stopa nebo album, které jste přidali jako první, budou jako první přehrány. Pořadí ve frontě můžete měnit myší přetahování stop nebo skupin stop v seznamu. Vyberte stopu či stopy, u které chcete změnit pořadí, zmáčkněte tlačítko myši, držte jej a táhněte v seznamu na nové místo. Tam tlačítko pusťte.</p>
- <list>
- <item>
- <p>Když chcete odstranit jednotlivou stopu, vyberte ji myší a zmáčkněte <key>Delete</key>.</p>
- </item>
- <item>
- <p>Když chcete odstranit více stop, vyberte je pomocí myši za současného držní klávesy <key>Ctrl</key>. Až máte všechny požadované stopy označené, zmáčkněte <key>Delete</key>.</p>
- <note style="tip">
- <p>V případě, že omylem označíte stopu, kterou odstranit nechcete, držte zmáčknutou klávesu <key>Ctrl</key> a vyberte ji myší znovu – označení se zruší.</p>
- </note>
- </item>
- <item>
- <p>Když chcete vymazat celou <gui>Frontu přehrávání</gui>, zmáčkněte tlačítko <gui style="button">Vyprázdnit</gui> v pravém horním rohu <gui>Fronty přehrávání</gui> nebo zmáčkněte <keyseq><key>Ctrl</key><key>A</key></keyseq> a <key>Delete</key>.</p>
- </item>
- </list>
+</section>
+
+<section id="removequeue">
- </section>
+ <title>Odstraňování stop z fronty přehrávání</title>
+ <p>Můžete odstraňovat jednotlivé stopy, skupiny stop nebo vymazat celou frontu.</p>
+
+ <p>Když chcete odstranit jednotlivou stopu nebo skupinu stop, vyberte stopu myši a zmáčkněte <key>Delete</key>.</p>
+
+ <p>Když chcete vymazat celou frontu přehrávání, zmáčkněte tlačítko <gui>Vyprázdnit</gui> v pravém horním rohu fronty přehrávání.</p>
+
+</section>
+
</page>
diff --git a/help/cs/play.page b/help/cs/play.page
index f1518b8..9aef0a0 100644
--- a/help/cs/play.page
+++ b/help/cs/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Přehrávejte svá videa a hudební soubory.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,79 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Přehrávání vašich médií</title>
- <section id="play-music">
- <title>Přehrávání vaší hudby</title>
-
- <p>Když si chcete v <app>Banshee</app> přehrát hudbu, zvolte zdroj Hudba. Hudební knihovna vám zobrazí všechny umělce ve vaší hudební kolekci, přebaly pro každé z alb a seznam skladeb ve vaší kolekci.</p>
-
- <p>Vyberte album nebo skladbu, které si přejete přehrát, ze seznamu umělců, alb nebo použijte vyhledávací pole v pravém horním rohu <app>Banshee</app>.</p>
-
- <p>K započetí přehrávání skladby použijte dvojité kliknutí myší na název skladby nebo zmáčkněte <key>mezerník</key> a nebo zvolte <guiseq><gui style="menu">Přehrát</gui> <gui style="menuitem">Přehrát</gui></guiseq> z nabídky <app>Banshee</app>.</p>
-
- <p>Můžete spustit i přehrávání alba výběrem alba v prohlížeči alba a dvojitým kliknutím na název skladby, zmáčknutím <key>mezerníku</key> nebo volbou <guiseq><gui style="menu">Přehrát</gui> <gui style="menuitem">Přehrát</gui></guiseq> z nabídky <app>Banshee</app>.</p>
-
- <p>Pro přehrání všech skladeb od jednoho umělce zvolte umělce v prohlížeči umělců a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui style="menu">Přehrát</gui> <gui style="menuitem">Přehrát</gui></guiseq> z nabídky <app>Banshee</app>.</p>
-
- <p>Přehrávač <app>Banshee</app> také zobrazuje vaše oblíbená alba (to jsou ta, která nejčastěji přehráváte), nedávno oblíbenou, nedávno přidanou a neposlouchanou hudbu. Jedno z toho si zvolte k poslechu a můžete přehrávat jednotlivé skladby.</p>
-
- <p><app>Banshee</app> můžete používat k přehrávání hudby v náhodném pořadí pomocí režimu <gui style="menuitem">Náhodné pořadí</gui>. Zapnete jej výběrem <guiseq><gui style="menu">Přehrát</gui> <gui style="menuitem">Náhodné pořadí</gui></guiseq> a následně volbou typu náhodného pořadí.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">Podle skladby</gui></title>
- <p>Přehraje stopy v náhodném pořadí.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Podle umělce</gui></title>
- <p>Přehraje stopy tak, aby se neopakovali umělci.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Podle alba</gui></title>
- <p>Přehraje stopy tak, aby se neopakovaly ze stejných alb.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Podle hodnocení</gui></title>
- <p>Přehraje stopy tak, aby se lépe hodnocené vyskytovaly častěji než nehodnocené.</p>
- <note style="info">
- <p>Pokud nejsou žádné hodnocené stopy k dispozici, budou se stopy přehrávat v náhodném pořadí.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">Podle bodování</gui></title>
- <p>Stopy, které jsou přehrávány často, jsou ohodnoceny více body a tím častěji přehrávány.</p>
- </item>
- </terms>
-
+ <section id="playmusic">
+ <title>Přehrávání vaší hudby</title>
+
+ <p>Když si chcete v Banshee přehrát hudbu, zvolte zdroj Hudba. Hudební knihovna vám zobrazí všechny umělce ve vaší hudební kolekci, přebaly pro každé z alb a seznam skladeb ve vaší kolekci.</p>
+
+ <p>Vyberte album nebo skladbu, které si přejete přehrát, ze seznamu umělců, alb nebo použijte vyhledávací pole v pravém horním rohu Banshee.</p>
+
+ <p>K započetí přehrávání skladby použijte dvojité kliknutí myší na název skladby nebo zmáčkněte <key>mezerník</key> a nebo zvolte <guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee.</p>
+
+ <p>Můžete spustit i přehrávání alba výběrem alba v prohlížeči alba a dvojitým kliknutím na název skladby, zmáčknutím <key>mezerníku</key> nebo volbou <guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee.</p>
+
+ <p>Pro přehrání všech skladeb od jednoho umělce zvolte umělce v prohlížeči umělců a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee.</p>
+
+ <p>Přehrávač Banshee také zobrazuje vaše oblíbená alba (to jsou ta, které nejčastěji přehráváte), nedávno oblíbenou, nedávno přidanou a neposlouchanou hudbu. Jedno z toho si zvolte k poslechu a můžete přehrávat jednotlivé skladby.</p>
+
</section>
- <section id="play-video">
- <title>Přehrávání videa</title>
-
- <p>Videa, která jste naimportovali, jsou seřazená abecedně. Když chcete video přehrávat, vyberte jej v seznamu a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui style="menu">Přehrát</gui> <gui style="menuitem">Přehrát</gui></guiseq> z nabídky <app>Banshee</app>.</p>
-
- <p>Přehrávač <app>Banshee</app> také zobrazuje vaše oblíbená videa (to jsou ta, která sledujete nejčastěji) a nezhlédnutá videa. Jedno z toho si zvolte a můžete si přehrávat videa ze seznamu.</p>
-
+ <section id="playvideo">
+ <title>Přehrávání videa</title>
+
+ <p>Videa, která jste naimportovali, jsou seřazená abecedně. Když chcete video přehrávat, vyberte jej v seznamu a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee.</p>
+
+ <p>Přehrávač Banshee také zobrazuje vaše oblíbená videa (to jsou ta, která sledujete nejčastěji) a nezhlédnutá videa. Jedno z toho si zvolte a můžete si přehrávat videa ze seznamu.</p>
+
</section>
-
- <section id="play-podcast">
- <title>Přehrávání podcastu</title>
-
+
+ <section id="playpodcast">
+ <title>Přehrávání podcastu</title>
+
<p>Zdroj Podcasty vám zobrazuje všechny podcasty, které odebíráte, všechny podcasty, které jsou dostupné, a prohlížeč podcastů vypisuje všechny podcasty v pořadí od nejnovějšího.</p>
-
- <p>Když chcete poslouchat podcast, vyberte jej v seznamu a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui style="menu">Přehrát</gui><gui style="menuitem">Přehrát</gui></guiseq> z nabídky <app>Banshee</app>.</p>
-
+
+ <p>Když chcete poslouchat podcast, vyberte jej v seznamu a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee.</p>
+
</section>
-
- <section id="play-radio">
- <title>Přehrávání stanice internetového rádia</title>
-
- <p>Zdroj Rádio vám zobrazuje abecedně všechny Internetové rádiové stanice, které máte do přehrávače <app>Banshee</app> přidány.</p>
-
- <p>Když chcete Internetovou rádiovou stanici poslouchat, vyberte ji v seznamu a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui style="menu">Přehrát</gui> <gui style="menuitem">Přehrát</gui></guiseq> z nabídky <app>Banshee</app>.</p>
-
- </section>
-
+
+ <section id="playradio">
+ <title>Přehrávání stanice internetového rádia</title>
+
+ <p>Zdroj Rádio vám zobrazuje abecedně všechny Internetové rádiové stanice, které máte do přehrávače Banshee přidány.</p>
+
+ <p>Když chcete Internetovou rádiovou stanici poslouchat, vyberte ji v seznamu a zmáčkněte <key>mezerník</key> nebo zvolte <guiseq><gui>Přehrát</gui><gui>Přehrát</gui></guiseq> z nabídky Banshee.</p>
+
+ </section>
+
</page>
diff --git a/help/cs/podcast.page b/help/cs/podcast.page
deleted file mode 100644
index 835da55..0000000
--- a/help/cs/podcast.page
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="cs">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Přidávejte, odebírejte a přehrávejte podcasty v <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasty</title>
-
- <section id="podcast-description">
- <title>Co je to podcast</title>
-
- <p>Podcast je zaznamenaný program, podobně jako program rádia, který je dostupný na Internetu a vy jej můžete odebírat. Když jste v přehrávači <app>Banshee</app> přihlášeni k odběru nějakého podcastu, tak pokaždé když je vydán nový program, <app>Banshee</app> jej automaticky stáhne a nabídne vám jej k poslechu.</p>
-
- <p>Existují podcasty s téměř jakýmkoliv tématem, včetně hudby, filmů, Linuxu a dalších věcí. Hledejte na Internetu svým oblíbeným vyhledávačem. K hledání použijte výraz typu „film podcast“ (respektive anglicky „movie podcast“, protože nabídka podcastů v angličtině je daleko větší) a můžete si vybírat.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Přidávání podcastů</title>
-
- <p>Když chcete do přehrávače <app>Banshee</app> přidat podcast, musíte nejprve ve svém prohlížeči navštívit domovskou stránku onoho podcastu na Intenetu. Většina podcastů má tlačítko nebo odkaz pro přihlášení k odběru podcastu. Zkopírujte odkaz do přihlášení k podcastu. Ve většině webových prohlížečů jde kliknout pravým tlačítkem na odkaz a zvolit <gui>Kopírovat adresu odkazu</gui>.</p>
-
- <p>V <app>Banshee</app> klikněte v nabídce v na levé straně okna na <gui style="menuitem">Podcast</gui>. Pak klikněte na <gui style="menuitem">Přihlásit se k podcastu</gui> v pravé polovině nástrojové lišty nebo v nabídce vyberte <guiseq><gui style="menu">Média</gui><gui style="menuitem">Přihlásit se k podcastu</gui></guiseq> a nebo zmáčkněte klávesovou zkratku <keyseq><key>Shift</key><key>Ctrl</key><key>F</key></keyseq>.</p>
-
- <p>Podcast se standardně nestahuje, takže jej bude moci poslouchat, jen když budete připojeni k Internetu. Po přihlášení k novému podcastu si můžete nastavit následující volby:</p>
-
- <list>
- <item>
- <p>Vyberte <gui style="checkbox">Stahovat nové díly</gui>, pokud chcete, aby se nové díly automaticky stahovaly do vašeho počítače a byly tak přístupné i ve chvílích, kdy nejste připojeni k Internetu.</p>
- </item>
- <item>
- <p>Vyberte <gui style="menuitem">Archivovat všechny díly vyjma nejnovějšího</gui>, pokud chcete mít zobrazen jen nejnovější díl.</p>
- </item>
- </list>
-
- <p>Po té, co máte přidán kanál podcastu, bude <app>Banshee</app> zobrazovat název podcastu, název každého dílu a datum, kdy byl zveřejněn.</p>
-
- <p>Jakmile je podcast archivován, je odstraněn ze seznamu <gui>Nové položky</gui>, ale stále se vyskytuje v seznamu <gui>Všechny položky</gui>.</p>
-
- <note style="tip">
- <p>Volby odběru můžete upravovat ve <gui style="menuitem">Vlastnostech podcastu</gui>, do kterých se dostanete po kliknutí pravým tlačítkem na příslušný název podcastu v seznamu nebo po kliknutí pravým tlačítkem na libovolný díl z tohoto podcastu.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Přehrávání podcastu</title>
-
- <p>Díl podcastu <link xref="play">přehrajete</link> dvojitým kliknutím na něj nebo jej vyberte a pak zvolte <guiseq><gui style="menu">Přehrát</gui><gui style="menuitem">Přehrát</gui></guiseq>. Díl můžete také přidat do <gui xref="play-queue">Fronty přehrávání</gui> kliknutím pravým tlačítkem a volbou <gui style="menuitem">Přidat do fronty přehrávání</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Odebírání podcastů</title>
-
- <p>Když chcete podcast odstranit, klikněte na něj pravým tlačítkem v seznamu podcastů a vyberte <gui style="menuitem">Odhlásit a odstranit</gui>. Tím se odhlásíte od příjmu aktualizací podcastu a z vaší kolekce budou smazány všechny díly daného podcastu.</p>
-
- </section>
-
-</page>
diff --git a/help/cs/radio.page b/help/cs/radio.page
deleted file mode 100644
index da2a52c..0000000
--- a/help/cs/radio.page
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="cs">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Přidávejte, odebírejte a přehrávejte stanice Internetových rádií v <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internetové rádio</title>
-
- <section id="radio-description">
- <title>Co je to Internetové rádio?</title>
-
- <p>Internetová rádiová stanice je podobná běžné rádiové stanici, umožňuje poslouchat individuální nebo společné proudové vysílání hudby živě přes Internet. Internetová rádiová stanice může být proud vysílání souběžný ke klasické rádiové stanici, amatérské hromadné vysílání něčí vlastní stanice nebo komerční Internetová rádiová stanice včetně živých diskžokejů a také reklam.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Přidávání rádiové stanice</title>
-
- <p>Pomocí svého oblíbeného vyhledávače si najděte stanici internetového rádia. Můžete hledat podle žánru, frekvencí kanálu, názvu stanice a další věcí, abyste našli nejpřesněji, co chcete. Řada rádiových stanic zveřejňuje na svém webu tlačítko nebo odkaz pro poslech jejich vysílání. Ve většině webových prohížečů pak na odkaz stačí kliknout pravým tlačítkem a zvolit <gui style="menuitem">Kopírovat adresu odkazu</gui>.</p>
-
- <steps>
- <title>Když chcete do <app>Banshee</app> přidat rádiovou stanici:</title>
- <item>
- <p>V nabídce v levé části svého okna vyberte <gui>Rádio</gui> a pak klikněte na <gui style="menuitem">Přidat stanici</gui> v pravém horním rohu <app>Banshee</app>. Nebo můžete v nabídce zvolit <guiseq><gui style="menu">Média</gui> <gui style="menuitem">Přidat stanici</gui></guiseq>.</p>
- </item>
- <item>
- <p>Budete muset uvést některé další údaje o rádiové stanici, kterou si přejete přidat. První tři pole jsou povinná:</p>
- <list>
- <item>
- <p>Do textového pole <gui style="menuitem">Žánr stanice</gui> zadejte popis typu hudby, kterou stanice internetového rádia hraje, aby se vytvořil správný štítek. Případně můžete vybírat ze štítků v rozbalovací nabídce.</p>
- </item>
- <item>
- <p>Do textového pole <gui style="input">Název stanice</gui> zadejte název radiostanice.</p>
- </item>
- <item>
- <p>Do pole <gui style="input">Adresa URL vysílání</gui> napiště adresu URL vysílání, případně ji můžete vložit ze schránky kliknutím pravým tlačítkem a volbou <gui style="menuitem">Vložit</gui> nebo zmáčknutím <keyseq><key>Ctrl</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>Volitelně můžete také vyplnit pole <gui style="input">Tvůrce stanice</gui>, <gui style="input">Popis</gui> a <gui style="input">Hodnocení</gui>.</p>
- </item>
- <item>
- <p>Nakonec zmáčkněte <gui style="button">Uložit</gui> a tím se internetová rádiová stanice do Banshee uloží.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Přehrávání rádiové stanice</title>
-
- <p><link xref="play">Přehrávání</link> rádiové stanice spustíte dvojitým kliknutím na ni. Další možností je na ni kliknout pravým tlačítkem a vybrat <gui style="menuitem">Přehrát</gui> nebo ji vybrat a zvolit <guiseq><gui style="menu">Přehrát</gui><gui style="menuitem">Přehrát</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>Když chcete přidat rádiovou stanici do <gui style="menuitem" xref="play-queue">Fronty přehrávání</gui>, klikněte na ni pravým tlačítkem a vyberte <gui style="menuitem">Přidat do fronty přehrávání</gui>. Přehrávat se začne, až se přehrají všechna média, která jsou ve <gui>Frontě přehrávání</gui> před přidanou stanicí.</p>
-
- <p>Můžete také na stanici kliknout pravým tlačítkem a vybrat <gui style="menuitem">Přehrát po aktuální stopě</gui>, aby se přidala hned za stopu, která je právě přehrávána.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Přehrát po aktuální stopě</gui> nemusí v některých instalacích <app>Banshee</app> fungovat.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Odebrání rádiové stanice</title>
-
- <p>Když chcete rádiovou stanici z <app>Banshee</app> odstranit, klikněte na ni pravým tlačítkem a vyberte <gui style="menuitem">Odstranit</gui>. Případně ji můžete myší vybrat a pak zmáčknout <key>Delete</key>. V obou případech budete požádáni o potvrzení, ve kterém klikněte na tlačítko <gui style="button">Odstranit</gui> a odstranění stanice se provede.</p>
-
- </section>
-
-</page>
diff --git a/help/cs/rb-import.page b/help/cs/rb-import.page
new file mode 100644
index 0000000..2190bbf
--- /dev/null
+++ b/help/cs/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="cs">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importujte hudbu a rozdělení do kategorií z multimediálního přehrávače <app>Rhythmbox</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import vaší kolekce <app>Rhythmbox</app></title>
+
+</page>
diff --git a/help/cs/search.page b/help/cs/search.page
index 8b63f56..cd663e1 100644
--- a/help/cs/search.page
+++ b/help/cs/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,76 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Prohledávání vaší kolekce <app>Banshee</app></title>
-
- <p>Součástí funkcí <app>Banshee</app> je mocný vyhledávací jazyk. Své kolekce můžete prohledávat rychle a snadno pomocí základní vyhledávacích výrazů nebo provádět podrobné hledání pomocí pokročilé vyhledávací terminologie <app>Banshee</app>.</p>
-
- <p>Když chcete ve svých médiích v přehrávači <app>Banshee</app> vyhledávat, zmáčkněte <key>S</key> nebo klikněte do pole <gui>Hledat svoji hudbu</gui> v pravém horním rohu zobrazení knihovny.</p>
-
- <p>Vyhledávací dotazy se skládají z nějakých základních výrazů, například <em>wabi daněk</em>. Zadáním <em>wabi daněk</em> do vyhledávacího pole bude <app>Banshee</app> hledat ve všech polích metadat, včetně názvu stopy, názvu alba, umělce alba, roku atd. Jakákoliv stopa, jejíž data obsahují <em>wabi</em> a <em>daněk</em>, bude vrácena jako výsledek. Vyhledávací výrazy neberou ohled na velikost písmen, takže se velikostí písmen nemusíte zabývat. <em>wabi</em>, <em>Wabi</em> i <em>WABI< [...]
-
- <section id="operators">
- <title>Základní operátory</title>
+ <title>Prohledávání vaší kolekce Banshee</title>
+
+ <p>Součástí funkcí Banshee je mocný vyhledávací jazyk. Své kolekce můžete prohledávat rychle a snadno pomocí základní vyhledávacích výrazů nebo provádět podrobné hledání pomocí pokročilé vyhledávací terminologie Banshee.</p>
+
+ <p>Když chcete ve svých médiích v přehrávači Banshee vyhledávat, zmáčkněte <key>S</key> nebo klikněte do pole <gui>Hledat svoji hudbu</gui> v pravém horním rohu zobrazení knihovny.</p>
+
+ <p>Vyhledávací dotazy se skládají z nějakých základních výrazů, například <em>wabi daněk</em>. Zadáním <em>wabi daněk</em> do vyhledávacího pole bude Banshee hledat ve všech polích metadat, včetně názvu stopy, názvu alba, umělce alba, roku atd. Jakákoliv stopa, jejíž data obsahují <em>wabi</em> a <em>daněk</em>, bude vrácena jako výsledek. Vyhledávací výrazy neberou ohled na velikost písmen, takže se velikostí písmen nemusíte zabývat. <em>wabi</em>, <em>Wabi</em> i <em>WABI</em> mají p [...]
+<section id="operators">
+ <title>Základní operátory</title>
<p>Mezi libovolná dvě hledaná slova nebo před hledané slovo lze umisťovat operátory. Výchozím operátorem je <gui>AND</gui>, který znamená „a zároveň“ a je použit jako výchozí, když mezi slovy žádný operátor zadán není. Protože je výchozí, není pro něj žádný symbol AND definován.</p>
-
+
<p>Dalšími základními operátory jsou <gui>OR</gui> a <gui>NOT</gui>. Všechny tři operátory spolu dohromady umí sestavit velmi mocné dotazy, které vám pomohou s hledáním médií.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logické operátory a příklady</title>
-
+<section id="logical">
+ <title>Logické operátory a příklady</title>
<p>Následuje seznam logických operátorů a příkladů výsledků hledání při jejich použití.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operátor</gui></p></td>
- <td><p><gui>Popis</gui></p></td>
+ <td><p><gui>Operátor</gui></p></td> <td><p><gui>Popis</gui></p></td>
</tr>
<tr>
- <td><p><em>výchozí</em>, <em>bílý znak</em></p></td>
- <td><p>Hledá dva výrazy s mezerou mezi dvěma slovy nebo výrazy.</p></td>
+ <td><p><em>výchozí</em>, <em>bílý znak</em></p></td> <td><p>Hledá dva výrazy s mezerou mezi dvěma slovy nebo výrazy.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Výsledkem hledání budou skladby s alespoň z jedním z výrazů v libovolném poli.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Výsledkem hledání budou skladby s alespoň z jedním z výrazů v libovolném poli.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Nezobrazovat výsledky hledání s libovolným výrazem, který následuje po operátoru NOT, not nebo <key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>Nezobrazovat výsledky hledání s libovolným výrazem, který následuje po operátoru NOT, not nebo <key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Příklady použití logických operátorů:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Dotaz</gui></p></td>
- <td><p><gui>Popis</gui></p></td>
+ <td><p><gui>Dotaz</gui></p></td> <td><p><gui>Popis</gui></p></td>
</tr>
<tr>
- <td><p>wabi daněk</p></td>
- <td><p>Odpovídají taková pole ve stopě, která obsahují jak <em>wabi</em>, tak <em>daněk</em>.</p></td>
+ <td><p>wabi daněk</p></td> <td><p>Odpovídají taková pole ve stopě, která obsahují jak <em>wabi</em>, tak <em>daněk</em>.</p></td>
</tr>
<tr>
- <td><p>wabi, daněk</p></td>
- <td><p>Odpovídají taková pole ve stopě, která obsahují buď <em>wabi</em> nebo <em>daněk</em> (nebo obojí).</p></td>
+ <td><p>wabi, daněk</p></td> <td><p>Odpovídají taková pole ve stopě, která obsahují buď <em>wabi</em> nebo <em>daněk</em> (nebo obojí).</p></td>
</tr>
<tr>
- <td><p>wabi or daněk</p></td>
- <td><p>Odpovídají taková pole ve stopě, která obsahují buď <em>wabi</em> nebo <em>daněk</em> (nebo obojí).</p></td>
- </tr>
+ <td><p>wabi or daněk</p></td> <td><p>Odpovídají taková pole ve stopě, která obsahují buď <em>wabi</em> nebo <em>daněk</em> (nebo obojí).</p></td>
+ </tr>
<tr>
- <td><p>wabi | daněk</p></td>
- <td><p>Odpovídají taková pole ve stopě, která obsahují buď <em>wabi</em> nebo <em>daněk</em> (nebo obojí).</p></td>
- </tr>
+ <td><p>wabi | daněk</p></td> <td><p>Odpovídají taková pole ve stopě, která obsahují buď <em>wabi</em> nebo <em>daněk</em> (nebo obojí).</p></td>
+ </tr>
<tr>
- <td><p>-"wabi daněk"</p></td>
- <td><p>Zobrazí všechny stopy, jejichž pole neobsahují <em>wabi daněk</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"wabi daněk"</p></td> <td><p>Zobrazí všechny stopy, jejichž pole neobsahují <em>wabi daněk</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Více informací o provádění komplexnějších vyhledávacích dotazů najdete na stránce <link xref="adv-search"/>.</p>
+
</section>
-
+
</page>
diff --git a/help/cs/sort.page b/help/cs/sort.page
index a7569ee..1906f4e 100644
--- a/help/cs/sort.page
+++ b/help/cs/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,19 +23,17 @@
<section id="addcolumn">
- <title>Přidávání sloupců</title>
-
+ <title>Přidávání sloupců</title>
+
<p>Jak vaše kolekce roste, můžete chtít změnit její zobrazení přidáním dalších informací o skladbách ve vaší kolekci nebo změnou způsobu, jak můžete zobrazit a seřadit své skladby, umělce a alba.</p>
-
- <p>Do zobrazení v přehrávači <app>Banshee</app> můžete přidávat další sloupce, abyste měli o skladbách více informací a mohli podle nich řadit. Jako výchozí zobrazuje <app>Banshee</app> pro skladby sloupce <gui>Název</gui>, <gui>Umělce</gui>, <gui>Album</gui> a <gui>Čas</gui>. Pokud chcete přidat další sloupce, použijte kliknutí pravým tlačítkem myši na libovolném sloupci a zobrazí se všechny dostupné sloupce, ze kterých si můžete vybírat. Klikněte na zaškrtávací políčko vedle názvu sl [...]
-
+
+ <p>Do zobrazení v přehrávači <app>Banshee</app> můžete přidávat další sloupce, abyste měli o skladbách více informací a mohli podle nich řadit. Jako výchozí sloupce pro skladby zobrazuje Banshee <gui>Název</gui>, <gui>Umělce</gui>, <gui>Album</gui> a <gui>Čas</gui>. Pokud chcete přidat další sloupce, použijte kliknutí pravým tlačítkem myši na libovolném sloupci a Banshee zobrazí všechny dostupné sloupce, ze kterých si můžete vybírat. Klikněte na zaškrtávací políčko vedle názvu sloupce, [...]
+
</section>
-
+
<section id="sorting">
<title>Řazení sloupců</title>
-
- <p>Své kolekce si můžete řadit pomocí myši tak, že kliknete na některý ze sloupců v zobrazení kolekce. Když si přejete seřadit svoji hudební kolekci podle umělce, klikněte na záhlaví sloupce <gui>Umělec</gui> a <app>Banshee</app> sloupec automaticky seřadí podle abecedy. Pokud na sloupce <gui>Umělec</gui> kliknete znovu, seřadí se abecedně v opačném pořadí.</p>
-
+ <p>Své kolekce si můžete řadit pomocí myši tak, že kliknete na některý ze sloupců v zobrazení kolekce. Když si přejete seřadit svoji hudební kolekci podle umělce, klikněte na záhlaví sloupce <gui>Umělec</gui> a Banshee sloupec automaticky seřadí podle abecedy. Pokud na sloupce <gui>Umělec</gui> kliknete znovu, seřadí se abecedně v opačném pořadí.</p>
</section>
-
+
</page>
diff --git a/help/cs/sync.page b/help/cs/sync.page
index 4b3cf67..14645d0 100644
--- a/help/cs/sync.page
+++ b/help/cs/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Synchronizujte svá média s přenosnými přehrávači a smartfony.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,79 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Synchronizace</title>
-
- <p>Přehrávač <app>Banshee</app> podporuje synchronizaci vaší hudby do přenosných multimediálních přehrávačů a smartfonů. Můžete přidávat konkrétní hudební stopy, alba nebo seznamy skladeb nebo dovolit <app>Banshee</app> udržovat váš hudební přehrávač synchronizovaný s určitou z kolekcí. Po připojení vašeho přehrávače k počítači z něj můžet v <app>Banshee</app> také skladby přehrávat. Když synchronizujete hudbu v bezeztrátovém formátu (jako je FLAC) bude <app>Banshee</app>, pokud máte n [...]
-
+ <title>Synchronizace</title>
+
+ <p>Přehrávač Banshee podporuje synchronizaci vaší hudby do přenosných multimediálních přehrávačů a smartfonů. Můžete přidávat konkrétní hudební stopy, alba nebo seznamy skladeb nebo dovolit Banshee udržovat váš hudební přehrávač synchronizovaný s určitou z kolekcí. Po připojení vašeho přehrávače k počítači můžete na něm také v Banshee přehrávat skladby. Když synchronizujete hudbu v bezeztrátovém formátu (jako je FLAC) bude Banshee, pokud máte nainstalovaný správný kodek, překódovávat v [...]
+
<section id="devices">
<title>Podpora zařízení</title>
-
- <p><app>Banshee</app> podporuje téměř všechny moderní přenosné hudební přehrávače a smartfony se známými výjimkami týkajícími se Apple iPhone, iPad a iPod Touch.</p>
-
- <p>Když své zařízení připojíte, přehrávač <app>Banshee</app> jej zobrazí v nabídce vlevo. Zmáčknutím ikony zařízení se přenesete na domovskou stránku svého zařízení v <app>Banshee</app>, která zobrazuje vaše předvolby synchronizace.</p>
-
+ <p>Banshee podporuje téměř všechny moderní přenosné hudební přehrávače a smartfony se známými výjimkami týkajícími se Apple iPhone, iPad a iPod Touch.</p>
+
+ <p>Když své zařízení připojíte, přehrávač Banshee jej zobrazí v nabídce vlevo. Zmáčknutím ikony zařízení se přenesete na domovskou stránku svého zařízení v Banshee, která zobrazuje vaše předvolby synchronizace.</p>
+
</section>
-
- <section id="sync-settings">
+
+ <section id="sync-settings">
<title>Synchronizace vaší hudby</title>
-
- <p>Můžete zvolit, aby přehrávač <app>Banshee</app> synchronizoval média na vašem přenosném přehrávači automaticky nebo můžete svoji hudbu a média spravovat ručně.</p>
-
- <p>Zvolte v nabídce <app>Banshee</app> své zařízení a pak zvolte, jak chcete synchronizovat svá média, včetně:</p>
-
- <list>
- <item><p>hudby</p></item>
- <item><p>mluvených knih</p></item>
- <item><p>videí</p></item>
- <item><p>Podcasty</p></item>
- </list>
-
- <p>Z rozbalovací nabídky u každého média zvolte z:</p>
-
- <list>
- <item><p>Spravovat ručně</p></item>
- <item><p>Synchronizovat celou kolekci</p></item>
- </list>
-
- <note style="warning">
- <p>Pokud zvolíte synchronizaci celé své kolekce s přenosným přehrávačem automaticky, ujistěte se, že váš přenosný multimediální přehrávač má dostatek úložného místa. V případě, že je kolekce větší než dostupné místo v přehrávači, <app>Banshee</app> bude média synchronizovat dokud se přehrávač nezaplní a pak synchronizaci ukončí.</p>
- </note>
-
- <p>Jestliže máte ve své kolekci vytvořen seznam skladeb nebo chytrý seznam skladeb, bude rovněž zobrazen jako volba synchronizace pro hudbu. To může být užitečné, když vytváříte chytré seznamy skladeb. Chytré seznamy skladeb budou automaticky aktualizovány, když je přidán nový obsah podle pravidel seznamu skladeb a <app>Banshee</app> synchronizuje nový seznam skladeb do zařízení pokaždé, když jej připojíte.</p>
-
- <p>Přehrávač <app>Banshee</app> bude zobrazovat celkové místo na disku vašeho přenosného multimediálního přehrávače v grafu dole uprostřed hlavního okna. Graf vám ukáže, kolik prostoru zabírají zvukové soubory, videa, ostatní soubory a volné místo. Přímo pod ním <app>Banshee</app> zobrazuje, kolik položek celkem je na vašem přenosném přehrávači uloženo, kolika hodinám či dnům poslechu to odpovídá a celkové obsazené místo.</p>
-
+ <p>Můžete zvolit, aby přehrávač Banshee synchronizoval média na vašem přenosném přehrávači automaticky nebo můžete svoji hudbu a média spravovat ručně.</p>
+
+ <p>Zvolte v nabídce Banshee své zařízení a pak zvolte, jak chcete synchronizovat svá média, včetně:</p>
+ <list>
+ <item><p>hudby</p></item>
+ <item><p>mluvených knih</p></item>
+ <item><p>videí</p></item>
+ <item><p>podcastů</p></item>
+ </list>
+
+ <p>Z rozbalovací nabídky u každého média zvolte z:</p>
+ <list>
+ <item><p>Spravovat ručně</p></item>
+ <item><p>Synchronizovat celou kolekci</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Pokud zvolíte synchronizaci své celé kolekce s přenosným přehrávačem automaticky, ujistěte se, že váš přenosný multimediální přehrávač má dostatek úložného místa. V případě, že je kolekce větší než dostupné místo v přehrávači, Banshee bude média synchronizovat dokud se přehrávač nezaplní a pak synchronizaci ukončí.</p>
+ </note>
+
+ <p>Jestliže máte ve své kolekci vytvořen seznam skladeb nebo chytrý seznam skladeb, bude rovněž zobrazen jako volba synchronizace pro hudbu. To může být užitečné, když vytváříte chytré seznamy skladeb tak, že chytré seznamy skladeb budou automaticky aktualizovány, když je přidán nový obsah podle pravidel seznamu skladeb a Banshee synchronizuje nový seznam skladeb do zařízení pokaždé, když jej připojíte.</p>
+
+ <p>Přehrávač Banshee bude zobrazovat celkové místo na disku vašeho přenosného multimediálního přehrávače v grafu dole uprostřed okna Banshee. Graf vám ukáže, kolik prostoru zabírají zvukové soubory, videa, ostatní soubory a volné místo. Přímo pod ním Banshee zobrazuje, kolik položek celkem je na vašem přenosném přehrávači uloženo, kolika hodinám či dnům poslechu to odpovídá a celkové obsazené místo.</p>
+
</section>
<section id="sync-manually">
- <title>Synchronizovat celou kolekci</title>
-
- <p>Média z <app>Banshee</app> do přenosného hudebního přehrávače můžete přenášet způsobem táhni a upusť. Vyberte soubor či soubory, které chcete překopírovat do přehrávače a zmáčkněte a držte pravé tlačítko myši a přetáhněte soubor(y) na ikonu přenosného multimediálního přehrávače v <app>Banshee</app>. Tím se soubory do vašeho zařízení překopírují.</p>
-
- <p>V případě, že je vaše hudební kolekce kódována ve formátu, který váš hudební přehrávač nepodporuje, třeba OGG nebo FLAC, a máte nainstalovány patřičné kodeky, umí <app>Banshee</app> soubory při přenosu do vašeho přenosného multimediálního přehrávač automaticky překódovat do MP3. To jak zkontrolovat, zda vaše distribuce obsahuje potřebné kodeky, je mimo rámec této příručky a liší se distribuci od distribuce.</p>
-
- <note style="tip">
- <p>Aby se soubory do přenosného multimediálního přehrávače správně načetly, může být zapotřebí zařízení „vysunout“. V <app>Banshee</app> k tomu použijte kliknutí pravým tlačítkem myši na zařízení a v nabídce zmáčkněte <gui style="menuitem">Odpojit</gui>.</p>
- </note>
+ <title>Synchronizace celé vaší kolekce</title>
+ <p>Média z Banshee do přenosného hudebního přehrávače můžete přenášet způsobem táhni a pusť. Vyberte soubor či soubory, které chcete překopírovat do přehrávače a zmáčkněte a držte pravé tlačítko myši a přetáhněte soubor(y) na ikonu přenosného multimediálního přehrávače v Banshee. Tím se soubory do vašeho zařízení překopírují.</p>
+
+ <p>V případě, že je vaše hudební kolekce kódována ve formátu, který váš hudební přehrávač nepodporuje, třeba OGG nebo FLAC, a máte nainstalován patřičný kodek, umí Banshee soubory při přenosu do vašeho přenosného multimediálního přehrávač automaticky překódovat do MP3. To jak zkontrolovat, zda vaše distribuce obsahuje potřebné kodeky, je mimo rámec této příručky a liší se distribuci od distribuce.</p>
+
+ <note style="tip">
+ <p>Aby se soubory do přenosného multimediálního přehrávače správně načetly, může být zapotřebí zařízení „vysunout“. V Banshee k tomu použijte kliknutí pravým tlačítkem myši na zařízení a v nabídce zmáčkněte <gui>Odpojit</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
<title>Přehrávání hudby z vašeho přenosného hudebního přehrávače</title>
-
- <p>Hudbu uloženou na svém přenosném multimediálním přehrávači můžete v <app>Banshee</app> rovnou přehrávat. V nabídce nalevo zvolte svůj přehrávač a zobrazí se kolekce vašeho přenosného přehrávače. Hudbu pak můžete přehrávat úplně stejně, jako ze své vlastní kolekce.</p>
-
+ <p>Hudbu uloženou na svém přenosném multimediálním přehrávači můžete v Banshee rovnou přehrávat. V nabídce nalevo zvolte svůj přehrávač a zobrazí se kolekce vašeho přenosného přehrávače. Hudbu pak můžete přehrávat úplně stejně, jako ze své vlastní kolekce.</p>
</section>
-
+
<section id="pmp-delete">
<title>Odstraňování hudby z vašeho přenosného hudebního přehrávače</title>
-
- <p>Pokud chcete odstranit skladbu uloženou ve svém přenosném multimediálním přehrávači, zvolte v <app>Banshee</app> zobrazení jeho kolekce. Po té vyberte stopy, které si přejete odstranit, klikněte na ně pravým tlačítkem a zvolte <gui style="menuitem">Odstranit</gui> nebo v nabídce zvolte <guiseq><gui style="menu">Upravit</gui> <gui style="menuitem">Odstranit</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Odstraněné soubory se z vašeho přenosného hudebního přehrávače smažou trvale a již je nebudete moci obnovit.</p>
- </note>
-
+ <p>Pokud chcete odstranit skladbu uloženou ve svém přenosném multimediálním přehrávači, zvolte v Banshee zobrazení jeho kolekce. Po té zvolte stopu, kterou si přejete odstranit, klikněte na ni pravým tlačítkem a zvolte <gui>Odstranit</gui> nebo v nabídce zvolte <guiseq><gui>Upravit</gui><gui>Odstranit</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Odstraněné soubory se z vašeho přenosného hudebního přehrávače smažou trvale a již je nebudete moci obnovit.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/cs/ui.page b/help/cs/ui.page
index d637651..0c2f390 100644
--- a/help/cs/ui.page
+++ b/help/cs/ui.page
@@ -4,17 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
<desc>Přehled uživatelského rozhraní přehrávače <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -24,66 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Uživatelské rozhraní <app>Banshee</app></title>
+ <title>Úvod do uživatelského rozhraní Banshee</title>
<figure>
<title>Okno <gui>Multimediálního přehrávače Banshee</gui></title>
<desc><app>Multimediální přehrávač Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Rozhraní kolekce <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Zdroje</title>
+ <p>Vaše zdroje hudby a videí jsou zobrazeny v levé části okna Banshee. Zdroje vám poskytují rychlý přístup k frontě přehrávání, hudbě, videím, službám Amazon a Last.fm, podcastům a dalším.</p>
+
+ <note style="tip">
+ <p>Volby nabídky se mění podle toho, který zdroj máte zvolen. Pokud například chcete použít nabídku pro import podcastu, musíte zvolit zdroj podcastů. Volba nabídky pro import podcastu není dostupná, když si prohlížíte video nebo hudební kolekci.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Procházení kolekcí</title>
+ <p>Když ve zdrojích vyberete zdroj hudby nebo videa, přehrávač Banshee zobrazí váš obsah v prohlížeči kolekce. Podle toho, jaký zdroj jste zvolili, může Banshee zobrazit vaši kolekci hudby nebo videa, odběry podcastů nebo i hudební obchod Amazon, kde můžete hudbu nakupovat.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Právě se přehrává</title>
+ <p>Pokud používáte přehrávač Banshee v režimu celé obrazovky, režim Právě se přehrává skryje kolekci, abyste získali větší pohled na hudbu nebo video, které sledujete. Když posloucháte hudbu, Právě se přehrává zobrazí jméno umělce, album a přebal (pokud je dostupný). Když sledujete video, bude Banshee zobrazovat video.</p>
+
+ <p>Pokud chcete zapnout režim Právě se přehrává, aby se skrylo uživatelské rozhraní Banshee a použil režim celé obrazovky, zmáčkněte <key>F</key> nebo tlačítko <gui>Celá obrazovka</gui> v pravém horním rohu přehrávače Banshee a nebo zvolte <guiseq><gui>Zobrazit</gui><gui>Celá obrazovka</gui></guiseq>.</p>
+
+</section>
+
+<section id="library">
+ <title>Kolekce</title>
+ <p>Zobrazení kolekce se v přehrávači Banshee mění v závislosti na zdroji, který máte zvolen. Hudební kolekce zobrazí přebal, umělce a seznam skladeb. Kolekce podcastu zobrazí vaše odběry podcastů, podcasty, které jsou staženy a které ne, a všechny, nové nebo staré podcasty. Na další podrobné informace o správě toho kterého zdroje se prosím podívejte na stránku s nápovědou příslušného zdroje.</p>
+</section>
- <section id="context">
- <title>Zdroje</title>
-
- <p>Vaše zdroje hudby a videí jsou zobrazeny v levé části okna <app>Banshee</app>. Zdroje vám poskytují rychlý přístup k <gui>Frontě přehrávání</gui>, <gui>Hudbě</gui>, <gui>Videím</gui>, <gui>Obchodu s MP3 Amazon</gui>, <gui>Last.fm</gui>, <gui>Podcastům</gui> a dalším.</p>
-
- <note style="tip">
- <p>Volby nabídky se mění podle toho, který zdroj máte zvolen. Pokud například chcete použít nabídku pro import podcastu, musíte zvolit zdroj <gui>Podcasty</gui>. Volba nabídky pro import podcastu není dostupná, když si prohlížíte video nebo hudební kolekci.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Procházení kolekcí</title>
-
- <p>Když ve zdrojích vyberete zdroj hudby nebo videa, přehrávač <app>Banshee</app> zobrazí váš obsah v prohlížeči kolekce. Podle toho, jaký zdroj jste zvolili, může <app>Banshee</app> zobrazit vaši kolekci hudby nebo videa, odběry podcastů nebo i hudební obchod Amazon, kde můžete hudbu nakupovat.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Právě se přehrává</gui></title>
-
- <p>Pokud používáte přehrávač <app>Banshee</app> v režimu celé obrazovky, režim <gui>Právě se přehrává</gui> skryje kolekci, abyste získali větší pohled na hudbu nebo video, které sledujete. Když posloucháte hudbu, <gui>Právě se přehrává</gui> zobrazí jméno umělce, album a přebal (pokud je dostupný). Když sledujete video, bude <app>Banshee</app> zobrazovat video.</p>
-
- <p>Přepnout se do režimu <gui>Právě se přehrává</gui> a skrýt tak uživatelské rozhraní <app>Banshee</app> a místo něj zobrazit svá média přes celou obrazovku, můžete následovně:</p>
-
- <list>
- <item>
- <p>Dvojitě myší klikněte na zobrazení.</p>
- </item>
- <item>
- <p>Zmáčkněte <key>F</key>.</p>
- </item>
- <item>
- <p>Zmáčkněte <key>F11</key>.</p>
- </item>
- <item>
- <p>Zmáčkněte tlačítko <gui style="button">Celá obrazovka</gui> v pravém horním rohu <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Vyberte <guiseq><gui style="menu">Zobrazit</gui><gui style="menuitem">Celá obrazovka</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Kolekce</title>
-
- <p>Zobrazení <gui>Kolekcí</gui> se v přehrávači <app>Banshee</app> mění v závislosti na zdroji, který máte zvolen. Kolekce <gui>Hudba</gui> zobrazí přebal, umělce a seznam skladeb. Kolekce <gui>Podcasty</gui> zobrazí vaše odběry podcastů, podcasty, které jsou staženy a které ne, a všechny, nové nebo staré podcasty. Na další podrobné informace o správě toho kterého zdroje se prosím podívejte na stránku s nápovědou příslušného zdroje.</p>
-
- </section>
</page>
diff --git a/help/da/add-podcast.page b/help/da/add-podcast.page
new file mode 100644
index 0000000..227abcf
--- /dev/null
+++ b/help/da/add-podcast.page
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="da">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play podcasts in Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>What is a Podcast?</title>
+
+ <p>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.</p>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Tilføj en podcast</title>
+
+ <p>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 <gui>Copy link</gui>.
+ </p>
+
+ <p>In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the
+ upper right hand corner, from the menu choose <guiseq><gui>Media</gui><gui>
+ Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut <keyseq>
+ <key>Shift</key><key>Control</key><key>F</key></keyseq>.
+ </p>
+
+ <p>Banshee will then allow you to choose how you want to download new podcasts
+ from a drop down menu. Your choices include:</p>
+
+ <list>
+ <item><p>Download the Most Recent Episode (This will automatically
+ download the last episode that was released).</p></item>
+ <item><p>Download All Episodes (This will download all episodes).</p></item>
+ <item><p>Let Me Decide Which Episodes to Download (This will allow you
+ to choose which episodes you would like to download).</p></item>
+ </list>
+
+ <p>After you have added a Podcast feed, Banshee will display:</p>
+
+ <list>
+ <item><p><gui>Name</gui>: (Name of the specific episode)</p></item>
+ <item><p><gui>Podcast</gui>: (Name of the Podcast)</p></item>
+ <item><p><gui>Published</gui> (Date the episode was published or released)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/da/add-radio.page b/help/da/add-radio.page
new file mode 100644
index 0000000..a706159
--- /dev/null
+++ b/help/da/add-radio.page
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="da">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play internet radio stations in Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Internet Radio</title>
+
+ <section id="radiodescription">
+ <title>What is Internet Radio?</title>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Add Radio Station</title>
+
+ <p>To add an internet radio station to Banshee, press <gui>Add Station</gui>
+ in the upper right hand corner of Banshee or, from the menu, choose <guiseq>
+ <gui>Media</gui><gui>Add Station</gui></guiseq>.
+ </p>
+
+ <p>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 <gui>Copy Link</gui>.
+ </p>
+
+
+ <p>Banshee will prompt you to enter the <gui>Station Genre</gui>.
+ Choose the kind of music the internet radio station plays from the available
+ drop down selections. You will then need to enter the <gui>Station Name</gui>.
+ Enter a name for the radio station. Then press tab or use your mouse to select
+ the <gui>Stream URL</gui> field to paste the URL of the radio station.
+ Using your mouse right click and choose <gui>Paste</gui> or press <keyseq>
+ <key>Control</key><key>V</key></keyseq>.</p>
+
+ <p>You can optionally also fill out the fields for
+ <gui>Station Creator</gui>, <gui>Description</gui>, and <gui>Rating</gui>.
+ </p>
+
+ <p>Then press <gui>Save</gui> to save the internet radio station in Banshee.
+ </p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/da/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/da/advanced.page
index 468ad23..b140304 100644
--- a/help/zh_CN/extensions.page
+++ b/help/da/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="da">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Get help for advanced actions.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Advanced Options and Help</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Keyboard Shortcuts</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Keyboard Shortcuts</title>
</section>
-
+
</page>
diff --git a/help/da/amazon.page b/help/da/amazon.page
index 9903bd2..e499a9c 100644
--- a/help/da/amazon.page
+++ b/help/da/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Sync and purchase music from the Amazon MP3 Store.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,63 +19,63 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Amazon MP3 Store</title>
+
+ <p>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.
+ </p>
+
+ <note style="important">
+ <p>Banshee uses an Amazon affiliate code for all music purchases. All
+ money made via this affiliate code is donated to the GNOME Foundation.
+ </p>
+ </note>
+
<section id="amazon-browser">
- <title>Purchase Amazon MP3s in your web browser</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Purchase Amazon MP3s in your web browser</title>
+
+ <p>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.
+ </p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Buy Amazon MP3s in Banshee</title>
+
+ <p>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.
+ </p>
</section>
-
+
<section id="amazon-manual">
- <title>Import Amazon MP3s manually</title>
-
+ <title>Import Amazon MP3s manually</title>
+
<p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ extension .amz is downloaded and saved to your hard drive. To import
+ music purchased manually from Amazon, in Banshee choose
+ <guiseq><gui>Media</gui> <gui>Import Media</gui></guiseq> 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.
+ </p>
+
<note style="warning">
- <p>Amazon .amz files are only active for a short time. If you do not
+ <p>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.</p>
+ 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.
+ </p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/da/emusic.page b/help/da/emusic.page
new file mode 100644
index 0000000..50a8d54
--- /dev/null
+++ b/help/da/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="da">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music purchased from eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importer dine eMusic-numre</title>
+
+</page>
diff --git a/help/da/extensions.page b/help/da/extensions.page
index 0bc5460..7ceaece 100644
--- a/help/da/extensions.page
+++ b/help/da/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="da">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="da">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Add additional functionality to Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Banshee Extensions</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Official Banshee Extensions</title>
</info>
+ <title>Manage extensions for Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Community Banshee Extensions</title>
+ </info>
+ <title>Add community built extensions for Banshee</title>
</section>
+
</page>
diff --git a/help/da/import.page b/help/da/import.page
index f64a48b..606b680 100644
--- a/help/da/import.page
+++ b/help/da/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Add music and videos from your computer to your Banshee library.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,19 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Import music & videos</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>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.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>To import music or video files on your computer, choose <guiseq><gui>Media</gui>
+ <gui>Import Media</gui></guiseq>. A dialog will appear with a number of choices.</p>
- <note style="tip">
+ <note>
<p>Plugins may add additional import choices. See <link xref="#plugins"/>
below.</p>
</note>
@@ -62,29 +58,25 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>You can safely import from a folder you have already imported
from without worrying about duplicate entries in your library.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Import from a Playlist</title>
+ <p>You can also import music from playlists. Most playlist files end
+ in <em>m3u</em>. To import from a playlist, from the Banshee menu
+ choose <guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and
+ locate the playlist file in your folder, select it and press
+ <gui>Import</gui>.
+ </p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Plugins may add additional import choices. The following additional
- sources will be available if the appropriate plugins are enabled:</p>
-
+ <title>Additional Import Sources</title>
+ <p>Plugins may add additional import choices. The following additional
+ sources will be available if the appropriate plugins are enabled:</p>
</section>
-
+
</page>
diff --git a/help/da/index.page b/help/da/index.page
index adf8e99..f9a88f3 100644
--- a/help/da/index.page
+++ b/help/da/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Banshee - medieafspiller</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Add, Remove & Play</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Manage & Sort</title>
</section>
-
+
<section id="sync" style="2column">
<title>Synkroniser dine medier til en bærbar medieafspiller</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Add additional functionality to Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Advanced options and help</title>
+ <title>Advanced options and help</title>
</section>
</page>
diff --git a/help/da/introduction.page b/help/da/introduction.page
index debac04..b72c6c5 100644
--- a/help/da/introduction.page
+++ b/help/da/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>Introduktion til <app>Banshee - medieafspiller</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,24 +20,28 @@
<title>Introduktion</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
- <p><app>Banshee</app> includes features to import your media, manage its
- metadata, and play your music and videos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>
+ <app>Banshee</app> 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.
+ </p>
+ <p>
+ <app>Banshee</app> includes features to import your media, manage its
+ metadata, and play your music and videos.
+ </p>
+ <p>
+ 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.
+ </p>
+<!--
<figure>
- <title>Vindue for <gui>Banshee - medieafspiller</gui></title>
- <desc><app>Banshee - medieafspiller</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p><app>Banshees</app> biblioteksgrænseflade</p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/da/itunes-import.page b/help/da/itunes-import.page
new file mode 100644
index 0000000..4b1cabe
--- /dev/null
+++ b/help/da/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="da">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>iTunes</app> media player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>iTunes</app> library</title>
+
+</page>
diff --git a/help/da/keyboard-shortcuts.page b/help/da/keyboard-shortcuts.page
deleted file mode 100644
index be12762..0000000
--- a/help/da/keyboard-shortcuts.page
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="da">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Play or Pause the current song</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Play the next song</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Play the previous song</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Move the focus to the search box</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Open import media dialog</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Playlists</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Create New Playlist</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Mark the selected episodes as old</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interface</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Toggle full-screen mode</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Select all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Unselect all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Previous Song (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Next Song (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
- </p></td>
- <td><p>Toggle Play / Pause (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/da/keyboardshortcuts.page b/help/da/keyboardshortcuts.page
new file mode 100644
index 0000000..56a56b5
--- /dev/null
+++ b/help/da/keyboardshortcuts.page
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="da">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Keyboard Shortcuts</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Control Banshee using Keyboard Shortcuts</title>
+
+ <section id="playbackcontrol">
+
+ <title>Playback Control</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Space Bar</p></td> <td><p>Play or Pause the current song</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Play the next song</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Play the previous song</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Library Interaction</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>
+ Move the focus to the search box</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Open import media dialog</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Playlists</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>
+ Create New Playlist</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>
+ Mark the selected episodes as old</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interface</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>
+ Toggle full-screen mode</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>
+ Select all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>
+ Unselect all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>
+ Hide Banshee Window (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Play Previous Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Play Next Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Toggle Play / Pause (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/da/lastfm.page b/help/da/lastfm.page
index ddd2932..18c4f35 100644
--- a/help/da/lastfm.page
+++ b/help/da/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="da">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Enable Last.fm, song reporting and Last.fm radio.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,111 +19,102 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
+ <title>Last.fm</title>
+
<p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ 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.</p>
+
<section id="enable-lastfm">
- <title>Enable Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Enable Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>To enable Banshee to report the songs you play on your computer to Last.fm,
+ sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences.
+ Enter your username and press the <gui>Log in to Last.fm</gui> button. You
+ will be directed to a Last.fm webpage in your browser to grant Banshee access.
+ Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</gui> button
+ to complete the process.
+ </p>
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Listen to Last.fm Radio</title>
<p>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.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+ 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.
+ </p>
+
+ <p>In Banshee's sources pane 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 <gui>Play</gui> button
+ in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio
+ station. You can also press the <gui>Next</gui> button in Banshee,
+ <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq>
+ to play the next song in your radio station queue.
+ </p>
+
</section>
-
+
</page>
diff --git a/help/da/manage-coverart.page b/help/da/manage-coverart.page
new file mode 100644
index 0000000..715808f
--- /dev/null
+++ b/help/da/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="da">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Manage or change your albums cover art.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Omslag</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/da/manage-playlists.page b/help/da/manage-playlists.page
index fb40e96..0edc4dc 100644
--- a/help/da/manage-playlists.page
+++ b/help/da/manage-playlists.page
@@ -1,157 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="da">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="da">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Create and manage playlists.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Playlists</title>
-
- <p>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.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+ <title>Playlists</title>
+
+ <p>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.
+ </p>
+
+ <p>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.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>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.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>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.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>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.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Normal Playlists</title>
+
+ <p>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.
+ </p>
+
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key>
+ <key>N</key></keyseq>, from the menu choosing <guiseq><gui>Media</gui>
+ <gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
+ to add to the playlist. Select the track(s), right click them, and choose
+ <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
+ 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 <gui>Music</gui>. As you drag it over <gui>Music</gui>,
+ a new option <gui><em>New Playlist</em></gui> will appear and you can drop
+ the track(s) over <gui><em>New Playlist</em></gui> to add them to the
+ playlist. You can repeat this process until you have added all the tracks
+ you want in the playlist.
+ </p>
+
+ <p>To give your playlist its own name, select the playlist and right click
+ on the playlist and press <gui>Rename Playlist</gui> and enter the name
+ of your playlist.
+ </p>
+
+ <p>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.
+ </p>
+
+ <p>To remove a track from the playlist, select the track(s) you wish to
+ remove. Press the <key>Delete</key>, from the menu choose
+ <guiseq><gui>Edit</gui><gui>Remove from Playlist</gui></guiseq> or right
+ click the track(s) with your mouse and press <gui>Remove from Playlist</gui>.
+ </p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Smart Playlist</title>
+
+ <p>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.
+ </p>
+
+ <p>To create a new Smart Playlist, from the menu choose <guiseq>
+ <gui>Media</gui><gui>New Smart Playlist</gui></guiseq>. 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:
+ </p>
+
<list>
<item><p>is</p></item>
- <item><p>is not</p></item>
+ <item><p>is not</p></item>
<item><p>less than</p></item>
- <item><p>more than</p></item>
+ <item><p>more than</p></item>
<item><p>at most</p></item>
- <item><p>at least</p></item>
+ <item><p>at least</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>You can also press the <gui>+</gui> 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:
+ </p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Year</gui></p></td>
- <td><p><gui>is</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Year</gui></p></td> <td><p><gui>is</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Rating</gui></p></td>
- <td><p><gui>is</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Rating</gui></p></td> <td><p><gui>is</gui></p></td>
+ <td><p><gui/>5 stars</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>You can then optionally select how many songs are included by pressing
+ the <gui>Limit</gui> to checkbox and choosing the number of songs to be
+ included.
+ </p>
+
+ <p>Banshee also includes smart playlists already created for
+ you. Press the <gui>Open in editor</gui> button to view how the playlist
+ created was or to modify it. If you press <gui>Create and save</gui> the
+ playlist will be automatically generated and saved for you. The following
+ playlists are included:
+ </p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Favorites (Songs rated four and five stars)</p>
- </item>
- <item>
- <p>Recent Favorites (Songs listened to often in the past week)</p>
- </item>
- <item>
- <p>Recently Added (Songs imported within the last week)</p>
- </item>
- <item>
- <p>Unheard (Songs that have not been played or skipped)</p>
- </item>
- <item>
- <p>Neglected Favorites (Favorites not played in over two months)</p>
- </item>
- <item>
- <p>700 MB of Favorites (A data CD worth of favorite songs)</p>
- </item>
- <item>
- <p>80 Minutes of Favorites (An audio CD worth of favorite songs)</p>
- </item>
- <item>
- <p>Unrated (Songs that haven't been rated)</p>
- </item>
+ <title>Banshee - smartafspilningslister</title>
+ <item><p>Favorites (Songs rated four and five stars)</p></item>
+ <item><p>Recent Favorites (Songs listened to often in the past week)
+ </p></item>
+ <item><p>Recently Added (Songs imported within the last week)</p></item>
+ <item><p>Unheard (Songs that have not been played or skipped)</p></item>
+ <item><p>Neglected Favorites (Favorites not played in over two months)
+ </p></item>
+ <item><p>700 MB of Favorites (A data CD worth of favorite songs)</p></item>
+ <item><p>80 Minutes of Favorites (An audio CD worth of favorite songs)
+ </p></item>
+ <item><p>Unrated (Songs that haven't been rated)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/da/manage-tags.page b/help/da/manage-tags.page
index 453b8f6..5e15338 100644
--- a/help/da/manage-tags.page
+++ b/help/da/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="da">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="da">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Edit and change music tags and metadata.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,51 +19,61 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Music Metadata</title>
- <title>Music metadata</title>
+ <section id="metadata">
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis
- comments for OGG Vorbis files.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
-
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>A dialog box will appear that shows the song's metadata and allow you to
- change or update it. The default fields displayed include:</p>
-
- <list>
- <item><p><gui>Track Title</gui></p></item>
- <item><p><gui>Track Artist</gui></p></item>
- <item><p><gui>Album Title</gui></p></item>
- <item><p><gui>Genre</gui></p></item>
- <item><p><gui>Track Number</gui></p></item>
- <item><p><gui>Disc Number</gui></p></item>
- <item><p><gui>Year</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>Music metadata</title>
+
+ <p>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
+ <link xref="import"/>.</p>
+
+ <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and
+ Vorbis comments for OGG Vorbis files.</p>
+
+ <p>If you have imported songs that do not contain metadata,
+ <app>Banshee</app> will display <gui>Unknown</gui> for most fields
+ in the library. </p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Edit Your Metadata</title>
+
+ <p>You can change and edit the metadata of your songs. Select the song or
+ songs you want to update and hit the <key>E</key>, choose
+ <guiseq><gui>Edit</gui><gui>Edit Track Information</gui></guiseq> from the menu, or use
+ your mouse and right click on the files and select
+ <gui>Edit Track Information</gui>.
+ </p>
+
+ <p>A dialog box will appear that shows the song's metadata and allow you to
+ change or update it. The default fields displayed include:</p>
+
+ <list>
+ <item><p><gui>Track Title</gui></p></item>
+ <item><p><gui>Track Artist</gui></p></item>
+ <item><p><gui>Album Title</gui></p></item>
+ <item><p><gui>Genre</gui></p></item>
+ <item><p><gui>Track Number</gui></p></item>
+ <item><p><gui>Disc Number</gui></p></item>
+ <item><p><gui>Year</gui></p></item>
+ </list>
+
+ <p>Update the song's information. If you have selected multiple songs to
+ edit press the right arrow icon to the right of the <gui>Track Title</gui>
+ field or press the <gui>Forward</gui> button at the bottom of the dialog
+ when finished with each song. When you have completed editing all metadata,
+ press <gui>Save</gui>.
+ </p>
+
</section>
</page>
diff --git a/help/da/play-queue.page b/help/da/play-queue.page
index 5ea1843..5cd0369 100644
--- a/help/da/play-queue.page
+++ b/help/da/play-queue.page
@@ -1,96 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="da">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="da">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Add media to your play queue.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
-
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
-
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
-
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
-
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
-
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
-
+ <title>Play Queue</title>
+
+ <p>The <gui>Play Queue</gui> 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.</p>
+
+<section id="addqueue">
+
+ <title>Add Music to the Play Queue</title>
+
+ <p>From your music library, you will need to select the music tracks or albums
+ you want to add to the play queue.
+ </p>
+
+ <p>To add an entire album to the Play Queue, using your mouse press and hold
+ the album and drag the album over <gui>Play Queue</gui> in the far left
+ window pane.
+ </p>
+
+ <p>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 <gui>Play Queue</gui>
+ in the far left window pane, or right click the track and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+ <p>You can select multiple files by using your mouse and pressing
+ <key>Control</key> and choosing each file with your mouse or
+ select a range of files by
+ pressing <key>Shift</key> and clicking twice to select that range of files. You can then
+ drag and drop it over the <gui>Play Queue</gui>
+ in the far left window pane or right click the tracks and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+</section>
+
+<section id="reorderqueue">
+
+ <title>Organize Your Play Queue</title>
+
+ <p>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.
+ </p>
+
+</section>
+
+<section id="removequeue">
+
+ <title>Removing Tracks from the Play Queue</title>
+
+ <p>You can remove an individual track, a group of tracks, or clear your entire
+ play queue.
+ </p>
+
+ <p>To remove an individual track or group of tracks, select the track
+ with your mouse and then press <key>Delete</key>.
+ </p>
+
+ <p>To clear your entire Play Queue, press the <gui>Clear</gui> button in the
+ upper right hand corner of the Play Queue.
+ </p>
+
+</section>
+
</page>
diff --git a/help/da/play.page b/help/da/play.page
index c76de53..da7275a 100644
--- a/help/da/play.page
+++ b/help/da/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Afspil dine videoer og musikfiler.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,82 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Afspil din musik</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <title>Afspil din musik</title>
+
+ <section id="playmusic">
+ <title>Afspil din musik</title>
+
+ <p>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.</p>
+
+ <p>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.
+ </p>
+
+ <p>To start playing a song, use your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
+ browser and using your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
+ and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
+ <p>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.
+ </p>
+
</section>
- <section id="play-video">
- <title>Play a video</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+ <section id="playvideo">
+ <title>Play a video</title>
+
+ <p>Your imported videos are listed alphabetically. To play a video,
+ choose the video you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>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.</p>
+
</section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
+
+ <section id="playpodcast">
+ <title>Afspil en podcast</title>
+
+ <p>Podcasts shows you all Podcasts you're subscribed to, all Podcast
+ shows available, and the Podcast browser lists all Podcasts in order of
newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <p>To play a Podcast,
+ choose the Podcast you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
</section>
-
- <section id="play-radio">
- <title>Play an internet radio station</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- </section>
-
+
+ <section id="playradio">
+ <title>Play an internet radio station</title>
+
+ <p>The Radio source shows you all internet radio stations you have added
+ to Banshee alphabetically.
+ </p>
+
+ <p>To play an internet radio station,
+ choose the radio station you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ </section>
+
</page>
diff --git a/help/da/podcast.page b/help/da/podcast.page
deleted file mode 100644
index 8a996dd..0000000
--- a/help/da/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="da">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/da/radio.page b/help/da/radio.page
deleted file mode 100644
index 355bc12..0000000
--- a/help/da/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="da">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/da/rb-import.page b/help/da/rb-import.page
new file mode 100644
index 0000000..c423a95
--- /dev/null
+++ b/help/da/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="da">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>Rhythmbox</app> music player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>Rhythmbox</app> library</title>
+
+</page>
diff --git a/help/da/search.page b/help/da/search.page
index 9d41602..f9cf0f2 100644
--- a/help/da/search.page
+++ b/help/da/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,100 +19,94 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
+ <title>Søg i dit Bansheebibliotek</title>
+
+ <p>Banshee har et kraftfuldt søgesprog. Du kan søge hurtigt og nemt i dit bibliotek med grundlæggende søgetekster eller udføre detaljerede søgninger med Banshees avancerede søgeterminologi.</p>
+
+ <p>For at udføre en søgning blandt dine medier i Banshee, tryk på <key>S</key> eller klik på boksen <gui>Søg</gui> i det øverste højre hjørne af biblioteksvisningen i Banshee.</p>
+
+ <p>A search query consists of some basic terms, for example,
+ <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
+ Banshee will search all metadata fields including Track Title, Album Title,
+ Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
+ and <em>matthews</em> will be returned. Search terms are case insensitive, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ all mean the same thing when searching.</p>
+
+<section id="operators">
+ <title>Basic Operators</title>
+ <p>Operators can be placed between any two search words or placed before a
+ search word. The default operation is <gui>AND</gui> and is used when
+ no other operators are used between two search terms. Because it is the
default, there is no explicit AND operator.</p>
-
- <p>Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together,
+
+ <p>Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together,
these three operations can yield very powerful queries to help you search
your media.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Logical Operators and Examples</title>
<p>The following is a list of logical operators and examples of the search
results when searching using them.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operator</gui></p></td>
- <td><p><gui>Beskrivelse</gui></p></td>
+ <td><p><gui>Operator</gui></p></td> <td><p><gui>Beskrivelse</gui></p></td>
</tr>
<tr>
- <td><p><em>default</em>, <em>white space</em></p></td>
- <td><p>Search for two terms with a space between the two
- words or terms.</p></td>
+ <td><p><em>default</em>, <em>white space</em></p></td> <td><p>
+ Search for two terms with a space between the two words or terms.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Search results will be two songs with either result in any
- field.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>
+ Search results will be two songs with either result in any field.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>
+ Do not display search results with any search term that follows the
+ operator of NOT, not,<key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Examples of logical operations include:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Query</gui></p></td>
- <td><p><gui>Beskrivelse</gui></p></td>
+ <td><p><gui>Query</gui></p></td> <td><p><gui>Beskrivelse</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Matches any fields in a track containing both <em>dave</em> and
+ <td><p>dave matthews</p></td> <td><p>
+ Matches any fields in a track containing both <em>dave</em> and
<em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave, matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave or matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
- </tr>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave | matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
- </tr>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Displays all tracks whose fields do not contain
- <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>
+ Displays all tracks whose fields do not contain <em>dave
+ matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>For more information on performing more complex search queries,
+ see the <link xref="adv-search"/> page.</p>
+
</section>
-
+
</page>
diff --git a/help/da/sort.page b/help/da/sort.page
index 5723110..3a0a1a9 100644
--- a/help/da/sort.page
+++ b/help/da/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Tilføjelse af kolonner</title>
+
<p>Efterhånden som dit bibliotek vokser, kan ønsket om at ændre visningen af dit bibliotek opstå, så du kan vise yderligere information om sangene i dit bibliotek eller ændre måde du viser og sorterer dine sange, kunstnere eller album.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>Du kan tilføje yderligere kolonner til biblioteksvisningen i <app>Banshee</app> for at give dig yderligere information om sangene, og du kan også sortere på disse. Som standard viser Banshee kolonner for sange, der indeholder <gui>Navn</gui>, <gui>Kunster</gui>, <gui>Album</gui> og <gui>Tid</gui>. For at tilføje yderligere kolonner bruger du højre museknap på en af de eksisterende kolonner og Banshee vil vise alle de kolonner, du kan vælge imellem. Klik på afkrydsningsboksen ved sid [...]
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Sortering af kolonner</title>
+ <p>Du kan sortere dit bibliotek ved at klikke med musen på en af de viste kolonner i biblioteksvisningen. Hvis du ønsker at sortere dit musikbibliotek efter kunsternavn, så klik på kolonnehovedet <gui>Kunstner</gui> og Banshee vil automatisk sortere den kolonne alfabetisk. Et yderligere klik på kolonnehovedet <gui>Kunstner</gui> vil sortere kolonnen i omvendt alfabetisk rækkefølge.</p>
</section>
-
+
</page>
diff --git a/help/da/sync.page b/help/da/sync.page
index 3050047..c20b8ea 100644
--- a/help/da/sync.page
+++ b/help/da/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Synkroniser dine medier til en bærbar medieafspiller eller smarttelefon.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,80 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Synkroniser</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Synkroniser</title>
+
+ <p>Banshee understøtter synkronisering af din musik til dine bærbare medieafspillere og smarttelefoner. Du kan tilføje specifikke musiknumre, album eller afspilningslister eller tillade, at Banshee holder din musikafspiller synkroniseret med dit bibliotek. Efter din afspiller er blevet forbundet med din computer, kan du også afspille sangene på din bærbare afspiller i Banshee. Når du synkroniserer musik i et ikke-forringende format, såsom FLAC, vil Banshee automatisk omkode din musik t [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Enhedsunderstøttelse</title>
+ <p>Banshee understøtter næsten alle moderne bærbare musikafspillere og smarttelefoner, dog ikke disse vigtige undtagelser: Apple iPhone, Ipdad og iPod Touch.</p>
+
+ <p>Når du tilslutter din enhed, vil Banshee vise enheden i den venstre menu. Et tryk på enhedsikonet vil føre dig til enhedens hjemmeside i Banshee, der viser dig dine synkroniseringsindstillinger.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Musik</p></item>
- <item><p>Lydbøger</p></item>
- <item><p>Videoer</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>Fra menuen i rullegardinet kan du vælge følgende for hvert medie:</p>
-
- <list>
- <item><p>Håndter manuelt</p></item>
- <item><p>Synkroniser hele biblioteket</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Synkroniser din musik</title>
+ <p>Du kan vælge at håndtere medierne på din bærbare ved at lade Banshee synkronisere automatisk eller vælge at håndtere dine medier manuelt.</p>
+
+ <p>Vælg din enhed fra Banshees menu og vælg så hvordan du ønsker at synkronisere dine medier, inklusive:</p>
+ <list>
+ <item><p>Musik</p></item>
+ <item><p>Lydbøger</p></item>
+ <item><p>Videoer</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>Fra menuen i rullegardinet kan du vælge følgende for hvert medie:</p>
+ <list>
+ <item><p>Håndter manuelt</p></item>
+ <item><p>Synkroniser hele biblioteket</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Hvis du vælger at synkronisere hele biblioteket med din bærbare medieafspiller så sikr dig, at din bærbare afspiller har nok lagerplads. Hvis dit bibliotek er større end pladsen på din bærbare medieafspiller, vil Banshee synkronisere medier indtil afspilleren er fyldt op og så stoppe.</p>
+ </note>
+
+ <p>Hvis du har oprettet afspilningslister eller intelligente afspilningslister i dit musikbibliotek, så vil de også blive vist som en synkroniseringsindstilling for Musik. Dette kan være brugbart, når der oprettes intelligente afspilningslister, da intelligente afspilningslister automatisk vil blive opdateret med nyt indhold efterhånden som det tilføjes efter afspilningslistens regler, og Banshee vil synkronisere den nye afspilningsliste med din enhed, hver gang du tilslutter den.</p>
+
+ <p>Banshee vil vise den samlede plads på din bærbare musikafspiller i en graf i bunden af Banshee. Grafen vil vise dig hvor meget plads der er optaget af lydfiler, video, andet og ledig plads. Lige derunder vil Banshee vise dig antallet af filer, der er gemt på din bærbare musikafspiller, hvor mange timer eller dage der kan afspilles uden stop og det samlede forbrug af plads.</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Synkroniser hele dit bibliotek</title>
+ <p>You can drag and drop media to your portable music player from 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.
+ </p>
+
+ <p>Hvis dit musikbibliotek er kodet, i et format som din bærbare medieafspiller ikke understøtter, såsom OGG eller FLAC, og du har de nødvendige codec installeret, kan Banshee automatisk omkode disse filer til MP3, når du overfører til din bærbare medieafspiller. Undersøg om din Linuxdistribution har de nødvendige codec, da det er uden for denne manuals omfang og varierer per distribution.</p>
+
+ <note style="tip">
+ <p>Du skal måske skubbe din enhed ud for at indlæse filerne korrekt på din bærbare musikafspiller. For at skubbe en enhed ud i Banshee, brug din mus og højreklik på enheden i Banshees menu og tryk <gui>Afbryd</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Afspil musik fra din bærbare musikafspiller</title>
+ <p>Du kan afspille musik gemt på din bærbare musikafspiller direkte i Banshee. Vælg din afspiller i Banshees menu til venstre og din bærbare musikafspillers bibliotek vil blive vist. Du kan så afspille musik i Banshee på samme måde som i dit bibliotek.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Sletning af filer fra din bærbare musikafspiller vil fjerne dem permanent, og du vil ikke kunne gendanne dem.</p>
- </note>
-
+ <title>Fjern musik fra din bærbare musikafspiller</title>
+ <p>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 <gui>Delete</gui> or from the
+ menu choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Sletning af filer fra din bærbare musikafspiller vil fjerne dem permanent, og du vil ikke kunne gendanne dem.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/da/ui.page b/help/da/ui.page
index 75dc392..60a860e 100644
--- a/help/da/ui.page
+++ b/help/da/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>Et overblik over <app>Bansshees</app> brugergrænseflade.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,46 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Introduktion til Banshees brugergrænseflade</title>
<figure>
<title>Vindue for <gui>Banshee - medieafspiller</gui></title>
<desc><app>Banshee - medieafspiller</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshees</app> biblioteksgrænseflade</p>
</media>
</figure>
+
+<section id="context">
+ <title>Kilder</title>
+ <p>Dine musik- og videokilder vises til venstre i Banshee. Kilderne giver dig hurtig adgang til din afspilningskø, musik, videoer, Amazon, Last.fm, podcaster og mere.</p>
+
+ <note style="tip">
+ <p>Menuvalgene vil ændre sig afhængig af den kilde, du har valgt. Du skal for eksempel vælge podcastkilden, for at bruge menuen til import af en podcast. Menuindstillingen for import af en podcast er ikke tilgængelig, når du kigger på videoer eller musikbiblioteket.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Biblioteksbrowser</title>
+ <p>Når du vælger en musik- eller videokilde fra kilder, vil Banshee vise dit indhold i biblioteksbrowseren. Afhængig af kilden du vælger, kan Banshee vise dit musik- eller videobibliotek, podcastabonnementer eller endog Amazons musikbutik hvor du kan købe musik.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Visning af Afspiller nu</title>
+ <p>Brugbar når Banshee skal køre i tilstanden fuldskærm, tilstanden Afspiller nu skjuler biblioteket, så den musik eller video du ser på fylder mere af skærmen. Når du lytter til musik, vil visningen Afspiller nu vise dig kunsternavnet, album og omslag, hvis de er tilgængelige. Hvis du kigger på en video, vil Banshee vise videoen.</p>
+
+ <p>To change Now Playing to hide the Banshee user interface and use the full
+ screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui>
+ button in the upper right hand corner of Banshee, or choose
+ <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen
+ mode.</p>
+
+</section>
+
+<section id="library">
+ <title>Bibliotek</title>
+ <p>Biblioteksvisningen i Banshee vil ændre sig, afhængig af den kilde du har valgt. Musikbiblioteket vil vise omslag, kunstere i dit bibliotek og sanglister. Podcastbiblioteket vil vise dine podcastabonnementer, podcaster som er hentet eller ikke hentet, og alle, nye og gamle podcaster. Se venligst hver kildes hjælpeside for detaljerede information om håndtering af en kilde.</p>
+</section>
- <section id="context">
- <title>Kilder</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/de/add-podcast.page b/help/de/add-podcast.page
new file mode 100644
index 0000000..42b63c6
--- /dev/null
+++ b/help/de/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="de">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Hinzufügen, Entfernen und Abspielen von Podcasts in Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>Was ist ein Podcast?</title>
+
+ <p>Podcasts sind aufgezeichnete Programme, ähnlich wie Radiosendungen, die über das Internet verbreitet werden und die Sie abonnieren können. Wenn Sie in Banshee einen solchen Podcast abonnieren, wird jedes Mal beim Erscheinen einer neuen Folge diese automatisch heruntergeladen, um sie anzuhören.</p>
+
+ <p>Es gibt Podcasts zu fast allen Themen wie Musik, Filme, Linux und noch vieles mehr. Durchsuchen Sie mit Ihrer Lieblings-Suchmaschine das Internet mit einem Suchbegriff wie »Film Podcast«, und Sie werden viele Treffer erhalten, aus denen Sie wählen können.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Hinzufügen eines Podcasts</title>
+
+ <p>Um einen Podcast zu Banshee hinzuzufügen, müssen Sie zunächst die Webseite des Podcasts in Ihrem Webbrowser aufrufen. Beinahe alle Podcasts verfügen über einen Knopf oder einen Verweis, über den Sie den Podcast abonnieren können. Kopieren Sie den Verweis zum Abonnement des Podcasts. In den meisten Webbrowsern können Sie den Verweis mit der rechten Maustaste anklicken und <gui>Link-Adresse kopieren</gui> oder <gui>Verweisziel kopieren</gui> im Kontextmenü wählen.</p>
+
+ <p>Klicken Sie in Banshee auf <gui>Podcast abonnieren</gui> in der oberen rechten Ecke oder wählen Sie im Menü <guiseq><gui>Medien</gui><gui>Podcast abonnieren</gui></guiseq>. Alternativ drücken Sie die Tastenkombination <keyseq><key>Umschalttaste</key><key>Strg</key><key>F</key></keyseq>.</p>
+
+ <p>Banshee ermöglicht Ihnen dann in einem Auswahlmenü, zu entscheiden, welche Podcasts heruntergeladen werden sollen. Folgende Möglichkeiten stehen bereit:</p>
+
+ <list>
+ <item><p>Neueste Folge herunterladen (Dadurch wird automatisch die Folge heruntergeladen, die zuletzt veröffentlicht wurde).</p></item>
+ <item><p>Alle Folgen herunterladen (Dadurch werden alle Folgen heruntergeladen).</p></item>
+ <item><p>Mich entscheiden lassen, welche Folgen heruntergeladen werden (Dadurch wird Ihnen ermöglicht, aus den verfügbaren Folgen diejenigen auszuwählen, welche Sie herunterladen wollen).</p></item>
+ </list>
+
+ <p>Nachdem Sie die Podcast-Folge hinzugefügt haben, zeigt Banshee Folgendes an:</p>
+
+ <list>
+ <item><p><gui>Name</gui>: (Name der bestimmten Folge)</p></item>
+ <item><p><gui>Podcast</gui>: (Name des Podcasts)</p></item>
+ <item><p><gui>Veröffentlicht</gui> (Veröffentlichungsdatum der Folge)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/de/add-radio.page b/help/de/add-radio.page
new file mode 100644
index 0000000..eee3add
--- /dev/null
+++ b/help/de/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="de">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Hinzufügen, Entfernen und Abspielen von Internet-Radiosendern in Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Internet-Radio</title>
+
+ <section id="radiodescription">
+ <title>Was ist Internet-Radio?</title>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Neue Radio-Station hinzufügen</title>
+
+ <p>Um eine Internet-Radiostation in Banshee hinzuzufügen, klicken Sie auf <gui>Sender hinzufügen</gui> in der oberen rechten Ecke des Anwendungsfensters oder klicken Sie im Menü auf <guiseq><gui>Medien</gui><gui>Sender hinzufügen</gui></guiseq>.</p>
+
+ <p>Kopieren Sie auf der Webseite der Internet-Radiostation den Link zur Datenstrom-Adresse. In den meisten Webbrowsern können Sie mit der rechten Maustaste auf den Link klicken und im Kontextmenü <gui>Link-Adresse kopieren</gui> wählen.</p>
+
+
+ <p>Banshee fordert Sie auf, das <gui>Sendergenre</gui> einzugeben. Wählen Sie aus den vorgegebenen Einträgen in der Auswahlliste die Musikrichtung aus, die diese Internet-Radiostation spielt. Geben Sie dann den <gui>Sendernamen</gui> ein. Geben Sie einen Namen für die Radiostation ein. Dann drücken Sie die Tabulatortaste oder benutzen Sie die Maus, um das Feld <gui>Stream-Adresse:</gui> anzuwählen. Hier geben Sie die URL der Radiostation ein. Klicken Sie mit der rechten Maustaste in da [...]
+
+ <p>Optional können Sie auch die Felder <gui>Stationsurheber</gui>, <gui>Beschreibung</gui> und <gui>Bewertung</gui> ausfüllen.</p>
+
+ <p>Dann klicken Sie auf <gui>Speichern</gui>, um den Internet-Radiosender in Banshee zu speichern.</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/de/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/de/advanced.page
index 468ad23..2e3ff57 100644
--- a/help/zh_CN/extensions.page
+++ b/help/de/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="de">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Hilfe zu fortgeschrittenen Aktionen.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Fortgeschrittene Optionen und Hilfe</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Tastaturkürzel</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Tastaturkürzel</title>
</section>
-
+
</page>
diff --git a/help/de/amazon.page b/help/de/amazon.page
index 92dd915..d62c21e 100644
--- a/help/de/amazon.page
+++ b/help/de/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Abgleichen und Kaufen von Musik im Amazon MP3-Musikladen.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Amazon MP3-Musikladen</title>
+
+ <p>Banshee unterstützt das Herunterladen und Importieren von Musik aus dem Amazon MP3-Musikladen. Sie können Amazon-Musikdateien manuell importieren, Musik in Ihrem Webbrowser oder innerhalb von Banshee kaufen. Amazon bietet Musik im MP3-Format nur in bestimmten Ländern und abhängig von Ihrem Aufenthaltsort zum Kauf an. Unter Umständen könnte es nicht möglich sein, MP3s von Amazon zu kaufen.</p>
+
+ <note style="important">
+ <p>Banshee nutzt einen Amazon-eigenen Code für alle Musik-Käufe. Alles über diesen Code eingespielte Geld kommt der GNOME-Foundation zu Gute.</p>
+ </note>
+
<section id="amazon-browser">
- <title>MP3s von Amazon in Ihrem Webbrowser kaufen</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>MP3s von Amazon in Ihrem Webbrowser kaufen</title>
+
+ <p>Im Amazon MP3-Musikladen gekaufte Musik kann automatisch heruntergeladen und in Banshee importiert werden. Banshee erkennt die .amz-Datei, die Amazon für MP3-Käufe bereitstellt. Wenn Sie Musik bei Amazon kaufen, dann lädt Ihr Webbrowser die .amz-Datei automatisch herunter, woraufhin Banshee diese automatisch öffnet und mit dem Herunterladen und dem Importieren der Musik beginnt.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>MP3s von Amazon in Banshee kaufen</title>
+
+ <p>Sie können in Banshee auch nach Musik bei Amazon suchen. Wählen Sie links im Banshee-Menü den Amazon MP3-Laden aus. Daraufhin wird der Amazon MP3-Laden angezeigt, so wie Sie es von Ihrem Webbrowser her kennen. Nachdem Sie sich bei Amazon angemeldet haben, können Sie nach der Musik suchen, die Sie kaufen wollen und den Kauf mit »1-Click« abschließen. Banshee lädt Ihren Kauf automatisch herunter und importiert ihn in die Bibliothek.</p>
</section>
-
+
<section id="amazon-manual">
- <title>MP3s von Amazon manuell importieren</title>
-
- <p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ <title>MP3s von Amazon manuell importieren</title>
+
+ <p>Wenn Sie Musik von Amazon in einem Webbrowser kaufen, wird eine Datei mit der Endung .amz heruntergeladen und gespeichert. Um bei Amazon gekaufte Musik manuell zu importieren, wählen Sie <guiseq><gui>Medien</gui><gui>Medien importieren</gui></guiseq> aus dem Banshee-Menü und wählen Sie die zu importierende *.amz-Datei. Banshee öffnet diese Datei und stellt eine Verbindung zum Amazon MP3-Musikladen her, um mit dem Herunterladen zu beginnen.</p>
+
<note style="warning">
<p>Die .amz-Dateien von Amazon sind nur für eine kurze Zeit aktiv. Falls Sie Ihre Musik nicht umgehend herunterladen, läuft die Datei ab und Sie können Sie nicht mehr von Amazon herunterladen. Amazon macht keine Angaben darüber, wie lange die Dateien aktiv sind. Es ist empfehlenswert, innerhalb einer Stunde nach dem Kauf die Dateien herunterzuladen und zu importieren.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/de/emusic.page b/help/de/emusic.page
new file mode 100644
index 0000000..88377a0
--- /dev/null
+++ b/help/de/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="de">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Von eMusic gekaufte Musik importieren.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Ihre eMusic-Titel importieren</title>
+
+</page>
diff --git a/help/de/extensions.page b/help/de/extensions.page
index 3cbec18..dba9e9c 100644
--- a/help/de/extensions.page
+++ b/help/de/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="de">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="de">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Zusätzliche Funktionalität zu Banshee hinzufügen.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Banshee-Erweiterungen</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Offizielle Banshee-Erweiterungen</title>
</info>
+ <title>Erweiterungen für Banshee verwalten</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Von der Gemeinschaft bereitgestellte Erweiterungen</title>
+ </info>
+ <title>Von der Gemeinschaft bereitgestellte Erweiterungen in Banshee hinzufügen</title>
</section>
+
</page>
diff --git a/help/de/import.page b/help/de/import.page
index 9f52bb3..d8bd117 100644
--- a/help/de/import.page
+++ b/help/de/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Hinzufügen von Musik und Videos auf Ihrem Rechner zur Banshee-Bibliothek.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Musik und Videos importieren</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>Sie können auf Ihrem Rechner gespeicherte Musik und Videos in Banshee importieren. Die importierten Dateien erscheinen in Ihren Quellen und können wie andere Medien in Banshee bearbeitet und verwaltet werden.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>Um Musik- oder Videodateien auf Ihren Rechner zu importieren, wählen Sie <guiseq><gui>Medien</gui><gui>Medien importieren</gui></guiseq>. Ein Dialogfenster mit Auswahlmöglichkeiten wird geöffnet.</p>
- <note style="tip">
+ <note>
<p>Durch Plugins können zusätzliche Importquellen hinzugefügt werden. Siehe <link xref="#plugins"/> nachfolgend.</p>
</note>
@@ -53,27 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Sie können sicher aus einem bereits importierten Ordner importieren, ohne die Vervielfachung vorhandener Einträge in Ihrer Bibliothek befürchten zu müssen.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Aus einer Wiedergabeliste importieren</title>
+ <p>Sie können auch Musikaus Wiedergabelisten importieren. Die meisten Wiedergabelisten-Dateien haben die Endung <em>m3u</em>. Um aus einer Wiedergabeliste zu importieren, wählen Sie <guiseq><gui>Medien</gui><gui>Wiedergabeliste importieren</gui></guiseq> und navigieren Sie zur Wiedergabelistendatei in Ihrem Ordner, wählen ihn aus und klicken auf <gui>Importieren</gui>.</p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Plugins können weitere Importmöglichkeiten zur Verfügung stellen. Die folgenden zusätzlichen Quellen werden verfügbar sein, sobald Sie das entsprechende Plugin aktiviert haben:</p>
-
+ <title>Zusätzliche Importquellen</title>
+ <p>Plugins können weitere Importmöglichkeiten zur Verfügung stellen. Die folgenden zusätzlichen Quellen werden verfügbar sein, sobald Sie das entsprechende Plugin aktiviert haben:</p>
</section>
-
+
</page>
diff --git a/help/de/index.page b/help/de/index.page
index 737e9a2..206fb49 100644
--- a/help/de/index.page
+++ b/help/de/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Banshee Medien-Wiedergabeprogramm</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Hinzufügen, Entfernen und Abspielen</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Verwalten und Sortieren</title>
</section>
-
+
<section id="sync" style="2column">
<title>Abgleichen Ihrer Medien mit einem tragbaren Abspielgerät</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Zusätzliche Funktionalität zu Banshee hinzufügen</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Fortgeschrittene Optionen und Hilfe</title>
+ <title>Fortgeschrittene Optionen und Hilfe</title>
</section>
</page>
diff --git a/help/de/introduction.page b/help/de/introduction.page
index bbc2c79..d6993b4 100644
--- a/help/de/introduction.page
+++ b/help/de/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>Einführung in <app>Banshee Media Player</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>Einführung</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p><app>Banshee</app> 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.</p>
<p><app>Banshee</app> verfügt über Funktionsmerkmale zum Importieren von Medien, Verwalten von Metadaten und Wiedergeben Ihrer Musik und Videos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>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.</p>
+<!--
<figure>
- <title>Fenster des <gui>Banshee Medien-Wiedergabeprogramms</gui></title>
- <desc><app>Banshee Medien-Wiedergabeprogramm</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Bibliotheksschnittstelle von <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/de/itunes-import.page b/help/de/itunes-import.page
new file mode 100644
index 0000000..f690749
--- /dev/null
+++ b/help/de/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="de">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Musik und Kategorisierungen vom <app>iTunes</app>-Medienwiedergabeprogramm importieren.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importieren Ihrer <app>iTunes</app>-Bibliothek</title>
+
+</page>
diff --git a/help/de/keyboard-shortcuts.page b/help/de/keyboard-shortcuts.page
deleted file mode 100644
index 9ea56fd..0000000
--- a/help/de/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="de">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Taste</gui></p></td>
- <td><p><gui>Aktion</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Den aktuellen Titel wiedergeben oder pausieren</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Den nächsten Titel wiedergeben</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Den vorherigen Titel wiedergeben</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Taste</gui></p></td>
- <td><p><gui>Aktion</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Den Fokus in das Suchfeld verschieben</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Strg</key><key>I</key></keyseq></p></td>
- <td><p>Medien-Importdialog öffnen</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Wiedergabelisten</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Taste</gui></p></td>
- <td><p><gui>Aktion</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Strg</key><key>N</key></keyseq></p></td>
- <td><p>Einen neue Wiedergabeliste erstellen</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Taste</gui></p></td>
- <td><p><gui>Aktion</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Die ausgewählten Folgen als alt markieren</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Schnittstelle</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Taste</gui></p></td>
- <td><p><gui>Aktion</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Vollbildmodus aktivieren/deaktivieren</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Strg</key><key>A</key></keyseq></p></td>
- <td><p>Alle Titel in der Wiedergabelistenansicht auswählen</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Strg</key><key>Umschalttaste</key><key>A</key></keyseq></p>
- </td>
- <td><p>Alle Titel in der Wiedergabelistenansicht abwählen</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Strg</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Strg</key><key>Linke Maustaste</key></keyseq>
- </p></td>
- <td><p>Vorherigen Titel wiedergeben (erfordert aktiviertes Plugin für das Benachrichtigungsfeld)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Strg</key><key>Rechte Maustaste</key></keyseq>
- </p></td>
- <td><p>Nächsten Titel wiedergeben (erfordert aktiviertes Plugin für das Benachrichtigungsfeld)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Strg</key><key>Mittlere Maustaste</key></keyseq>
- </p></td>
- <td><p>Wiedergabe/Pause umschalten (erfordert aktiviertes Plugin für das Benachrichtigungsfeld)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/de/keyboardshortcuts.page b/help/de/keyboardshortcuts.page
new file mode 100644
index 0000000..57055c2
--- /dev/null
+++ b/help/de/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="de">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Tastaturkürzel</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Banshee über Tastaturkürzel bedienen</title>
+
+ <section id="playbackcontrol">
+
+ <title>Wiedergabesteuerung</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Taste</gui></p></td> <td><p><gui>Aktion</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Leertaste</p></td> <td><p>Den aktuellen Titel wiedergeben oder pausieren</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Den nächsten Titel wiedergeben</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Den vorherigen Titel wiedergeben</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Interaktion mit der Bibliothek</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Taste</gui></p></td> <td><p><gui>Aktion</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Strg</key><key>F</key></keyseq></p></td> <td><p>Den Fokus in das Suchfeld verschieben</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Strg</key><key>I</key></keyseq></p></td>
+ <td><p>Medien-Importdialog öffnen</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Wiedergabelisten</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Taste</gui></p></td> <td><p><gui>Aktion</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Strg</key><key>N</key></keyseq></p></td> <td><p>Einen neue Wiedergabeliste erstellen</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Taste</gui></p></td> <td><p><gui>Aktion</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Die ausgewählten Folgen als alt markieren</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Schnittstelle</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Taste</gui></p></td> <td><p><gui>Aktion</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Vollbildmodus aktivieren/deaktivieren</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Strg</key><key>A</key></keyseq></p></td> <td><p>Alle Titel in der Wiedergabelistenansicht auswählen</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Strg</key><key>Umschalttaste</key><key>A</key></keyseq></p>
+ </td> <td><p>Alle Titel in der Wiedergabelistenansicht abwählen</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Strg</key><key>W</key></keyseq></p></td> <td><p>Das Banshee-Fenster verbergen (erfordert aktiviertes Plugin für das Benachrichtigungsfeld)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Strg</key><key>Linke Maustaste</key></keyseq>
+ </p></td> <td><p>Vorherigen Titel wiedergeben (erfordert aktiviertes Plugin für das Benachrichtigungsfeld)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Strg</key><key>Rechte Maustaste</key></keyseq>
+ </p></td> <td><p>Nächsten Titel wiedergeben (erfordert aktiviertes Plugin für das Benachrichtigungsfeld)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Strg</key><key>Mittlere Maustaste</key></keyseq>
+ </p></td> <td><p>Wiedergabe/Pause umschalten (erfordert aktiviertes Plugin für das Benachrichtigungsfeld)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/de/lastfm.page b/help/de/lastfm.page
index 3fac846..c022d4c 100644
--- a/help/de/lastfm.page
+++ b/help/de/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="de">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Last.fm, Titelbewertungen und Last.fm-Radio aktivieren.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,56 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>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, [...]
+
<section id="enable-lastfm">
- <title>Last.fm aktivieren</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Last.fm aktivieren</title>
+ <p>Um Last.fm umfassend zu nutzen, sollten Sie ein Last.fm-Benutzerprofil erstellen. Besuchen Sie <link href="http://www.last.fm/join">http://www.last.fm/join</link>, wo Sie ein Konto erstellen können oder wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq> im Banshee-Menü. Klicken Sie dann auf den Reiter <gui>Quellspezifisch</gui> und öffnen Sie das Auswahlmenü <gui>Quelle</gui>. Wählen Sie anschließend <gui>Last.fm</gui> und öffnen Sie den Verweis <em>Bei Last.f [...]
+
+ <p>Damit Banshee die auf Ihrem Rechner gespielten Titel an Ladt.fm übermitteln kann, melden Sie sich zunächst in den <gui>Quellspezifisch</gui>-Einstellungen in Banshee bei Last.fm an. Geben Sie Ihren Benutzernamen und Ihr Passwort an und klicken Sie auf den Knopf <gui>Bei Last.fm anmelden</gui>. Sie werden zur Last.fm-Webseite in Ihrem Browser weitergeleitet, damit Banshee Zugang erhalten kann. Klicken Sie auf den Verweis <gui>Ja, Zugriff erlauben</gui> in Ihrem Browser, woraufhin Sie [...]
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Musikbewertungen für Last.fm in Banshee aktivieren</title>
+ <p>Nachdem Sie nun Banshee erfolgreich mit Ihrem Last.fm-Benutzerprofil verknüpft haben, müssen Sie sicher stellen, dass Banshee die gespielten Titel übermittelt. Dazu öffnen Sie die Einstellungen von Banshee den Reiter <gui>Quellspezifisch</gui>, wählen <gui>Last.fm</gui> in der Auswahlliste und aktivieren das Ankreuzfeld <gui>Übermittlung von Titeln aktivieren</gui>. Falls Sie über eine aktive Internetverbindung verfügen, sendet Banshee nun Informationen an Last.fm entsprechend Ihrer [...]
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Musikbewertungen für Last.fm auf Ihrem Gerät aktivieren</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Abspielen des Last.fm Internet-Radios</title>
<p>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.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+
+ <p>In der linken Seitenleiste von Banshee wird nun ein Last.fm-Eintrag mit Ihren Last.fm-Stationen angezeigt. Sie benötigen eine aktive Internetverbindung, um Last.fm-Radio zu hören. Wählen Sie die gewünschte Station aus, woraufhin Banshee eine Verbindung zu Last.fm aufbaut, um Musiktitel für diese Station zusammenzustellen. Klicken Sie auf den Knopf <gui>Wiedergabe</gui> in Banshee oder drücken Sie die <key>Leertaste</key>, um mit der Übertragung einer Last.fm-Radiostation zu beginnen [...]
+
</section>
-
+
</page>
diff --git a/help/de/manage-coverart.page b/help/de/manage-coverart.page
new file mode 100644
index 0000000..932daf1
--- /dev/null
+++ b/help/de/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="de">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Verwalten und Ändern der Anzeige von Alben-Covern.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Cover-Anzeige</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/de/manage-playlists.page b/help/de/manage-playlists.page
index 5904f4c..fd5f718 100644
--- a/help/de/manage-playlists.page
+++ b/help/de/manage-playlists.page
@@ -1,144 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="de">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="de">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Erstellen und Verwalten von Wiedergabelisten.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Wiedergabelisten</title>
-
+ <title>Wiedergabelisten</title>
+
<p>Wiedergabelisten ermöglichen Ihnen das Erstellen und Speichern einer Liste aus Musiktiteln, die in einer bestimmten Reihenfolge abgespielt werden sollen. Wiedergabelisten stellen einen bequemen Weg zum Erstellen einer Liste Ihrer Lieblingstiteln oder zum Unterteilen Ihrer Bibliothek in kleinere Listen, die sich leichter durchsuchen lassen. Einige tragbare Abspielgeräte ermöglichen sogar die Übertragung der Wiedergabeliste, so dass Sie sie überall hin mitnehmen können.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>Banshee unterstützt sowohl gewöhnliche Wiedergabelisten als auch intelligente Wiedergabelisten. Zu gewöhnlichen Wiedergabelisten fügen Sie Titel selbst hinzu. Intelligente Wiedergabelisten werden automatisch anhand Ihrer Hörgewohnheiten, Ihrer Lieblingsmusik und weiterer Anhaltspunkte erstellt.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>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.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>Sie können die Reihenfolge der Wiedergabeliste ändern, indem Sie die Titel durch Ziehen und Ablegen neu anordnen. Titel können nur dann neu geordnet werden, wenn keine der Spalten sortiert ist. Um die Sortierung einer Spalte zu entfernen, klicken Sie auf die Spalte, bis die nach oben und unten zeigenden Pfeile nicht mehr sichtbar sind. Dann können Sie die Wiedergabeliste neu sortieren.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>Intelligente Wiedergabelisten ermöglichen Ihnen die schnelle und einfache Erstellung dynamischer Wiedergabelisten, basierend auf einer Reihe von vorher festgelegten Variablen. Sie können eine neue Wiedergabeliste auf der Basis eines Künstlers, auf Vorlieben oder weiterer Parameter erstellen.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Gewöhnliche Wiedergabelisten</title>
+
+ <p>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.</p>
+
+ <p>Zum Erstellen einer neuen Wiedergabeliste drücken Sie <keyseq><key>Strg</key><key>N</key></keyseq> oder wählen im Menü <guiseq><gui>Menü</gui><gui>Neue Wiedergabeliste</gui></guiseq>. Alternativ können Sie einfach die Titel auswählen, die Sie zur Wiedergabeliste hinzufügen wollen. Klicken Sie mit der rechten Maustaste darauf und wählen Sie <guiseq><gui>Zur Wiedergabeliste hinzufügen</gui><gui>Neue Wiedergabeliste</gui></guiseq>. Sie können die Titel auch auswählen und mit der Maus [...]
+
+ <p>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 <gui>Wiedergabeliste umbenennen</gui> im Kontextmenü und geben Sie den Namen Ihrer Wiedergabeliste ein.</p>
+
+ <p>Sie können die Reihenfolge der Wiedergabeliste ändern, indem Sie die Titel durch Ziehen und Ablegen neu anordnen. Titel können nur dann neu geordnet werden, wenn keine der Spalten sortiert ist. Um die Sortierung einer Spalte zu entfernen, klicken Sie auf die Spalte, bis die nach oben und unten zeigenden Pfeile nicht mehr sichtbar sind. Dann können Sie die Wiedergabeliste neu sortieren.</p>
+
+ <p>Um einen Titel aus der Wiedergabeliste zu löschen, wählen Sie zunächst den oder die zu löschenden Titel aus. Drücken Sie anschließend die <key>Entf</key>-Taste, wählen Sie im Menü <guiseq><gui>Bearbeiten</gui><gui>Aus der Wiedergabeliste entfernen</gui></guiseq> oder klicken Sie mit der rechten Maustaste auf den oder die zu löschenden Titel und klicken Sie im Kontextmenü auf <gui>Aus der Wiedergabeliste entfernen</gui>.</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Intelligente Wiedergabelisten</title>
+
+ <p>Intelligente Wiedergabelisten ermöglichen Ihnen die schnelle und einfache Erstellung dynamischer Wiedergabelisten, basierend auf einer Reihe von vorher festgelegten Variablen. Sie können eine neue Wiedergabeliste auf der Basis eines Künstlers, auf Vorlieben oder weiterer Parameter erstellen.</p>
+
+ <p>Um eine neue intelligente Wiedergabeliste anzulegen, wählen Sie im Menü <guiseq><gui>Medien</gui><gui>Neue intelligente Wiedergabeliste</gui></guiseq>. Ein dialog zum Erstellen der neuen intelligenten Wiedergabeliste wird geöffnet. Geben Sie den Namen Ihrer Wiedergabeliste ein und wählen Sie anschließend die Kriterien aus, auf denen Ihre Wiedergabeliste basieren soll. Sie können aus jedem in den Metadaten der Titel enthaltenen Feld wählen, wie Album, Künstler oder Erscheinungsjahr [...]
+
<list>
<item><p>ist</p></item>
- <item><p>ist nicht</p></item>
+ <item><p>ist nicht</p></item>
<item><p>weniger als</p></item>
- <item><p>mehr als</p></item>
+ <item><p>mehr als</p></item>
<item><p>ist maximal</p></item>
- <item><p>mindestens</p></item>
+ <item><p>mindestens</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>Sie können auch auf den <gui>+</gui>-Knopf klicken, um eine zusätzliche Abfrage zu Ihrer intelligenten Wiedergabeliste hinzuzufügen. Beispielsweise könnte Ihre Wiedergabeliste auf allen Titeln basieren, die im Jahr 2010 veröffentlicht wurden und die sie mit 5 Sternen bewertet haben. Mit den folgenden Optionen erstellen Sie eine solche Wiedergabeliste:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Jahr</gui></p></td>
- <td><p><gui>ist</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Jahr</gui></p></td> <td><p><gui>ist</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Bewertung</gui></p></td>
- <td><p><gui>ist</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Bewertung</gui></p></td> <td><p><gui>ist</gui></p></td>
+ <td><p><gui/>5 Sterne</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>Sie können dann optional auswählen, wie viele Titel hinzugefügt werden sollen, indem Sie das Ankreuzfeld <gui>Limit</gui> aktivieren und die gewünschte maximale Anzahl der Titel angeben.</p>
+
+ <p>Banshee stellt Ihnen auch bereits für Sie erstellte intelligente Wiedergabelisten zur Verfügung. Klicken Sie auf den Knopf <gui>Im Editor öffnen</gui>, um zu sehen, wie die Wiedergabeliste angelegt wurde beziehungsweise wie sie angepasst werden kann. Sobald Sie auf <gui>Erstellen und speichern</gui> klicken, wird die Wiedergabeliste automatisch angelegt und für Sie gespeichert. Folgende Wiedergabelisten werden bereits mitgeliefert:</p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Favoriten (Lieder, die mit vier oder fünf Sternen bewertet wurden)</p>
- </item>
- <item>
- <p>Aktuelle Favoriten (Lieder, die Sie in der letzten Woche oft gehört haben)</p>
- </item>
- <item>
- <p>Kürzlich hinzugefügt (Lieder, die innerhalb der letzten Woche importiert wurden)</p>
- </item>
- <item>
- <p>Nicht gehört (Lieder, die noch nie abgespielt bzw. stets übersprungen wurden)</p>
- </item>
- <item>
- <p>Nicht beachtete Favoriten (Favoriten, die in den letzten zwei Monaten nicht abgespielt wurden)</p>
- </item>
- <item>
- <p>700 MB der Favoriten (eine Daten-CD voll mit Ihren Lieblingsliedern)</p>
- </item>
- <item>
- <p>80 Minuten der Favoriten (eine Audio-CD voll mit Ihren Lieblingsliedern)</p>
- </item>
- <item>
- <p>Unbewertet (Lieder, die noch nicht bewertet wurden)</p>
- </item>
+ <title>Intelligente Wiedergabelisten in Banshee</title>
+ <item><p>Favoriten (Lieder, die mit vier oder fünf Sternen bewertet wurden)</p></item>
+ <item><p>Aktuelle Favoriten (Lieder, die Sie in der letzten Woche oft gehört haben)</p></item>
+ <item><p>Kürzlich hinzugefügt (Lieder, die innerhalb der letzten Woche importiert wurden)</p></item>
+ <item><p>Nicht gehört (Lieder, die noch nie abgespielt bzw. stets übersprungen wurden)</p></item>
+ <item><p>Nicht beachtete Favoriten (Favoriten, die in den letzten zwei Monaten nicht abgespielt wurden)</p></item>
+ <item><p>700 MB der Favoriten (eine Daten-CD voll mit Ihren Lieblingsliedern)</p></item>
+ <item><p>80 Minuten der Favoriten (eine Audio-CD voll mit Ihren Lieblingsliedern)</p></item>
+ <item><p>Unbewertet (Lieder, die noch nicht bewertet wurden)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/de/manage-tags.page b/help/de/manage-tags.page
index fcef5c5..87f6b75 100644
--- a/help/de/manage-tags.page
+++ b/help/de/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="de">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="de">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Bearbeiten und Ändern von Markierungen und Metadaten der Musiktitel.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,49 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Musik-Metadaten</title>
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Populäre Metadaten-Formate sind ID3v1 und ID3v2 für MP3-Dateien sowie Vorbis-Kommentare für OGG-Vorbis-Dateien.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
+ <section id="metadata">
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>Ein Dialogfeld erscheint, welches die Metadaten des Titels anzeigt und Ihnen die Änderung oder Aktualisierung ermöglicht. Standardmäßig werden folgende Felder angezeigt:</p>
-
- <list>
- <item><p><gui>Titelbezeichnung</gui></p></item>
- <item><p><gui>Titel-Interpret</gui></p></item>
- <item><p><gui>Albumtitel</gui></p></item>
- <item><p><gui>Genre</gui></p></item>
- <item><p><gui>Titelnummer</gui></p></item>
- <item><p><gui>CD-Nummer</gui></p></item>
- <item><p><gui>Jahr</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>Musik-Metadaten</title>
+
+ <p>Digital gespeicherte Musiktitel enthalten Metadaten, welche Informationen wie Name des Künstlers, Album, Jahr der Aufnahme, Genre und noch Einiges mehr enthalten können. In nahezu aller über das Internet verbreiteten Musik sind diese Metadaten bereits integriert. Wenn Sie Musik von CDs importieren, berücksichtigt Banshee diese Metadaten beim Auslesen der CD, falls diese verfügbar sind. Weitere Informationen über das Auslesen von CDs und Einbinden von Metadaten finden Sie in <link x [...]
+
+ <p>Populäre Metadaten-Formate sind ID3v1 und ID3v2 für MP3-Dateien sowie Vorbis-Kommentare für OGG-Vorbis-Dateien.</p>
+
+ <p>Falls Sie über importierte Titel verfügen, die keine Metadaten enthalten, zeigt <app>Banshee</app> in den meisten Feldern in der Bibliothek <gui>Unbekannt</gui> an.</p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Metadaten bearbeiten</title>
+
+ <p>Sie können die Metadaten Ihrer Titel ändern und bearbeiten. Wählen Sie den oder die zu bearbeitenden Titel aus und drücken Sie entweder die Taste <key>E</key>, wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Titelinformationen bearbeiten</gui></guiseq> im Menü oder klicken Sie mit der rechten Maustaste auf die Datei(en) und wählen Sie <gui>Titelinformationen bearbeiten</gui> im Kontextmenü.</p>
+
+ <p>Ein Dialogfeld erscheint, welches die Metadaten des Titels anzeigt und Ihnen die Änderung oder Aktualisierung ermöglicht. Standardmäßig werden folgende Felder angezeigt:</p>
+
+ <list>
+ <item><p><gui>Titelbezeichnung</gui></p></item>
+ <item><p><gui>Titel-Interpret</gui></p></item>
+ <item><p><gui>Albumtitel</gui></p></item>
+ <item><p><gui>Genre</gui></p></item>
+ <item><p><gui>Titelnummer</gui></p></item>
+ <item><p><gui>CD-Nummer</gui></p></item>
+ <item><p><gui>Jahr</gui></p></item>
+ </list>
+
+ <p>Aktualisieren Sie die Titelinformationen. Falls Sie mehrere Titel zur Bearbeitung ausgewählt haben, klicken Sie auf das rechte Pfeilsymbol rechts vom Feld <gui>Stücktitel</gui> oder klicken Sie auf den Knopf <gui>Weiter</gui> unten im Dialog, wenn Sie mit der Bearbeitung des jeweiligen Titels fertig sind. Wenn Sie mit der Bearbeitung sämtlicher Metadaten fertig sind, klicken Sie auf <gui>Speichern</gui>.</p>
+
</section>
</page>
diff --git a/help/de/play-queue.page b/help/de/play-queue.page
index 9542c3c..a5df3d8 100644
--- a/help/de/play-queue.page
+++ b/help/de/play-queue.page
@@ -1,96 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="de">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="de">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Medien zur Wiedergabe-Warteschlange hinzufügen.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
+ <title>Wiedergabe-Warteschlange</title>
+
+ <p>Die <gui>Wiedergabe-Warteschlange</gui> ermöglicht Ihnen das Hinzufügen von Musik zum Wiedergeben in einer bestimmten Reihenfolge. Sie können viele Titel hinzufügen, die dann über mehrere Stunden ununterbrochenen Musikgenuss ermöglichen. Sie können einzelne Titel oder ganze Alben hinzufügen und diese sortieren oder neu ordnen.</p>
+
+<section id="addqueue">
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
+ <title>Musik zur Wiedergabe-Warteschlange hinzufügen</title>
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
+ <p>Es ist erforderlich, aus der Musikbibliothek die Musiktitel oder Alben auszuwählen, die Sie zur Wiedergabe-Warteschlange hinzufügen wollen.</p>
+
+ <p>Um ein komplettes Album zur Wiedergabe-Warteschlange hinzuzufügen, klicken Sie es mit der Maus an und ziehen Sie es mit gedrückter Maustaste in die <gui>Wiedergabe-Warteschlange</gui> in der äußersten linken Leiste des Fensters.</p>
+
+ <p>Sie können Musiktitel einzeln oder als Gruppe zur Wiedergabe-Warteschlange hinzufügen. Um eine einzelne Datei hinzuzufügen, ziehen Sie sie mit der Maus in die <gui>Wiedergabe-Warteschlange</gui> in der äußersten linken Leiste des Fensters, oder klicken Sie mit der rechten Maustaste auf den Titel und wählen Sie <gui>Zur Wiedergabe-Warteschlange hinzufügen</gui> im Kontextmenü.</p>
+
+ <p>Sie können mehrere Dateien auf einmal auswählen, indem Sie die <key>Strg</key>-Taste gedrückt halten und dann jede Datei einzeln mit der Maus anklicken, oder Sie können einen zusammenhängenden Bereich einer Dateiliste auswählen, indem Sie die <key>Umschalttaste</key> gedrückt halten und dann durch Klicken mit der Maus an zwei Stellen in der Liste Beginn und Ende des gewünschten Bereichs markieren. Diesen Bereich können Sie dann in die Wiedergabe-Warteschlange ziehen und dort ablegen [...]
+
+</section>
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
+<section id="reorderqueue">
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
+ <title>Organisieren Ihrer Wiedergabe-Warteschlange</title>
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+ <p>Ihre Wiedergabe-Warteschlange wird in der Reihenfolge organisiert, in der Sie die Titel hinzugefügt haben. Die ersten zur Wiedergabe-Warteschlange hinzugefügten Titel oder Alben werden auch zuerst abgespielt. Sie können die Wiedergabe-Warteschlange neu ordnen, indem Sie die Maus dazu verwenden, um Titel oder Titelgruppen in der Liste zu ziehen und an der gewünschten Stelle abzulegen. Wählen Sie den oder die Titel aus, die Sie neu ordnen wollen, und lassen Sie die Maustaste an der St [...]
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>Titel aus der Wiedergabe-Warteschlange entfernen</title>
+ <p>Sie können einen bestimmten Titel oder eine Titelgruppe entfernen oder auch die gesamte Wiedergabe-Warteschlange löschen.</p>
+
+ <p>Um einen bestimmten Titel oder eine Titelgruppe zu entfernen, wählen Sie den Titel mit der Maus aus und klicken Sie auf <key>Löschen</key>.</p>
+
+ <p>Um die die gesamte Wiedergabe-Warteschlange zu löschen, klicken Sie auf den <gui>Leeren</gui>-Knopf in der rechten oberen Ecke der Wiedergabe-Warteschlange.</p>
+
+</section>
+
</page>
diff --git a/help/de/play.page b/help/de/play.page
index f95f0a6..29fae90 100644
--- a/help/de/play.page
+++ b/help/de/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Ihre Videos und Musikdateien widergeben.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Ihre Musik wiedergeben</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>Ein Video abspielen</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+
+ <title>Ihre Medien wiedergeben</title>
+
+ <section id="playmusic">
+ <title>Ihre Musik wiedergeben</title>
+
+ <p>Um Musik in Banshee wiederzugeben, wählen Sie die Musik-Quelle. Die Musikbibliothek zeigt alle Künstler in Ihrer Bibliothek an, Alben-cover für jedes Album, sowie eine Liste aller Titel in Ihrer Bibliothek.</p>
+
+ <p>Wählen Sie das wiederzugebende Album oder den wiederzugebenden Titel in der Liste der Künstler oder Alben aus, oder benutzen sie das Suchfeld in der oberen rechten Ecke dea Anwendungsfensters von Banshee.</p>
+
+ <p>Um mit der Wiedergabe eines Liedes zu beginnen, klicken Sie mit der Maus doppelt auf den Titelnamen, drücken Sie die <key>Leertaste</key> oder wählen Sie <guiseq><gui>Wiedergabe</gui><gui>Wiedergabe</gui></guiseq> im Banshee-Menü.</p>
+
+ <p>Sie können auch ein Album abspielen, indem Sie das Album im Alben-Browser auswählen und dann entweder mit der Maus doppelt auf das erste Lied klicken, die <key>Leertaste</key> drücken oder <guiseq><gui>Wiedergabe</gui><gui>Wiedergabe</gui></guiseq> im Banshee-Menü wählen.</p>
+
+ <p>Um alle Lieder eines Künstlers abzuspielen, wählen Sie den Künstler im Künstler-Browser aus und drücken Sie die <key>Leertaste</key> oder wählen Sie <guiseq><gui>Wiedergabe</gui><gui>Wiedergabe</gui></guiseq> im Banshee-Menü.</p>
+
+ <p><app>Banshee</app> zeigt auch Ihre Lieblingsalben an, das sind diejenigen, die Sie am häufigsten abspielen, außerdem kürzlich hinzugefügte Favoriten und noch nicht gehörte Musik. Wählen Sie aus, was Sie hören wollen und Sie können es nacheinander abspielen.</p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>Ein Video abspielen</title>
+
+ <p>Ihre importierten Videos werden alphabetisch aufgelistet. Um ein Video abzuspielen, wählen Sie das gewünschte Video in der Liste aus und drücken Sie die <key>Leertaste</key> oder wählen Sie <guiseq><gui>Wiedergabe</gui><gui>Wiedergabe</gui></guiseq> im Banshee-Menü.</p>
+
+ <p><app>Banshee</app> zeigt auch Ihre Lieblingsvideos an, das sind diejenigen, die Sie am häufigsten abspielen, außerdem noch nicht abgespielte Videos. Wählen Sie eines aus und Sie können ein Video aus der Liste abspielen.</p>
+
</section>
-
- <section id="play-radio">
- <title>Einen Internet-Radiosender wiedergeben</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>Einen Podcast wiedergeben</title>
+
+ <p>Unter »Podcasts« werden alle Podcasts, die Sie abonniert haben, sowie alle weiteren verfügbaren Podcasts angezeigt. Der Podcast-Browser listet alle Podcasts in absteigender Reihenfolge auf, angefangen mit dem aktuellsten.</p>
+
+ <p>Um einen Podcast wiederzugeben, wählen Sie den Podcast in der Liste aus und drücken Sie die <key>Leertaste</key> oder wählen Sie <guiseq><gui>Wiedergabe</gui><gui>Wiedergabe</gui></guiseq> im Banshee-Menü.</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>Einen Internet-Radiosender wiedergeben</title>
+
+ <p>Die Radio-Quelle zeigt Ihnen alle Internet-Radiosender in alphabetischer Reihenfolge, die sie zu Banshee hinzugefügt haben.</p>
+
+ <p>Um einen Internet-Radiosender abzuspielen, wählen Sie den gewünschten Sender aus der Liste aus und drücken Sie die <key>Leertaste</key> oder wählen Sie <guiseq><gui>Wiedergabe</gui><gui>Wiedergabe</gui></guiseq> aus dem Banshee-Menü.</p>
+
+ </section>
+
</page>
diff --git a/help/de/podcast.page b/help/de/podcast.page
deleted file mode 100644
index fcb23a2..0000000
--- a/help/de/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="de">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/de/radio.page b/help/de/radio.page
deleted file mode 100644
index b1b8ff9..0000000
--- a/help/de/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="de">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/de/rb-import.page b/help/de/rb-import.page
new file mode 100644
index 0000000..46816cb
--- /dev/null
+++ b/help/de/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="de">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import von Musik und Kategorisierungen vom <app>Rhythmbox</app> Musik-Wiedergabeprogramm.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importieren Ihrer <app>Rhythmbox</app>-Bibliothek</title>
+
+</page>
diff --git a/help/de/search.page b/help/de/search.page
index c18ffb1..9d7d1e6 100644
--- a/help/de/search.page
+++ b/help/de/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,90 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Durchsuchen Ihrer Banshee-Bibliothek</title>
+
+ <p>Banshee liefert eine mächtige Suchsprache mit. Sie können schnell und einfach mittels grundlegender Suchbegriffe Ihre Bibliothek durchsuchen oder eine detailliertere Suche mit der erweiterten Terminologie von Banshee durchführen.</p>
+
+ <p>Um Ihre Medien in Banshee zu durchsuchen, drücken Sie die Taste <key>S</key> oder klicken Sie in das Feld <gui>Suchen</gui> in der oberen rechten Ecke der Bibliotheksansicht in Banshee.</p>
+
+ <p>Eine Suchanfrage besteht aus zwei einfachen Begriffen, beispielsweise <em>dave matthews</em>. Bei Eingabe von <em>dave matthews</em> im Suchfeld durchsucht Banshee alle Metadaten, wie Titelbezeichnung, Albumtitel, Album-Interpret, Jahr usw. Jeder Titel, dessen Metadaten <em>dave</em> und <em>matthews</em> enthalten, wird ausgegeben. In den Suchbegriffen wird die Groß- und Kleinschreibung nicht berücksichtigt, <em>dave</em>, <em>Dave</em> und <em>DAVE</em> sind in der Suche gleichbed [...]
+
+<section id="operators">
+ <title>Grundlegende Operatoren</title>
+ <p>Operatoren können zwischen zwei Suchwörter oder auch vor ein Suchwort gesetzt werden. Die vorgegebene Operation ist <gui>AND</gui> und wird immer dann verwendet, wenn keine weiteren Operatoren zwischen zwei Suchbegriffen verwendet werden. Da dies ohnehin die Vorgabe ist, gibt es keinen expliziten AND-Operator.</p>
+
<p>Weitere grundlegende Operatoren sind <gui>OR</gui> und <gui>NOT</gui>. Zusammen erzielen Sie mit diesen drei Operationen erfolgreiche Suchanfragen, die Sie beim Durchsuchen Ihrer Medien unterstützen.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Logische Operatoren und Beispiele</title>
<p>Nachfolgend sehen Sie eine Liste logischer Operatoren und Beispiele für Suchergebnisse, wenn Sie diese Operatoren in einer Suche verwenden.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operator</gui></p></td>
- <td><p><gui>Beschreibung</gui></p></td>
+ <td><p><gui>Operator</gui></p></td> <td><p><gui>Beschreibung</gui></p></td>
</tr>
<tr>
- <td><p><em>Vorgabe</em>, <em>Leerzeichen</em></p></td>
- <td><p>Sucht nach zwei Begriffen mit einem Leerzeichen zwischen den Wörtern oder Begriffen.</p></td>
+ <td><p><em>Vorgabe</em>, <em>Leerzeichen</em></p></td> <td><p>Sucht nach zwei Begriffen mit einem Leerzeichen zwischen den Wörtern oder Begriffen.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Als Suchergebnis erhalten Sie zwei Lieder mit je einem Ergebnis in jedem Feld.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Als Suchergebnis erhalten Sie zwei Lieder mit je einem Ergebnis in jedem Feld.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>Keine Suchergebnisse anzeigen, die den Teil des Suchbegriffs enthalten, der dem Operator NOT folgt, <key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Beispiele für logische Operationen:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Abfrage</gui></p></td>
- <td><p><gui>Beschreibung</gui></p></td>
+ <td><p><gui>Abfrage</gui></p></td> <td><p><gui>Beschreibung</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Berücksichtigt alle Felder in einem Titel, die sowohl <em>dave</em> als auch <em>matthews</em> enthalten.</p></td>
+ <td><p>dave matthews</p></td> <td><p>Berücksichtigt alle Felder in einem Titel, die sowohl <em>dave</em> als auch <em>matthews</em> enthalten.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Berücksichtigt alle Felder in einem Titel, die entweder <em>dave</em> oder <em>matthews</em> enthalten.</p></td>
+ <td><p>dave, matthews</p></td> <td><p>Berücksichtigt alle Felder in einem Titel, die entweder <em>dave</em> oder <em>matthews</em> enthalten.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Berücksichtigt alle Felder in einem Titel, die entweder <em>dave</em> oder <em>matthews</em> enthalten.</p></td>
- </tr>
+ <td><p>dave or matthews</p></td> <td><p>Berücksichtigt alle Felder in einem Titel, die entweder <em>dave</em> oder <em>matthews</em> enthalten.</p></td>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Berücksichtigt alle Felder in einem Titel, die entweder <em>dave</em> oder <em>matthews</em> enthalten.</p></td>
- </tr>
+ <td><p>dave | matthews</p></td> <td><p>Berücksichtigt alle Felder in einem Titel, die entweder <em>dave</em> oder <em>matthews</em> enthalten.</p></td>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Zeigt alle Titel an, deren Felder nicht <em>dave matthews</em> enthalten.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>Zeigt alle Titel an, deren Felder nicht <em>dave matthews</em> enthalten.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Weitere Informationen über die Ausführung komplexerer Suchanfragen finden Sie in <link xref="adv-search"/>.</p>
+
</section>
-
+
</page>
diff --git a/help/de/sort.page b/help/de/sort.page
index 39a07f4..b5a4a4e 100644
--- a/help/de/sort.page
+++ b/help/de/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Hinzufügen von Spalten</title>
+
<p>Mit zunehmender Größe Ihrer Bibliothek kann es sinnvoll werden, die Ansicht der Bibliothek zu ändern, damit zusätzliche Informationen zu den Liedern angezeigt werden, oder auch das Schema anzupassen, nach dem Lieder, Interpreten und Alben angezeigt und sortiert werden können.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>Sie können zusätzliche Spalten zur Bibliotheksansicht in <app>Banshee</app> hinzufügen, um weitere Informationen über die Titel und die Sortierung anhand dieser Informationen zu ermöglichen. Standardmäßig zeigt Banshee die Spalten <gui>Name</gui>, <gui>Interpret</gui>, <gui>Album</gui> und <gui>Zeit</gui> an. Um zusätzliche Spalten hinzuzufügen, klicken Sie mit der rechten Maustaste auf eine beliebige Spalte, woraufhin Banshee alle zur Auswahl verfügbaren Spalten anzeigt. Klicken Si [...]
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Sortieren der Spalten</title>
+ <p>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 <gui>Künstler</gui>, und Banshee sortiert diese Spalte alphabetisch nach dem Namen des Künstlers. Klicken Sie erneut in die Kopfzeile der Spalte <gui>Künstler</gui>, um die Sortierreihenfolge der Spalte umzukehren.</p>
</section>
-
+
</page>
diff --git a/help/de/sync.page b/help/de/sync.page
index 097c62b..4442e88 100644
--- a/help/de/sync.page
+++ b/help/de/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Abgleichen Ihrer Medien mit einem tragbaren Abspielgerät oder Smartphone.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Abgleich</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Abgleich</title>
+
+ <p>Banshee unterstützt den Abgleich Ihrer Musik mit tragbaren Musikwiedergabegeräten und Smartphones. Sie können bestimmte Musiktitel, Alben oder Wiedergabelisten hinzufügen oder Banshee gestatten, Ihr Wiedergabegerät direkt mit Ihrer gesamten Bibliothek synchron zu halten. Wenn Sie Ihr Wiedergabegerät angeschlossen haben, dann können sie die darauf befindliche Musik direkt in Banshee abspielen. Beim Abgleich von Musik in einem verlustlosen Format wie z.B. FLAC, wandelt Banshee Ihre Mu [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Geräteunterstützung</title>
+ <p>Banshee unterstützt beinahe alle aktuellen tragbaren Musikwiedergabegeräte und Smartphones, mit den bekannten Ausnahmen für Apple iPhone, iPad und iPod Touch.</p>
+
+ <p>Wenn Sie Ihr Gerät anschließen, dann zeigt Banshee es im linken Menü an. Ein Klick auf das Symbol des Gerätes zeigt eine Übersichtsseite zu diesem Gerät in Banshee an, in der die Abgleicheinstellungen angezeigt werden.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Musik</p></item>
- <item><p>Hörbücher</p></item>
- <item><p>Videos</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>Wäheln Sie im Auswahlmenü neben jedem der Medien aus folgenden Optionen:</p>
-
- <list>
- <item><p>Manuell verwalten</p></item>
- <item><p>Gesamte Bibliothek abgleichen</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Ihre Musik abgleichen</title>
+ <p>Sie können wählen, ob die Medien Ihrer tragbaren Geräte automatisch abgeglichen werden sollen oder ob Sie Ihre Musik und Medien manuell verwalten wollen.</p>
+
+ <p>Wählen Sie Ihr Gerät im Banshee-Menü aus und wählen Sie anschließend, wie Sie Ihre Medien abgleichen wollen:</p>
+ <list>
+ <item><p>Musik</p></item>
+ <item><p>Hörbücher</p></item>
+ <item><p>Videos</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>Wäheln Sie im Auswahlmenü neben jedem der Medien aus folgenden Optionen:</p>
+ <list>
+ <item><p>Manuell verwalten</p></item>
+ <item><p>Gesamte Bibliothek abgleichen</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Wenn Sie sich dafür entscheiden, Ihre gesamte Bibliothek automatisch mit Ihrem tragbaren Wiedergabegerät abgleichen zu lassen, dann stellen Sie bitte sicher, dass genug Speicherplatz zur Verfügung steht. Falls Ihre Bibliothek umfangreicher ist als der auf dem tragbaren Wiedergabegerät vorhandene Speicherplatz, dann gleicht Banshee die Medien so lange ab, bis das Wiedergabegerät voll ist und bricht dann den Vorgang ab.</p>
+ </note>
+
+ <p>Falls Sie intelligente oder gewöhnliche Wiedergabelisten in Ihrer Musikbibliothek erstellt haben, dann werden diese auch als Abgleichoption für Musik angezeigt. Dies kann beim Erstellen intelligenter Wiedergabelisten hilfreich sein, da diese gemäß den Regeln der Wiedergabeliste automatisch aktualisiert werden, sobald neue Inhalte hinzugefügt werden. Banshee gleicht dann jedes Mal beim anschließen Ihres Gerätes die neue Wiedergabeliste ab.</p>
+
+ <p>Banshee zeigt den gesamten auf Ihrem tragbaren Wiedergabegerät vorhandenen Speicherplatz in einer Grafik unten in der Mitte des Banshee-Fensters an. Die Grafik zeigt an, wie viel Platz jeweils von Audio-, Video- und anderen Dateien beansprucht wird und wie viel freier Platz verfügbar ist. Direkt darunter zeigt Banshee die Gesamtanzahl der auf Ihrem tragbaren Wiedergabegerät gespeicherten Objekte an, die Gesamtzeit der möglichen Wiedergabe in Tagen und Stunden und den insgasamt gen [...]
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Abgleichen Ihrer gesamten Bibliothek</title>
+ <p>Sie können Medien von Banshee auf Ihr tragbares Wiedergabegerät ziehen und dort ablegen. Wählen Sie die Datei oder die Dateien aus, die Sie auf Ihr tragbares Wiedergabegerät kopieren möchten, dann klicken Sie sie mit der rechten Maustaste an, halten diese gedrückt und ziehen die Dateien auf das Symbol Ihres tragbaren Wiedergabegerätes in Banshee. Dadurch werden die Dateien auf Ihr Gerät kopiert.</p>
+
+ <p>Falls Ihre Musikbibliothek in einem Format vorliegt, mit dem Ihr tragbares Wiedergabegerät nicht umgehen kann, wie OGG oder FLAC, Sie aber die notwendigen Codecs installiert haben, dann kann Banshee diese Dateien bei der Übertragung auf Ihr tragbares Wiedergabegerät automatisch in MP3 umwandeln. Prüfen Sie in Ihrer Distribution, ob die notwendigen Codecs vorhanden sind. Einzelheiten dazu liegen außerhalb des Bereichs dieser Dokumentation und können von Distribution zu Distribution [...]
+
+ <note style="tip">
+ <p>Möglicherweise müssen Sie Ihr Gerät »auswerfen«, bevor die Dateien korrekt auf Ihr tragbares Wiedergabegerät geladen werden können. Um Ihr Gerät in Banshee auszuwerfen, klicken Sie mit der rechten Maustaste auf das Gerät im Banshee-Menü und klicken anschließend auf <gui>Trennen</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Abspielen von Musik von tragbaren Abspielgeräten</title>
+ <p>Sie können auf Ihrem tragbaren Wiedergabegerät gespeicherte Musik direkt in Banshee anhören. Wählen Sie Ihr Wiedergabegerät im Banshee-Menü an der linken Seite aus, woraufhin die Bibliothek Ihres tragbaren Wiedergabegerätes angezeigt wird. Sie können Sie Musik dann so wiedergeben, als ob Sie sich direkt in Ihrer eigenen Bibliothek befinden würde.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Dateien auf tragbaren Geräten werden dauerhaft entfernt und können nicht wiederhergestellt werden.</p>
- </note>
-
+ <title>Löschen von Musik von tragbaren Abspielgeräten</title>
+ <p>Um Titel zu löschen, die auf Ihrem tragbaren Wiedergabegerät gespeichert sind, wählen Sie Ihr Wiedergabegerät in Banshee aus, um dessen Bibliothek anzuzeigen. Wählen Sie dann die zu löschenden Titel aus, klicken Sie sie mit der rechten Maustaste an und wählen Sie <gui>Löschen</gui>. Alternativ wählen Sie im Menü <guiseq><gui>Bearbeiten</gui><gui>Löschen</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Dateien auf tragbaren Geräten werden dauerhaft entfernt und können nicht wiederhergestellt werden.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/de/ui.page b/help/de/ui.page
index 1afd288..c09c0b0 100644
--- a/help/de/ui.page
+++ b/help/de/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>Ein Überblick über die Benutzeroberfläche von <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Einführung in die Benutzeroberfläche von Banshee</title>
<figure>
<title>Fenster des <gui>Banshee Medien-Wiedergabeprogramms</gui></title>
<desc><app>Banshee Medien-Wiedergabeprogramm</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Bibliotheksschnittstelle von <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Quellen</title>
+ <p>Ihre Musik und Videos werden links in Banshee angezeigt. Über die Quellen erhalten Sie schnellen Zugriff auf Ihre Wiedergabe-Warteschlange, Musik, Videos, Amazon, Last.fm, Podcasts und mehr.</p>
+
+ <note style="tip">
+ <p>Abhängig von der von Ihnen gewählten Quelle ändert sich die Menüauswahl. Wenn Sie beispielsweise einen Podcast in Banshee importieren, müssen Sie die Podcast-Quelle wählen. Die Menüoption zum Importieren eines Podcasts ist jedoch nicht vorhanden, wenn Sie ein Video abspielen oder die Musikbibliothek betrachten.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Bibliotheksbrowser</title>
+ <p>Wenn Sie eine Musik- oder Videoquelle wählen, dann zeigt Banshee deren Inhalt im Bibliotheksbrowser an. Abhängig von der gewählten Quelle kann Banshee Ihre Musik- oder Videobibliothek, abonnierte Podcasts oder den Amazon-Musikladen anzeigen, wo Sie Musik kaufen können.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Die »Jetzt wiedergegeben«-Ansicht</title>
+ <p>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.</p>
+
+ <p>Um während des »Jetzt Wiedergegeben«-Modus die Banshee-Benutzeroberfläche zu verbergen und den Vollbildmodus zu verwenden, drücken Sie entweder die Taste <key>F</key> oder klicken Sie auf den Knopf <gui>Vollbild</gui> in der oberen rechten Ecke des Banshee-Fensters, oder wählen Sie <guiseq>Ansicht<gui/>Vollbild<gui/></guiseq>.</p>
+
+</section>
+
+<section id="library">
+ <title>Bibliothek</title>
+ <p>Abhängig von der von Ihnen gewählten Quelle ändert sich die Bibliotheksansicht in Banshee. Die Musikbibliothek zeigt Alben-Cover, die Künstler in Ihrer Bibliothek sowie eine Liste der Titel an. Die Podcast-Bibliothek zeigt Ihre abonnierten Podcasts, heruntergeladene oder nicht heruntergeladene Podcasts und alle alten oder neuen Podcasts an. In der Hilfeseite zu den Quellen finden Sie detailliertere Informationen über die Verwaltung einer Quelle.</p>
+</section>
- <section id="context">
- <title>Quellen</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/el/add-podcast.page b/help/el/add-podcast.page
new file mode 100644
index 0000000..b591aab
--- /dev/null
+++ b/help/el/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="el">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Προσθήκη, αφαίρεση και αναπαραγωγή φορητών εκπομπών στο Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Φορητές εκπομπές</title>
+
+ <section id="podcastdescription">
+ <title>Τι είναι η φορητή εκπομπή (Podcast);</title>
+
+ <p>Οι φορητές εκπομπές είναι ηχογραφημένα προγράμματα, παρόμοια με τα ραδιοφωνικά, που είναι διαθέσιμα στο διαδίκτυο και σας επιτρέπουν να γίνετε συνδρομητής. Όταν γίνετε συνδρομητής σε μια φορητή εκπομπή στο Banshee, κάθε φορά που παράγεται ένα καινούριο πρόγραμμα, το Banshee θα μεταφορτώσει αυτόματα την εκπομπή για να την ακούσετε.</p>
+
+ <p>Υπάρχουν φορητές εκπομπές για σχεδόν κάθε θέμα, περιλαμβανομένων μουσικής, ταινιών, Linux και άλλων. Αναζητήστε στο διαδίκτυο με χρήση της αγαπημένης σας μηχανής αναζήτησης με έναν όρο αναζήτησης όπως "movie podcast" και θα εμφανιστούν πολλές επιλογές για να διαλέξετε.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Προσθήκη φορητής εκπομπής (podcast)</title>
+
+ <p>Για να προσθέσετε μια φορητή εκπομπή στο Banshee θα χρειαστεί πρώτα να επισκεφτείτε την ιστοσελίδα της φορητής εκπομπής στο διαδίκτυο με τον περιηγητή ιστού σας. Σχεδόν όλες οι φορητές εκπομπές θα έχουν ένα κουμπί ή σύνδεσμο για να εγγραφείτε στη φορητή εκπομπή. Αντιγράψτε το δεσμό στη συνδρομή σας της φορητής εκπομπής. Στους περισσότερους περιηγητές ιστού μπορείτε να κάνετε δεξί κλικ στο δεσμό και να επιλέξετε <gui>Αντιγραφή δεσμού</gui>.</p>
+
+ <p>Στο Banshee, πατήστε και επιλέξτε <gui>Συνδρομή σε φορητές εκπομπές</gui>, στην πάνω δεξιά γωνία από το μενού επιλέξτε <guiseq><gui>Πολυμέσα</gui><gui> Συνδρομή στη φορητή εκπομπή</gui></guiseq> ή χρησιμοποιήστε τη συντόμευση πληκτρολογίου <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
+
+ <p>Το Banshee θα σας επιτρέψει τότε να επιλέξετε πως θέλετε να μεταφορτώνονται οι νέες φορητές εκπομπές από ένα αναπτυσσόμενο μενού. Οι επιλογές σας περιλαμβάνουν:</p>
+
+ <list>
+ <item><p>Μεταφόρτωση του πιο πρόσφατου επεισοδίου (Αυτό θα μεταφορτώσει αυτόματα το τελευταίο επεισόδιο που κυκλοφόρησε).</p></item>
+ <item><p>Μεταφόρτωση όλων των επεισοδίων (Αυτό θα μεταφορτώσει όλα τα επεισόδια).</p></item>
+ <item><p>Αφήστε με να αποφασίσω ποια επεισόδια θα μεταφορτωθούν (Αυτό θα σας επιτρέψει να επιλέξετε ποια επεισόδια θα θέλατε να μεταφορτώσετε).</p></item>
+ </list>
+
+ <p>Αφού προσθέσετε μια ροή φορητής εκπομπής, το Banshee θα εμφανίσει:</p>
+
+ <list>
+ <item><p><gui>Όνομα</gui>: (Όνομα του συγκεκριμένου επεισοδίου)</p></item>
+ <item><p><gui>Φορητή εκπομπή</gui>: (Όνομα της φορητής εκπομπής)</p></item>
+ <item><p><gui>Κυκλοφόρησε</gui> (Ημερομηνία κυκλοφορίας ή δημοσίευσης του επεισοδίου)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/el/add-radio.page b/help/el/add-radio.page
new file mode 100644
index 0000000..4f4d06e
--- /dev/null
+++ b/help/el/add-radio.page
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="el">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Προσθήκη, αφαίρεση και αναπαραγωγή σταθμών διαδικτυακού ραδιοφώνου στο Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Διαδικτυακό ραδιόφωνο</title>
+
+ <section id="radiodescription">
+ <title>Τι είναι το διαδικτυακό ραδιόφωνο;</title>
+
+ <p>Οι διαδικτυακοί ραδιοφωνικοί σταθμοί είναι παρόμοιοι με τους κανονικούς, επιτρέποντας σε ένα άτομο ή οργανισμό να μεταδώσει ζωντανά μουσική μέσω του διαδικτύου. Οι διαδικτυακοί ραδιοφωνικοί σταθμοί μπορεί να είναι μια ταυτόχρονη ροή ενός κανονικού ραδιοφωνικού σταθμού, ένας ερασιτέχνης που μεταδίδει το δικό του σταθμό ή εμπορικοί διαδικτυακοί σταθμοί με παραγωγούς, ζωντανό πρόγραμμα και διαφημίσεις.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Προσθήκη ραδιοφωνικού σταθμού</title>
+
+ <p>To add an internet radio station to Banshee, press <gui>Add Station</gui>
+ in the upper right hand corner of Banshee or, from the menu, choose <guiseq>
+ <gui>Media</gui><gui>Add Station</gui></guiseq>.
+ </p>
+
+ <p>Από την ιστοσελίδα του διαδικτυακού ραδιοφωνικού σταθμού, αντιγράψτε το URL της ροής του στον περιηγητή ιστού σας. Στους περισσότερους περιηγητές μπορείτε να κάνετε δεξί κλικ στο σύνδεσμο και να πατήσετε <gui>Αντιγραφή δεσμού</gui>.</p>
+
+
+ <p>Banshee will prompt you to enter the <gui>Station Genre</gui>.
+ Choose the kind of music the internet radio station plays from the available
+ drop down selections. You will then need to enter the <gui>Station Name</gui>.
+ Enter a name for the radio station. Then press tab or use your mouse to select
+ the <gui>Stream URL</gui> field to paste the URL of the radio station.
+ Using your mouse right click and choose <gui>Paste</gui> or press <keyseq>
+ <key>Control</key><key>V</key></keyseq>.</p>
+
+ <p>Μπορείτε προαιρετικά να συμπληρώσετε τα πεδία για <gui>Δημιουργό σταθμού</gui>, <gui>Περιγραφή</gui> και <gui>Βαθμολογία</gui>.</p>
+
+ <p>Μετά πατήστε <gui>Αποθήκευση</gui> για να αποθηκεύσετε τον διαδικτυακό σταθμό στο Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/cs/extensions.page b/help/el/advanced.page
similarity index 50%
copy from help/cs/extensions.page
copy to help/el/advanced.page
index 345cce3..3d37839 100644
--- a/help/cs/extensions.page
+++ b/help/el/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="cs">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="el">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Přidejte do <app>Banshee</app> další funkce.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Βοήθεια για προχωρημένες ενέργειες</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Επιλογές για προχωρημένους και βοήθεια</title>
- <title>Rozšíření <app>Banshee</app></title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Oficiální rozšíření <app>Banshee</app></title>
+ <title type="link">Συντομεύσεις πληκτρολογίου</title>
</info>
-
- <title>Správa rozšíření pro <app>Banshee</app></title>
-
+ <title>Συντομεύσεις πληκτρολογίου</title>
</section>
-
+
</page>
diff --git a/help/el/amazon.page b/help/el/amazon.page
index f09213b..b9f08f4 100644
--- a/help/el/amazon.page
+++ b/help/el/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Συγχρονισμός και αγορά μουσικής από το κατάστημα MP3 του Amazon.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,37 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Κατάστημα Amazon MP3</title>
-
- <p>Το <app>Banshee</app> υποστηρίζει μεταφόρτωση και εισαγωγή μουσικής από το κατάστημα Amazon MP3. Μπορείτε να εισάγετε χειροκίνητα μουσικά αρχεία του Amazon, να αγοράσετε μουσική από τον περιηγητή ιστού σας ή να αγοράσετε μουσική μέσα από το <app>Banshee</app>. Το Amazon προσφέρει μουσική προς πώληση ως MP3 μόνο σε ορισμένες χώρες και ανάλογα με την τοποθεσία σας, μπορεί να μην είναι δυνατή η αγορά MP3 από το Amazon.</p>
-
- <note style="important">
- <p>Το <app>Banshee</app> χρησιμοποιεί ένα κωδικό συνεργάτη του Amazon για όλες τις αγορές μουσικής. Όλα τα χρήματα που συγκεντρώνονται μέσω αυτού του κωδικού δωρίζονται στο GNOME Foundation.</p>
- </note>
-
+ <title>Κατάστημα Amazon MP3</title>
+
+ <p>Το Banshee υποστηρίζει μεταφόρτωση και εισαγωγή μουσικής από το κατάστημα Amazon MP3. Μπορείτε να εισάγετε χειροκίνητα μουσικά αρχεία του Amazon, να αγοράσετε μουσική από τον περιηγητή ιστού σας ή να αγοράσετε μουσική μέσα από το Banshee. Το Amazon προσφέρει μουσική προς πώληση ως MP3 μόνο σε ορισμένες χώρες και ανάλογα με την τοποθεσία σας μπορεί να μην είναι δυνατή η αγορά MP3 από το Amazon.</p>
+
+ <note style="important">
+ <p>Το Banshee χρησιμοποιεί ένα κωδικό συνεργάτη για όλες τις αγορές μουσικής. Όλα τα χρήματα που συγκεντρώνονται μέσω αυτού του κωδικού δωρίζονται στο GNOME Foundation.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Αγορά MP3 από το Amazon στον περιηγητή ιστού σας</title>
-
- <p>Η μουσική που αγοράστηκε από το κατάστημα MP3 του Amazon μπορεί να μεταφορτωθεί αυτόματα και να εισαχθεί στο <app>Banshee</app>. Το <app>Banshee</app> συσχετίζεται με το αρχείο .amz που παρέχει το Amazon για αγορές MP3. Όταν αγοράζετε μουσική στο Amazon, ο περιηγητής ιστού σας θα μεταφορτώσει το αρχείο .amz και το <app>Banshee</app> θα το ανοίξει αυτόματα και θα αρχίσει τη μεταφόρτωση και εισαγωγή της μουσικής.</p>
-
+ <title>Αγορά MP3 από το Amazon στον περιηγητή ιστού σας</title>
+
+ <p>Η μουσική που αγοράστηκε από το κατάστημα MP3 του Amazon μπορεί να μεταφορτωθεί αυτόματα και να εισαχθεί στο Banshee. Το Banshee συσχετίζεται με το αρχείο .amz που παρέχει το Amazon για αγορές MP3. Όταν αγοράζετε μουσική στο Amazon, ο περιηγητής ιστού σας θα μεταφορτώσει το αρχείο .amz και το Banshee θα το ανοίξει αυτόματα και θα αρχίσει τη μεταφόρτωση και εισαγωγή της μουσικής.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Αγορά MP3 του Amazon στο <app>Banshee</app></title>
-
- <p>Μπορείτε επίσης να αναζητήσετε τραγούδια στο Amazon μέσα από το <app>Banshee</app>. Επιλέξτε το κατάστημα Amazon MP3 από το μενού του <app>Banshee</app> αριστερά. Αυτό θα φορτώσει το κατάστημα Amazon MP3 ακριβώς σαν να ήσασταν σε περιηγητή ιστού. Μπορείτε να αναζητήσετε στο Amazon τη μουσική που επιθυμείτε να αγοράσετε και μετά τη σύνδεση στο Amazon, να την αγοράσετε με ένα πάτημα. Το <app>Banshee</app> θα μεταφορτώσει και θα εισάγει αυτόματα τις αγορές σας στη βιβλιοθήκη.</p>
-
+ <title>Αγορά MP3 του Amazon στο Banshee</title>
+
+ <p>Μπορείτε επίσης να αναζητήσετε τραγούδια στο Amazon μέσα από το Banshee. Επιλέξτε το κατάστημα Amazon MP3 από το μενού του Banshee αριστερά. Αυτό θα φορτώσει το κατάστημα Amazon MP3 ακριβώς σαν να ήσασταν σε περιηγητή ιστού. Μπορείτε να αναζητήσετε στο Amazon τη μουσική που επιθυμείτε να αγοράσετε και μετά τη σύνδεση στο Amazon, να την αγοράσετε με ένα κλικ. Το Banshee θα μεταφορτώσει και θα εισάγει αυτόματα τις αγορές σας στη βιβλιοθήκη.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Εισαγωγή MP3 του Amazon χειροκίνητα</title>
-
- <p>Όταν γίνεται αγορά μουσικής από το Amazon με περιηγητή ιστού, μεταφορτώνεται και αποθηκεύεται στον σκληρό σας δίσκο ένα αρχείο με επέκταση .amz. Για να εισάγετε χειροκίνητα μουσική που αγοράσθηκε από το Amazon, στο <app>Banshee</app>, επιλέξτε <guiseq><gui style="menu">Πολυμέσα</gui><gui style="menuitem">Εισαγωγή πολυμέσων</gui></guiseq> από το μενού και επιλέξτε το αρχείο *.amz που θα εισαχθεί. Το <app>Banshee</app> θα ανοίξει αυτό το αρχείο και θα συνδεθεί στο κατάστημα Amazon MP3 [...]
-
+ <title>Εισαγωγή MP3 του Amazon χειροκίνητα</title>
+
+ <p>Όταν γίνεται αγορά μουσικής από το Amazon με περιηγητή ιστού, μεταφορτώνεται και αποθηκεύεται στον υπολογιστή σας ένα αρχείο με επέκταση .amz. Για να εισάγετε χειροκίνητα μουσική που αγοράσθηκε από το Amazon, στο μενού του Banshee επιλέξτε <guiseq><gui>Πολυμέσα</gui><gui>Εισαγωγή πολυμέσων</gui></guiseq> και επιλέξτε το αρχείο *.amz που θα εισαχθεί. Το Banshee θα ανοίξει αυτό το αρχείο και θα συνδεθεί στο κατάστημα Amazon MP3 για να ξεκινήσει τη μεταφόρτωση.</p>
+
<note style="warning">
<p>Τα αρχεία .amz του Amazon είναι ενεργά μόνο για μικρό χρονικό διάστημα. Αν δεν μεταφορτώσετε τη μουσική σας γρήγορα, το αρχείο θα λήξει και δεν θα μπορέσετε να μεταφορτώσετε τη μουσική σας από το Amazon. Το Amazon δεν δημοσιοποιεί για πόσο χρόνο είναι ενεργά τα αρχεία. Συνίσταται να μεταφορτώσετε και να εισάγετε τυχόν αγορές σας από το Amazon εντός μίας ώρας από την αγορά.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/el/el.po b/help/el/el.po
index 370d412..8fc97f8 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -1,214 +1,173 @@
# Copyright (C) 2010 banshee's COPYRIGHT HOLDER
# This file is distributed under the same license as the banshee package.
# Michael Kotsarinis <mk73628 at gmail.com>, 2010, 2011.
-# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32 at gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: banshee master\n"
-"POT-Creation-Date: 2013-08-03 23:28+0000\n"
-"PO-Revision-Date: 2013-08-05 09:22+0300\n"
-"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32 at gmail.com>\n"
-"Language-Team: team at gnome.gr\n"
+"POT-Creation-Date: 2011-01-02 12:09+0000\n"
+"PO-Revision-Date: 2011-01-15 09:12+0300\n"
+"Last-Translator: Michael Kotsarinis <mk73628 at gmail.com>\n"
+"Language-Team: Greek team\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Virtaal 0.5.2\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-Country: GREECE\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:35(None) C/introduction.page:44(None)
-msgid ""
-"@@image: 'figures/main-window.png'; md5=a4b2814f0dce9333bceb0d05e910a796"
-msgstr ""
-"@@image: 'figures/main-window.png'· md5=a4b2814f0dce9333bceb0d05e910a796"
+#: 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:9(desc)
-msgid "An overview of the <app>Banshee</app> user interface."
-msgstr "Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>."
+#: C/ui.page:8(desc)
+msgid "An overview of <app>Banshee's</app> user interface."
+msgstr "Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>"
#: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name)
-#: C/search.page:12(name) C/radio.page:14(name) C/podcast.page:15(name)
-#: C/play.page:14(name) C/play-queue.page:18(name) C/manage-tags.page:12(name)
-#: C/manage-playlists.page:12(name) C/lastfm.page:12(name)
-#: C/keyboard-shortcuts.page:10(name) C/introduction.page:10(name)
-#: C/index.page:11(name) C/import.page:12(name) C/extensions.page:11(name)
-#: C/amazon.page:11(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/radio.page:15(email) C/podcast.page:16(email)
-#: C/play.page:15(email) C/play-queue.page:19(email)
-#: C/manage-tags.page:13(email) C/manage-playlists.page:13(email)
-#: C/lastfm.page:13(email) C/keyboard-shortcuts.page:11(email)
-#: C/introduction.page:11(email) C/index.page:12(email)
-#: C/import.page:13(email) C/extensions.page:12(email) C/amazon.page:12(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 at gnome.org"
msgstr "pcutler at gnome.org"
-#: C/ui.page:16(name) C/sync.page:16(name) C/sort.page:16(name)
-#: C/radio.page:18(name) C/play.page:22(name) C/play-queue.page:13(name)
-#: C/lastfm.page:16(name) C/introduction.page:14(name) C/index.page:19(name)
-#: C/import.page:20(name) C/amazon.page:15(name)
-msgid "Aruna Sankaranarayanan"
-msgstr "Aruna Sankaranarayanan"
-
-#: C/ui.page:17(email) C/sync.page:17(email) C/sort.page:17(email)
-#: C/search.page:17(email) C/radio.page:19(email) C/play.page:23(email)
-#: C/play-queue.page:14(email) C/lastfm.page:17(email)
-#: C/introduction.page:15(email) C/index.page:20(email)
-#: C/import.page:21(email) C/amazon.page:16(email)
-msgid "aruna.evam at gmail.com"
-msgstr "aruna.evam at gmail.com"
-
-#: C/ui.page:29(title)
-msgid "The <app>Banshee</app> user interface"
-msgstr "Η διεπαφή χρήστη του <app>Banshee</app>"
-
-#: C/ui.page:32(title) C/introduction.page:41(title)
+#: C/ui.page:24(title)
+msgid "Introduction to the Banshee User Interface"
+msgstr "Εισαγωγή στη διεπαφή χρήστη του Banshee"
+
+#: C/ui.page:27(title) C/introduction.page:43(title)
msgid "<gui>Banshee Media Player</gui> window"
msgstr "Παράθυρο <gui>Αναπαραγωγή πολυμέσων Banshee</gui>"
-#: C/ui.page:33(app) C/introduction.page:42(app)
+#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title)
msgid "Banshee Media Player"
msgstr "Αναπαραγωγή πολυμέσων Banshee"
-#: C/ui.page:36(p) C/introduction.page:45(p)
+#: C/ui.page:30(p) C/introduction.page:46(p)
msgid "<app>Banshee</app> library interface"
msgstr "Διεπαφή βιβλιοθήκης <app>Banshee</app>"
-#: C/ui.page:41(title)
+#: C/ui.page:35(title)
msgid "Sources"
msgstr "Πηγές"
-#: C/ui.page:43(p)
+#: C/ui.page:36(p)
msgid ""
-"Your music and video sources are shown on the left in <app>Banshee</app>. "
-"The sources give you quick access to your <gui>Play Queue</gui>, <gui>Music</"
-"gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>, <gui>Last.fm</gui>, "
-"<gui>Podcasts</gui> and more."
+"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 ""
"Οι πηγές για τη μουσική και τα βίντεό σας εμφανίζονται στα αριστερά στο "
-"<app>Banshee</app>. Οι πηγές σας δίνουν γρήγορη πρόσβαση στη <gui>Σειρά "
-"αναπαραγωγής</gui>, στη <gui>Μουσική</gui>, στα <gui>Βίντεο</gui>, στο "
-"<gui>Κατάστημα MP3 του Amazon</gui>, στο <gui>Last.fm</gui>, στις "
-"<gui>Φορητές εκπομπές</gui> και άλλα."
+"Banshee. Οι πηγές σας δίνουν γρήγορη πρόσβαση στη Σειρά αναπαραγωγής σας, "
+"στη Μουσική, στα Βίντεο, στο Amazon, στο Last.fm, στις Φορητές εκπομπές "
+"(Podcasts) και άλλα."
-#: C/ui.page:49(p)
+#: 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 "
-"<gui>Podcasts</gui> source. The menu option for importing a podcast is not "
-"available when viewing the video or music library."
+"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 ""
"Οι επιλογές του μενού θα αλλάζουν ανάλογα με την πηγή που έχετε επιλέξει. "
"Παραδείγματος χάριν, για να χρησιμοποιήσετε το μενού για την εισαγωγή μιας "
-"φορητής εκπομπής (podcast), πρέπει να επιλέξετε την πηγή <gui>Φορητές "
-"εκπομπές</gui>. Η επιλογή του μενού για εισαγωγή φορητής εκπομπής δεν είναι "
-"διαθέσιμη όταν βλέπετε τη βιβλιοθήκη των βίντεο ή της μουσικής."
+"φορητής εκπομπής (podcast), πρέπει να επιλέξετε την πηγή Φορητές εκπομπές. Η "
+"επιλογή του μενού για εισαγωγή φορητής εκπομπής δεν είναι διαθέσιμη όταν "
+"βλέπετε τη βιβλιοθήκη των βίντεο ή της μουσικής."
-#: C/ui.page:58(title)
-msgid "Library browser"
+#: C/ui.page:50(title)
+msgid "Library Browser"
msgstr "Περιηγητής βιβλιοθήκης"
-#: C/ui.page:60(p)
-msgid ""
-"When you select a music or video source from Sources, <app>Banshee</app> "
-"will display your content in the library browser. Depending on the source "
-"you choose, <app>Banshee</app> can display your music or video library, "
-"podcast subscriptions or even the Amazon Music Store to allow you to buy "
-"music."
-msgstr ""
-"Όταν επιλέγετε μια πηγή μουσικής ή βίντεο από τις πηγές σας, το "
-"<app>Banshee</app> θα εμφανίσει το περιεχόμενό σας στον περιηγητή "
-"βιβλιοθήκης. Ανάλογα με την πηγή που επιλέγετε, το <app>Banshee</app> μπορεί "
-"να εμφανίσει τη βιβλιοθήκη σας μουσικής ή βίντεο ή ακόμα το κατάστημα "
-"μουσικής του Amazon για να σας επιτρέψει να αγοράσετε μουσική."
-
-#: C/ui.page:68(title)
-msgid "<gui>Now Playing</gui> view"
-msgstr "Προβολή <gui>τρέχουσας αναπαραγωγής</gui>"
-
-#: C/ui.page:70(p)
-msgid ""
-"Helpful when using <app>Banshee</app> in full screen mode, the <gui>Now "
-"Playing</gui> mode hides the library to give you a larger view of the music "
-"or video you are watching. When listening to music, the <gui>Now Playing</"
-"gui> view will show you the artist name, album and cover art if available. "
-"If you are watching a video, <app>Banshee</app> will display the video."
-msgstr ""
-"Βοηθάει όταν χρησιμοποιείτε το <app>Banshee</app> σε κατάσταση πλήρους "
-"οθόνης, η κατάσταση <gui>τρέχουσας αναπαραγωγής</gui> αποκρύπτει τη "
-"βιβλιοθήκη για να σας δώσει μια μεγαλύτερη προβολή της μουσικής ή του βίντεο "
-"που παρακολουθείτε. Όταν ακούτε μουσική, η προβολή <gui>τρέχουσας "
-"αναπαραγωγής</gui> θα εμφανίσει το όνομα του καλλιτέχνη, τον δίσκο και το "
-"εξώφυλλο, αν είναι διαθέσιμα. Αν παρακολουθείτε βίντεο το <app>Banshee</app> "
-"θα εμφανίσει το βίντεο."
-
-#: C/ui.page:77(p)
+#: C/ui.page:51(p)
msgid ""
-"To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app> "
-"user interface and view your media in full screen mode instead, you can do "
-"any of the following:"
+"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 ""
-"Για αλλαγή της κατάστασης <gui>τρέχουσας αναπαραγωγής</gui> για να κρύψετε "
-"τη διεπαφή χρήστη του <app>Banshee</app> και να προβάλετε τα μέσα σας σε "
-"κατάσταση πλήρους οθόνης, μπορείτε να κάνετε οποιοδήποτε από τα παρακάτω:"
-
-#: C/ui.page:83(p)
-msgid "Double-click the view with your mouse."
-msgstr "Διπλοπατήστε την προβολή με το ποντίκι σας."
-
-#: C/ui.page:86(p)
-msgid "Press <key>F</key>."
-msgstr "Πατήστε <key>F</key>."
-
-#: C/ui.page:89(p)
-msgid "Press <key>F11</key>."
-msgstr "Πατήστε <key>F11</key>."
-
-#: C/ui.page:92(p)
-msgid ""
-"Press the <gui style=\"button\">Fullscreen</gui> button in the upper right "
-"hand corner of <app>Banshee</app>."
-msgstr ""
-"Πατήστε το κουμπί <gui style=\"button\">Πλήρης οθόνη</gui> στην πάνω δεξιά "
-"γωνία του <app>Banshee</app>."
-
-#: C/ui.page:96(p)
-msgid ""
-"Select <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem"
-"\">Fullscreen</gui></guiseq>."
-msgstr ""
-"Επιλέξτε <guiseq><gui style=\"menu\">Προβολή</gui><gui style=\"menuitem\">Πλήρης "
-"οθόνη</gui></guiseq>."
-
-#: C/ui.page:104(title)
-msgid "Libraries"
-msgstr "Βιβλιοθήκες"
+"Όταν επιλέγετε μια πηγή μουσικής ή βίντεο από τις πηγές σας, το Banshee θα "
+"εμφανίσει το περιεχόμενό σας στον περιηγητή βιβλιοθήκης. Ανάλογα με την πηγή "
+"που επιλέγετε, το Banshee μπορεί να εμφανίσει τη βιβλιοθήκη σας μουσικής ή "
+"βίντεο ή ακόμα το κατάστημα μουσικής του Amazon για να σας επιτρέψει να "
+"αγοράσετε μουσική."
-#: C/ui.page:106(p)
-msgid ""
-"The <gui>Libraries</gui> view in <app>Banshee</app> will change depending on "
-"the Source you have chosen. For example, the <gui>Music</gui> library will "
-"display cover art, artists in your library, and list of songs and the "
-"<gui>Podcasts</gui> library will display your podcast subscriptions, "
-"podcasts that are downloaded or not downloaded, and all, new or old "
-"podcasts. Please see the help page of each source for detailed information "
+#: 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 ""
+"Βοηθάει όταν χρησιμοποιείτε το Banshee σε κατάσταση πλήρους οθόνης, η "
+"κατάσταση τρέχουσας αναπαραγωγής αποκρύπτει τη βιβλιοθήκη για να σας δώσει "
+"μια μεγαλύτερη προβολή της μουσικής ή του βίντεο που παρακολουθείτε. Όταν "
+"ακούτε μουσική, η προβολή τρέχουσας αναπαραγωγής θα εμφανίσει το όνομα του "
+"καλλιτέχνη, το δίσκο και το εξώφυλλο, αν είναι διαθέσιμα. Αν παρακολουθείτε "
+"βίντεο το Banshee θα εμφανίσει το βίντεο."
+
+#: 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 <key>F</key>, press the <gui>Fullscreen</"
+#| "gui> button in the upper right hand corner of Banshee, or choose "
+#| "<guiseq>View<gui/>Fullscreen<gui/></guiseq> to start Fullscreen mode."
+msgid ""
+"To change Now Playing to hide the Banshee user interface and use the full "
+"screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui> "
+"button in the upper right hand corner of Banshee, or choose "
+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen "
+"mode."
+msgstr ""
+"Για να αλλάξετε την τρέχουσα αναπαραγωγή για να αποκρυφτεί η διεπαφή χρήστη "
+"του Banshee και να χρησιμοποιηθεί η κατάσταση πλήρους οθόνης, πατήστε το "
+"<key>F</key> ή το κουμπί <gui>Πλήρης οθόνη</gui> στην πάνω δεξιά γωνία του "
+"Banshee ή επιλέξτε <guiseq>Προβολή<gui/>Πλήρης οθόνη<gui/></guiseq> για να "
+"αρχίσετε την κατάσταση πλήρους οθόνης."
+
+#: 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 ""
-"Η προβολή <gui>βιβλιοθήκες</gui> στο <app>Banshee</app> θα αλλάξει ανάλογα "
-"με την πηγή που έχετε επιλέξει. Για παράδειγμα, η βιβλιοθήκη "
-"<gui>μουσική</gui> θα εμφανίσει εξώφυλλο, καλλιτέχνες στη βιβλιοθήκη σας και "
-"λίστα τραγουδιών και η βιβλιοθήκη <gui>Φορητών εκπομπών</gui> θα εμφανίσει "
-"τις συνδρομές σας σε φορητές εκπομπές, εκπομπές που έχουν ή δεν έχουν "
-"μεταφορτωθεί και όλες, τις νέες ή τις παλιές εκπομπές. Παρακαλούμε, δείτε τη "
-"σελίδα βοήθειας κάθε πηγής για λεπτομερείς πληροφορίες για τη διαχείρισή "
-"μιας πηγής."
+"Η προβολή βιβλιοθήκης στο Banshee θα αλλάξει ανάλογα με την πηγή που έχετε "
+"επιλέξει. Η βιβλιοθήκη μουσικής θα εμφανίσει εξώφυλλο, καλλιτέχνες στη "
+"βιβλιοθήκη σας και λίστα τραγουδιών. Η βιβλιοθήκη φορητών εκπομπών θα "
+"εμφανίσει τις συνδρομές σας σε φορητές εκπομπές, εκπομπές που έχουν ή δεν "
+"έχουν μεταφορτωθεί και όλες, τις νέες ή τις παλιές εκπομπές. Παρακαλούμε "
+"δείτε τη σελίδα βοήθειας κάθε πηγής για λεπτομερείς πληροφορίες για τη "
+"διαχείρισή της."
#: C/sync.page:9(desc)
msgid "Sync your media to a portable media player or smartphone."
@@ -216,239 +175,230 @@ msgstr ""
"Συγχρονίστε τα πολυμέσα σας με μια φορητή συσκευή αναπαραγωγής ή ένα έξυπνο "
"κινητό."
-#: C/sync.page:28(title)
+#: C/sync.page:24(title)
msgid "Sync"
msgstr "Συγχρονισμός"
-#: C/sync.page:30(p)
+#: C/sync.page:26(p)
msgid ""
-"<app>Banshee</app> supports syncing your music to portable media players and "
+"Banshee supports syncing your music to portable media players and "
"smartphones. You can add specific music tracks, albums or playlist or allow "
-"<app>Banshee</app> 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 <app>Banshee</app>. When syncing "
-"music in a lossless format, such as FLAC, <app>Banshee</app> 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 ""
-"Το <app>Banshee</app> υποστηρίζει το συγχρονισμό της μουσικής σας με "
-"φορητούς αναπαραγωγείς μέσων και έξυπνα κινητά. Μπορείτε να προσθέσετε "
-"συγκεκριμένα μουσικά κομμάτια, δίσκους ή λίστες αναπαραγωγής ή να επιτρέψετε "
-"στο <app>Banshee</app> να συγχρονίσει τη συσκευή σας με ολόκληρη τη "
-"βιβλιοθήκη σας. Αφού η συσκευή σας συνδεθεί στον υπολογιστή σας μπορείτε "
-"επίσης να αναπαράγετε τα τραγούδια που είναι σε αυτή μέσω του "
-"<app>Banshee</app>. Όταν συγχρονίζετε μουσική σε μη απωλεστική μορφή, όπως "
-"το FLAC, το <app>Banshee</app> αυτόματα θα μετατρέψει τη μουσική σας σε μια "
+"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 ""
+"Το Banshee υποστηρίζει το συγχρονισμό της μουσικής σας με φορητούς "
+"αναπαραγωγείς και κινητά. Μπορείτε να προσθέσετε συγκεκριμένα μουσικά "
+"κομμάτια, δίσκους ή λίστες αναπαραγωγής ή να επιτρέψετε στο Banshee να "
+"συγχρονίσει τη συσκευή σας με ολόκληρη τη βιβλιοθήκη σας. Αφού η συσκευή σας "
+"συνδεθεί στον υπολογιστή σας μπορείτε επίσης να αναπαράγετε τα τραγούδια που "
+"είναι σε αυτή μέσω του Banshee. Όταν συγχρονίζετε μουσική σε μη απωλεστική "
+"μορφή, όπως το FLAC, το Banshee αυτόματα θα μετατρέψει τη μουσική σας σε μια "
"απωλεστική μορφή, όπως το Ogg Vorbis ή το MP3, αν έχετε τους σωστούς "
-"κωδικοποιητές-αποκωδικοποιητές εγκατεστημένους."
+"κωδικοποιητές εγκατεστημένους."
-#: C/sync.page:40(title)
-msgid "Device support"
+#: C/sync.page:37(title)
+msgid "Device Support"
msgstr "Υποστήριξη συσκευών"
-#: C/sync.page:42(p)
+#: C/sync.page:38(p)
msgid ""
-"<app>Banshee</app> supports almost all modern portable music players and "
-"smartphones with the notable exception of the Apple iPhone, iPad and iPod "
-"Touch."
+"Banshee supports almost all modern portable music players and smartphones "
+"with the notable exception of the Apple iPhone, iPad and iPod Touch."
msgstr ""
-"Το <app>Banshee</app> υποστηρίζει σχεδόν όλες τις σύγχρονες φορητές συσκευές "
-"αναπαραγωγής και τα έξυπνα κινητά με την αξιοσημείωτη εξαίρεση των iPhone, "
+"Το Banshee υποστηρίζει σχεδόν όλες τις σύγχρονες φορητές συσκευές "
+"αναπαραγωγής και τα «έξυπνα» κινητά με την αξιοσημείωτη εξαίρεση των iPhone, "
"iPad και iPod Touch της Apple."
-#: C/sync.page:46(p)
+#: C/sync.page:42(p)
msgid ""
-"When you plug your device in, <app>Banshee</app> will display it in the left "
-"menu. Pressing the device icon will take you to your device home page in "
-"<app>Banshee</app> displaying your sync preferences."
+"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 ""
-"Όταν συνδέσετε τη συσκευή σας, το <app>Banshee</app> θα την εμφανίσει στο "
-"αριστερό μενού. Πατώντας το εικονίδιο της συσκευής θα μεταφερθείτε στην "
-"αρχική της σελίδα στο <app>Banshee</app> όπου εμφανίζονται οι προτιμήσεις "
-"σας συγχρονισμού."
+"Όταν συνδέσετε τη συσκευή σας, το Banshee θα την εμφανίσει στο αριστερό "
+"μενού. Πατώντας το εικονίδιο της συσκευής θα μεταφερθείτε στην αρχική της "
+"σελίδα στο Banshee όπου εμφανίζονται οι προτιμήσεις σας συγχρονισμού."
-#: C/sync.page:53(title)
-msgid "Sync your music"
-msgstr "Συγχρονισμός της μουσικής σας"
+#: C/sync.page:50(title)
+msgid "Sync Your Music"
+msgstr "Συγχρονίστε τη μουσική σας"
-#: C/sync.page:55(p)
+#: C/sync.page:51(p)
msgid ""
-"You can choose to manage the media on your portable music by having "
-"<app>Banshee</app> automatically sync it or manage your music and media "
-"manually."
+"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 ""
"Μπορείτε να επιλέξετε να διαχειρίζεστε τα πολυμέσα στη φορητή σας συσκευή "
-"βάζοντας το <app>Banshee</app> να κάνει αυτόματο συγχρονισμό ή να "
-"διαχειρίζεστε τη μουσική και τα πολυμέσα σας χειροκίνητα."
+"βάζοντας το Banshee να κάνει αυτόματο συγχρονισμό ή να διαχειρίζεστε τη "
+"μουσική και τα πολυμέσα σας χειροκίνητα."
-#: C/sync.page:59(p)
+#: C/sync.page:56(p)
msgid ""
-"Choose your device from the <app>Banshee</app> menu and then choose how you "
-"want to sync your media, including:"
+"Choose your device from the Banshee menu and then choose how you want to "
+"sync your media, including:"
msgstr ""
-"Επιλέξτε τη συσκευή σας από το μενού του <app>Banshee</app> και μετά "
-"επιλέξτε πώς θέλετε να συγχρονίσετε τα πολυμέσα σας, συμπεριλαμβανομένων:"
+"Επιλέξτε τη συσκευή σας από το μενού του Banshee και μετά επιλέξτε πως "
+"θέλετε να συγχρονίσετε τα πολυμέσα σας, συμπεριλαμβανομένων:"
-#: C/sync.page:63(p)
+#: C/sync.page:60(p)
msgid "Music"
msgstr "Μουσικής"
-#: C/sync.page:64(p)
+#: C/sync.page:61(p)
msgid "Audiobooks"
msgstr "Ηχογραφημένων βιβλίων"
-#: C/sync.page:65(p)
+#: C/sync.page:62(p)
msgid "Videos"
msgstr "Βίντεο"
-#: C/sync.page:66(p) C/podcast.page:31(title)
-#: C/keyboard-shortcuts.page:90(title)
-msgid "Podcasts"
-msgstr "Φορητές εκπομπές"
+#: C/sync.page:63(p)
+msgid "Podcast"
+msgstr "Φορητών εκπομπών (podcast)"
-#: C/sync.page:69(p)
+#: C/sync.page:66(p)
msgid "From the dropdown menu next to each of the media, choose from:"
msgstr "Από το αναπτυσσόμενο μενού δίπλα σε κάθε μέσο, επιλέξτε από:"
-#: C/sync.page:72(p)
+#: C/sync.page:69(p)
msgid "Manage manually"
msgstr "Χειροκίνητη διαχείριση"
-#: C/sync.page:73(p)
+#: C/sync.page:70(p)
msgid "Sync entire library"
msgstr "Συγχρονισμός όλης της βιβλιοθήκης"
-#: C/sync.page:77(p)
+#: 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, "
-"<app>Banshee</app> will sync media until your player is full and then stop."
+"Banshee will sync media until your player is full and then stop."
msgstr ""
"Αν επιλέξετε να συγχρονίσετε όλη τη βιβλιοθήκη σας αυτόματα με τη φορητή "
-"συσκευή σας αναπαραγωγής βεβαιωθείτε ότι η φορητή συσκευή σας έχει αρκετό "
-"χώρο αποθήκευσης. Αν η βιβλιοθήκη σας είναι μεγαλύτερη από τον χώρο στη "
-"φορητή συσκευή σας, το <app>Banshee</app> θα συγχρονίσει μέχρι να γεμίσει η "
-"συσκευή και μετά θα σταματήσει."
+"συσκευή σας αναπαραγωγής βεβαιωθείτε ότι η συσκευή έχει αρκετό χώρο "
+"αποθήκευσης. Αν η βιβλιοθήκη σας είναι μεγαλύτερη από το χώρο στη συσκευή, "
+"το Banshee θα συγχρονίσει μέχρι να γεμίσει η συσκευή και μετά θα σταματήσει."
-#: C/sync.page:84(p)
+#: 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 <app>Banshee</app> "
-"will sync the new playlist to your device every time you plug it in."
+"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 ""
"Αν έχετε δημιουργήσει λίστες αναπαραγωγής ή έξυπνες λίστες αναπαραγωγής στη "
"μουσική σας βιβλιοθήκη, θα εμφανιστούν και αυτές ως επιλογή συγχρονισμού για "
"τη μουσική. Αυτό μπορεί να βοηθά κατά τη δημιουργία έξυπνων λιστών "
"αναπαραγωγής, καθώς αυτές θα ενημερώνονται αυτόματα κατά την προθήκη νέου "
-"περιεχόμενου με βάση τους κανόνες της λίστας και το <app>Banshee</app> θα "
-"συγχρονίζει τη νέα λίστα με τη συσκευή σας κάθε φορά που τη συνδέετε."
-
-#: C/sync.page:90(p)
-msgid ""
-"<app>Banshee</app> will display the total hard drive space of your portable "
-"music player in a graph in the bottom center of <app>Banshee</app>. The "
-"graph will show you how much space is taken by audio files, video, other and "
-"free space. Directly below that <app>Banshee</app> 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 ""
-"Το <app>Banshee</app> θα εμφανίσει το συνολικό χώρο του σκληρού δίσκου της "
-"φορητής συσκευής σας αναπαραγωγής με ένα γράφημα στο κέντρο και κάτω στο "
-"<app>Banshee</app>. Το γράφημα θα σας δείξει πόσος χώρος καταλαμβάνεται από "
-"αρχεία ήχου, βίντεο και άλλα και τον ελεύθερο χώρο. Ακριβώς από κάτω το "
-"<app>Banshee</app> θα εμφανίσει πόσα συνολικά στοιχεία είναι αποθηκευμένα "
-"στη συσκευή σας, σε πόσες ώρες ή ημέρες ακρόασης αντιστοιχούν και το "
-"συνολικό χώρο που χρησιμοποιείται."
+"περιεχόμενου με βάση τους κανόνες της λίστας και το Banshee θα συγχρονίζει "
+"τη νέα λίστα με τη συσκευή σας κάθε φορά που τη συνδέετε."
+
+#: 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 ""
+"Το Banshee θα εμφανίσει το συνολικό χώρο του σκληρού δίσκου της φορητής "
+"συσκευής σας αναπαραγωγής με ένα γράφημα στο κέντρο και κάτω στο Banshee. Το "
+"γράφημα θα σας δείξει πόσος χώρος καταλαμβάνεται από αρχεία ήχου, βίντεο και "
+"άλλα και τον ελεύθερο χώρο. Ακριβώς από κάτω το Banshee θα εμφανίσει πόσα "
+"συνολικά αντικείμενα είναι αποθηκευμένα στη συσκευή σας, σε πόσες ώρες ή "
+"ημέρες ακρόασης αντιστοιχούν και το συνολικό χώρο που χρησιμοποιείται."
#: C/sync.page:100(title)
-msgid "Sync your entire library"
-msgstr "Συγχρονισμός όλης της βιβλιοθήκης σας"
+msgid "Sync Your Entire Library"
+msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκης σας"
-#: C/sync.page:102(p)
+#: C/sync.page:101(p)
msgid ""
-"You can drag and drop media to your portable music player from <app>Banshee</"
-"app>. 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 <app>Banshee</app>. This will copy the "
-"files to your device."
+"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 ""
"Μπορείτε να σύρετε και να αφήσετε μέσα στη φορητή σας συσκευή από το "
-"<app>Banshee</app>. Επιλέξετε το αρχεία ή τα αρχεία που θέλετε να "
-"αντιγράψετε στη φορητή σας συσκευή αναπαραγωγής και μετά πατήστε και "
-"κρατήστε πατημένο το δεξί κουμπί του ποντικού και σύρετε το αρχείο ή τα "
-"αρχεία στο εικονίδιο της φορητής σας συσκευής στο <app>Banshee</app>. Αυτό "
-"θα αντιγράψει τα αρχεία στη συσκευή σας."
+"Banshee. Επιλέξετε το αρχεία ή τα αρχεία που θέλετε να αντιγράψετε στη "
+"φορητή σας συσκευή αναπαραγωγής και μετά πατήστε και κρατήστε πατημένο το "
+"δεξί κουμπί του ποντικού και σύρετε το αρχείο ή τα αρχεία στο εικονίδιο της "
+"φορητής σας συσκευής στο Banshee. Αυτό θα αντιγράψει τα αρχεία στη συσκευή "
+"σας."
#: 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, <app>Banshee</app> can automatically transcode these files to MP3 "
-"when transferring to your portable media player. Check with your Linux "
+"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 ""
"Αν η μουσική σας βιβλιοθήκη είναι κωδικοποιημένη σε μορφή που δεν "
"υποστηρίζει η φορητή σας συσκευή, όπως OGG ή FLAC, και έχετε τους "
-"απαραίτητους κωδικοποιητές εγκατεστημένους, το <app>Banshee</app> θα "
-"μετατρέψει αυτόματα αυτά τα αρχεία σε MP3 κατά τη μεταφορά τους στη φορητή "
-"συσκευή αναπαραγωγής. Ελέγξτε τη διανομή σας Linux για τους απαραίτητους "
-"κωδικοποιητές-αποκωδικοποιητές καθώς είναι εκτός του πεδίου αυτής της "
-"βοήθειας και διαφέρει ανά διανομή."
+"απαραίτητους κωδικοποιητές εγκατεστημένους, το Banshee θα μετατρέψει "
+"αυτόματα αυτά τα αρχεία σε MP3 κατά τη μεταφορά τους στη φορητή συσκευή "
+"αναπαραγωγής. Ελέγξτε τη διανομή σας Linux για τους απαραίτητους "
+"κωδικοποιητές καθώς είναι εκτός του πεδίου αυτής της βοήθειας και διαφέρει "
+"ανά διανομή."
-#: C/sync.page:116(p)
+#: 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 <app>Banshee</app>, using "
-"your mouse right click the device in the <app>Banshee</app> menu and press "
-"<gui style=\"menuitem\">Disconnect</gui>."
+"portable music player. To eject your device in Banshee, using your mouse "
+"right click the device in the Banshee menu and press <gui>Disconnect</gui>."
msgstr ""
-"Μπορεί να χρειαστεί να αφαιρέσετε τη συσκευή σας για να φορτωθούν τα αρχεία "
-"σωστά στη φορητή συσκευή σας. Για να το κάνετε αυτό στο <app>Banshee</app>, "
-"δεξιοπατήστε τη συσκευή στο μενού του <app>Banshee</app> και πατήστε <gui "
-"style=\"menuitem\">Αποσύνδεση</gui>."
+"Μπορεί να χρειασθεί να αφαιρέσετε τη φορητή συσκευή σας για να φορτωθούν τα "
+"αρχεία σωστά σε αυτή. Για να το κάνετε αυτό στο Banshee, κάντε δεξί κλικ με "
+"το ποντίκι πάνω στη συσκευή στο μενού του Banshee και πατήστε "
+"<gui>Αποσύνδεση</gui>."
-#: C/sync.page:125(title)
-msgid "Play music from your portable music player"
+#: C/sync.page:127(title)
+msgid "Play Music From Your Portable Music Player"
msgstr "Αναπαραγωγή μουσικής από τη φορητή σας συσκευή αναπαραγωγής"
-#: C/sync.page:127(p)
+#: C/sync.page:128(p)
msgid ""
-"You can play music stored on your portable music player directly in "
-"<app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the "
-"left and your portable music player's library will be displayed. You can "
-"then play music in <app>Banshee</app> just as you would music in your own "
-"library."
+"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 ""
"Μπορείτε να αναπαράγετε μουσική αποθηκευμένη στη φορητή σας συσκευή "
-"απευθείας στο <app>Banshee</app>. Επιλέξτε την από το μενού του "
-"<app>Banshee</app> αριστερά και θα εμφανιστεί η βιβλιοθήκη μουσικής που "
-"περιέχει. Μπορείτε έπειτα, να αναπαράγετε τη μουσική στο <app>Banshee</app> "
-"ακριβώς όπως θα κάνατε με τη μουσική της βιβλιοθήκης σας."
+"απευθείας στο Banshee. Επιλέξτε τη από το μενού του Banshee αριστερά και θα "
+"εμφανιστεί η βιβλιοθήκη μουσικής που περιέχει. Μπορείτε εν συνεχεία να "
+"αναπαράγετε τη μουσική ακριβώς όπως με τη μουσική της βιβλιοθήκης σας."
-#: C/sync.page:136(title)
-msgid "Remove music from your portable music player"
+#: C/sync.page:135(title)
+msgid "Remove Music From your Portable Music Player"
msgstr "Αφαιρέστε μουσική από τη φορητή σας συσκευή αναπαραγωγής"
-#: C/sync.page:138(p)
+#: C/sync.page:136(p)
msgid ""
"To remove songs stored on your portable music player, choose your player in "
-"<app>Banshee</app> to view its library. Then choose the tracks you would "
-"like to remove and right click the tracks and choose <gui style=\"menuitem"
-"\">Delete</gui> or from the menu choose <guiseq><gui style=\"menu\">Edit</"
-"gui><gui style=\"menuitem\">Delete</gui></guiseq>."
+"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 "
+"<guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
msgstr ""
"Για να αφαιρέσετε τραγούδια αποθηκευμένα στη φορητή σας συσκευή, επιλέξτε τη "
-"στο <app>Banshee</app> για να δείτε τη βιβλιοθήκη της. Έπειτα επιλέξτε τα "
-"κομμάτια που θα θέλατε να αφαιρέσετε και δεξιοπατήστε στα κομμάτια και "
-"επιλέξτε <gui style=\"menuitem\">Διαγραφή</gui> ή από το μενού επιλέξτε "
-"<guiseq><gui style=\"menu\">Επεξεργασία</gui><gui "
-"style=\"menuitem\">Διαγραφή</gui></guiseq>."
+"στο Banshee για να δείτε τη βιβλιοθήκη της. Έπειτα επιλέξτε τα κομμάτια που "
+"θα θέλατε να αφαιρέσετε και κάντε δεξί κλικ στα κομμάτια και επιλέξτε "
+"\"Διαγραφή\" ή από το μενού επιλέξτε <guiseq><gui>Επεξεργασία</"
+"gui><gui>Διαγραφή</gui></guiseq>."
-#: C/sync.page:146(p)
+#: 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."
msgid ""
"Deleting files from your portable music player will permanently remove the "
"files and you will not be able to recover them."
@@ -460,15 +410,18 @@ msgstr ""
msgid "Sort your media and add additional columns."
msgstr "Ταξινομήστε τα μέσα σας και προσθέστε επιπλέον στήλες."
-#: C/sort.page:28(title)
+#: C/sort.page:24(title)
msgid "Sort your media"
msgstr "Ταξινομήστε τα μέσα σας"
-#: C/sort.page:32(title)
-msgid "Adding columns"
+#: C/sort.page:28(title)
+msgid "Adding Columns"
msgstr "Προσθήκη στηλών"
-#: C/sort.page:34(p)
+#: 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."
msgid ""
"As your library grows, you may want to change your library view to add "
"additional information about the songs in your library or change the way you "
@@ -479,117 +432,126 @@ msgstr ""
"αλλάξετε τον τρόπο προβολής και ταξινόμησης για τα τραγούδια, καλλιτέχνες ή "
"δίσκους σας."
-#: C/sort.page:38(p)
+#: C/sort.page:34(p)
msgid ""
"You can add additional columns to the library view in <app>Banshee</app> to "
"give you more information about the songs and also allow you to sort by. By "
-"default, <app>Banshee</app> displays columns for songs including <gui>Name</"
-"gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To add "
-"additional columns, using your mouse right click on any of the columns and "
-"<app>Banshee</app> 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."
+"default, Banshee displays columns for songs including <gui>Name</gui>, "
+"<gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. 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 ""
"Μπορείτε να προσθέσετε περισσότερες στήλες στην προβολή βιβλιοθήκης στο "
"<app>Banshee</app> για να έχετε περισσότερες πληροφορίες για τα τραγούδια "
-"και επίσης να μπορείτε να τα ταξινομήσετε. Ως προεπιλογή, το "
-"<app>Banshee</app> εμφανίζει για τα τραγούδια στήλες που περιλαμβάνουν "
-"<gui>Όνομα</gui>, <gui>Καλλιτέχνη</gui>, <gui>Δίσκο</gui> και "
-"<gui>Διάρκεια</gui>. Για να προσθέσετε επιπλέον στήλες, δεξιοπατήστε σε "
-"οποιαδήποτε από τις στήλες και το <app>Banshee</app> θα εμφανίσει όλες τις "
-"διαθέσιμες στήλες για να επιλέξετε. Πατήστε το πλαίσιο ελέγχου δίπλα από το "
-"όνομα της στήλης που θέλετε να προσθέσετε στην προβολή βιβλιοθήκης."
-
-#: C/sort.page:50(title)
-msgid "Sorting columns"
+"και επίσης να μπορείτε να τα ταξινομήσετε. Ως προεπιλογή, το Banshee "
+"εμφανίζει για τα τραγούδια στήλες που περιλαμβάνουν <gui>Όνομα</gui>, "
+"<gui>Καλλιτέχνη</gui>, <gui>Δίσκο</gui> και <gui>Διάρκεια</gui>. Για να "
+"προσθέσετε επιπλέον στήλες, κάντε δεξί κλικ με το ποντίκι σας σε οποιαδήποτε "
+"από τις στήλες και το Banshee θα εμφανίσει όλες τις διαθέσιμες στήλες για να "
+"επιλέξετε. Κάντε κλικ στο πεδίο δίπλα από το όνομα της στήλης που επιθυμείτε "
+"να προσθέσετε στην προβολή βιβλιοθήκης."
+
+#: C/sort.page:46(title)
+msgid "Sorting Columns"
msgstr "Ταξινόμηση στηλών"
-#: C/sort.page:52(p)
+#: 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 <gui>Artist</gui> column header and Banshee will "
+#| "automically sort that column alphabetically. Clicking the <gui>Artist</"
+#| "gui> column again will sort the column in reverse alphabetical order."
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 <gui>Artist</gui> column header and <app>Banshee</app> will "
-"automatically sort that column alphabetically. Clicking the <gui>Artist</"
-"gui> column again will sort the column in reverse alphabetical order."
+"click the <gui>Artist</gui> column header and Banshee will automatically "
+"sort that column alphabetically. Clicking the <gui>Artist</gui> column again "
+"will sort the column in reverse alphabetical order."
msgstr ""
-"Μπορείτε να ταξινομήσετε τη βιβλιοθήκη σας δεξιοπατώντας σε οποιαδήποτε "
-"στήλη εμφανίζεται στην προβολή βιβλιοθήκης. Αν θέλετε να ταξινομήσετε τη "
-"μουσική σας βιβλιοθήκη κατά καλλιτέχνη, πατήστε στην επικεφαλίδα της στήλης "
-"<gui>Καλλιτέχνης</gui> και το <app>Banshee</app> αυτόματα θα την ταξινομήσει "
-"αλφαβητικά. Πατώντας τη στήλη <gui>Καλλιτέχνης</gui> ξανά, θα την "
-"ταξινομήσει με αντίστροφη αλφαβητική σειρά."
+"Μπορείτε να ταξινομήσετε τη βιβλιοθήκη σας κάνοντας κλικ με το ποντίκι σε "
+"οποιαδήποτε στήλη εμφανίζεται στην προβολή βιβλιοθήκης. Αν επιθυμείτε να "
+"ταξινομήσετε τη μουσική σας βιβλιοθήκη κατά καλλιτέχνη, κάντε κλικ στην "
+"επικεφαλίδα της στήλης <gui>Καλλιτέχνης</gui> και το Banshee αυτόματα θα την "
+"ταξινομήσει αλφαβητικά. Κάνοντας πάλι κλικ στη στήλη <gui>Καλλιτέχνης</gui> "
+"το Banshee θα την ταξινομήσει με αντίστροφη αλφαβητική σειρά."
#: C/search.page:9(desc)
msgid "Search your media and perfom basic queries."
msgstr "Αναζήτηση στα μέσα σας και βασικά ερωτήματα."
-#: C/search.page:16(name)
-msgid "Aruna sankaranarayanan"
-msgstr "Aruna sankaranarayanan"
+#: C/search.page:24(title)
+msgid "Searching your Banshee Library"
+msgstr "Αναζήτηση στη βιβλιοθήκη σας του Banshee"
-#: C/search.page:28(title)
-msgid "Searching your <app>Banshee</app> library"
-msgstr "Αναζήτηση στη βιβλιοθήκη σας του <app>Banshee</app>"
-
-#: C/search.page:30(p)
+#: C/search.page:26(p)
msgid ""
-"<app>Banshee</app> features a powerful search language. You can search your "
-"library quickly and easily with basic search terms or perform detailed "
-"searches with the <app>Banshee</app> advanced search terminology."
+"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 ""
-"Το <app>Banshee</app> έχει μια ισχυρή γλώσσα αναζήτησης. Μπορείτε να ψάξετε "
-"εύκολα και γρήγορα στη βιβλιοθήκη σας με βασικούς όρους αναζήτησης ή να "
-"κάνετε λεπτομερείς αναζητήσεις με την προχωρημένη ορολογία αναζήτησης του "
-"<app>Banshee</app>."
+"Το Banshee έχει μια ισχυρή γλώσσα αναζήτησης. Μπορείτε να ψάξετε εύκολα και "
+"γρήγορα στη βιβλιοθήκη σας με βασικούς όρους αναζήτησης ή να κάνετε "
+"λεπτομερείς αναζητήσεις με την προχωρημένη ορολογία αναζήτησης του Banshee."
-#: C/search.page:34(p)
+#: C/search.page:30(p)
msgid ""
-"To perform a search of your media in <app>Banshee</app>, press the <key>S</"
-"key> or click the <gui>Search</gui> box in the upper right hand corner of "
-"the Library view in <app>Banshee</app>."
+"To perform a search of your media in Banshee, press the <key>S</key> or "
+"click the <gui>Search</gui> box in the upper right hand corner of the "
+"Library view in Banshee."
msgstr ""
-"Για να εκτελέσετε μια αναζήτηση μέσων στο <app>Banshee</app>, πατήστε το "
-"<key>S</key> ή πατήστε το πλαίσιο <gui>Αναζήτηση</gui> στην πάνω δεξιά γωνία "
-"της προβολής βιβλιοθήκης στο <app>Banshee</app>."
+"Για να εκτελέσετε μια αναζήτηση στη βιβλιοθήκη των μέσων σας στο Banshee, "
+"πατήστε το <key>S</key> ή κάντε κλικ στο πεδίο <gui>Αναζήτηση</gui> στην "
+"πάνω δεξιά γωνία της προβολής βιβλιοθήκης στο Banshee."
-#: C/search.page:38(p)
+#: C/search.page:35(p)
+#| msgid ""
+#| "A search query consists of some basic terms, for example, <em>dave "
+#| "matthews</em>. By entering <em>dave matthews</em> in the search box, "
+#| "Banshee will search all metatdata fields including Track Title, Album "
+#| "Title, Album Artist, Year, etc. Any track whose metadata includes "
+#| "<em>dave</em> and <em>matthews</em> will be returned. Search terms are "
+#| "case, meaningyou don't have to capitalize. <em>dave</em>, <em>Dave</em>, "
+#| "and <em>DAVE</em> all mean the same thing when searching."
msgid ""
"A search query consists of some basic terms, for example, <em>dave matthews</"
-"em>. By entering <em>dave matthews</em> in the search box, <app>Banshee</"
-"app> will search all metadata fields including Track Title, Album Title, "
-"Album Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
-"<em>matthews</em> will be returned. Search terms are case insensitive, "
-"meaning you do not have to capitalize. <em>dave</em>, <em>Dave</em>, and "
-"<em>DAVE</em> all mean the same thing when searching."
+"em>. By entering <em>dave matthews</em> in the search box, Banshee will "
+"search all metatdata fields including Track Title, Album Title, Album "
+"Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
+"<em>matthews</em> will be returned. Search terms are case, meaning you don't "
+"have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean "
+"the same thing when searching."
msgstr ""
"Ένα ερώτημα αναζήτησης αποτελείται από μερικούς βασικούς όρους, "
"παραδείγματος χάριν, <em>dave matthews</em>. Εισάγοντας <em>dave "
-"matthews</em> στο πεδίο αναζήτησης, το <app>Banshee</app> θα ψάξει σε όλα τα "
-"πεδία μεταδεδομένων, περιλαμβανομένων των τίτλου κομματιού, τίτλου δίσκου, "
-"καλλιτέχνη δίσκου, έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα "
+"matthews</em> στο πεδίο αναζήτησης, το Banshee θα ψάξει σε όλα τα πεδία "
+"μεταδεδομένων, περιλαμβανομένων των Τίτλου κομματιού, Τίτλου δίσκου, "
+"Καλλιτέχνη δίσκου, Έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα "
"μεταδεδομένα περιλαμβάνουν το <em>dave</em> και το <em>matthews</em> θα "
-"επιστραφεί. Οι όροι αναζήτησης δεν ξεχωρίζουν πεζά-κεφαλαία, δηλαδή δεν "
-"χρειάζεται να χρησιμοποιήσετε κεφαλαία. Τα <em>dave</em>, <em>Dave</em>, και "
-"<em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα κατά την αναζήτηση."
+"εντοπισθεί. Οι όροι αναζήτησης δεν κάνουν διάκριση πεζών-κεφαλαίων, δηλαδή "
+"δεν χρειάζεται να χρησιμοποιήσετε κεφαλαία στην αρχή των λέξεων. Τα "
+"<em>dave</em>, <em>Dave</em>, και <em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα "
+"κατά την αναζήτηση."
-#: C/search.page:47(title)
-msgid "Basic operators"
+#: C/search.page:43(title)
+msgid "Basic Operators"
msgstr "Βασικοί τελεστές"
-#: C/search.page:49(p)
+#: 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 <gui>AND</gui> and is used when no "
-"other operators are used between two search terms. Since it is the default, "
-"there is no explicit AND operator."
+"other operators are used between two search terms. Because it is the "
+"default, there is no explicit AND operator."
msgstr ""
"Οι τελεστές μπορεί να τοποθετηθούν μεταξύ οποιωνδήποτε δύο αναζητούμενων "
"λέξεων ή πριν από μια αναζητούμενη λέξη. Η προεπιλεγμένη λειτουργία είναι "
-"<gui>ΚΑΙ</gui> και χρησιμοποιείται όταν δεν έχουν ορισθεί άλλοι τελεστές "
-"μεταξύ δύο όρων της αναζήτησης. Επειδή είναι η προεπιλογή, δεν εμφανίζεται "
-"ρητά ο τελεστής ΚΑΙ."
+"<gui></gui> και χρησιμοποιείται όταν δεν έχουν ορισθεί άλλοι τελεστές μεταξύ "
+"δύο όρων της αναζήτησης. Επειδή είναι η προεπιλογή, δεν εμφανίζεται το AND "
+"ως τελεστής."
-#: C/search.page:54(p)
+#: C/search.page:49(p)
msgid ""
"Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together, "
"these three operations can yield very powerful queries to help you search "
@@ -599,11 +561,11 @@ msgstr ""
"Μαζί, αυτοί οι τρεις τελεστές μπορούν να συνθέσουν πολύ ισχυρά ερωτήματα για "
"να σας βοηθήσουν στην αναζήτηση των μέσων σας."
-#: C/search.page:61(title)
-msgid "Logical operators and examples"
+#: C/search.page:56(title)
+msgid "Logical Operators and Examples"
msgstr "Λογικοί τελεστές και παραδείγματα"
-#: C/search.page:63(p)
+#: C/search.page:57(p)
msgid ""
"The following is a list of logical operators and examples of the search "
"results when searching using them."
@@ -611,57 +573,61 @@ msgstr ""
"Η ακόλουθη είναι μια λίστα λογικών τελεστών και παραδειγμάτων των "
"αποτελεσμάτων κατά την αναζήτηση με χρήση τους."
-#: C/search.page:68(gui)
+#: C/search.page:62(gui)
msgid "Operator"
msgstr "Τελεστής"
-#: C/search.page:69(gui) C/search.page:93(gui)
+#: C/search.page:62(gui) C/search.page:84(gui)
msgid "Description"
msgstr "Περιγραφή"
-#: C/search.page:72(p)
+#: C/search.page:65(p)
msgid "<em>default</em>, <em>white space</em>"
msgstr "<em>προεπιλογή</em>, <em>κενό διάστημα</em>"
-#: C/search.page:73(p)
+#: C/search.page:65(p)
msgid "Search for two terms with a space between the two words or terms."
msgstr "Αναζήτηση για δύο όρους με ένα διάστημα μεταξύ των δύο λέξεων ή όρων."
-#: C/search.page:77(p)
+#: C/search.page:69(p)
msgid "OR, or, <key>|</key>, <key>,</key>"
msgstr "OR, or, <key>|</key>, <key>,</key>"
-#: C/search.page:78(p)
+#: C/search.page:69(p)
+#| msgid "Search results will be two terms with either result in any field."
msgid "Search results will be two songs with either result in any field."
msgstr ""
"Τα αποτελέσματα θα είναι δύο τραγούδια με οποιοδήποτε από τα δύο "
"αποτελέσματα σε οποιοδήποτε πεδίο."
-#: C/search.page:82(p)
+#: C/search.page:73(p)
msgid "NOT, not,<key>-</key>"
msgstr "NOT, not,<key>-</key>"
-#: C/search.page:83(p)
+#: C/search.page:73(p)
+#| msgid ""
+#| "Do not display search results with any search team that follows the "
+#| "operator of NOT, not,<key>-</key>."
msgid ""
"Do not display search results with any search term that follows the operator "
-"of NOT, not,<key>-</key>"
+"of NOT, not,<key>-</key>."
msgstr ""
-"Να μην εμφανισθούν αποτελέσματα αναζήτησης με οποιοδήποτε όρο αναζήτησης που "
-"ακολουθεί τον τελεστή NOT, not,<key>-</key>."
+"Να μην εμφανισθούν αποτελέσματα με οποιοδήποτε όρο που ακολουθεί μετά τον "
+"τελεστή NOT, not,<key>-</key>."
-#: C/search.page:88(p)
+#: C/search.page:80(p)
msgid "Examples of logical operations include:"
msgstr "Παραδείγματα λογικών αναζητήσεων περιλαμβάνουν:"
-#: C/search.page:92(gui)
+#: C/search.page:84(gui)
msgid "Query"
msgstr "Ερώτημα"
-#: C/search.page:96(p)
+#: C/search.page:87(p)
msgid "dave matthews"
msgstr "dave matthews"
-#: C/search.page:97(p)
+#: C/search.page:87(p)
msgid ""
"Matches any fields in a track containing both <em>dave</em> and "
"<em>matthews</em>."
@@ -669,588 +635,171 @@ msgstr ""
"Ταιριάζει με οποιαδήποτε πεδία σε ένα κομμάτι περιέχουν και το <em>dave</em> "
"και το <em>matthews</em>."
-#: C/search.page:101(p)
+#: C/search.page:92(p)
msgid "dave, matthews"
msgstr "dave, matthews"
-#: C/search.page:102(p) C/search.page:107(p) C/search.page:112(p)
+#: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p)
msgid ""
-"Matches any fields in a track containing either <em>dave</em> or "
-"<em>matthews</em>."
+"Matches any fields in a track containing both <em>dave</em> or <em>matthews</"
+"em>."
msgstr ""
-"Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού που περιλαμβάνουν το <em>dave</"
-"em> ή το <em>matthews</em>."
+"Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού περιλαμβάνουν το <em>dave</em> "
+"ή το <em>matthews</em>."
-#: C/search.page:106(p)
+#: C/search.page:97(p)
msgid "dave or matthews"
msgstr "dave or matthews"
-#: C/search.page:111(p)
+#: C/search.page:102(p)
msgid "dave | matthews"
msgstr "dave | matthews"
-#: C/search.page:116(p)
+#: C/search.page:107(p)
msgid "-\"dave matthews\""
msgstr "-\"dave matthews\""
-#: C/search.page:117(p)
-msgid "Displays all tracks whose fields do not contain <em>dave matthews</em>."
+#: C/search.page:107(p)
+msgid ""
+"Displays all tracks whose fields do not containt <em>dave matthews</em>."
msgstr ""
"Εμφανίζει όλα τα κομμάτια των οποίων τα πεδία δεν περιέχουν <em>dave "
"matthews</em>."
-#: C/radio.page:10(desc)
-msgid "Add, remove and play internet radio stations in <app>Banshee</app>."
-msgstr ""
-"Προσθήκη, αφαίρεση και αναπαραγωγή σταθμών διαδικτυακού ραδιοφώνου στο "
-"<app>Banshee</app>."
-
-#: C/radio.page:30(title)
-msgid "Internet radio"
-msgstr "Διαδικτυακό ραδιόφωνο"
-
-#: C/radio.page:33(title)
-msgid "What is internet radio?"
-msgstr "Τι είναι το διαδικτυακό ραδιόφωνο;"
-
-#: C/radio.page:35(p)
-msgid ""
-"Internet radio stations are similar to regular radio stations, allowing an "
-"individual or an organization to stream music live over the internet. "
-"Internet radio stations can be a simultaneous stream of a regular radio "
-"station, amateurs broadcasting their own station, or commercial radio "
-"stations that include live DJs and even commercials."
-msgstr ""
-"Οι διαδικτυακοί ραδιοφωνικοί σταθμοί είναι παρόμοιοι με τους κανονικούς, "
-"επιτρέποντας σε ένα άτομο ή οργανισμό να μεταδώσει ζωντανά μουσική μέσω του "
-"διαδικτύου. Οι διαδικτυακοί ραδιοφωνικοί σταθμοί μπορεί να είναι μια "
-"ταυτόχρονη ροή ενός κανονικού ραδιοφωνικού σταθμού, ενός ερασιτέχνη που "
-"μεταδίδει το δικό του σταθμό ή εμπορικών διαδικτυακών σταθμών που "
-"περιλαμβάνουν, ζωντανό πρόγραμμα και ακόμα διαφημίσεις."
-
-#: C/radio.page:44(title)
-msgid "Add radio station"
-msgstr "Προσθήκη ραδιοφωνικού σταθμού"
-
-#: C/radio.page:46(p)
+#: C/search.page:114(p)
msgid ""
-"Search for internet radio stations using your favourite search engine. You "
-"can specify genres, channel frequencies, names of stations and other details "
-"to narrow down your search. Many radio stations display either a button or a "
-"link to listen to their stream. In most web-browsers, you can right click on "
-"the link and choose <gui style=\"menuitem\">Copy Link</gui>."
+"For more information on performing more complex search queries, see the "
+"<link xref=\"adv-search\"/> page."
msgstr ""
-"Αναζήτηση για διαδικτυακούς ραδιοφωνικούς σταθμούς χρησιμοποιώντας την "
-"αγαπημένη σας μηχανή αναζήτησης. Μπορείτε να ορίσετε είδη, συχνότητες "
-"καναλιών, ονόματα σταθμών και άλλες λεπτομέρειες για τον περιορισμό της "
-"αναζήτησής σας. Πολλοί ραδιοφωνικοί σταθμοί εμφανίζουν ή ένα κουμπί ή ένα "
-"σύνδεσμο για ακρόαση της ροής τους. Στους περισσότερους περιηγητές ιστού, "
-"μπορείτε να δεξιοπατήσετε στον σύνδεσμο και να επιλέξετε <gui "
-"style=\"menuitem\">Αντιγραφή συνδέσμου</gui>."
+"Για περισσότερες πληροφορίες για την εκτέλεση πιο σύνθετων ερωτημάτων "
+"αναζήτησης, δείτε τη σελίδα <link xref=\"adv-search\"/>."
-#: C/radio.page:54(title)
-msgid "To add an internet radio station to <app>Banshee</app>:"
-msgstr "Προσθήκη σταθμού διαδικτυακού ραδιοφώνου στο <app>Banshee</app>:"
-
-#: C/radio.page:56(p)
+#: C/rb-import.page:8(desc)
msgid ""
-"Select <gui>Radio</gui> in the menu on the left hand side of your window, "
-"then click on <gui style=\"menuitem\">Add Station</gui> on the upper right "
-"hand corner of <app>Banshee</app>. Or, you can select <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">Add Station</gui></guiseq> from "
-"the menu."
-msgstr ""
-"Επιλέξτε <gui>Ραδιόφωνο</gui> στο μενού στα αριστερά του παραθύρου σας, "
-"έπειτα πατήστε στο <gui style=\"menuitem\">Προσθήκη σταθμού</gui> στην πάνω "
-"δεξιά γωνία του <app>Banshee</app>. Ή μπορείτε να επιλέξετε από το μενού, "
-"επιλέξτε <guiseq><gui style=\"menu\">Μενού</gui><gui style=\"menuitem\">Προσθήκη "
-"σταθμού</gui></guiseq>."
+"Import music and categorizations from the <app>Rhythmbox</app> music player."
+msgstr "Εισάγετε μουσική και κατηγοριοποιήσεις από το <app>Rhythmbox</app>."
-#: C/radio.page:63(p)
-msgid ""
-"You will need to enter some details about the radio station that you wish to "
-"add. The first three fields are mandatory:"
-msgstr ""
-"Θα χρειαστείτε να εισάγετε κάποιες λεπτομέρειες για τον ραδιοφωνικό σταθμό "
-"που θέλετε να προσθέσετε. Τα πρώτα τρία πεδία είναι υποχρεωτικά:"
-
-#: C/radio.page:67(p)
-msgid ""
-"In the <gui style=\"menuitem\">Station Genre</gui> text box, describe the "
-"type of music the internet radio station plays by creating an appropriate "
-"label, or choose a label from the available drop down selections."
-msgstr ""
-"Στο πλαίσιο κειμένου <gui style=\"menuitem\">Είδος σταθμού</gui>, περιγράψτε "
-"τον τύπο μουσικής που ο διαδικτυακός ραδιοφωνικός σταθμός παίζει "
-"δημιουργώντας μια κατάλληλη ετικέτα, ή επιλέξτε μια ετικέτα από τις "
-"διαθέσιμες πτυσσόμενες επιλογές."
-
-#: C/radio.page:73(p)
-msgid ""
-"In the <gui style=\"input\">Station Name</gui> text box, enter a name for "
-"the radio station."
-msgstr ""
-"Στο πλαίσιο κειμένου <gui style=\"input\">Όνομα σταθμού</gui>, εισάγετε ένα "
-"όνομα για τον ραδιοφωνικό σταθμό."
-
-#: C/radio.page:77(p)
-msgid ""
-"In the <gui style=\"input\">Stream URL</gui> field, enter or paste the URL "
-"of the stream by right clicking and selecting <gui style=\"menuitem\">Paste</"
-"gui> or pressing <keyseq><key>Control</key><key>V</key></keyseq>."
-msgstr ""
-"Στο πεδίο <gui style=\"input\">URL ροής</gui>, εισάγετε ή επικολλήστε το URL "
-"της ροής δεξιοπατώντας και επιλέγοντας <gui "
-"style=\"menuitem\">Επικόλληση</gui> ή πατώντας "
-"<keyseq><key>Control</key><key>V</key></keyseq>."
-
-#: C/radio.page:85(p)
-msgid ""
-"You can also fill out the fields for <gui style=\"input\">Station Creator</"
-"gui>, <gui style=\"input\">Description</gui>, and <gui style=\"input"
-"\">Rating</gui>."
-msgstr ""
-"Μπορείτε επίσης να συμπληρώσετε τα πεδία για <gui style=\"input\">Δημιουργό "
-"σταθμού</gui>, <gui style=\"input\">Περιγραφή</gui> και <gui "
-"style=\"input\">Βαθμολογία</gui>."
-
-#: C/radio.page:91(p)
-msgid ""
-"Finally, click <gui style=\"button\">Save</gui> to save the internet radio "
-"station in <app>Banshee</app>."
-msgstr ""
-"Τελικά, πατήστε <gui style=\"button\">Αποθήκευση</gui> για να αποθηκεύσετε τον "
-"διαδικτυακό σταθμό στο <app>Banshee</app>."
-
-#: C/radio.page:99(title)
-msgid "Play a radio station"
-msgstr "Αναπαραγωγή ραδιοφωνικού σταθμού"
-
-#: C/radio.page:101(p)
-msgid ""
-"To <link xref=\"play\">play</link> a radio station, double click on the "
-"radio station. Alternatively, right click on the station and select <gui "
-"style=\"menuitem\">Play</gui> or select the radio station and choose "
-"<guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem\">Play</"
-"gui></guiseq>."
-msgstr ""
-"Για <link xref=\"play\">αναπαραγωγή</link> ραδιοφωνικού σταθμού, διπλοπατήστε "
-"τον ραδιοφωνικό σταθμό. Εναλλακτικά, δεξιοπατήστε στον σταθμό και επιλέξτε "
-"<gui style=\"menuitem\">αναπαραγωγή</gui> ή επιλέξτε τον ραδιοφωνικό σταθμό "
-"και διαλέξτε <guiseq><gui style=\"menu\">Αναπαραγωγή</gui><gui "
-"style=\"menuitem\">Εκτέλεση</gui></guiseq>."
-
-#. Not sure about play queue and play after current track
-#: C/radio.page:109(p)
-msgid ""
-"To add a radio station to the <gui style=\"menuitem\" xref=\"play-queue"
-"\">Play Queue</gui>, you can right click on the station and select <gui "
-"style=\"menuitem\">Add to Play Queue</gui>. This will play the radio station "
-"when the queue has finished playing all media which is ahead of the station "
-"in the <gui>Play Queue</gui>."
-msgstr ""
-"Για την προσθήκη ενός ραδιοφωνικού σταθμού στη <gui style=\"menuitem\" xref"
-"=\"play-queue\">Σειρά αναπαραγωγής</gui>, μπορείτε να δεξιοπατήσετε στον "
-"σταθμό και να επιλέξετε <gui style=\"menuitem\">Προσθήκη στη σειρά "
-"αναπαραγωγής</gui>. Αυτό θα παίξει τον ραδιοφωνικό σταθμό, όταν η αναμονή "
-"έχει τελειώσει την αναπαραγωγή όλων των μέσων που είναι πριν στον σταθμό "
-"στην <gui>Σειρά αναπαραγωγής</gui>."
-
-#: C/radio.page:115(p)
-msgid ""
-"You can also right click the station and select <gui style=\"menuitem\">Play "
-"after Current Track</gui> to add the radio station to the queue after the "
-"track that is currently playing."
-msgstr ""
-"Μπορείτε επίσης να δεξιοπατήσετε στον σταθμό και να επιλέξετε <gui "
-"style=\"menuitem\">Αναπαραγωγή μετά το τρέχον κομμάτι</gui> για να προσθέσετε "
-"τον ραδιοφωνικό σταθμό στην αναμονή μετά το κομμάτι που παίζει προς το "
-"παρόν."
-
-#: C/radio.page:120(p)
-msgid ""
-"<gui style=\"menuitem\">Play after Current Track</gui> may not work on some "
-"<app>Banshee</app> installations."
-msgstr ""
-"<gui style=\"menuitem\">Αναπαραγωγή μετά το τρέχον κομμάτι</gui> ίσως να μη "
-"δουλέψει σε μερικές εγκαταστάσεις του <app>Banshee</app>."
-
-#: C/radio.page:127(title)
-msgid "Remove a radio station"
-msgstr "Αφαίρεση ραδιοφωνικού σταθμού"
-
-#: C/radio.page:129(p)
-msgid ""
-"To remove a radio station from <app>Banshee</app>, you can right click on "
-"the radio station and select <gui style=\"menuitem\">Remove</gui>, or "
-"alternatively, you can select the station with your mouse and press "
-"<key>Delete</key>. When you are prompted for confirmation, click the <gui "
-"style=\"button\">Remove</gui> button to remove the radio station."
-msgstr ""
-"Για την αφαίρεση ραδιοφωνικού σταθμού από το <app>Banshee</app>, μπορείτε να "
-"δεξιοπατήσετε στον ραδιοφωνικό σταθμό και να επιλέξετε <gui "
-"style=\"menuitem\">Αφαίρεση</gui>, ή εναλλακτικά, μπορείτε να επιλέξετε τον "
-"σταθμό με το ποντίκι σας και να πατήσετε <key>Διαγραφή</key>. Όταν σας "
-"ζητηθεί επιβεβαίωση, πατήστε το κουμπί <gui style=\"button\">Αφαίρεση</gui> "
-"για να απομακρυνθεί ο ραδιοφωνικός σταθμός."
-
-#: C/podcast.page:11(desc)
-msgid "Add, remove and play podcasts in <app>Banshee</app>."
-msgstr ""
-"Προσθήκη, αφαίρεση και αναπαραγωγή φορητών εκπομπών στο <app>Banshee</app>."
-
-#: C/podcast.page:19(name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/podcast.page:20(email)
-msgid "kittykat3756 at gmail.com"
-msgstr "kittykat3756 at gmail.com"
-
-#: C/podcast.page:34(title)
-msgid "What is a podcast?"
-msgstr "Τι είναι φορητή εκπομπή (Podcast);"
-
-#: C/podcast.page:36(p)
-msgid ""
-"Podcasts are recorded programs, similar to radio programs, that are "
-"available on the internet and allow you to subscribe to them. When you "
-"subscribe to a podcast in <app>Banshee</app>, each time a new program is "
-"released, <app>Banshee</app> will automatically download the podcast to your "
-"library."
-msgstr ""
-"Οι φορητές εκπομπές είναι ηχογραφημένα προγράμματα, παρόμοια με τα "
-"ραδιοφωνικά, που είναι διαθέσιμα στο διαδίκτυο και σας επιτρέπουν να γίνετε "
-"συνδρομητής. Όταν γίνετε συνδρομητής σε μια φορητή εκπομπή στο "
-"<app>Banshee</app>, κάθε φορά που παράγεται ένα καινούριο πρόγραμμα, το "
-"<app>Banshee</app> θα μεταφορτώσει αυτόματα την εκπομπή στη βιβλιοθήκη σας."
-
-#: C/podcast.page:42(p)
-msgid ""
-"Podcasts have been made on almost any subject, including music, movies, "
-"Linux and more. Search the internet using your favorite search engine with a "
-"search term such as \"Linux podcast\" and you will be presented with many "
-"options to choose from."
-msgstr ""
-"Υπάρχουν φορητές εκπομπές για σχεδόν κάθε θέμα, περιλαμβανομένων μουσικής, "
-"ταινιών, Λίνουξ και άλλων. Αναζητήστε στο διαδίκτυο με χρήση της αγαπημένης "
-"σας μηχανής αναζήτησης έναν όρο αναζήτησης όπως \"Linux podcast\" και θα "
-"εμφανιστούν πολλές επιλογές για να διαλέξετε."
-
-#: C/podcast.page:50(title)
-msgid "Add a podcast"
-msgstr "Προσθήκη φορητής εκπομπής (podcast)"
-
-#: C/podcast.page:52(p)
-msgid ""
-"To add a podcast to <app>Banshee</app>, you will first need to visit the "
-"podcast home page. Most podcasts will have a button or link displayed to "
-"subscribe to the podcast. Copy the link to the podcast subscription feed. In "
-"most web browsers, you can right click on the link and choose <gui style="
-"\"menuitem\">Copy link</gui>."
-msgstr ""
-"Για να προσθέσετε μια φορητή εκπομπή στο <app>Banshee</app>, θα χρειαστεί "
-"πρώτα να επισκεφτείτε την ιστοσελίδα της φορητής εκπομπής. Σχεδόν όλες οι "
-"φορητές εκπομπές θα έχουν ένα κουμπί ή σύνδεσμο για να εγγραφείτε στη φορητή "
-"εκπομπή. Αντιγράψτε το δεσμό στη συνδρομή σας της φορητής εκπομπής. Στους "
-"περισσότερους περιηγητές ιστού, μπορείτε να δεξιοπατήσετε στο δεσμό και να "
-"επιλέξετε <gui style=\"menuitem\">Αντιγραφή δεσμού</gui>."
-
-#: C/podcast.page:58(p)
-msgid ""
-"In <app>Banshee</app>, click <gui style=\"menuitem\">Podcast</gui> in the "
-"menu on the left side of the window. Then, click <gui style=\"menuitem"
-"\">Subscribe to Podcasts</gui> in the right half of the toolbar, from the "
-"menu choose <guiseq><gui style=\"menu\">Media</gui><gui style=\"menuitem"
-"\">Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
-"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
-msgstr ""
-"Στο <app>Banshee</app>, πατήστε <gui style=\"menuitem\">Φορητή εκπομπή</gui> "
-"στο μενού στα αριστερά του παραθύρου. Έπειτα, πατήστε <gui "
-"style=\"menuitem\">εγγραφή στις φορητές εκπομπές</gui> στο δεξιό μισό της "
-"εργαλειοθήκης, από το μενού επιλέξτε <guiseq><gui "
-"style=\"menu\">Πολυμέσα</gui><gui style=\"menuitem\"> Συνδρομή στη φορητή "
-"εκπομπή</gui></guiseq> ή χρησιμοποιήστε τη συντόμευση πληκτρολογίου "
-"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
-
-#: C/podcast.page:65(p)
-msgid ""
-"By default, the podcasts will not be downloaded, so you will only be able to "
-"listen to them while you are connected to the internet. When you subscribe "
-"to a new podcast, you will be able to select the following options:"
-msgstr ""
-"Από προεπιλογή, οι φορητές εκπομπές δεν μεταφορτώνονται, έτσι θα μπορείτε "
-"μόνο να τις ακούσετε, ενώ είσαστε συνδεμένοι στο διαδίκτυο. Όταν γράφεστε σε "
-"μια νέα φορητή εκπομπή, θα μπορείτε να διαλέξετε τις παρακάτω επιλογές:"
-
-#: C/podcast.page:71(p)
-msgid ""
-"Select <gui style=\"checkbox\">Download new episodes</gui> to automatically "
-"download any new episodes to your computer so that you can access them when "
-"you do not have an internet connection."
-msgstr ""
-"Επιλέξτε <gui style=\"checkbox\">Μεταφόρτωση νέων επεισοδίων</gui> για "
-"αυτόματη μεταφόρτωση οποιωνδήποτε νέων επεισοδίων στον υπολογιστή σας, έτσι "
-"ώστε να μπορείτε να τα προσπελάσετε, όταν δεν έχετε διαδικτυακή σύνδεση."
-
-#: C/podcast.page:76(p)
-msgid ""
-"Select <gui style=\"menuitem\">Archive all episodes except the newest one</"
-"gui> to have only the newest episode displayed."
-msgstr ""
-"Επιλέξτε <gui style=\"menuitem\">Αρχειοθέτηση όλων των επεισοδίων εκτός από το "
-"πιο νέο</gui> για να εμφανίζεται μόνο το πιο νέο επεισόδιο."
-
-#: C/podcast.page:81(p)
-msgid ""
-"After you have added a podcast feed, <app>Banshee</app> will display the "
-"name of the podcast, the title of each episode and the date that it was "
-"published on."
-msgstr ""
-"Μετά την προσθήκη μιας τροφοδοσίας φορητής εκπομπής, το <app>Banshee</app> "
-"θα εμφανίσει το όνομα της φορητής εκπομπής, τον τίτλο κάθε επεισοδίου και "
-"την ημερομηνία δημοσίευσης."
-
-#: C/podcast.page:85(p)
-msgid ""
-"Once a podcast has been archived, it will be removed from the <gui>New "
-"Items</gui> list, but it will still appear in the <gui>All Items</gui> list."
-msgstr ""
-"Μόλις μια φορητή εκπομπή αρχειοθετηθεί, θα αφαιρεθεί από τη λίστα <gui>Νέα "
-"στοιχεία</gui>, αλλά θα εμφανίζεται ακόμα στη λίστα <gui>Όλα τα "
-"στοιχεία</gui>."
-
-#: C/podcast.page:90(p)
-msgid ""
-"You can edit the subscription options the <gui style=\"menuitem\">Podcast "
-"Properties</gui>, which can be accessed by right clicking on the "
-"corresponding podcast name in the podcast list or by right clicking on any "
-"episode of that podcast."
-msgstr ""
-"Μπορείτε να επεξεργαστείτε τις επιλογές εγγραφής στο <gui "
-"style=\"menuitem\">Ιδιότητες φορητής εκπομπής</gui>, που μπορεί να "
-"προσπελαστεί δεξιοπατώντας στο αντίστοιχο όνομα φορητής εκπομπής στη λίστα "
-"φορητών εκπομπών ή δεξιοπατώντας σε οποιοδήποτε επεισόδιο αυτής της "
-"εκπομπής."
-
-#: C/podcast.page:99(title) C/play.page:121(title)
-msgid "Play a podcast"
-msgstr "Αναπαραγωγή φορητής εκπομπής"
-
-#: C/podcast.page:101(p)
-msgid ""
-"To <link xref=\"play\">play</link> a podcast episode, double click on the "
-"episode or select it, then select <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq>. You can also add the "
-"episode to the <gui xref=\"play-queue\">Play Queue</gui> by right clicking "
-"on the episode and selecting <gui style=\"menuitem\">Add to Play Queue</gui>."
-msgstr ""
-"Για <link xref=\"play\">αναπαραγωγή</link> ενός επεισοδίου φορητής εκπομπής, "
-"διπλοπατήστε στο επεισόδιο ή επιλέξτε το, έπειτα επιλέξτε <guiseq><gui "
-"style=\"menu\">Αναπαραγωγή</gui><gui style=\"menuitem\">Εκτέλεση</gui></guiseq>. "
-"Μπορείτε επίσης να προσθέσετε το επεισόδιο στην <gui xref=\"play-"
-"queue\">σειρά αναπαραγωγής</gui> δεξιοπατώντας στο επεισόδιο και επιλέγοντας "
-"<gui style=\"menuitem\">Προσθήκη στη σειρά αναπαραγωγής</gui>."
-
-#: C/podcast.page:110(title)
-msgid "Remove a podcast"
-msgstr "Αφαίρεση φορητής εκπομπής (Podcast)"
-
-#: C/podcast.page:112(p)
-msgid ""
-"To remove a podcast, right click on the podcast in the podcast list and "
-"select <gui style=\"menuitem\">Unsubscribe and Delete</gui>. This will "
-"unsubscribe you from receiving podcast updates and will delete all the "
-"episodes of the podcast from your library."
-msgstr ""
-"Για την αφαίρεση φορητής εκπομπής, δεξιοπατήστε στην εκπομπή στη λίστα "
-"φορητών εκπομπών και επιλέξτε <gui style=\"menuitem\">Απεγγραφή και "
-"διαγραφή</gui>. Αυτό θα σας απεγγράψει από τη λήψη ενημερώσεων φορητής "
-"εκπομπής και θα διαγράψει όλα τα επεισόδια της εκπομπής από τη βιβλιοθήκη "
-"σας."
+#: C/rb-import.page:12(title)
+msgid "Import your <app>Rhythmbox</app> library"
+msgstr "Εισάγετε τη βιβλιοθήκη σας του <app>Rhythmbox</app>"
#: C/play.page:9(desc)
msgid "Play your videos and music files."
msgstr "Αναπαράγετε τα βίντεο και τα αρχεία σας μουσικής."
-#: C/play.page:18(name) C/index.page:15(name)
-msgid "Sindhu S"
-msgstr "Sindhu S"
-
-#: C/play.page:19(email) C/index.page:16(email)
-msgid "sindhus at live.in"
-msgstr "sindhus at live.in"
-
-#: C/play.page:34(title)
-msgid "Play your media"
+#: C/play.page:24(title)
+msgid "Play Your Media"
msgstr "Αναπαραγωγή των πολυμέσων σας"
-#: C/play.page:37(title)
+#: C/play.page:27(title)
msgid "Play your music"
msgstr "Αναπαραγωγή της μουσικής σας"
-#: C/play.page:39(p)
+#: C/play.page:29(p)
msgid ""
-"To play music in <app>Banshee</app>, 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."
+"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 ""
-"Για αναπαραγωγή μουσικής στο <app>Banshee</app>, επιλέξτε την πηγή μουσική. "
-"Η βιβλιοθήκη μουσικής θα σας εμφανίσει όλους τους καλλιτέχνες στη μουσική "
-"βιβλιοθήκη, το εξώφυλλο για κάθε δίσκο και μια λίστα όλων των τραγουδιών στη "
-"βιβλιοθήκη σας."
+"Για αναπαραγωγή μουσικής στο Banshee, επιλέξτε την πηγή μουσική. Η "
+"βιβλιοθήκη μουσικής θα σας εμφανίσει όλους τους καλλιτέχνες στη βιβλιοθήκη, "
+"το εξώφυλλο για κάθε δίσκο και μια λίστα όλων των τραγουδιών στη βιβλιοθήκη "
+"σας."
-#: C/play.page:43(p)
+#: 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 <app>Banshee</app>."
+"or use the search bar in the upper right hand corner of Banshee."
msgstr ""
-"Επιλέξτε τον δίσκο ή το τραγούδι που θέλετε να αναπαραχθεί από τη λίστα "
+"Επιλέξτε το δίσκο ή το τραγούδι που θέλετε να αναπαραχθεί από τη λίστα "
"καλλιτεχνών, δίσκων ή χρησιμοποιήστε τη γραμμή αναζήτησης στην πάνω δεξιά "
-"γωνία του <app>Banshee</app>."
+"γωνία του Banshee."
-#: C/play.page:47(p)
+#: C/play.page:37(p)
msgid ""
"To start playing a song, use your mouse to double click the song name, press "
-"the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
+"gui></guiseq> from the Banshee menu."
msgstr ""
-"Για να αρχίσετε την αναπαραγωγή ενός τραγουδιού, διπλοπατήστε στο όνομα του "
-"τραγουδιού, πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε "
-"<guiseq><gui style=\"menu\">Αναπαραγωγή</gui><gui "
-"style=\"menuitem\">Εκτέλεση</gui></guiseq> από το μενού του "
-"<app>Banshee</app>."
+"Για να αρχίσετε την αναπαραγωγή ενός τραγουδιού, κάντε διπλό κλικ με το "
+"ποντίκι σας στο όνομα του τραγουδιού, πατήστε το <key>πλήκτρο διαστήματος</"
+"key> ή επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></"
+"guiseq> από το μενού του Banshee."
-#: C/play.page:53(p)
+#: 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 <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
+#| "gui></guiseq> from the Banshee menu."
msgid ""
"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 "
-"<key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</gui><gui "
-"style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> menu."
+"<key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></"
+"guiseq> from the Banshee menu."
msgstr ""
"Μπορείτε να ξεκινήσετε την αναπαραγωγή ενός δίσκου επιλέγοντας το δίσκο στην "
"περιήγηση δίσκων με διπλό κλικ στο όνομα του τραγουδιού, πατώντας το "
-"<key>πλήκτρο διαστήματος</key> ή επιλέγοντας <guiseq><gui "
-"style=\"menu\">Αναπαραγωγή</gui><gui style=\"menuitem\">Εκτέλεση</gui></guiseq> "
-"από το μενού του <app>Banshee</app>."
+"<key>πλήκτρο διαστήματος</key> ή επιλέγοντας "
+"<guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού "
+"του Banshee."
-#: C/play.page:59(p)
+#: C/play.page:48(p)
msgid ""
"To play all songs by one artist, choose the artist in the artist browser and "
-"press the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
"Για να αναπαραχθούν όλα τα τραγούδια ενός καλλιτέχνη, επιλέξτε τον "
"καλλιτέχνη από την περιήγηση και πατήστε το <key>πλήκτρο διαστήματος</key> ή "
-"επιλέξτε <guiseq><gui style=\"menu\">Αναπαραγωγή</gui><gui "
-"style=\"menuitem\">Εκτέλεση</gui></guiseq> από το μενού του "
-"<app>Banshee</app>."
+"επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από "
+"το μενού του Banshee."
-#: C/play.page:65(p)
+#: C/play.page:53(p)
msgid ""
-"<app>Banshee</app> 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."
+"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 ""
-"Το <app>Banshee</app> επίσης εμφανίζει τους αγαπημένους σας δίσκους (αυτούς "
-"που ακούτε περισσότερο), τα πρόσφατα αγαπημένα, τις πρόσφατες προσθήκες και "
-"πρώτες παρουσιάσεις μουσικής. Επιλέξτε αυτό που επιθυμείτε να ακούσετε και "
+"Το Banshee επίσης εμφανίζει τους αγαπημένους σας δίσκους (αυτούς που ακούτε "
+"περισσότερο), τα πρόσφατα αγαπημένα, τις πρόσφατες προσθήκες και αυτά που "
+"δεν έχουν αναπαραχθεί ποτέ. Επιλέξτε αυτό που επιθυμείτε να ακούσετε και "
"μπορείτε να αναπαράγετε τραγούδια από το καθένα."
-#: C/play.page:69(p)
-msgid ""
-"<app>Banshee</app> can be used to play music in a random order using the "
-"<gui style=\"menuitem\">Shuffle</gui> mode. Enable the mode in <guiseq><gui "
-"style=\"menu\">Playback</gui><gui style=\"menuitem\">Shuffle</gui></guiseq>, "
-"followed by a shuffle type selection."
-msgstr ""
-"Το <app>Banshee</app> μπορεί να χρησιμοποιηθεί για αναπαραγωγή μουσικής με "
-"τυχαία σειρά χρησιμοποιώντας την κατάσταση <gui style=\"menuitem\">τυχαίας "
-"σειράς</gui>. Ενεργοποιήστε την κατάσταση στο <guiseq><gui "
-"style=\"menu\">Αναπαραγωγή</gui><gui style=\"menuitem\">Τυχαία "
-"σειρά</gui></guiseq>, ακολουθούμενη από την επιλογή τύπου τυχαίας σειράς."
-
-#: C/play.page:77(gui)
-msgid "By Song"
-msgstr "Κατά τραγούδι"
-
-#: C/play.page:78(p)
-msgid "Play tracks in a random order."
-msgstr "Αναπαραγωγή κομματιών με τυχαία σειρά."
-
-#: C/play.page:81(gui)
-msgid "By Artist"
-msgstr "Κατά καλλιτέχνη"
-
-#: C/play.page:82(p)
-msgid "Play tracks by different artists every time."
-msgstr "Αναπαραγωγή κομματιών από διαφορετικούς καλλιτέχνες κάθε φορά."
-
-#: C/play.page:85(gui)
-msgid "By Album"
-msgstr "Κατά δίσκο"
-
-#: C/play.page:86(p)
-msgid "Play tracks from different albums every time."
-msgstr "Αναπαραγωγή κομματιών από διαφορετικούς δίσκους κάθε φορά."
-
-#: C/play.page:89(gui)
-msgid "By Rating"
-msgstr "Κατά κατάταξη"
-
-#: C/play.page:90(p)
-msgid "Play tracks with higher ratings more often than unrated ones."
-msgstr "Αναπαραγωγή κομματιών με υψηλότερη κατάταξη πιο συχνά από αβαθμολόγητα."
-
-#: C/play.page:92(p)
-msgid "If there are no rated tracks, the tracks are played in a random order."
-msgstr ""
-"Αν δεν υπάρχουν βαθμολογημένα κομμάτια, τα κομμάτια αναπαράγονται με τυχαία "
-"σειρά."
-
-#: C/play.page:97(gui)
-msgid "By Score"
-msgstr "Κατά βαθμολογία"
-
-#: C/play.page:98(p)
-msgid ""
-"Tracks that you play frequently are scored higher and played more often."
-msgstr ""
-"Κομμάτια που παίζετε συχνά βαθμολογούνται υψηλότερα και παίζονται πιο συχνά."
-
-#: C/play.page:106(title)
+#: C/play.page:61(title)
msgid "Play a video"
msgstr "Αναπαραγωγή βίντεο"
-#: C/play.page:108(p)
+#: 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 <key>Space</key>, or "
-"choose <guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem"
-"\">Play</gui></guiseq> from the <app>Banshee</app> menu."
+"video you wish to play from the list and press the <key>Spacebar</key>, or "
+"choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee "
+"menu."
msgstr ""
"Τα εισαγόμενα βίντεο εμφανίζονται αλφαβητικά. Για την αναπαραγωγή ενός "
"βίντεο, επιλέξτε το βίντεο που θέλετε να αναπαραχθεί από τη λίστα και "
-"πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui "
-"style=\"menu\">Αναπαραγωγή</gui><gui style=\"menuitem\">Εκτέλεση</gui></guiseq> "
-"από το μενού του <app>Banshee</app>."
+"πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε "
+"<guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού "
+"του Banshee."
-#: C/play.page:114(p)
+#: C/play.page:68(p)
msgid ""
-"<app>Banshee</app> also shows your Favorite videos (those you watch the "
-"most) and Unwatched videos. Choose one and you can play a video from the "
-"list."
+"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 ""
-"Το <app>Banshee</app> εμφανίζει επίσης τα αγαπημένα σας βίντεο (αυτά που "
-"παρακολουθείτε περισσότερο) και αυτά που δεν έχουν προβληθεί. Επιλέξτε ένα "
-"και μπορείτε να το αναπαράγετε από τη λίστα."
+"Το Banshee εμφανίζει επίσης τα αγαπημένα σας βίντεο (αυτά που παρακολουθείτε "
+"περισσότερο) και αυτά που δεν έχουν προβληθεί. Επιλέξτε ένα και μπορείτε να "
+"το αναπαράγετε από τη λίστα."
+
+#: C/play.page:74(title)
+msgid "Play a Podcast"
+msgstr "Αναπαραγωγή φορητής εκπομπής"
-#: C/play.page:123(p)
+#: C/play.page:76(p)
msgid ""
-"Podcasts shows you all podcasts you are subscribed to, all podcast shows "
-"available, and the podcast browser lists all podcasts in order of newest "
+"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 ""
"Οι φορητές εκπομπές (Podcasts) εμφανίζουν όλες τις φορητές εκπομπές στις "
@@ -1258,222 +807,188 @@ msgstr ""
"περιήγηση στις φορητές εκπομπές εμφανίζει όλες τις διαθέσιμες φορητές "
"εκπομπές με πρώτες τις πιο πρόσφατες."
-#: C/play.page:127(p)
+#: C/play.page:80(p)
msgid ""
-"To play a podcast, choose the podcast you wish to play from the list and "
-"press the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"To play a Podcast, choose the Podcast you wish to play from the list and "
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
"Για την αναπαραγωγή μιας φορητής εκπομπής, επιλέξτε τη φορητή εκπομπή, που "
-"θέλετε να αναπαραχθεί, από τη λίστα και πατήστε το <key>πλήκτρο "
-"διαστήματος</key> ή επιλέξτε <guiseq><gui style=\"menu\">Αναπαραγωγή</gui><gui "
-"style=\"menuitem\">Εκτέλεση</gui></guiseq> από το μενού του "
-"<app>Banshee</app>."
+"θέλετε να αναπαραχθεί, από τη λίστα και πατήστε το <key>πλήκτρο διαστήματος</"
+"key> ή επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></"
+"guiseq> από το μενού του Banshee."
-#: C/play.page:136(title)
+#: C/play.page:88(title)
msgid "Play an internet radio station"
msgstr "Αναπαραγωγή διαδικτυακού ραδιοφωνικού σταθμού"
-#: C/play.page:138(p)
+#: C/play.page:90(p)
msgid ""
"The Radio source shows you all internet radio stations you have added to "
-"<app>Banshee</app> alphabetically."
+"Banshee alphabetically."
msgstr ""
"Η πηγή ραδιόφωνο σας δείχνει αλφαβητικά όλους τους διαδικτυακούς "
-"ραδιοφωνικούς σταθμούς που έχετε προσθέσει στο <app>Banshee</app>."
+"ραδιοφωνικούς σταθμούς που έχετε προσθέσει στο Banshee."
-#: C/play.page:141(p)
+#: 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 <key>Space</key>, or choose <guiseq><gui style="
-"\"menu\">Playback</gui><gui style=\"menuitem\">Play</gui></guiseq> from the "
-"<app>Banshee</app> menu."
+"from the list and press the <key>Spacebar</key>, or choose "
+"<guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
-"Για την αναπαραγωγή ενός διαδικτυακού ραδιοφωνικού σταθμού, επιλέξτε τον "
-"σταθμό που θέλετε από τη λίστα και πατήστε το <key>πλήκτρο διαστήματος</key> "
-"ή επιλέξτε <guiseq><gui style=\"menu\">Αναπαραγωγή</gui><gui "
-"style=\"menuitem\">Εκτέλεση</gui></guiseq> από το μενού του "
-"<app>Banshee</app>."
+"Για την αναπαραγωγή ενός διαδικτυακού ραδιοφωνικού σταθμού, επιλέξτε το "
+"σταθμό, που επιθυμείτε, από τη λίστα και πατήστε το <key>πλήκτρο "
+"διαστήματος</key> ή επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</"
+"gui></guiseq> από το μενού του Banshee."
#: C/play-queue.page:9(desc)
-msgid "Add media to your <gui>Play Queue</gui>."
-msgstr "Προσθήκη μέσων στη <gui>σειρά αναπαραγωγής</gui> σας."
-
-#: C/play-queue.page:15(years)
-msgid "2013"
-msgstr "2013"
+msgid "Add media to your play queue."
+msgstr "Προσθήκη μέσων στη σειρά αναπαραγωγής σας."
-#: C/play-queue.page:24(title)
-msgid "Play queue"
+#: C/play-queue.page:18(title)
+msgid "Play Queue"
msgstr "Σειρά αναπαραγωγής"
-#: C/play-queue.page:26(p)
+#: C/play-queue.page:20(p)
msgid ""
-"The <gui>Play Queue</gui> can be used to play tracks in a sequential order. "
-"You can add many tracks to the <gui>Play Queue</gui> and listen to hours of "
-"music non-stop. You can add individual tracks or entire albums, and sort or "
-"re-order them as you wish."
+"The <gui>Play Queue</gui> 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 ""
-"Η <gui>σειρά αναπαραγωγής</gui> μπορεί να χρησιμοποιηθεί για την αναπαραγωγή "
-"κομματιών με μια διαδοχική σειρά. Μπορείτε να προσθέσετε πολλά κομμάτια στη "
-"<gui>σειρά αναπαραγωγής</gui> και να ακούσετε πολλές ώρες μουσικής χωρίς "
-"διακοπή. Μπορείτε να προσθέσετε μεμονωμένα κομμάτια ή ολόκληρους δίσκους και "
-"να τα ταξινομήσετε ή να τα επαναδιατάξετε όπως θέλετε."
+"Η <gui>σειρά αναπαραγωγής</gui> σας επιτρέπει να προσθέσετε μουσική για να "
+"αναπαραχθεί με τη σειρά. Μπορείτε να προσθέσετε πολλά κομμάτια για να "
+"ακούσετε πολλές ώρες μουσικής χωρίς διακοπή. Μπορείτε να προσθέσετε "
+"μεμονωμένα κομμάτια ή ολόκληρους δίσκους και να τα ταξινομήσετε ή να τα "
+"επαναδιατάξετε."
-#: C/play-queue.page:32(title)
-msgid "Add music to the <gui>Play Queue</gui>"
-msgstr "Προσθήκη μουσικής στη <gui>σειρά αναπαραγωγής</gui>"
+#: C/play-queue.page:26(title)
+msgid "Add Music to the Play Queue"
+msgstr "Προσθήκη μουσικής στη σειρά αναπαραγωγής"
-#: C/play-queue.page:34(p)
+#: 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 <gui>Play Queue</gui>."
+"you want to add to the play queue."
msgstr ""
"Από τη μουσική σας βιβλιοθήκη, θα χρειαστεί να επιλέξετε τα κομμάτια ή τους "
-"δίσκους που θέλετε να προσθέσετε στη <gui>σειρά αναπαραγωγής</gui>."
+"δίσκους που θέλετε να προσθέσετε στη σειρά αναπαραγωγής."
-#: C/play-queue.page:37(p)
+#: C/play-queue.page:32(p)
msgid ""
-"To add an entire album to the <gui>Play Queue</gui>, use your mouse to press "
-"and hold the album and drag and drop it over <gui>Play Queue</gui> in the "
-"far left window pane."
+"To add an entire album to the Play Queue, using your mouse press and hold "
+"the album and drag the album over <gui>Play Queue</gui> in the far left "
+"window pane."
msgstr ""
-"Για να προσθέσετε έναν ολόκληρο δίσκο στη <gui>σειρά αναπαραγωγής</gui>, "
-"χρησιμοποιήστε το ποντίκι σας για να πατήσετε και να κρατήσετε πατημένο τον "
-"δίσκο και έπειτα να τον μεταφέρετε και να τον αποθέσετε πάνω από τη "
-"<gui>σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου."
+"Για να προσθέσετε έναν ολόκληρο δίσκο στη σειρά αναπαραγωγής, με το ποντίκι "
+"σύρετε το δίσκο πάνω από τη <gui>σειρά αναπαραγωγής</gui> στο αριστερότερο "
+"πλαίσιο του παραθύρου."
-#: C/play-queue.page:41(p)
+#: C/play-queue.page:37(p)
msgid ""
-"You can add music tracks to the <gui>Play Queue</gui> individually or as a "
-"group. To add an individual file, drag and drop it over the <gui>Play Queue</"
-"gui> in the far left window pane, or right click the track and choose <gui "
-"style=\"menuitem\">Add to Play Queue</gui>."
+"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 <gui>Play Queue</gui> in "
+"the far left window pane, or right click the track and choose <gui>Add to "
+"Play Queue</gui>."
msgstr ""
-"Μπορείτε να προσθέσετε μουσικά κομμάτια στη <gui>σειρά αναπαραγωγής</gui> "
-"μεμονωμένα ή ως ομάδα. Για να προσθέσετε ένα μεμονωμένο αρχείο, σύρετε και "
-"αφήστε το πάνω στη <gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο "
-"του παραθύρου ή δεξιοπατήστε στο κομμάτι και επιλέξτε <gui "
-"style=\"menuitem\">Προσθήκη στη σειρά αναπαραγωγής</gui>."
+"Μπορείτε να προσθέσετε μουσικά κομμάτια στη σειρά αναπαραγωγής μεμονωμένα ή "
+"ως ομάδα. Για να προσθέσετε ένα μεμονωμένο αρχείο, σύρετε και αφήστε το πάνω "
+"στη <gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή "
+"κάντε δεξί κλικ στο κομμάτι και επιλέξτε <gui>Προσθήκη στη σειρά "
+"αναπαραγωγής</gui>."
-#: C/play-queue.page:46(p)
+#: C/play-queue.page:43(p)
msgid ""
-"To select multiple tracks, select each track with your mouse while holding "
-"down <key>Ctrl</key> or select a range of files by pressing <key>Shift</key> "
-"and clicking twice to select that range of files. You can then drag and drop "
-"it over the <gui>Play Queue</gui> in the far left window pane or right click "
-"the tracks and choose <gui style=\"menuitem\">Add to Play Queue</gui>."
+"You can select multiple files by using your mouse and pressing <key>Control</"
+"key> and choosing each file with your mouse or select a range of files by "
+"pressing <key>Shift</key> twice to select that range of files. You can then "
+"drag and drop it over the <gui>Play Queue</gui> in the far left window pane "
+"or right click the tracks and choose <gui>Add to Play Queue</gui>."
msgstr ""
-"Για την επιλογή πολλών κομματιών, επιλέξτε κάθε κομμάτι με το ποντίκι σας, "
-"ενώ κρατάτε πατημένο το <key>Control</key>, ή επιλέξτε μια περιοχή αρχείων "
-"πατώντας το <key>Shift</key> και πατώντας δυο φορές για να επιλέξετε την "
-"περιοχή των αρχείων. Μπορείτε μετά να σύρετε και να τα αποθέσετε πάνω στη "
-"<gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή να "
-"δεξιοπατήσετε στα κομμάτια και να επιλέξτε <gui style=\"menuitem\">Προσθήκη "
-"στη σειρά αναπαραγωγής</gui>."
+"Μπορείτε να επιλέξετε πολλαπλά αρχεία με το ποντίκι και πατώντας το "
+"<key>Control</key> και επιλέγοντας κάθε αρχείο με το ποντίκι σας ή "
+"επιλέγοντας μια σειρά αρχείων πατώντας δυο φορές το <key>Shift</key> για να "
+"τα επιλέξετε. Μπορείτε μετά να σύρετε και να τα αφήσετε πάνω στη <gui>Σειρά "
+"αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή να κάνετε δεξί "
+"κλικ στα κομμάτια και να επιλέξτε <gui>Προσθήκη στη σειρά αναπαραγωγής</gui>."
#: C/play-queue.page:56(title)
-msgid "Organize your <gui>Play Queue</gui>"
-msgstr "Οργάνωση της <gui>σειράς αναπαραγωγής</gui> σας"
+msgid "Organize Your Play Queue"
+msgstr "Οργάνωση της σειράς αναπαραγωγής σας"
#: C/play-queue.page:58(p)
msgid ""
-"Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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."
+"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 ""
-"Η <gui>σειρά αναπαραγωγής</gui> σας οργανώνεται με τη σειρά που προσθέσατε "
-"τα κομμάτια. Τα πρώτα κομμάτια ή δίσκοι που προσθέσατε θα αναπαραχθούν "
-"πρώτα. Μπορείτε να επαναδιατάξετε τη <gui>σειρά αναπαραγωγής</gui> με το "
-"ποντίκι, σύροντας και αφήνοντας ένα κομμάτι ή ομάδα κομματιών στη λίστα. "
-"Επιλέξτε τα κομμάτια που θέλετε να επαναδιατάξετε με το ποντίκι σας και "
-"αφήστε το ποντίκι σας πάνω από τον αριθμό ή τη θέση στη λίστα που θέλετε να "
-"τοποθετηθούν αυτά τα αρχεία."
+"Η σειρά αναπαραγωγής σας οργανώνεται με τη σειρά που προσθέσατε τα κομμάτια. "
+"Τα πρώτα κομμάτια ή δίσκοι που προσθέσατε θα αναπαραχθούν πρώτα. Μπορείτε να "
+"επαναδιατάξετε τη σειρά αναπαραγωγής με το ποντίκι, σύροντας και αφήνοντας "
+"ένα κομμάτι ή ομάδα κομματιών στη λίστα. Επιλέξτε το κομμάτι(α) που θέλετε "
+"να επαναδιατάξετε με το ποντίκι σας και αφήστε το κουμπί του ποντικιού πάνω "
+"από τον αριθμό ή θέση της λίστας που θέλετε να τοποθετηθούν αυτά τα αρχεία."
-#: C/play-queue.page:68(title)
-msgid "Removing tracks from the <gui>Play Queue</gui>"
-msgstr "Αφαίρεση κομματιών από τη <gui>σειρά αναπαραγωγής</gui>"
+#: C/play-queue.page:70(title)
+msgid "Removing Tracks from the Play Queue"
+msgstr "Αφαίρεση κομματιών από τη σειρά αναπαραγωγής"
-#: C/play-queue.page:70(p)
+#: C/play-queue.page:72(p)
msgid ""
"You can remove an individual track, a group of tracks, or clear your entire "
-"<gui>Play Queue</gui>:"
+"play queue."
msgstr ""
"Μπορείτε να αφαιρέσετε ένα μεμονωμένο κομμάτι, μια ομάδα κομματιών ή να "
-"εκκαθαρίσετε όλη τη <gui>σειρά αναπαραγωγής</gui>:"
-
-#: C/play-queue.page:75(p)
-msgid ""
-"To remove an individual track, select the track with your mouse and then "
-"press <key>Delete</key>."
-msgstr ""
-"Για να αφαιρέσετε ένα μεμονωμένο κομμάτι, επιλέξτε το κομμάτι με το ποντίκι "
-"σας και πατήστε <key>Delete</key>."
-
-#: C/play-queue.page:79(p)
-msgid ""
-"To remove multiple tracks, select each track with your mouse while holding "
-"down <key>Ctrl</key>. Once all the desired tracks have been selected, press "
-"<key>Delete</key>."
-msgstr ""
-"Για να αφαιρέσετε πολλά κομμάτια, επιλέξτε κάθε κομμάτι με το ποντίκι σας, "
-"ενώ κρατάτε πατημένο το <key>Ctrl</key>. Μόλις όλα τα επιθυμητά κομμάτια "
-"έχουν επιλεγεί, πατήστε <key>Διαγραφή</key>."
+"εκκαθαρίσετε όλη τη σειρά αναπαραγωγής."
-#: C/play-queue.page:83(p)
+#: C/play-queue.page:76(p)
msgid ""
-"If you accidentally select a track you do not want to remove, hold down "
-"<key>Ctrl</key> and select the track again with your mouse, to unselect it."
+"To remove an individual track or group of tracks, select the track with your "
+"mouse and then press <key>Delete</key>."
msgstr ""
-"Αν επιλέξατε κατά λάθος ένα κομμάτι που δεν θέλετε να αφαιρέσετε, κρατήστε "
-"πατημένο το <key>Ctrl</key> και επιλέξτε το κομμάτι πάλι με το ποντίκι σας, "
-"για να το αποεπιλέξετε."
+"Για να αφαιρέσετε ένα μεμονωμένο κομμάτι ή ομάδα κομματιών, επιλέξτε το "
+"κομμάτι με το ποντίκι σας και πατήστε <key>Delete</key>."
-#: C/play-queue.page:89(p)
+#: C/play-queue.page:80(p)
msgid ""
-"To clear your entire <gui>Play Queue</gui>, press the <gui style=\"button"
-"\">Clear</gui> button in the upper right hand corner of the <gui>Play Queue</"
-"gui> or press <keyseq><key>Ctrl</key><key>A</key></keyseq> and press "
-"<key>Delete</key>."
+"To clear your entire Play Queue, press the <gui>Clear</gui> button in the "
+"upper right hand corner of the Play Queue."
msgstr ""
-"Για να καθαρίσετε όλη τη <gui>σειρά αναπαραγωγής</gui> σας, πατήστε το "
-"κουμπί <gui style=\"button\">Καθαρισμός</gui> στην πάνω δεξιά γωνία της "
-"<gui>σειράς αναπαραγωγής</gui> ή πατήστε "
-"<keyseq><key>Ctrl</key><key>Α</key></keyseq> και πατήστε "
-"<key>Διαγραφή</key>."
+"Για να εκκαθαρίσετε όλη τη σειρά αναπαραγωγής σας, πατήστε το κουμπί "
+"<gui>Εκκαθάριση</gui> στην πάνω δεξιά γωνία της σειράς αναπαραγωγής."
-#: C/manage-tags.page:9(desc)
+#: C/manage-tags.page:10(desc)
msgid "Edit and change music tags and metadata."
msgstr "Επεξεργασία και αλλαγή ετικετών μουσικής και μεταδεδομένων."
-#: C/manage-tags.page:24(title)
+#: C/manage-tags.page:25(title)
+msgid "Music Metadata"
+msgstr "Μεταδεδομένα μουσικής"
+
+#: C/manage-tags.page:29(title)
msgid "Music metadata"
msgstr "Μεταδεδομένα μουσικής"
-#: C/manage-tags.page:26(p)
+#: 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, <app>Banshee</app> will include the "
-"metadata when ripping the CD if available. For more information on ripping "
-"CDs and including the metadata see the <link xref=\"import\"/>."
+"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 <link xref=\"import\"/>."
msgstr ""
"Η ψηφιακή μουσική περιέχει μεταδεδομένα που αποθηκεύουν πληροφορίες στο "
"μουσικό αρχείο που περιλαμβάνουν τον καλλιτέχνη, το δίσκο, το έτος "
"ηχογράφησης, το είδος και άλλα. Σχεδόν όλη η μουσική που αγοράζεται μέσω "
"διαδικτύου θα έχει ήδη ενσωματωμένα τα μεταδεδομένα και αν εισάγετε μουσική "
-"από CDs, το <app>Banshee</app> θα συμπεριλάβει τα μεταδεδομένα κατά την "
-"αντιγραφή από το CD, αν είναι διαθέσιμα. Για περισσότερες πληροφορίες για "
-"την αντιγραφή CD και την συμπερίληψη μεταδεδομένων δείτε την <link "
-"xref=\"import\"/>."
+"από CD, το Banshee θα συμπεριλάβει τα μεταδεδομένα κατά την εξαγωγή από το "
+"CD, αν είναι διαθέσιμα. Για περισσότερες πληροφορίες για την εξαγωγή CD και "
+"την συμπερίληψη μεταδεδομένων δείτε την <link xref=\"εισαγωγή\"/>."
-#: C/manage-tags.page:33(p)
+#: C/manage-tags.page:39(p)
msgid ""
"Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis "
"comments for OGG Vorbis files."
@@ -1481,35 +996,35 @@ msgstr ""
"Δημοφιλείς μορφές μεταδεδομένων είναι οι ID3v1 και ID3v2 για αρχεία MP3 και "
"τα σχόλια Vorbis για αρχεία OGG Vorbis."
-#: C/manage-tags.page:36(p)
+#: C/manage-tags.page:42(p)
msgid ""
-"If you have imported songs that do not contain metadata,<app>Banshee</app> "
+"If you have imported songs that do not contain metadata, <app>Banshee</app> "
"will display <gui>Unknown</gui> for most fields in the library."
msgstr ""
"Αν έχετε εισαγάγει τραγούδια που δεν περιέχουν μεταδεδομένα, το "
"<app>Banshee</app> θα εμφανίσει <gui>Άγνωστο</gui> στα περισσότερα πεδία στη "
"βιβλιοθήκη."
-#: C/manage-tags.page:40(title)
-msgid "Edit your metadata"
-msgstr "Επεξεργασία των μεταδεδομένων σας"
+#: C/manage-tags.page:50(title)
+msgid "Edit Your Metadata"
+msgstr "Επεξεργασία μεταδεδομένων"
-#: C/manage-tags.page:42(p)
+#: 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 <key>E</key>, choose <guiseq><gui style=\"menu"
-"\">Edit</gui><gui style=\"menuitem\">Edit Track Information</gui></guiseq> "
-"from the menu, or use your mouse and right click on the files and select "
-"<gui style=\"menuitem\">Edit Track Information</gui>."
+"you want to update and hit the <key>E</key>, choose <guiseq><gui>Edit</"
+"gui><gui>Edit Track Information</gui></guiseq> from the menu, or use your "
+"mouse and right click on the files and select <gui>Edit Track Information</"
+"gui>."
msgstr ""
-"Μπορείτε να αλλάξετε και να επεξεργαστείτε τα μεταδεδομένα των τραγουδιών "
+"Μπορείτε να αλλάξετε και να επεξεργασθείτε τα μεταδεδομένα των τραγουδιών "
"σας. Επιλέξτε το τραγούδι ή τα τραγούδια που θέλετε να ενημερώσετε και "
-"πατήστε το <key>E</key>, επιλέξτε <guiseq><gui "
-"style=\"menu\">Επεξεργασία</gui><gui style=\"menuitem\">Επεξεργασία πληροφοριών "
-"κομματιού</gui></guiseq> από το μενού ή δεξιοπατήστε στα αρχεία και επιλέξτε "
-"<gui style=\"menuitem\">Επεξεργασία πληροφοριών κομματιού</gui>."
+"πατήστε το <key>E</key>, επιλέξτε <guiseq><gui>Επεξεργασία</"
+"gui><gui>Επεξεργασία πληροφοριών κομματιού</gui></guiseq> από το μενού ή "
+"κάντε δεξί κλικ στα αρχεία και επιλέξτε <gui>Επεξεργασία πληροφοριών "
+"κομματιού</gui>."
-#: C/manage-tags.page:49(p)
+#: 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:"
@@ -1518,58 +1033,57 @@ msgstr ""
"τραγουδιού και σας επιτρέπει να τα αλλάξετε ή να τα ενημερώσετε. Τα "
"προεπιλεγμένα πεδία που εμφανίζονται περιλαμβάνουν:"
-#: C/manage-tags.page:53(gui)
-msgid "Track Title"
-msgstr "Τίτλος κομματιού"
+#: C/manage-tags.page:63(gui)
+msgid "Track Title:"
+msgstr "Τίτλος κομματιού:"
-#: C/manage-tags.page:54(gui)
+#: C/manage-tags.page:64(gui)
msgid "Track Artist"
msgstr "Καλλιτέχνης κομματιού"
-#: C/manage-tags.page:55(gui)
+#: C/manage-tags.page:65(gui)
msgid "Album Title"
msgstr "Τίτλος δίσκου"
-#: C/manage-tags.page:56(gui)
+#: C/manage-tags.page:66(gui)
msgid "Genre"
msgstr "Είδος"
-#: C/manage-tags.page:57(gui)
+#: C/manage-tags.page:67(gui)
msgid "Track Number"
msgstr "Αριθμός κομματιού"
-#: C/manage-tags.page:58(gui)
+#: C/manage-tags.page:68(gui)
msgid "Disc Number"
msgstr "Αριθμός δίσκου"
-#: C/manage-tags.page:59(gui) C/manage-playlists.page:107(gui)
+#: C/manage-tags.page:69(gui) C/manage-playlists.page:109(gui)
msgid "Year"
msgstr "Έτος"
-#: C/manage-tags.page:62(p)
+#: 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 <gui>Track Title</gui> field "
-"or press the <gui style=\"button\">Forward</gui> button at the bottom of the "
-"dialog when finished with each song. When you have completed editing all "
-"metadata, press <gui style=\"button\">Save</gui>."
-msgstr ""
-"Ενημερώστε τις πληροφορίες τραγουδιού. Αν έχετε επιλέξει πολλά τραγούδια για "
-"επεξεργασία, πατήστε το εικονίδιο με το δεξί βέλος στα δεξιά του πεδίου "
-"<gui>Τίτλος κομματιού</gui> ή πατήστε το κουμπί <gui "
-"style=\"button\">Μπροστά</gui> στο κάτω μέρος του διαλόγου όταν τελειώνετε με "
-"κάθε τραγούδι. Όταν έχετε επεξεργασθεί όλα τα μεταδεδομένα, πατήστε <gui "
-"style=\"button\">Αποθήκευση</gui>."
-
-#: C/manage-playlists.page:9(desc)
+"or press the <gui>Forward</gui> button at the bottom of the dialog when "
+"finished with each song. When you have completed editing all metadata, press "
+"<gui>Save</gui>."
+msgstr ""
+"Ενημερώστε τις πληροφορίες τραγουδιού. Αν έχετε επιλέξει πολλαπλά τραγούδια "
+"για επεξεργασία, πατήστε το εικονίδιο με το δεξί βέλος στα δεξιά του πεδίου "
+"<gui>Τίτλος κομματιού</gui> ή πατήστε το κουμπί <gui>Μπροστά</gui> στο κάτω "
+"μέρος του διαλόγου όταν τελειώνετε με κάθε τραγούδι. Όταν έχετε επεξεργασθεί "
+"όλα τα μεταδεδομένα, πατήστε <gui>Αποθήκευση</gui>."
+
+#: C/manage-playlists.page:10(desc)
msgid "Create and manage playlists."
msgstr "Δημιουργία και διαχείριση λιστών αναπαραγωγής."
-#: C/manage-playlists.page:18(title) C/keyboard-shortcuts.page:73(title)
+#: C/manage-playlists.page:19(title)
msgid "Playlists"
msgstr "Λίστες αναπαραγωγής"
-#: C/manage-playlists.page:20(p)
+#: 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 "
@@ -1585,23 +1099,23 @@ msgstr ""
"συσκευές αναπαραγωγής σας επιτρέπουν ακόμα και να μεταφέρετε τη λίστα "
"αναπαραγωγής ώστε να μπορείτε να την πάρετε μαζί σας."
-#: C/manage-playlists.page:26(p)
+#: C/manage-playlists.page:28(p)
msgid ""
-"<app>Banshee</app> supports normal playlists, which include songs you add to "
-"the playlist, as well as smart playlists. Smart Playlists are automatically "
+"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 ""
-"Το <app>Banshee</app> υποστηρίζει κανονικές λίστες αναπαραγωγής, που "
-"περιλαμβάνουν τραγούδια που προσθέτετε στη λίστα αναπαραγωγής καθώς και "
-"έξυπνες λίστες αναπαραγωγής. Οι έξυπνες λίστες αναπαραγωγής δημιουργούν "
-"αυτόματα λίστες αναπαραγωγής βασισμένες στις συνήθειές ακρόασης σας, στην "
-"αγαπημένη σας μουσική και άλλα."
+"Το Banshee υποστηρίζει κανονικές λίστες αναπαραγωγής, που περιλαμβάνουν "
+"τραγούδια που προσθέτετε στη λίστα αναπαραγωγής καθώς και έξυπνες λίστες "
+"αναπαραγωγής. Οι έξυπνες λίστες αναπαραγωγής δημιουργούν αυτόματα λίστες "
+"αναπαραγωγής βασισμένες στις συνήθειές σας ακρόασης, στην αγαπημένη σας "
+"μουσική και άλλα."
-#: C/manage-playlists.page:32(title)
-msgid "Normal playlists"
+#: C/manage-playlists.page:34(title)
+msgid "Normal Playlists"
msgstr "Κανονικές λίστες αναπαραγωγής"
-#: C/manage-playlists.page:34(p)
+#: 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 "
@@ -1610,54 +1124,61 @@ msgid ""
msgstr ""
"Μια κανονική λίστα αναπαραγωγής είναι μια λίστα τραγουδιών που έχετε "
"προσθέσει και διαχειρίζεστε. Μπορεί να θέλετε να δημιουργήσετε τη δική σας "
-"λίστα τραγουδιών από τον αγαπημένο σας καλλιτέχνη από πολλούς δίσκους, τα "
-"τελευταία αγαπημένα σας τραγούδια ή μια λίστα με έντονο ρυθμό για να ακούτε "
-"όσο ασκείστε."
-
-#: C/manage-playlists.page:39(p)
+"λίστα τραγουδιών από τον αγαπημένο σας καλλιτέχνη από πολλαπλούς δίσκους ή "
+"μια λίστα με έντονο ρυθμό για να ακούτε όσο ασκείστε."
+
+#: C/manage-playlists.page:42(p)
+#| msgid ""
+#| "You can create a new playlist by pressing <keyseq><key>Control</"
+#| "key><key>N</key></keyseq>, from the menu choosing <guiseq><gui>Menu</"
+#| "gui><gui>New Playlist</gui></guiseq> or by selecing the track(s) you "
+#| "would like to add to the playlist. Select the track(s), right click them, "
+#| "and choose <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></"
+#| "guiseq>. 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 "
+#| "<gui>Music</gui>. As you drag it over <gui>Music</gui>, a new option "
+#| "<gui><em>New Playlist</em></gui> will appear and you can drop the track"
+#| "(s) over <gui><em>New Playlist</em></gui> to add them to the playlist. "
+#| "You can repeat this process until you have added all the tracks you want "
+#| "in the playlist."
msgid ""
"You can create a new playlist by pressing <keyseq><key>Control</key><key>N</"
-"key></keyseq>, from the menu choosing <guiseq><gui style=\"menu\">Media</"
-"gui><gui style=\"menuitem\">New Playlist</gui></guiseq> or by selecing the "
-"track(s) you would like to add to the playlist. Select the track(s), right "
-"click them, and choose <guiseq><gui style=\"menuitem\">Add to Playlist</"
-"gui><gui style=\"menuitem\">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you drag it over "
-"<gui>Music</gui>, a new option <gui style=\"menuitem\"><em>New Playlist</"
-"em></gui> will appear and you can drop the track(s) over <gui style="
-"\"menuitem\"><em>New Playlist</em></gui> to add them to the playlist. You "
-"can repeat this process until you have added all the tracks you want in the "
-"playlist."
+"key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui><gui>New "
+"Playlist</gui></guiseq> or by selecing the track(s) you would like to add to "
+"the playlist. Select the track(s), right click them, and choose "
+"<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you "
+"drag it over <gui>Music</gui>, a new option <gui><em>New Playlist</em></gui> "
+"will appear and you can drop the track(s) over <gui><em>New Playlist</em></"
+"gui> to add them to the playlist. You can repeat this process until you have "
+"added all the tracks you want in the playlist."
msgstr ""
"Μπορείτε να δημιουργήσετε μια νέα λίστα αναπαραγωγής πατώντας "
"<keyseq><key>Control</key><key>N</key></keyseq>, από το μενού επιλέγοντας "
-"<guiseq><gui style=\"menu\">Μέσα</gui><gui style=\"menuitem\">Νέα λίστα "
-"αναπαραγωγής</gui></guiseq> ή επιλέγοντας τα κομμάτια που θέλετε να "
-"προσθέσετε στη λίστα αναπαραγωγής. Επιλέξτε τα κομμάτια, δεξιοπατήστε τα και "
-"επιλέξτε <guiseq><gui style=\"menuitem\">Προσθήκη στη λίστα "
-"αναπαραγωγής</gui><gui style=\"menuitem\">Νέα λίστα "
-"αναπαραγωγής</gui></guiseq>. Μπορείτε επίσης να σύρετε και να τα αφήσετε σε "
-"μια νέα λίστα αναπαραγωγής επιλέγοντας τα κομμάτια και σύροντάς τα στο "
-"αριστερό πλαίσιο του παραθύρου πάνω από το <gui>Μουσική</gui>. Καθώς τα "
-"σύρετε πάνω από το <gui>Μουσική</gui>, θα εμφανισθεί μια νέα επιλογή <gui "
-"style=\"menuitem\"><em>Νέα λίστα αναπαραγωγής</em></gui> και μπορείτε να "
-"αφήσετε τα κομμάτια πάνω από τη <gui style=\"menuitem\"><em>Νέα λίστα "
-"αναπαραγωγής</em></gui> για να τα προσθέσετε στη λίστα αναπαραγωγής. "
-"Μπορείτε να επαναλάβετε αυτή τη διαδικασία μέχρι να προσθέσετε όλα τα "
-"κομμάτια που θέλετε στη λίστα αναπαραγωγής."
+"<guiseq><gui>Μενού</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq> ή "
+"επιλέγοντας τα κομμάτια που θέλετε να προσθέσετε στη λίστα αναπαραγωγής. "
+"Επιλέξτε τα κομμάτια, κάντε δεξί κλικ και επιλέξτε <guiseq><gui>Προσθήκη στη "
+"λίστα αναπαραγωγής</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq>. "
+"Μπορείτε επίσης να σύρετε και να τα αφήσετε σε μια νέα λίστα αναπαραγωγής "
+"επιλέγοντας τα κομμάτια και σύροντάς τα στο αριστερό πλαίσιο πάνω από το "
+"<gui>Μουσική</gui>. Καθώς τα σύρετε πάνω από το <gui>Μουσική</gui>, θα "
+"εμφανισθεί μια νέα επιλογή <gui><em>Νέα λίστα αναπαραγωγής</em></gui> και "
+"μπορείτε να αφήσετε τα κομμάτια πάνω από αυτή για να προσθέσετε στη λίστα "
+"αναπαραγωγής. Μπορείτε να επαναλάβετε αυτή τη διαδικασία μέχρι να προσθέσετε "
+"όλα τα κομμάτια που θέλετε στη λίστα αναπαραγωγής."
#: 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 <gui style=\"menuitem\">Rename Playlist</gui> and "
-"enter the name of your playlist."
+"the playlist and press <gui>Rename Playlist</gui> and enter the name of your "
+"playlist."
msgstr ""
-"Για να δώσετε στη λίστα αναπαραγωγής σας όνομα, επιλέξτε την και "
-"δεξιοπατήστε σε αυτή, πατήστε <gui style=\"menuitem\">Μετονομασία λίστας "
-"αναπαραγωγής</gui> και εισάγετε το όνομα της λίστας σας."
+"Για να δώσετε στη λίστα αναπαραγωγής όνομα, επιλέξτε τη, κάντε δεξί κλικ σε "
+"αυτή, πατήστε <gui>Μετονομασία λίστας αναπαραγωγής</gui> και εισάγετε το "
+"όνομα της λίστας."
-#: C/manage-playlists.page:60(p)
+#: 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 "
@@ -1671,23 +1192,21 @@ msgstr ""
"μια στήλη, κάντε κλικ πάνω της μέχρι να μην εμφανίζεται πάνω ή κάτω βέλος "
"και η στήλη να είναι κενή και μετά επαναδιατάξτε τη λίστα αναπαραγωγής."
-#: C/manage-playlists.page:66(p)
+#: C/manage-playlists.page:68(p)
msgid ""
"To remove a track from the playlist, select the track(s) you wish to remove. "
-"Press the <key>Delete</key>, from the menu choose <guiseq><gui style=\"menu"
-"\">Edit</gui><gui style=\"menuitem\">Remove from Playlist</gui></guiseq> or "
-"right click the track(s) with your mouse and press <gui style=\"menuitem"
-"\">Remove from Playlist</gui>."
+"Press the <key>Delete</key>, from the menu choose <guiseq><gui>Edit</"
+"gui><gui>Remove from Playlist</gui></guiseq> or right click the track(s) "
+"with your mouse and press <gui>Remove from Playlist</gui>."
msgstr ""
"Για να αφαιρέσετε ένα κομμάτι από τη λίστα αναπαραγωγής, επιλέξτε τα "
-"κομμάτια που θέλετε να απομακρύνετε. Πατήστε το <key>Delete</key>, επιλέξτε "
-"από το μενού <guiseq><gui style=\"menu\">Επεξεργασία</gui><gui "
-"style=\"menuitem\">Αφαίρεση από τη λίστα αναπαραγωγής</gui></guiseq> ή "
-"δεξιοπατήστε στα κομμάτια με το ποντίκι σας και πατήστε <gui "
-"style=\"menuitem\">Αφαίρεση από τη λίστα αναπαραγωγής</gui>."
+"κομμάτια που θέλετε να αφαιρέσετε. Πατήστε το <key>Delete</key>, επιλέξτε "
+"από το μενού <guiseq><gui>Επεξεργασία</gui><gui>Αφαίρεση από τη λίστα "
+"αναπαραγωγής</gui></guiseq> ή κάντε δεξί κλικ στο κομμάτι(α) με το ποντίκι "
+"σας και πατήστε <gui>Αφαίρεση από τη λίστα αναπαραγωγής</gui>."
#: C/manage-playlists.page:76(title)
-msgid "Smart playlist"
+msgid "Smart Playlist"
msgstr "Έξυπνη λίστα αναπαραγωγής"
#: C/manage-playlists.page:78(p)
@@ -1698,326 +1217,260 @@ msgid ""
msgstr ""
"Οι έξυπνες λίστες αναπαραγωγής σας επιτρέπουν να δημιουργήσετε γρήγορα μια "
"δυναμική λίστα βασισμένη σε ένα αριθμό προκαθορισμένων μεταβλητών. Μπορεί να "
-"δημιουργήσετε γρήγορα μια νέα λίστα αναπαραγωγής βασισμένη σε έναν "
+"δημιουργήσετε γρήγορα μια νέα λίστα αναπαραγωγής βασισμένη σε ένα "
"καλλιτέχνη, σε αγαπημένα και άλλα."
-#: C/manage-playlists.page:82(p)
+#: C/manage-playlists.page:83(p)
msgid ""
-"To create a new Smart Playlist, from the menu choose <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">New Smart Playlist</gui></"
-"guiseq>. 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:"
+"To create a new Smart Playlist, from the menu choose <guiseq><gui>Media</"
+"gui><gui>New Smart Playlist</gui></guiseq>. 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 ""
"Για να δημιουργήσετε μια έξυπνη λίστα αναπαραγωγής, από το μενού επιλέξτε "
-"<guiseq><gui style=\"menu\">Πολυμέσα</gui><gui style=\"menuitem\">Νέα έξυπνη "
-"λίστα αναπαραγωγής</gui></guiseq>. Θα εμφανιστεί ένας διάλογος για "
-"δημιουργία νέας έξυπνης λίστας αναπαραγωγής. Εισάγετε το όνομα της λίστας "
-"αναπαραγωγής σας και μετά επιλέξτε τα κριτήρια στα οποία θα βασίζεται η "
-"λίστα σας. Μπορεί να επιλέξετε από οποιοδήποτε πεδίο περιλαμβάνεται στα "
-"μεταδεδομένα του τραγουδιού, όπως Δίσκος, Καλλιτέχνης ή Έτος. Επιλέξτε τα "
-"κριτήρια και μετά επιλέξτε ένα από τα ακόλουθα:"
-
-#: C/manage-playlists.page:92(p) C/manage-playlists.page:108(gui)
+"<guiseq><gui>Πολυμέσα</gui><gui>Νέα έξυνπη λίστα αναπαραγωγής</gui></"
+"guiseq>. Θα εμφανιστεί ένας διάλογος για δημιουργία νέας έξυπνης λίστας "
+"αναπαραγωγής. Εισάγετε το όνομα της λίστας αναπαραγωγής σας και μετά "
+"επιλέξτε τα κριτήρια στα οποία θα βασίζεται η λίστα σας. Μπορεί να επιλέξετε "
+"από οποιοδήποτε πεδίο περιλαμβάνεται στα μεταδεδομένα του τραγουδιού, όπως "
+"Δίσκος, Καλλιτέχνης ή Έτος. Επιλέξτε τα κριτήρια και μετά επιλέξτε ένα από "
+"τα ακόλουθα:"
+
+#: 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:93(p)
+#: C/manage-playlists.page:94(p)
msgid "is not"
msgstr "δεν είναι"
-#: C/manage-playlists.page:94(p)
+#: C/manage-playlists.page:95(p)
msgid "less than"
msgstr "λιγότερο από"
-#: C/manage-playlists.page:95(p)
+#: C/manage-playlists.page:96(p)
msgid "more than"
msgstr "περισσότερο από"
-#: C/manage-playlists.page:96(p)
+#: C/manage-playlists.page:97(p)
msgid "at most"
msgstr "το πολύ"
-#: C/manage-playlists.page:97(p)
+#: C/manage-playlists.page:98(p)
msgid "at least"
msgstr "τουλάχιστον"
-#: C/manage-playlists.page:100(p)
+#: C/manage-playlists.page:101(p)
msgid ""
-"You can also press the <gui style=\"button\">+</gui> 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:"
+"You can also press the <gui>+</gui> 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 ""
-"Μπορείτε επίσης να πατήσετε το κουμπί <gui style=\"button\">+</gui> για να "
-"προσθέσετε ένα ερώτημα προσθήκης στην έξυπνη λίστα αναπαραγωγής σας. "
-"Παραδείγματος χάριν, θα μπορούσατε να δημιουργήσετε μια έξυπνη λίστα "
-"αναπαραγωγής που περιλαμβάνει όλα τα τραγούδια από το 2010 που βαθμολογήσατε "
-"με 5 αστέρια. Για να δημιουργήσετε αυτή τη λίστα θα πρέπει να επιλέξετε:"
+"Μπορείτε επίσης να πατήσετε το κουμπί <gui>+</gui> για να προσθέσετε ένα "
+"ερώτημα προσθήκης στην έξυπνη λίστα αναπαραγωγής σας. Παραδείγματος χάριν, "
+"θα μπορούσατε να δημιουργήσετε μια έξυπνη λίστα αναπαραγωγής που "
+"περιλαμβάνει όλα τα τραγούδια από το 2010 που βαθμολογήσατε με 5 αστέρια. "
+"Για να δημιουργήσετε αυτή τη λίστα θα επιλέγατε:"
-#: C/manage-playlists.page:109(p)
+#: C/manage-playlists.page:110(gui)
msgid "2010"
msgstr "2010"
-#: C/manage-playlists.page:112(gui)
+#: C/manage-playlists.page:113(gui)
msgid "Rating"
-msgstr "Κατάταξη"
+msgstr "Βαθμολογία"
#: C/manage-playlists.page:114(p)
-msgid "5 stars"
-msgstr "5 αστέρια"
+msgid "<gui/>5 stars"
+msgstr "<gui/>5 αστέρια"
#: C/manage-playlists.page:118(p)
msgid ""
"You can then optionally select how many songs are included by pressing the "
-"<gui style=\"checkbox\">Limit to</gui> checkbox and choosing the number of "
-"songs to be included."
+"<gui>Limit</gui> to checkbox and choosing the number of songs to be included."
msgstr ""
"Μπορείτε τότε προαιρετικά να επιλέξετε πόσα τραγούδια περιλαμβάνονται "
-"πατώντας το πλαίσιο ελέγχου <gui style=\"checkbox\">Περιορισμός</gui> και "
-"επιλέγοντας τον αριθμό των τραγουδιών που θα περιληφθούν."
+"πατώντας το <gui>Περιορισμός</gui> στο πεδίο επιλογής και επιλέγοντας τον "
+"αριθμό των τραγουδιών που θα περιληφθούν."
-#: C/manage-playlists.page:122(p)
+#: C/manage-playlists.page:123(p)
msgid ""
-"<app>Banshee</app> also includes smart playlists already created for you. "
-"Press the <gui style=\"button\">Open in editor</gui> button to view how the "
-"playlist created was or to modify it. If you press <gui style=\"button"
-"\">Create and save</gui> the playlist will be automatically generated and "
-"saved for you. The following playlists are included:"
+"Banshee also includes smart playlists already created for you. Press the "
+"<gui>Open in editor</gui> button to view how the playlist created was or to "
+"modify it. If you press <gui>Create and save</gui> the playlist will be "
+"automatically generated and saved for you. The following playlists are "
+"included:"
msgstr ""
-"Το <app>Banshee</app> περιλαμβάνει επίσης έξυπνες λίστες αναπαραγωγής που "
-"έχουν δημιουργηθεί για εσάς. Πατήστε το κουμπί <gui style=\"button\">Άνοιγμα "
-"στον επεξεργαστή</gui> για να δείτε πώς δημιουργήθηκε η λίστα αναπαραγωγής ή "
-"για να την τροποποιήσετε. Αν πατήσετε <gui style=\"button\">Δημιουργία και "
-"αποθήκευση</gui> η λίστα αναπαραγωγής θα δημιουργηθεί αυτόματα και θα "
-"αποθηκευτεί. Περιλαμβάνονται οι ακόλουθες λίστες αναπαραγωγής:"
+"Το Banshee περιλαμβάνει επίσης έξυπνες λίστες αναπαραγωγής που έχουν "
+"δημιουργηθεί για εσάς. Πατήστε το κουμπί <gui>Άνοιγμα στον επεξεργαστή</gui> "
+"για να δείτε πως δημιουργήθηκε η λίστα αναπαραγωγής ή για να την "
+"τροποποιήσετε. Αν πατήσετε <gui>Δημιουργία και αποθήκευση</gui> η λίστα θα "
+"δημιουργηθεί αυτόματα και θα αποθηκευτεί. Περιλαμβάνονται οι ακόλουθες "
+"λίστες αναπαραγωγής:"
-#: C/manage-playlists.page:130(title)
-msgid "<app>Banshee</app> smart playlists"
-msgstr "Έξυπνες λίστες αναπαραγωγής του <app>Banshee</app>"
+#: C/manage-playlists.page:131(title)
+msgid "Banshee Smart Playlists"
+msgstr "Έξυπνες λίστες αναπαραγωγής του Banshee"
#: C/manage-playlists.page:132(p)
msgid "Favorites (Songs rated four and five stars)"
msgstr "Αγαπημένα (τραγούδια με 4 και 5 αστέρια)"
-#: C/manage-playlists.page:135(p)
+#: C/manage-playlists.page:133(p)
msgid "Recent Favorites (Songs listened to often in the past week)"
msgstr ""
"Πρόσφατα αγαπημένα (τραγούδια που ακούστηκαν συχνά την προηγούμενη εβδομάδα)"
-#: C/manage-playlists.page:138(p)
-msgid "Recently Added (Songs imported within the last week)"
+#: C/manage-playlists.page:135(p)
+msgid "Recently Added (Songs imported within the last week"
msgstr ""
-"Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν την προηγούμενη εβδομάδα)"
+"Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν εντός της προηγούμενης "
+"εβδομάδας)"
-#: C/manage-playlists.page:141(p)
+#: C/manage-playlists.page:136(p)
msgid "Unheard (Songs that have not been played or skipped)"
-msgstr "Πρωτάκουστα (τραγούδια που δεν έχουν αναπαραχθεί ή παραβλεφθεί)"
+msgstr "Δεν έχουν ακουστεί (τραγούδια που δεν έχουν αναπαραχθεί ή παραβλεφθεί)"
-#: C/manage-playlists.page:144(p)
+#: C/manage-playlists.page:137(p)
msgid "Neglected Favorites (Favorites not played in over two months)"
msgstr ""
"Παραμελημένα αγαπημένα (αγαπημένα που δεν έχουν παιχθεί για πάνω από δύο "
"μήνες)"
-#: C/manage-playlists.page:147(p)
+#: C/manage-playlists.page:139(p)
msgid "700 MB of Favorites (A data CD worth of favorite songs)"
msgstr "700 MB αγαπημένων (ένα CD δεδομένων γεμάτο με αγαπημένα τραγούδια)"
-#: C/manage-playlists.page:150(p)
+#: C/manage-playlists.page:140(p)
msgid "80 Minutes of Favorites (An audio CD worth of favorite songs)"
msgstr "80 λεπτά αγαπημένων (ένα CD ήχου γεμάτο με αγαπημένα τραγούδια)"
-#: C/manage-playlists.page:153(p)
+#: C/manage-playlists.page:142(p)
msgid "Unrated (Songs that haven't been rated)"
-msgstr "Αβαθμολόγητα (τραγούδια που δεν έχουν αξιολογηθεί)"
+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 ""
"Ενεργοποιήστε το Last.fm, αναφορά τραγουδιών και το ραδιόφωνο του Last.fm."
-#: C/lastfm.page:28(title)
+#: C/lastfm.page:24(title)
msgid "Last.fm"
msgstr "Last.fm"
-#: C/lastfm.page:30(p)
+#: 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."
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 "
-"<app>Banshee</app> for free. If you subscribe as a paying member, you can "
-"also listen to streaming music from Last.fm in various music clients, "
-"including <app>Banshee</app>. Last.fm offers multiple channels to stream, "
-"including recommended music for you based on your listening habits, your "
-"favorites and more."
+"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."
msgstr ""
"Το Last.fm είναι μια δημοφιλής δικτυακή υπηρεσία που προσφέρει τόσο δωρεάν "
"όσο και επί πληρωμή υπηρεσίες. Το Last.fm προσφέρει πληροφορίες για "
-"καλλιτέχνες της μουσικής και δίσκους και αν δημιουργήσετε μια κατατομή "
-"χρήστη, το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο "
-"<app>Banshee</app> δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε "
-"επίσης να ακούτε ροές μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, "
-"περιλαμβανομένου του <app>Banshee</app>. Το Last.fm προσφέρει πολλά κανάλια "
-"για ροές, περιλαμβανομένης προτεινόμενης μουσικής για εσάς με βάση τις "
-"συνήθειες ακρόασής σας, τα αγαπημένα σας και άλλα."
-
-#: C/lastfm.page:40(title)
+"καλλιτέχνες της μουσικής και δίσκους και αν δημιουργήσετε ένα προφίλ χρήστη, "
+"το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο "
+"Banshee δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε "
+"ροές μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, "
+"περιλαμβανομένου του Banshee. Το Last.fm προσφέρει πολλαπλά κανάλια για "
+"ροές, περιλαμβανομένης προτεινόμενης μουσικής για εσάς με βάση τις συνήθειες "
+"ακρόασής σας, τα αγαπημένα σας και άλλα."
+
+#: C/lastfm.page:35(title)
msgid "Enable Last.fm"
msgstr "Ενεργοποίηση Last.fm"
-#: C/lastfm.page:42(p)
+#: C/lastfm.page:36(p)
msgid ""
"To get the most out of Last.fm, you will want to create a Last.fm profile. "
"Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> "
-"to create an account or choose <guiseq><gui style=\"menu\">Edit</gui><gui "
-"style=\"menuitem\">Preferences</gui></guiseq> from the <app>Banshee</app> "
-"menu. Once in the preferences select the <gui style=\"tab\">Source Specific</"
-"gui> tab, press the <gui style=\"menu\">Source</gui> drop down menu, choose "
-"<gui style=\"menuitem\">Last.fm</gui> and finally select the <em>Sign up for "
-"Last.fm</em> link."
-msgstr ""
-"Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε μια "
-"κατατομή στο Last.fm. Επισκεφθείτε το <link "
-"href=\"http://www.last.fm/join\">http://www.last.fm/join</link> για να "
-"δημιουργήσετε ένα λογαριασμό ή επιλέξτε <guiseq><gui "
-"style=\"menu\">Επεξεργασία</gui><gui "
-"style=\"menuitem\">Προτιμήσεις</gui></guiseq> από το μενού του "
-"<app>Banshee</app>. Μόλις βρεθείτε στις προτιμήσεις επιλέξτε την καρτέλα "
-"<gui style=\"tab\">Ειδική πηγή</gui> και πατήστε το πτυσσόμενο μενού <gui "
-"style=\"menu\">Πηγή</gui>, επιλέξτε <gui style=\"menuitem\">Last.fm</gui> και "
-"επιλέξτε τελικά τον σύνδεσμο <em>Εγγραφή στο Last.fm</em>."
-
-#: C/lastfm.page:53(p)
-msgid ""
-"To enable <app>Banshee</app> to report the songs you play on your computer "
-"to Last.fm, sign in to Last.fm in <app>Banshee</app> in the <gui style=\"tab"
-"\">Source Specific</gui> preferences. Enter your username and press the <gui "
-"style=\"button\">Log in to Last.fm</gui> button. You will be directed to a "
-"Last.fm webpage in your browser to grant <app>Banshee</app> access. Press "
-"the <gui style=\"button\">Yes, allow access</gui> link in your browser and "
-"you will be redirected to a webpage that displays a message that "
-"<app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app> "
-"and press the <gui style=\"button\">Finish Logging In</gui> button to "
-"complete the process."
-msgstr ""
-"Για να μπορεί το <app>Banshee</app> να αναφέρει τα τραγούδια που αναπαράγετε "
-"στον υπολογιστή σας στο Last.fm, συνδεθείτε στο Last.fm στο "
-"<app>Banshee</app> και στις προτιμήσεις <gui style=\"tab\">Ειδική πηγή</gui>. "
-"Εισάγετε το όνομα χρήστη σας και πατήστε το κουμπί <gui "
-"style=\"button\">Σύνδεση στο Last.fm</gui>. Θα μεταφερθείτε σε μια ιστοσελίδα "
-"του Last.fm στον περιηγητή ιστού σας για να δοθεί πρόσβαση στο "
-"<app>Banshee</app>. Πατήστε τον σύνδεσμο <gui style=\"button\">Ναι, να "
-"επιτραπεί η πρόσβαση</gui> στον περιηγητή σας και θα ανακατευθυνθείτε σε μια "
-"ιστοσελίδα που εμφανίζει ένα μήνυμα ότι το <app>Banshee</app> έχει τώρα "
-"πρόσβαση στο Last.fm. Επιστρέψτε στο <app>Banshee</app> και πατήστε το "
-"κουμπί <gui style=\"button\">Ολοκλήρωση σύνδεσης</gui> για να ολοκληρωθεί η "
-"διαδικασία."
-
-#: C/lastfm.page:68(title)
-msgid "Enable Last.fm song reporting from <app>Banshee</app>"
-msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από το <app>Banshee</app>"
-
-#: C/lastfm.page:70(p)
-msgid ""
-"After you have successfully linked <app>Banshee</app> to your Last.fm "
-"profile you must ensure that you have enabled <app>Banshee</app> to report "
-"your songs. To enable <app>Banshee</app> to report the songs to your Last.fm "
-"profile go to <app>Banshee</app> and select preferences, then select the "
-"<gui style=\"tab\">Source Specific</gui> tab, select <gui style=\"menuitem"
-"\">Last.fm</gui> from the dropdown, and press the <gui style=\"checkbox"
-"\">Enable Song Reporting From <app>Banshee</app></gui> checkbox. If you have "
-"an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata Fixer extension "
-"to correct your files instead)."
-msgstr ""
-"Αφού έχετε επιτυχώς συνδέσει το <app>Banshee</app> με τη κατατομή σας στο "
-"Last.fm, πρέπει να βεβαιωθείτε ότι έχετε ενεργοποιήσει το <app>Banshee</app> "
-"για να αναφέρει τα τραγούδια σας. Για την ενεργοποίηση του "
-"<app>Banshee</app> ώστε να αναφέρει τα τραγούδια στην κατατομή σας στο "
-"Last.fm, πηγαίνετε στο <app>Banshee</app> και επιλέξτε τις προτιμήσεις, "
-"έπειτα επιλέξτε την καρτέλα <gui style=\"tab\">Ειδική πηγή</gui>, επιλέξτε "
-"<gui style=\"menuitem\">Last.fm</gui> από το πτυσσόμενο και πατήστε το πλαίσιο "
-"ελέγχου <gui style=\"checkbox\">Ενεργοποίηση αναφοράς τραγουδιού από το "
-"<app>Banshee</app></gui>. Αν έχετε μια ενεργή σύνδεση διαδικτύου το "
-"<app>Banshee</app>, θα στείλει τώρα τις πληροφορίες στο Last.fm σχετικά με "
-"τα τραγούδια που παίζετε. Για να προβάλετε το ιστορικό αναπαραγωγής, "
-"επισκεφτείτε την κατατομή σας στον ιστότοπο του Last.fm. Το Last.fm θα "
-"ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα, αν κάποιο από τα "
-"καλλιτέχνης, τίτλος τραγουδιού, ή πληροφορίες δίσκου είναι εσφαλμένο (αν και "
-"συνιστούμε να χρησιμοποιείτε την επέκταση Metadata Fixer για να διορθώσετε "
-"τα αρχεία σας)."
-
-#: C/lastfm.page:87(title)
-msgid "Enable Last.fm song reporting from your device"
-msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από τη συσκευή σας"
-
-#: C/lastfm.page:89(p)
-msgid ""
-"After successfully linking <app>Banshee</app> to your Last.fm profile and "
-"enabling <app>Banshee</app> to report songs to Last.fm you can also enable "
-"scrobbling from a connected device. <app>Banshee</app> will, upon connection "
-"of your device, attempt to scrobble the songs you have played since the "
-"device was last connected and submit them to Last.fm."
-msgstr ""
-"Μετά την πετυχημένη σύνδεση του <app>Banshee</app> στη κατατομή σας του "
-"Last.fm και την ενεργοποίηση του <app>Banshee</app> για αναφορά τραγουδιών "
-"στο Last.fm, μπορείτε επίσης να ενεργοποιήσετε τις επιλογές από μια "
-"συνδεμένη συσκευή. Το <app>Banshee</app>, με τη σύνδεση της συσκευής σας, θα "
-"προσπαθήσει να διαλέξει τα τραγούδια που έχετε παίξει από την τελευταία "
-"σύνδεση της συσκευής και να τα υποβάλλει στο Last.fm."
-
-#: C/lastfm.page:95(p)
-msgid ""
-"To enable scrobbling of a connected device go to <app>Banshee</app> and "
-"select Preferences, select the <gui style=\"tab\">Source Specific</gui> tab, "
-"select <gui style=\"menuitem\">Last.fm</gui> from the dropdown, and press "
-"the <gui style=\"checkbox\">Enable Song Reporting From Device</gui> "
-"checkbox. If you have an active internet connection <app>Banshee</app> will, "
-"upon connection of your device, now attempt to gather information regarding "
-"the songs that you have played since it was last connected."
-msgstr ""
-"Για την ενεργοποίηση της επιλογής μιας συνδεμένης συσκευής πηγαίνετε στο "
-"<app>Banshee</app> και επιλέξτε προτιμήσεις, επιλέξτε την καρτέλα <gui "
-"style=\"tab\">Ειδική πηγή</gui>, επιλέξτε <gui style=\"menuitem\">Last.fm</gui> "
-"από την πτυσσόμενη λίστα και πατήστε το πλαίσιο ελέγχου <gui "
-"style=\"checkbox\">Ενεργοποίηση αναφοράς τραγουδιού από συσκευή</gui>. Αν "
-"έχετε μια ενεργή διαδικτυακή σύνδεση το <app>Banshee</app>, με τη σύνδεση "
-"της συσκευής σας, θα προσπαθήσει να συλλέξει πληροφορίες σχετικά με τα "
-"τραγούδια που έχουν παίξει από την τελευταία σύνδεση."
-
-#: C/lastfm.page:103(p)
-msgid ""
-"As with regular <app>Banshee</app> scrobbling submissions Last.fm will "
-"automatically update your music metadata if any of your artist, title, or "
-"album information is incorrect (although we again recommend that you use the "
-"Metadata Fixer extension to correct your files instead)."
-msgstr ""
-"Όπως με τις κανονικές υποβολές επιλογής του <app>Banshee</app>, το Last.fm "
-"θα ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα αν οποιαδήποτε από τις "
-"πληροφορίες καλλιτέχνη, τίτλου ή δίσκου είναι εσφαλμένες (αν και συνιστούμε "
-"πάλι τη χρήση της επέκτασης Metadata Fixer για διόρθωση των αρχείων σας)."
-
-#: C/lastfm.page:108(p)
-msgid ""
-"Please note that currently <app>Banshee</app> only supports this feature "
-"with Apple products that are supported by the AppleDevice extension."
-msgstr ""
-"Παρακαλούμε, σημειώστε ότι προς το παρόν το <app>Banshee</app> υποστηρίζει "
-"αυτό το γνώρισμα μόνο με προϊόντα Apple που υποστηρίζονται από την επέκταση "
-"AppleDevice."
-
-#: C/lastfm.page:114(title)
-msgid "Listen to Last.fm radio"
+"to create an account or choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq> from the Banshee menu. Then press the <gui>Source Specific</"
+"gui> tab and press the <gui>Source</gui> drop down menu and choose <gui>Last."
+"fm</gui> and select the <em>Sign up for Last.fm</em> link."
+msgstr ""
+"Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε ένα "
+"προφίλ. Επισκεφθείτε το <link href=\"http://www.last.fm/join\">http://www."
+"last.fm/join</link> για να δημιουργήσετε ένα λογαριασμό ή επιλέξτε "
+"<guiseq><gui>Επεξεργασία</gui><gui>Προτιμήσεις</gui></guiseq> από το μενού "
+"του Banshee. Μετά πατήστε την καρτέλα <gui>Για συγκεκριμένη πηγή</gui> και "
+"πατήστε το αναπτυσσόμενο μενού <gui>Πηγή</gui>, επιλέξτε <gui>Last.fm</gui> "
+"και επιλέξτε <em>Εγγραφή στο Last.fm</em>."
+
+#: 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 <gui>Source Specific</gui> preferences. "
+"Enter your username and press the <gui>Log in to Last.fm</gui> button. You "
+"will be directed to a Last.fm webpage in your browser to grant Banshee "
+"access. Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</"
+"gui> button to complete the process."
+msgstr ""
+"Για να μπορεί το Banshee να αναφέρει τα τραγούδια που αναπαράγετε στον "
+"υπολογιστή σας στο Last.fm, συνδεθείτε σε αυτό στο Banshee στις προτιμήσεις "
+"<gui>Συγκεκριμένης πηγής</gui>. Εισάγετε το όνομα χρήστη σας και πατήστε "
+"<gui>Σύνδεση στο Last.fm</gui>. Θα μεταφρεθείτε σε μια ιστοσελίδα του Last."
+"fm στον περιηγητή ιστού σας για να δοθεί πρόσβαση στο Banshee. Πατήστε το "
+"σύνδεσμο <gui>Ναι, να επιτραπεί η πρόσβαση</gui> στον περιηγητή σας και θα "
+"επανακατευθυνθείτε σε μια ιστοσελίδα που εμφανίζει ένα μήνυμα ότι το Banshee "
+"έχει τώρα πρόσβαση στο Last.fm. Επιστρέψτε στο Banshee και πατήστε το κουμπί "
+"<gui>Ολοκλήρωση σύνδεσης</gui> για να ολοκληρωθεί η διαδικασία."
+
+#: C/lastfm.page:58(title)
+msgid "Enable Last.fm Song Reporting"
+msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm"
+
+#: 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 "
+"<gui>Source Specific</gui> tab in Banshee's preferences, press the "
+"<gui>Enable Song Reporting</gui> 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 ""
+"Αφού έχετε επιτυχώς συνδέσει το Banshee με το προφίλ σας στο Last.fm, για να "
+"ενεργοποιήσετε την αναφορά τραγουδιών στο προφίλ σας του Last.fm, στην "
+"καρτέλα <gui>Συγκεκριμένη πηγή</gui> στις προτιμήσεις του Banshee, πατήστε "
+"στο πεδίο <gui>Ενεργοποίηση αναφοράς τραγουδιών</gui>. Αν έχετε ενεργή "
+"σύνδεση στο διαδίκτυο, το Banshee θα στέλνει στο Last.fm πληροφορίες σχετικά "
+"με τα τραγούδια που παίζετε. Για να προβάλετε το ιστορικό αναπαραγωγής σας, "
+"επισκεφθείτε το προφίλ σας στην ιστοσελίδα του Last.fm. Το Last.fm θα "
+"ενημερώνει αυτόματα τα μεταδεδομένα της μουσικής σας αν οι πληροφορίες για "
+"κάποιο καλλιτέχνη, τίτλο τραγουδιού ή δίσκο είναι λανθασμένες."
+
+#: C/lastfm.page:72(title)
+msgid "Listen to Last.fm Radio"
msgstr "Ακούστε το ραδιόφωνο του Last.fm"
-#: C/lastfm.page:116(p)
+#: 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 "
@@ -2030,210 +1483,232 @@ msgstr ""
"πληρώσουν για ένα λογαριασμό του Last.fm για ακούσουν ραδιόφωνο. Τα επί "
"πληρωμή μέλη, επίσης έχουν επιπλέον χαρακτηριστικά στο ραδιόφωνο: ακρόαση "
"λιστών αναπαραγωγής και σταθμούς μουσικής που σας αρέσουν ή έχετε "
-"επισημάνει."
-
-#: C/lastfm.page:122(p)
-msgid ""
-"In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will communicate "
-"with Last.fm to populate songs for that radio station. Press the <gui style="
-"\"button\">Play</gui> button in <app>Banshee</app> or <key>Space</key> to "
-"start streaming a Last.fm radio station. You can also press the <gui style="
-"\"button\">Next</gui> button in <app>Banshee</app>, <key>N</key> or choose "
-"<guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem\">Next</"
-"gui></guiseq> to play the next song in your radio station queue."
-msgstr ""
-"Στο παράθυρο πηγών του <app>Banshee</app> στα αριστερά, θα έχετε τώρα μια "
-"ενότητα Last.fm, που συμπεριλαμβάνει τους σταθμούς σας του ραδιοφώνου "
-"Last.fm. Θα χρειαστείτε μια ενεργή σύνδεση διαδικτύου για να ακούσετε το "
-"ραδιόφωνο του Last.fm. Επιλέξτε τον ραδιοφωνικό σταθμό που θέλετε να "
-"ακούσετε και το <app>Banshee</app> θα επικοινωνήσει με το Last.fm για να "
-"συμπληρώσει τραγούδια για αυτό το ραδιοφωνικό σταθμό. Πατήστε το κουμπί <gui "
-"style=\"button\">Αναπαραγωγή</gui> στο <app>Banshee</app> ή το <key>πλήκτρο "
-"διαστήματος</key> για να αρχίσετε τη ροή του ραδιοφωνικού σταθμού Last.fm. "
-"Μπορείτε επίσης να πατήσετε το κουμπί <gui style=\"button\">Επόμενο</gui> στο "
-"<app>Banshee</app>, το <key>N</key> ή να επιλέξετε <guiseq><gui "
-"style=\"menu\">Αναπαραγωγή</gui><gui style=\"menuitem\">Επόμενο</gui></guiseq> "
-"για να αναπαράγετε το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού."
-
-#: C/keyboard-shortcuts.page:7(desc)
-msgid "Keyboard shortcuts"
+"επισημάνει. "
+
+#: 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 <gui>Play</gui> button "
+#| "in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio "
+#| "station. You can also press the <gui>Next</gui> button in Banshee, "
+#| "<key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></"
+#| "guiseq> to play the next song in your radio station queue."
+msgid ""
+"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 <gui>Play</gui> button in Banshee or "
+"<key>Spacebar</key> to start streaming a Last.fm radio station. You can also "
+"press the <gui>Next</gui> button in Banshee, <key>N</key> or choose "
+"<guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in "
+"your radio station queue."
+msgstr ""
+"Στο μενού περιεχομένου του Banshee, στην αριστερή πλευρά, θα έχετε τώρα μια "
+"ενότητα Last.fm, που περιλαμβάνει τους σταθμούς σας του Last.fm. Θα "
+"χρειαστείτε μια ενεργή σύνδεση διαδικτύου για να ακούσετε το ραδιόφωνο του "
+"Last.fm. Επιλέξτε το ραδιοφωνικό σταθμό που θέλετε να ακούσετε και το "
+"Banshee θα επικοινωνήσει με το Last.fm για να συμπληρώσει τραγούδια για αυτό "
+"το ραδιοφωνικό σταθμό. Πατήστε το κουμπί <gui>Αναπαραγωγή</gui> στο Banshee "
+"ή το <key>Spacebar</key> για να αρχίσετε τη ροή του ραδιοφωνικού σταθμού. "
+"Μπορείτε επίσης να πατήσετε το κουμπί <gui>Επόμενο</gui>, το <key>N</key> ή "
+"να επιλέξετε <guiseq><gui>Αναπαραγωγή</gui><gui>Επόμενο</gui></guiseq> για "
+"να αναπαράγετε το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού."
+
+#: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title)
+#: C/advanced.page:29(title)
+msgid "Keyboard Shortcuts"
msgstr "Συντομεύσεις πληκτρολογίου"
-#: C/keyboard-shortcuts.page:24(title)
-msgid "Control <app>Banshee</app> using keyboard shortcuts"
-msgstr "Έλεγχος του <app>Banshee</app> με χρήση συντομεύσεων πληκτρολογίου"
+#: C/keyboardshortcuts.page:24(title)
+msgid "Control Banshee using Keyboard Shortcuts"
+msgstr "Έλεγχος του Banshee με χρήση συντομεύσεων πληκτρολογίου"
-#: C/keyboard-shortcuts.page:27(title)
-msgid "Playback control"
+#: C/keyboardshortcuts.page:28(title)
+msgid "Playback Control"
msgstr "Έλεγχος αναπαραγωγής"
-#: C/keyboard-shortcuts.page:31(gui) C/keyboard-shortcuts.page:55(gui)
-#: C/keyboard-shortcuts.page:77(gui) C/keyboard-shortcuts.page:94(gui)
-#: C/keyboard-shortcuts.page:111(gui)
+#: 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/keyboard-shortcuts.page:32(gui) C/keyboard-shortcuts.page:56(gui)
-#: C/keyboard-shortcuts.page:78(gui) C/keyboard-shortcuts.page:95(gui)
-#: C/keyboard-shortcuts.page:112(gui)
+#: 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/keyboard-shortcuts.page:35(key)
-msgid "Space"
+#: C/keyboardshortcuts.page:35(p)
+msgid "Space Bar"
msgstr "Πλήκτρο διαστήματος"
-#: C/keyboard-shortcuts.page:36(p)
+#: C/keyboardshortcuts.page:35(p)
msgid "Play or Pause the current song"
msgstr "Αναπαραγωγή ή παύση του τρέχοντος τραγουδιού"
-#: C/keyboard-shortcuts.page:39(key) C/keyboard-shortcuts.page:81(key)
+#: C/keyboardshortcuts.page:38(p) C/keyboardshortcuts.page:76(key)
msgid "N"
msgstr "N"
-#: C/keyboard-shortcuts.page:40(p)
+#: C/keyboardshortcuts.page:38(p)
msgid "Play the next song"
msgstr "Αναπαραγωγή του επόμενου τραγουδιού"
-#: C/keyboard-shortcuts.page:43(key)
+#: C/keyboardshortcuts.page:41(p)
msgid "B"
msgstr "B"
-#: C/keyboard-shortcuts.page:44(p)
+#: C/keyboardshortcuts.page:41(p)
msgid "Play the previous song"
msgstr "Αναπαραγωγή του προηγούμενου τραγουδιού"
-#: C/keyboard-shortcuts.page:51(title)
-msgid "Library interaction"
+#: C/keyboardshortcuts.page:49(title) C/keyboardshortcuts.page:69(title)
+msgid "Library Interaction"
msgstr "Αλληλεπίδραση με βιβλιοθήκη"
-#: C/keyboard-shortcuts.page:59(p)
-msgid "<key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq>"
-msgstr "<key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq>"
-
-#: C/keyboard-shortcuts.page:61(p)
-msgid "Move the focus to the search box"
-msgstr "Μεταφορά της εστίασης στο πλαίσιο αναζήτησης"
-
-#: C/keyboard-shortcuts.page:64(key) C/keyboard-shortcuts.page:81(key)
-#: C/keyboard-shortcuts.page:119(key) C/keyboard-shortcuts.page:123(key)
-#: C/keyboard-shortcuts.page:128(key) C/keyboard-shortcuts.page:133(key)
-#: C/keyboard-shortcuts.page:139(key) C/keyboard-shortcuts.page:145(key)
+#: 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/keyboard-shortcuts.page:64(key)
-msgid "I"
-msgstr "I"
+#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:110(key)
+msgid "F"
+msgstr "F"
+
+#: C/keyboardshortcuts.page:56(p)
+msgid "Move the focus to the search box"
+msgstr "Μεταφορά της εστίασης στο πεδίο αναζήτησης"
-#: C/keyboard-shortcuts.page:65(p)
+#: C/keyboardshortcuts.page:60(p)
+msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
+msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
+
+#: C/keyboardshortcuts.page:61(p)
msgid "Open import media dialog"
msgstr "Άνοιγμα του διαλόγου εισαγωγής πολυμέσων"
-#: C/keyboard-shortcuts.page:82(p)
+#: C/keyboardshortcuts.page:76(p)
msgid "Create New Playlist"
msgstr "Δημιουργία νέας λίστας αναπαραγωγής"
-#: C/keyboard-shortcuts.page:98(key)
+#: C/keyboardshortcuts.page:86(title) C/add-podcast.page:26(title)
+msgid "Podcasts"
+msgstr "Φορητές εκπομπές"
+
+#: C/keyboardshortcuts.page:93(key)
msgid "Y"
msgstr "Y"
-#: C/keyboard-shortcuts.page:99(p)
+#: C/keyboardshortcuts.page:93(p)
msgid "Mark the selected episodes as old"
msgstr "Σήμανση των επιλεγμένων επεισοδίων ως παλαιών"
-#: C/keyboard-shortcuts.page:107(title)
+#: C/keyboardshortcuts.page:103(title)
msgid "Interface"
msgstr "Διεπαφή"
-#: C/keyboard-shortcuts.page:115(key)
-msgid "F"
-msgstr "F"
-
-#: C/keyboard-shortcuts.page:116(p)
+#: C/keyboardshortcuts.page:110(p)
msgid "Toggle full-screen mode"
msgstr "Εναλλαγή κατάστασης πλήρους οθόνης"
-#: C/keyboard-shortcuts.page:119(key) C/keyboard-shortcuts.page:123(key)
+#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
msgid "A"
msgstr "A"
-#: C/keyboard-shortcuts.page:120(p)
+#: C/keyboardshortcuts.page:114(p)
msgid "Select all songs in playlist view"
msgstr "Επιλέξτε όλα τα τραγούδια στην προβολή λίστας αναπαραγωγής"
-#: C/keyboard-shortcuts.page:123(key)
+#: C/keyboardshortcuts.page:118(key)
msgid "Shift"
msgstr "Shift"
-#: C/keyboard-shortcuts.page:125(p)
+#: C/keyboardshortcuts.page:119(p)
msgid "Unselect all songs in playlist view"
msgstr "Αποεπιλογή όλων των τραγουδιών στην προβολή λίστας αναπαραγωγής"
-#: C/keyboard-shortcuts.page:128(key)
+#: C/keyboardshortcuts.page:123(key)
msgid "W"
msgstr "W"
-#: C/keyboard-shortcuts.page:129(p)
-msgid ""
-"Hide <app>Banshee</app> Window (Requires Notification Area Plug-in Enabled)"
+#: C/keyboardshortcuts.page:123(p)
+msgid "Hide Banshee Window (Requires Notification Area Plug-in Enabled"
msgstr ""
-"Απόκρυψη του παραθύρου του <app>Banshee</app> (Απαιτεί ενεργοποίηση του "
-"πρόσθετου περιοχής ειδοποιήσεων)"
+"Απόκρυψη του παραθύρου του Banshee (Απαιτεί ενεργοποίηση του πρόσθετου "
+"περιοχής ειδοποιήσεων)"
-#: C/keyboard-shortcuts.page:133(key)
+#: C/keyboardshortcuts.page:127(key)
msgid "Left Mouse Button"
msgstr "Αριστερό κουμπί του ποντικιού"
-#: C/keyboard-shortcuts.page:135(p)
+#: C/keyboardshortcuts.page:128(p)
msgid "Play Previous Song (Requires Notification Area Plug-in Enabled"
msgstr ""
"Αναπαραγωγή προηγούμενου τραγουδιού (Απαιτεί ενεργοποίηση του πρόσθετου "
"περιοχής ειδοποιήσεων)"
-#: C/keyboard-shortcuts.page:139(key)
+#: C/keyboardshortcuts.page:132(key)
msgid "Right Mouse Button"
msgstr "Δεξί κουμπί του ποντικιού"
-#: C/keyboard-shortcuts.page:141(p)
+#: C/keyboardshortcuts.page:133(p)
msgid "Play Next Song (Requires Notification Area Plug-in Enabled"
msgstr ""
"Αναπαραγωγή επόμενου τραγουδιού (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής "
"ειδοποιήσεων)"
-#: C/keyboard-shortcuts.page:145(key)
+#: C/keyboardshortcuts.page:137(key)
msgid "Middle Mouse Button"
msgstr "Μεσαίο κουμπί του ποντικιού"
-#: C/keyboard-shortcuts.page:147(p)
+#: 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 <app>iTunes</app> media player."
+msgstr ""
+"Εισαγωγή μουσική και κατηγοριοποίησης από την εφαρμογή αναπαραγωγής "
+"πολυμέσων <app>iTunes</app>."
+
+#: C/itunes-import.page:12(title)
+msgid "Import your <app>iTunes</app> library"
+msgstr "Εισαγωγή της βιβλιοθήκης σας του <app>iTunes</app>"
+
#: C/introduction.page:8(desc)
-msgid "Introduction to the <app>Banshee</app> media player."
-msgstr "Εισαγωγή στην αναπαραγωγή πολυμέσων του <app>Banshee</app>."
+msgid "Introduction to the <app>Banshee Media Player</app>."
+msgstr "Εισαγωγή στην <app>Αναπαραγωγή πολυμέσων Banshee</app>."
-#: C/introduction.page:26(title)
+#: C/introduction.page:24(title)
msgid "Introduction"
msgstr "Εισαγωγή"
-#: C/introduction.page:28(p)
+#: C/introduction.page:26(p)
+#| msgid ""
+#| "<app>Banshee</app> 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."
msgid ""
"<app>Banshee</app> is a media player that allows you to play your music, "
-"videos and other media, as well as sync it with portable devices to take "
-"your media on the go."
+"videos, and other media as well sync it with portable devices to take your "
+"media on the go."
msgstr ""
"Το <app>Banshee</app> είναι μια εφαρμογή αναπαραγωγής πολυμέσων που σας "
"επιτρέπει να αναπαράγετε τη μουσική σας, τα βίντεό σας και άλλα πολυμέσα "
"καθώς και να τα συγχρονίζετε με άλλες φορητές συσκευές για να τα έχετε μαζί "
"σας."
-#: C/introduction.page:32(p)
+#: C/introduction.page:31(p)
msgid ""
"<app>Banshee</app> includes features to import your media, manage its "
"metadata, and play your music and videos."
@@ -2244,83 +1719,81 @@ msgstr ""
#: C/introduction.page:35(p)
msgid ""
-"<app>Banshee</app> also helps you sync your music and videos to popular "
-"portable devices, such as digital audio players and smartphones. "
-"<app>Banshee</app> supports popular devices including most iPods, Sandisk "
-"and Creative MP3 players, and Android powered phones."
+"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 ""
-"Το <app>Banshee</app> σας βοηθά επίσης να συγχρονίσετε τη μουσική και τα "
-"βίντεό σας με δημοφιλείς φορητές συσκευές, όπως αναπαραγωγείς ψηφιακού ήχου "
-"και έξυπνα κινητά. Το <app>Banshee</app> υποστηρίζει δημοφιλείς συσκευές "
-"περιλαμβανομένων των περισσότερων iPod και τους αναπαραγωγούς Creative MP3 "
-"και Sandisk καθώς και κινητά με λειτουργικό Android."
-
-#: C/index.page:31(title)
-msgid "<app>Banshee</app> media player"
-msgstr "Αναπαραγωγείς πολυμέσων <app>Banshee</app>"
+"Το Banshee σας βοηθά επίσης να συγχρονίσετε τη μουσική και τα βίντεό σας με "
+"δημοφιλείς φορητές συσκευές, όπως αναπαραγωγείς ψηφιακής μουσικής και έξυνπα "
+"κινητά. Το Banshee υποστηρίζει δημοφιλείς συσκευές περιλαμβανομένων των "
+"περισσότερων iPod, τους αναπαραγωγείς MP3 της Sandisk και της Creative και "
+"κινητά με λειτουργικό Android."
-#: C/index.page:34(title)
-msgid "Add, remove & play"
-msgstr "Προσθήκη, αφαίρεση & αναπαραγωγή"
+#: C/index.page:24(title)
+msgid "Add, Remove & Play"
+msgstr "Προσθήκη, Αφαίρεση & Αναπαραγωγή"
-#: C/index.page:38(title)
-msgid "Manage & sort"
-msgstr "Διαχείριση & ταξινόμηση"
+#: C/index.page:28(title)
+msgid "Manage & Sort"
+msgstr "Διαχείριση & Ταξινόμηση"
-#: C/index.page:42(title)
+#: C/index.page:32(title)
msgid "Sync your media with a portable music player"
msgstr "Συγχρονισμός των πολυμέσων σας με φορητή συσκευή μουσικής"
-#: C/index.page:46(title)
-msgid "Add additional functionality to <app>Banshee</app>"
-msgstr "Προσθήκη επιπλέον λειτουργιών στο <app>Banshee</app>"
+#: C/index.page:36(title)
+msgid "Add additional functionality to Banshee"
+msgstr "Προσθήκη επιπλέον λειτουργιών στο Banshee"
-#: C/index.page:50(title)
+#: C/index.page:40(title)
msgid "Advanced options and help"
msgstr "Προχωρημένες επιλογές και βοήθεια"
-#: C/import.page:7(desc)
-msgid ""
-"Add music and videos from your computer to your <app>Banshee</app> library."
+#: 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 ""
"Προσθήκη μουσικής και βίντεο από τον υπολογιστή σας στη βιβλιοθήκη σας του "
-"<app>Banshee</app>."
+"Banshee."
-#: C/import.page:16(name)
+#: C/import.page:15(name)
msgid "Shaun McCance"
msgstr "Shaun McCance"
-#: C/import.page:17(email)
+#: C/import.page:16(email)
msgid "shaunm at gnome.org"
msgstr "shaunm at gnome.org"
-#: C/import.page:26(title)
+#: C/import.page:21(title)
msgid "Import music & videos"
msgstr "Εισαγωγή μουσικής & βίντεο"
-#: C/import.page:28(p)
+#: C/import.page:23(p)
msgid ""
-"You can import music and videos stored on your computer into <app>Banshee</"
-"app>. Imported files appear in your sources and can be edited and managed "
-"like any other media in <app>Banshee</app>."
+"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 ""
"Μπορείτε να εισάγετε μουσική και βίντεο αποθηκευμένα στον υπολογιστή σας στο "
-"<app>Banshee</app>. Τα εισαχθέντα αρχεία εμφανίζονται στις πηγές σας και "
-"μπορείτε να τα επεξεργαστείτε και να τα διαχειριστείτε όπως οποιοδήποτε άλλο "
-"μέσο στο <app>Banshee</app>."
+"Banshee. Τα εισαχθέντα αρχεία εμφανίζονται στις πηγές σας και μπορείτε να τα "
+"επεξεργασθείτε και να τα διαχειριστείτε σαν οποιοδήποτε άλλο μέσο στο "
+"Banshee."
-#: C/import.page:32(p)
+#: C/import.page:27(p)
msgid ""
-"To import music or video files on your computer, choose <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">Import Media</gui></guiseq>. A "
-"dialog wil appear with a number of choices."
+"To import music or video files on your computer, choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq>. A dialog will appear with a number of "
+"choices."
msgstr ""
-"Για να εισάγετε αρχεία μουσικής ή βίντεο στον υπολογιστή σας, επιλέξτε "
-"<guiseq><gui style=\"menu\">Πολυμέσα</gui><gui style=\"menuitem\">Εισαγωγή "
-"πολυμέσων</gui></guiseq>. Θα εμφανισθεί ένας διάλογος με έναν αριθμό "
-"επιλογών."
+"Για να εισάγετε τα αρχεία σας μουσικής ή βίντεο του υπολογιστή σας, επιλέξτε "
+"<guiseq><gui>Πολυμέσα</gui><gui>Εισαγωγή πολυμέσων</gui></guiseq>. Θα "
+"εμφανισθεί ένα παράθυρο διαλόγου με έναν αριθμό επιλογών."
-#: C/import.page:37(p)
+#: C/import.page:31(p)
msgid ""
"Plugins may add additional import choices. See <link xref=\"#plugins\"/> "
"below."
@@ -2328,11 +1801,11 @@ msgstr ""
"Τα πρόσθετα μπορεί να προσθέσουν επιπλέον επιλογές εισαγωγής. Δείτε το <link "
"xref=\"#plugins\"/> παρακάτω."
-#: C/import.page:43(gui)
+#: C/import.page:37(gui)
msgid "Local Folders"
msgstr "Τοπικοί φάκελοι"
-#: C/import.page:44(p)
+#: 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 "
@@ -2342,11 +1815,11 @@ msgstr ""
"του καθορισμένου φακέλου και όλων των υποφακέλων. Θα εμφανισθεί ένα παράθυρο "
"διαλόγου για να επιλέξετε φάκελο εισαγωγής."
-#: C/import.page:49(gui)
+#: C/import.page:43(gui)
msgid "Local Files"
msgstr "Τοπικά αρχεία"
-#: C/import.page:50(p)
+#: 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."
@@ -2355,11 +1828,11 @@ msgstr ""
"αρχεία που επιλέγετε. Θα εμφανισθεί ένας διάλογος για να επιλέξετε το αρχείο "
"ή τα αρχεία προς εισαγωγή."
-#: C/import.page:55(gui)
+#: C/import.page:49(gui)
msgid "Home Folder"
msgstr "Προσωπικός φάκελος"
-#: C/import.page:56(p)
+#: 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."
@@ -2368,11 +1841,16 @@ msgstr ""
"από όλο τον προσωπικό σας φάκελο, συμπεριλαμβανομένων των αρχείων σε "
"υποφακέλους."
-#: C/import.page:60(gui)
+#: C/import.page:54(gui)
msgid "Videos From Photos Folder"
msgstr "Βίντεο από το φάκελο φωτογραφίες"
-#: C/import.page:61(p)
+#: 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."
msgid ""
"Many digital cameras can take short videos, and photo-management "
"applications often download these videos directly into your Photos folder. "
@@ -2384,7 +1862,7 @@ msgstr ""
"φάκελό σας Φωτογραφίες. Επιλέξτε αυτή την επιλογή για να εισάγετε τυχόν "
"βίντεο που έχουν αποθηκευτεί στο φάκελο Φωτογραφίες."
-#: C/import.page:69(p)
+#: 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."
@@ -2393,31 +1871,29 @@ msgstr ""
"κάνει εισαγωγή χωρίς να ανησυχείτε για τυχόν διπλές εγγραφές στη βιβλιοθήκη "
"σας."
-#: C/import.page:74(title)
-msgid "Import from a playlist"
+#: C/import.page:68(title)
+msgid "Import from a Playlist"
msgstr "Εισαγωγή από λίστα αναπαραγωγής"
-#: C/import.page:76(p)
+#: C/import.page:69(p)
msgid ""
"You can also import music from playlists. Most playlist files end in "
-"<em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu "
-"choose <guiseq><gui style=\"menu\">Media</gui><gui style=\"menuitem\">Import "
-"Playlist</gui></guiseq> and locate the playlist file in your folder, select "
-"it and press <gui style=\"button\">Import</gui>."
+"<em>m3u</em>. To import from a playlist, from the Banshee menu choose "
+"<guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and locate the "
+"playlist file in your folder, select it and press <gui>Import</gui>."
msgstr ""
"Μπορείτε επίσης να εισάγετε μουσική από λίστες αναπαραγωγής. Τα περισσότερα "
-"αρχεία λίστας αναπαραγωγής λήγουν σε <em>m3u</em>. Για να εισάγετε από μια "
-"λίστα αναπαραγωγής, από το μενού του <app>Banshee</app> επιλέξτε "
-"<guiseq><gui style=\"menu\">Πολυμέσα</gui><gui style=\"menuitem\">Εισαγωγή "
-"λίστας αναπαραγωγής</gui></guiseq>, εντοπίστε το αρχείο της λίστας "
-"αναπαραγωγής στον φάκελό σας, επιλέξτε το και πατήστε <gui "
-"style=\"button\">Εισαγωγή</gui>."
-
-#: C/import.page:86(title)
-msgid "Additional import sources"
+"αρχεία λίστας αναπαραγωγής έχουν κατάληξη <em>m3u</em>. Για να εισάγετε από "
+"μια λίστα αναπαραγωγής, από το μενού του Banshee επιλέξτε "
+"<guiseq><gui>Πολυμέσα</gui><gui>Εισαγωγή λίστας αναπαραγωγής</gui></guiseq>, "
+"εντοπίστε το αρχείο της λίστας στο φάκελό σας, επιλέξτε το και πατήστε "
+"<gui>Εισαγωγή</gui>."
+
+#: C/import.page:78(title)
+msgid "Additional Import Sources"
msgstr "Επιπλέον πηγές εισαγωγής"
-#: C/import.page:88(p)
+#: 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:"
@@ -2427,117 +1903,137 @@ msgstr ""
"ενεργοποιημένα:"
#: C/extensions.page:8(desc)
-msgid "Add additional functionality to <app>Banshee</app>."
-msgstr "Προσθήκη επιπλέον λειτουργιών στο <app>Banshee</app>."
+msgid "Add additional functionality to Banshee."
+msgstr "Προσθήκη επιπλέον λειτουργιών στο Banshee."
#: C/extensions.page:23(title)
-msgid "<app>Banshee</app> extensions"
-msgstr "Επεκτάσεις του <app>Banshee</app>"
+msgid "Banshee Extensions"
+msgstr "Επεκτάσεις του Banshee"
#: C/extensions.page:27(title)
-msgid "Official <app>Banshee</app> extensions"
-msgstr "Επίσημες επεκτάσεις του <app>Banshee</app>"
+msgid "Official Banshee Extensions"
+msgstr "Επίσημες επεκτάσεις του Banshee"
+
+#: C/extensions.page:29(title)
+msgid "Manage extensions for Banshee"
+msgstr "Διαχείριση επεκτάσεων του Banshee"
+
+#: C/extensions.page:34(title)
+msgid "Community Banshee Extensions"
+msgstr "Επεκτάσεις από την κοινότητα για το Banshee"
-#: C/extensions.page:30(title)
-msgid "Manage extensions for <app>Banshee</app>"
-msgstr "Διαχείριση επεκτάσεων του <app>Banshee</app>"
+#: C/extensions.page:36(title)
+msgid "Add community built extensions for Banshee"
+msgstr "Προσθήκη επεκτάσεων φτιαγμένων από την κοινότητα για το Banshee"
-#: C/amazon.page:8(desc)
+#: C/emusic.page:8(desc)
+msgid "Import music purchased from eMusic."
+msgstr "Εισαγωγή μουσικής αγορασμένης από το eMusic."
+
+#: C/emusic.page:12(title)
+msgid "Import your eMusic tracks"
+msgstr "Εισαγωγή των κομματιών σας από το eMusic"
+
+#: C/amazon.page:9(desc)
msgid "Sync and purchase music from the Amazon MP3 Store."
msgstr "Συγχρονισμός και αγορά μουσικής από το κατάστημα MP3 του Amazon."
-#: C/amazon.page:28(title)
-msgid "Amazon MP3 store"
+#: C/amazon.page:24(title)
+msgid "Amazon MP3 Store"
msgstr "Κατάστημα Amazon MP3"
-#: C/amazon.page:30(p)
+#: C/amazon.page:26(p)
msgid ""
-"<app>Banshee</app> 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 <app>Banshee</app>. 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 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 ""
-"Το <app>Banshee</app> υποστηρίζει μεταφόρτωση και εισαγωγή μουσικής από το "
-"κατάστημα Amazon MP3. Μπορείτε να εισάγετε χειροκίνητα μουσικά αρχεία του "
-"Amazon, να αγοράσετε μουσική από τον περιηγητή ιστού σας ή να αγοράσετε "
-"μουσική μέσα από το <app>Banshee</app>. Το Amazon προσφέρει μουσική προς "
-"πώληση ως MP3 μόνο σε ορισμένες χώρες και ανάλογα με την τοποθεσία σας, "
-"μπορεί να μην είναι δυνατή η αγορά MP3 από το Amazon."
+"Το Banshee υποστηρίζει μεταφόρτωση και εισαγωγή μουσικής από το κατάστημα "
+"Amazon MP3. Μπορείτε να εισάγετε χειροκίνητα μουσικά αρχεία του Amazon, να "
+"αγοράσετε μουσική από τον περιηγητή ιστού σας ή να αγοράσετε μουσική μέσα "
+"από το Banshee. Το Amazon προσφέρει μουσική προς πώληση ως MP3 μόνο σε "
+"ορισμένες χώρες και ανάλογα με την τοποθεσία σας μπορεί να μην είναι δυνατή "
+"η αγορά MP3 από το Amazon."
-#: C/amazon.page:37(p)
+#: C/amazon.page:34(p)
msgid ""
-"<app>Banshee</app> uses an Amazon affiliate code for all music purchases. "
-"All money made via this affiliate code is donated to the GNOME Foundation."
+"Banshee uses an Amazon affiliate code for all music purchases. All money "
+"made via this affiliate code is donated to the GNOME Foundation."
msgstr ""
-"Το <app>Banshee</app> χρησιμοποιεί ένα κωδικό συνεργάτη του Amazon για όλες "
-"τις αγορές μουσικής. Όλα τα χρήματα που συγκεντρώνονται μέσω αυτού του "
-"κωδικού δωρίζονται στο GNOME Foundation."
+"Το Banshee χρησιμοποιεί ένα κωδικό συνεργάτη για όλες τις αγορές μουσικής. "
+"Όλα τα χρήματα που συγκεντρώνονται μέσω αυτού του κωδικού δωρίζονται στο "
+"GNOME Foundation."
-#: C/amazon.page:43(title)
+#: C/amazon.page:40(title)
msgid "Purchase Amazon MP3s in your web browser"
msgstr "Αγορά MP3 από το Amazon στον περιηγητή ιστού σας"
-#: C/amazon.page:45(p)
+#: C/amazon.page:42(p)
msgid ""
-"Music purchased from the Amazon MP3 store can be automatically downloaded "
-"and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app> "
-"will automatically open it and begin the download and import the music."
+"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 ""
"Η μουσική που αγοράστηκε από το κατάστημα MP3 του Amazon μπορεί να "
-"μεταφορτωθεί αυτόματα και να εισαχθεί στο <app>Banshee</app>. Το "
-"<app>Banshee</app> συσχετίζεται με το αρχείο .amz που παρέχει το Amazon για "
-"αγορές MP3. Όταν αγοράζετε μουσική στο Amazon, ο περιηγητής ιστού σας θα "
-"μεταφορτώσει το αρχείο .amz και το <app>Banshee</app> θα το ανοίξει αυτόματα "
-"και θα αρχίσει τη μεταφόρτωση και εισαγωγή της μουσικής."
-
-#: C/amazon.page:54(title)
-msgid "Buy Amazon MP3s in <app>Banshee</app>"
-msgstr "Αγορά MP3 του Amazon στο <app>Banshee</app>"
-
-#: C/amazon.page:56(p)
-msgid ""
-"You can also search for songs on Amazon within <app>Banshee</app>. Choose "
-"the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and "
-"import your purchase into the library."
-msgstr ""
-"Μπορείτε επίσης να αναζητήσετε τραγούδια στο Amazon μέσα από το "
-"<app>Banshee</app>. Επιλέξτε το κατάστημα Amazon MP3 από το μενού του "
-"<app>Banshee</app> αριστερά. Αυτό θα φορτώσει το κατάστημα Amazon MP3 "
-"ακριβώς σαν να ήσασταν σε περιηγητή ιστού. Μπορείτε να αναζητήσετε στο "
-"Amazon τη μουσική που επιθυμείτε να αγοράσετε και μετά τη σύνδεση στο "
-"Amazon, να την αγοράσετε με ένα πάτημα. Το <app>Banshee</app> θα "
+"μεταφορτωθεί αυτόματα και να εισαχθεί στο Banshee. Το Banshee συσχετίζεται "
+"με το αρχείο .amz που παρέχει το Amazon για αγορές MP3. Όταν αγοράζετε "
+"μουσική στο Amazon, ο περιηγητής ιστού σας θα μεταφορτώσει το αρχείο .amz "
+"και το Banshee θα το ανοίξει αυτόματα και θα αρχίσει τη μεταφόρτωση και "
+"εισαγωγή της μουσικής."
+
+#: C/amazon.page:51(title)
+msgid "Buy Amazon MP3s in Banshee"
+msgstr "Αγορά MP3 του Amazon στο Banshee"
+
+#: 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."
+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 your purchase into the "
+"library."
+msgstr ""
+"Μπορείτε επίσης να αναζητήσετε τραγούδια στο Amazon μέσα από το Banshee. "
+"Επιλέξτε το κατάστημα Amazon MP3 από το μενού του Banshee αριστερά. Αυτό θα "
+"φορτώσει το κατάστημα Amazon MP3 ακριβώς σαν να ήσασταν σε περιηγητή ιστού. "
+"Μπορείτε να αναζητήσετε στο Amazon τη μουσική που επιθυμείτε να αγοράσετε "
+"και μετά τη σύνδεση στο Amazon, να την αγοράσετε με ένα κλικ. Το Banshee θα "
"μεταφορτώσει και θα εισάγει αυτόματα τις αγορές σας στη βιβλιοθήκη."
-#: C/amazon.page:66(title)
+#: C/amazon.page:63(title)
msgid "Import Amazon MP3s manually"
msgstr "Εισαγωγή MP3 του Amazon χειροκίνητα"
-#: C/amazon.page:68(p)
+#: 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 <app>Banshee</app> choose <guiseq><gui "
-"style=\"menu\">Media</gui><gui style=\"menuitem\">Import Media</gui></"
-"guiseq> from the menu and select the *.amz file to be imported. "
-"<app>Banshee</app> will then open this file and connect to the Amazon MP3 "
-"store to begin the download."
+"purchased manually from Amazon, in Banshee choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq> 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 ""
"Όταν γίνεται αγορά μουσικής από το Amazon με περιηγητή ιστού, μεταφορτώνεται "
-"και αποθηκεύεται στον σκληρό σας δίσκο ένα αρχείο με επέκταση .amz. Για να "
-"εισάγετε χειροκίνητα μουσική που αγοράσθηκε από το Amazon, στο "
-"<app>Banshee</app>, επιλέξτε <guiseq><gui style=\"menu\">Πολυμέσα</gui><gui "
-"style=\"menuitem\">Εισαγωγή πολυμέσων</gui></guiseq> από το μενού και επιλέξτε "
-"το αρχείο *.amz που θα εισαχθεί. Το <app>Banshee</app> θα ανοίξει αυτό το "
-"αρχείο και θα συνδεθεί στο κατάστημα Amazon MP3 για να ξεκινήσει τη "
+"και αποθηκεύεται στον υπολογιστή σας ένα αρχείο με επέκταση .amz. Για να "
+"εισάγετε χειροκίνητα μουσική που αγοράσθηκε από το Amazon, στο μενού του "
+"Banshee επιλέξτε <guiseq><gui>Πολυμέσα</gui><gui>Εισαγωγή πολυμέσων</gui></"
+"guiseq> και επιλέξτε το αρχείο *.amz που θα εισαχθεί. Το Banshee θα ανοίξει "
+"αυτό το αρχείο και θα συνδεθεί στο κατάστημα Amazon MP3 για να ξεκινήσει τη "
"μεταφόρτωση."
-#: C/amazon.page:78(p)
+#: 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 "
@@ -2552,158 +2048,221 @@ msgstr ""
"μεταφορτώσετε και να εισάγετε τυχόν αγορές σας από το Amazon εντός μίας ώρας "
"από την αγορά."
+#: 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 ""
+"Προσθήκη, αφαίρεση και αναπαραγωγή σταθμών διαδικτυακού ραδιοφώνου στο "
+"Banshee."
+
+#: 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."
+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 broadcasting 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 <gui>Add Station</gui> in "
+"the upper right hand corner of Banshee or, from the menu, choose "
+"<guiseq><gui>Menu</gui><gui>Add Station</gui></guiseq>."
+msgstr ""
+"Για να προσθέσετε ένα ραδιοφωνικό σταθμό στο Banshee, πατήστε <gui>Προσθήκη "
+"σταθμού</gui> στην πάνω δεξιά γωνία του Banshee ή από το μενού επιλέξτε "
+"<guiseq><gui>Μενού</gui><gui>Προσθήκη σταθμού</gui></guiseq>."
+
+#: 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 <gui>Copy Link</gui>."
+msgstr ""
+"Από την ιστοσελίδα του διαδικτυακού ραδιοφωνικού σταθμού, αντιγράψτε το URL "
+"της ροής του στον περιηγητή ιστού σας. Στους περισσότερους περιηγητές "
+"μπορείτε να κάνετε δεξί κλικ στο σύνδεσμο και να πατήσετε <gui>Αντιγραφή "
+"δεσμού</gui>."
+
+#: C/add-radio.page:54(p)
+msgid ""
+"Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
+"kind of music the internet radio station plays from the available drop down "
+"selections. You will then need to enter the <gui>Station Name</gui>. Enter a "
+"name for the radio station. Then press tab or use your mouse to select the "
+"<gui>Stream URL:</gui> dialog to paste the URL of the radio station. Using "
+"your mouse right click and choose <gui>Paste</gui> or press "
+"<keyseq><key>Control</key>+<key>V</key></keyseq>."
+msgstr ""
+"Το Banshee θα σας ζητήσει να εισάγετε το <gui>Είδος σταθμού</gui>. Επιλέξτε "
+"το είδος της μουσικής που παίζει ο σταθμός από τις διαθέσιμες επιλογές. Στη "
+"συνέχεια θα πρέπει εισάγετε το <gui>Όνομα σταθμού</gui>. Εισάγετε ένα όνομα "
+"για το σταθμό. Μετά πατήστε το tab ή με το ποντίκι σας επιλέξτε το διάλογο "
+"<gui>URL ροής:</gui> για να επικολλήσετε το URL του ραδιοφωνικού σταθμού. Με "
+"χρήση του ποντικιού σας κάντε δεξί κλικ και επιλέξτε <gui>Επικόλληση</gui> ή "
+"πατήστε <keyseq><key>Control</key>+<key>V</key></keyseq>."
+
+#: C/add-radio.page:62(p)
+msgid ""
+"You can optionally also fill out the fields for <gui>Station Creator</gui>, "
+"<gui>Description</gui>, and <gui>Rating</gui>."
+msgstr ""
+"Μπορείτε προαιρετικά να συμπληρώσετε τα πεδία για <gui>Δημιουργό σταθμού</"
+"gui>, <gui>Περιγραφή</gui> και <gui>Βαθμολογία</gui>."
+
+#: C/add-radio.page:66(p)
+msgid ""
+"Then press <gui>Save</gui> to save the internet radio station in Banshee."
+msgstr ""
+"Μετά πατήστε <gui>Αποθήκευση</gui> για να αποθηκεύσετε τον διαδικτυακό "
+"σταθμό στο Banshee."
+
+#: C/add-podcast.page:11(desc)
+msgid "Add, remove and play podcasts in Banshee."
+msgstr "Προσθήκη, αφαίρεση και αναπαραγωγή φορητών εκπομπών στο Banshee."
+
+#: C/add-podcast.page:29(title)
+msgid "What is a Podcast?"
+msgstr "Τι είναι η φορητή εκπομπή (Podcast);"
+
+#: 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 ""
+"Οι φορητές εκπομπές είναι ηχογραφημένα προγράμματα, παρόμοια με τα "
+"ραδιοφωνικά, που είναι διαθέσιμα στο διαδίκτυο και σας επιτρέπουν να γίνετε "
+"συνδρομητής. Όταν γίνετε συνδρομητής σε μια φορητή εκπομπή στο Banshee, κάθε "
+"φορά που παράγεται ένα καινούριο πρόγραμμα, το Banshee θα μεταφορτώσει "
+"αυτόματα την εκπομπή για να την ακούσετε."
+
+#: 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 ""
+"Υπάρχουν φορητές εκπομπές για σχεδόν κάθε θέμα, περιλαμβανομένων μουσικής, "
+"ταινιών, Linux και άλλων. Αναζητήστε στο διαδίκτυο με χρήση της αγαπημένης "
+"σας μηχανής αναζήτησης με έναν όρο αναζήτησης όπως \"movie podcast\" και θα "
+"εμφανιστούν πολλές επιλογές για να διαλέξετε."
+
+#: C/add-podcast.page:44(title)
+msgid "Add a Podcast"
+msgstr "Προσθήκη φορητής εκπομπής (podcast)"
+
+#: 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 <gui>Copy link</gui>."
+msgstr ""
+"Για να προσθέσετε μια φορητή εκπομπή στο Banshee θα χρειαστεί πρώτα να "
+"επισκεφτείτε την ιστοσελίδα της φορητής εκπομπής στο διαδίκτυο με τον "
+"περιηγητή ιστού σας. Σχεδόν όλες οι φορητές εκπομπές θα έχουν ένα κουμπί ή "
+"σύνδεσμο για να εγγραφείτε στη φορητή εκπομπή. Αντιγράψτε το δεσμό στη "
+"συνδρομή σας της φορητής εκπομπής. Στους περισσότερους περιηγητές ιστού "
+"μπορείτε να κάνετε δεξί κλικ στο δεσμό και να επιλέξετε <gui>Αντιγραφή "
+"δεσμού</gui>."
+
+#: C/add-podcast.page:53(p)
+msgid ""
+"In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the upper "
+"right hand corner, from the menu choose <guiseq><gui>Media</gui><gui> "
+"Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
+"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
+msgstr ""
+"Στο Banshee, πατήστε και επιλέξτε <gui>Συνδρομή σε φορητές εκπομπές</gui>, "
+"στην πάνω δεξιά γωνία από το μενού επιλέξτε <guiseq><gui>Πολυμέσα</gui><gui> "
+"Συνδρομή στη φορητή εκπομπή</gui></guiseq> ή χρησιμοποιήστε τη συντόμευση "
+"πληκτρολογίου <keyseq><key>Shift</key><key>Control</key><key>F</key></"
+"keyseq>."
+
+#: 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 ""
+"Το Banshee θα σας επιτρέψει τότε να επιλέξετε πως θέλετε να μεταφορτώνονται "
+"οι νέες φορητές εκπομπές από ένα αναπτυσσόμενο μενού. Οι επιλογές σας "
+"περιλαμβάνουν:"
+
+#: 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 "Αφού προσθέσετε μια ροή φορητής εκπομπής, το Banshee θα εμφανίσει:"
+
+#: C/add-podcast.page:73(p)
+msgid "<gui>Name</gui>: (Name of the specific episode)"
+msgstr "<gui>Όνομα</gui>: (Όνομα του συγκεκριμένου επεισοδίου)"
+
+#: C/add-podcast.page:74(p)
+msgid "<gui>Podcast</gui>: (Name of the Podcast)"
+msgstr "<gui>Φορητή εκπομπή</gui>: (Όνομα της φορητής εκπομπής)"
+
+#: C/add-podcast.page:75(p)
+msgid "<gui>Published</gui> (Date the episode was published or released)"
+msgstr ""
+"<gui>Κυκλοφόρησε</gui> (Ημερομηνία κυκλοφορίας ή δημοσίευσης του επεισοδίου)"
+
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
msgid "translator-credits"
-msgstr ""
-"Ελληνική μεταφραστική ομάδα GNOME\n"
-" Δημήτρης Σπίγγος <dmtrs32 at gmail.com>, 2013\n"
-" Michael Kotsarinis <mk73628 at gmail.com>, 2010\n"
-"Για περισσότερες πληροφορίες http://gnome.gr"
-
-#~ msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
-#~ msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
-
-#~ msgid "Introduction to the Banshee User Interface"
-#~ msgstr "Εισαγωγή στη διεπαφή χρήστη του Banshee"
-
-#~ msgid ""
-#~ "To change Now Playing to hide the Banshee user interface and use the full "
-#~ "screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</"
-#~ "gui> button in the upper right hand corner of Banshee, or choose "
-#~ "<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen "
-#~ "mode."
-#~ msgstr ""
-#~ "Για να αλλάξετε την τρέχουσα αναπαραγωγή για να αποκρυφτεί η διεπαφή "
-#~ "χρήστη του Banshee και να χρησιμοποιηθεί η κατάσταση πλήρους οθόνης, "
-#~ "πατήστε το <key>F</key> ή το κουμπί <gui>Πλήρης οθόνη</gui> στην πάνω "
-#~ "δεξιά γωνία του Banshee ή επιλέξτε <guiseq><gui>Προβολή</gui><gui>Πλήρης "
-#~ "οθόνη</gui></guiseq> για να αρχίσετε την κατάσταση πλήρους οθόνης."
-
-#~ msgid "Podcast"
-#~ msgstr "Φορητών εκπομπών (podcast)"
-
-#~ msgid "Sync Your Entire Library"
-#~ msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκης σας"
-
-#~ msgid ""
-#~ "For more information on performing more complex search queries, see the "
-#~ "<link xref=\"adv-search\"/> page."
-#~ msgstr ""
-#~ "Για περισσότερες πληροφορίες για την εκτέλεση πιο σύνθετων ερωτημάτων "
-#~ "αναζήτησης, δείτε τη σελίδα <link xref=\"adv-search\"/>."
-
-#~ msgid ""
-#~ "Import music and categorizations from the <app>Rhythmbox</app> music "
-#~ "player."
-#~ msgstr "Εισάγετε μουσική και κατηγοριοποιήσεις από το <app>Rhythmbox</app>."
-
-#~ msgid "Import your <app>Rhythmbox</app> library"
-#~ msgstr "Εισάγετε τη βιβλιοθήκη σας του <app>Rhythmbox</app>"
-
-#~ msgid "Music Metadata"
-#~ msgstr "Μεταδεδομένα μουσικής"
-
-#~ msgid "Manage or change your albums cover art."
-#~ msgstr "Διαχείριση ή αλλαγή των εξωφύλλων των δίσκων σας."
-
-#~ msgid "Cover art"
-#~ msgstr "Εξώφυλλο"
-
-#~ msgid ""
-#~ "Import music and categorizations from the <app>iTunes</app> media player."
-#~ msgstr ""
-#~ "Εισαγωγή μουσική και κατηγοριοποίησης από την εφαρμογή αναπαραγωγής "
-#~ "πολυμέσων <app>iTunes</app>."
-
-#~ msgid "Import your <app>iTunes</app> library"
-#~ msgstr "Εισαγωγή της βιβλιοθήκης σας του <app>iTunes</app>"
-
-#~ msgid "Community Banshee Extensions"
-#~ msgstr "Επεκτάσεις από την κοινότητα για το Banshee"
-
-#~ msgid "Add community built extensions for Banshee"
-#~ msgstr "Προσθήκη επεκτάσεων φτιαγμένων από την κοινότητα για το Banshee"
-
-#~ msgid "Import music purchased from eMusic."
-#~ msgstr "Εισαγωγή μουσικής αγορασμένης από το eMusic."
-
-#~ msgid "Import your eMusic tracks"
-#~ msgstr "Εισαγωγή των κομματιών σας από το eMusic"
-
-#~ msgid "Get help for advanced actions."
-#~ msgstr "Βοήθεια για προχωρημένες ενέργειες."
-
-#~ msgid "Advanced Options and Help"
-#~ msgstr "Επιλογές για προχωρημένους και βοήθεια"
-
-#~ 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 <gui>Copy Link</gui>."
-#~ msgstr ""
-#~ "Από την ιστοσελίδα του διαδικτυακού ραδιοφωνικού σταθμού, αντιγράψτε το "
-#~ "URL της ροής του στον περιηγητή ιστού σας. Στους περισσότερους περιηγητές "
-#~ "μπορείτε να κάνετε δεξί κλικ στο σύνδεσμο και να πατήσετε <gui>Αντιγραφή "
-#~ "δεσμού</gui>."
-
-#~ msgid ""
-#~ "Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
-#~ "kind of music the internet radio station plays from the available drop "
-#~ "down selections. You will then need to enter the <gui>Station Name</gui>. "
-#~ "Enter a name for the radio station. Then press tab or use your mouse to "
-#~ "select the <gui>Stream URL</gui> field to paste the URL of the radio "
-#~ "station. Using your mouse right click and choose <gui>Paste</gui> or "
-#~ "press <keyseq><key>Control</key><key>V</key></keyseq>."
-#~ msgstr ""
-#~ "Το Banshee θα σας ζητήσει να εισάγετε το <gui>Είδος σταθμού</gui>. "
-#~ "Επιλέξτε το είδος της μουσικής που παίζει ο ραδιοφωνικός σταθμός από τις "
-#~ "διαθέσιμες επιλογές. Στη συνέχεια θα πρέπει εισάγετε το <gui>Όνομα "
-#~ "σταθμού</gui>. Εισάγετε ένα όνομα για τον ραδιοφωνικό σταθμό. Μετά "
-#~ "πατήστε τον στηλοθέτη ή με το ποντίκι σας επιλέξτε το πεδίο <gui>URL "
-#~ "ροής</gui> για να επικολλήσετε το URL του ραδιοφωνικού σταθμού. Με χρήση "
-#~ "του ποντικιού σας δεξιοπατήστε και επιλέξτε <gui>Επικόλληση</gui> ή "
-#~ "πατήστε <keyseq><key>Control</key>+<key>V</key></keyseq>."
-
-#~ msgid ""
-#~ "Banshee will then allow you to choose how you want to download new "
-#~ "podcasts from a drop down menu. Your choices include:"
-#~ msgstr ""
-#~ "Το Banshee θα σας επιτρέψει τότε να επιλέξετε πως θέλετε να "
-#~ "μεταφορτώνονται οι νέες φορητές εκπομπές από ένα αναπτυσσόμενο μενού. Οι "
-#~ "επιλογές σας περιλαμβάνουν:"
-
-#~ msgid ""
-#~ "Download the Most Recent Episode (This will automatically download the "
-#~ "last episode that was released)."
-#~ msgstr ""
-#~ "Μεταφόρτωση του πιο πρόσφατου επεισοδίου (Αυτό θα μεταφορτώσει αυτόματα "
-#~ "το τελευταίο επεισόδιο που κυκλοφόρησε)."
-
-#~ msgid "Download All Episodes (This will download all episodes)."
-#~ msgstr ""
-#~ "Μεταφόρτωση όλων των επεισοδίων (Αυτό θα μεταφορτώσει όλα τα επεισόδια)."
-
-#~ msgid ""
-#~ "Let Me Decide Which Episodes to Download (This will allow you to choose "
-#~ "which episodes you would like to download)."
-#~ msgstr ""
-#~ "Αφήστε με να αποφασίσω ποια επεισόδια θα μεταφορτωθούν (Αυτό θα σας "
-#~ "επιτρέψει να επιλέξετε ποια επεισόδια θα θέλατε να μεταφορτώσετε)."
-
-#~ msgid "After you have added a Podcast feed, Banshee will display:"
-#~ msgstr "Αφού προσθέσετε μια ροή φορητής εκπομπής, το Banshee θα εμφανίσει:"
-
-#~ msgid "<gui>Name</gui>: (Name of the specific episode)"
-#~ msgstr "<gui>Όνομα</gui>: (Όνομα του συγκεκριμένου επεισοδίου)"
-
-#~ msgid "<gui>Podcast</gui>: (Name of the Podcast)"
-#~ msgstr "<gui>Φορητή εκπομπή</gui>: (Όνομα της φορητής εκπομπής)"
-
-#~ msgid "<gui>Published</gui> (Date the episode was published or released)"
-#~ msgstr ""
-#~ "<gui>Κυκλοφόρησε</gui> (Ημερομηνία κυκλοφορίας ή δημοσίευσης του "
-#~ "επεισοδίου)"
-
-#~ msgid "Common Problems"
-#~ msgstr "Συνήθη προβλήματα"
+msgstr "Michael Kotsarinis <mk73628 at gmail.com>, 2010"
diff --git a/help/el/emusic.page b/help/el/emusic.page
new file mode 100644
index 0000000..d9c235e
--- /dev/null
+++ b/help/el/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="el">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Εισαγωγή μουσικής αγορασμένης από το eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Εισαγωγή των κομματιών σας από το eMusic</title>
+
+</page>
diff --git a/help/el/extensions.page b/help/el/extensions.page
index e562ad8..87fd6d7 100644
--- a/help/el/extensions.page
+++ b/help/el/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="el">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="el">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Προσθήκη επιπλέον λειτουργιών στο <app>Banshee</app>.</desc>
+ <desc>Προσθήκη επιπλέον λειτουργιών στο Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Επεκτάσεις του <app>Banshee</app></title>
+ <title>Επεκτάσεις του Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Επίσημες επεκτάσεις του <app>Banshee</app></title>
+ <title type="link">Επίσημες επεκτάσεις του Banshee</title>
</info>
+ <title>Διαχείριση επεκτάσεων του Banshee</title>
+ </section>
- <title>Διαχείριση επεκτάσεων του <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Επεκτάσεις από την κοινότητα για το Banshee</title>
+ </info>
+ <title>Προσθήκη επεκτάσεων φτιαγμένων από την κοινότητα για το Banshee</title>
</section>
+
</page>
diff --git a/help/el/import.page b/help/el/import.page
index e699b8e..d5708eb 100644
--- a/help/el/import.page
+++ b/help/el/import.page
@@ -3,7 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Προσθήκη μουσικής και βίντεο από τον υπολογιστή σας στη βιβλιοθήκη σας του <app>Banshee</app>.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Προσθήκη μουσικής και βίντεο από τον υπολογιστή σας στη βιβλιοθήκη σας του Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -13,20 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Εισαγωγή μουσικής & βίντεο</title>
- <p>Μπορείτε να εισάγετε μουσική και βίντεο αποθηκευμένα στον υπολογιστή σας στο <app>Banshee</app>. Τα εισαχθέντα αρχεία εμφανίζονται στις πηγές σας και μπορείτε να τα επεξεργαστείτε και να τα διαχειριστείτε όπως οποιοδήποτε άλλο μέσο στο <app>Banshee</app>.</p>
+ <p>Μπορείτε να εισάγετε μουσική και βίντεο αποθηκευμένα στον υπολογιστή σας στο Banshee. Τα εισαχθέντα αρχεία εμφανίζονται στις πηγές σας και μπορείτε να τα επεξεργασθείτε και να τα διαχειριστείτε σαν οποιοδήποτε άλλο μέσο στο Banshee.</p>
- <p>Για να εισάγετε αρχεία μουσικής ή βίντεο στον υπολογιστή σας, επιλέξτε <guiseq><gui style="menu">Πολυμέσα</gui><gui style="menuitem">Εισαγωγή πολυμέσων</gui></guiseq>. Θα εμφανισθεί ένας διάλογος με έναν αριθμό επιλογών.</p>
+ <p>Για να εισάγετε τα αρχεία σας μουσικής ή βίντεο του υπολογιστή σας, επιλέξτε <guiseq><gui>Πολυμέσα</gui><gui>Εισαγωγή πολυμέσων</gui></guiseq>. Θα εμφανισθεί ένα παράθυρο διαλόγου με έναν αριθμό επιλογών.</p>
- <note style="tip">
+ <note>
<p>Τα πρόσθετα μπορεί να προσθέσουν επιπλέον επιλογές εισαγωγής. Δείτε το <link xref="#plugins"/> παρακάτω.</p>
</note>
@@ -49,22 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Μπορείτε να εισάγετε με ασφάλεια από έναν φάκελο από τον οποίο έχετε ήδη κάνει εισαγωγή χωρίς να ανησυχείτε για τυχόν διπλές εγγραφές στη βιβλιοθήκη σας.</p>
</note>
-
+
<section id="import-playlist">
<title>Εισαγωγή από λίστα αναπαραγωγής</title>
-
- <p>Μπορείτε επίσης να εισάγετε μουσική από λίστες αναπαραγωγής. Τα περισσότερα αρχεία λίστας αναπαραγωγής λήγουν σε <em>m3u</em>. Για να εισάγετε από μια λίστα αναπαραγωγής, από το μενού του <app>Banshee</app> επιλέξτε <guiseq><gui style="menu">Πολυμέσα</gui><gui style="menuitem">Εισαγωγή λίστας αναπαραγωγής</gui></guiseq>, εντοπίστε το αρχείο της λίστας αναπαραγωγής στον φάκελό σας, επιλέξτε το και πατήστε <gui style="button">Εισαγωγή</gui>.</p>
-
+ <p>Μπορείτε επίσης να εισάγετε μουσική από λίστες αναπαραγωγής. Τα περισσότερα αρχεία λίστας αναπαραγωγής έχουν κατάληξη <em>m3u</em>. Για να εισάγετε από μια λίστα αναπαραγωγής, από το μενού του Banshee επιλέξτε <guiseq><gui>Πολυμέσα</gui><gui>Εισαγωγή λίστας αναπαραγωγής</gui></guiseq>, εντοπίστε το αρχείο της λίστας στο φάκελό σας, επιλέξτε το και πατήστε <gui>Εισαγωγή</gui>.</p>
</section>
-
+
<section id="plugins">
<title>Επιπλέον πηγές εισαγωγής</title>
-
- <p>Τα πρόσθετα μπορεί να προσθέσουν επιπλέον επιλογές εισαγωγής. Οι ακόλουθες επιπλέον πηγές θα είναι διαθέσιμες αν τα κατάλληλα πρόσθετα είναι ενεργοποιημένα:</p>
-
+ <p>Τα πρόσθετα μπορεί να προσθέσουν επιπλέον επιλογές εισαγωγής. Οι ακόλουθες επιπλέον πηγές θα είναι διαθέσιμες αν τα κατάλληλα πρόσθετα είναι ενεργοποιημένα:</p>
</section>
-
+
</page>
diff --git a/help/el/index.page b/help/el/index.page
index f77db9e..3d63584 100644
--- a/help/el/index.page
+++ b/help/el/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Αναπαραγωγείς πολυμέσων <app>Banshee</app></title>
+ <title>Αναπαραγωγή πολυμέσων Banshee</title>
<section id="media" style="2column">
- <title>Προσθήκη, αφαίρεση & αναπαραγωγή</title>
+ <title>Προσθήκη, Αφαίρεση & Αναπαραγωγή</title>
</section>
<section id="manage" style="2column">
- <title>Διαχείριση & ταξινόμηση</title>
+ <title>Διαχείριση & Ταξινόμηση</title>
</section>
-
+
<section id="sync" style="2column">
<title>Συγχρονισμός των πολυμέσων σας με φορητή συσκευή μουσικής</title>
</section>
<section id="extensions" style="2column">
- <title>Προσθήκη επιπλέον λειτουργιών στο <app>Banshee</app></title>
+ <title>Προσθήκη επιπλέον λειτουργιών στο Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Προχωρημένες επιλογές και βοήθεια</title>
+ <title>Προχωρημένες επιλογές και βοήθεια</title>
</section>
</page>
diff --git a/help/el/introduction.page b/help/el/introduction.page
index 70beef5..57b67ec 100644
--- a/help/el/introduction.page
+++ b/help/el/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Εισαγωγή στην αναπαραγωγή πολυμέσων του <app>Banshee</app>.</desc>
+ <desc>Εισαγωγή στην <app>Αναπαραγωγή πολυμέσων Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -25,17 +21,15 @@
<title>Εισαγωγή</title>
<p>Το <app>Banshee</app> είναι μια εφαρμογή αναπαραγωγής πολυμέσων που σας επιτρέπει να αναπαράγετε τη μουσική σας, τα βίντεό σας και άλλα πολυμέσα καθώς και να τα συγχρονίζετε με άλλες φορητές συσκευές για να τα έχετε μαζί σας.</p>
-
<p>Το <app>Banshee</app> περιλαμβάνει λειτουργίες εισαγωγής των πολυμέσων σας, διαχείρισης των μεταδεδομένων τους και αναπαραγωγής της μουσικής και των βίντεό σας.</p>
-
- <p>Το <app>Banshee</app> σας βοηθά επίσης να συγχρονίσετε τη μουσική και τα βίντεό σας με δημοφιλείς φορητές συσκευές, όπως αναπαραγωγείς ψηφιακού ήχου και έξυπνα κινητά. Το <app>Banshee</app> υποστηρίζει δημοφιλείς συσκευές περιλαμβανομένων των περισσότερων iPod και τους αναπαραγωγούς Creative MP3 και Sandisk καθώς και κινητά με λειτουργικό Android.</p>
-
+ <p>Το Banshee σας βοηθά επίσης να συγχρονίσετε τη μουσική και τα βίντεό σας με δημοφιλείς φορητές συσκευές, όπως αναπαραγωγείς ψηφιακής μουσικής και έξυνπα κινητά. Το Banshee υποστηρίζει δημοφιλείς συσκευές περιλαμβανομένων των περισσότερων iPod, τους αναπαραγωγείς MP3 της Sandisk και της Creative και κινητά με λειτουργικό Android.</p>
+<!--
<figure>
- <title>Παράθυρο <gui>Αναπαραγωγή πολυμέσων Banshee</gui></title>
- <desc><app>Αναπαραγωγή πολυμέσων Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Διεπαφή βιβλιοθήκης <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/el/itunes-import.page b/help/el/itunes-import.page
new file mode 100644
index 0000000..1119ae6
--- /dev/null
+++ b/help/el/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="el">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Εισαγωγή μουσική και κατηγοριοποίησης από την εφαρμογή αναπαραγωγής πολυμέσων <app>iTunes</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Εισαγωγή της βιβλιοθήκης σας του <app>iTunes</app></title>
+
+</page>
diff --git a/help/el/keyboard-shortcuts.page b/help/el/keyboard-shortcuts.page
deleted file mode 100644
index 718b958..0000000
--- a/help/el/keyboard-shortcuts.page
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="el">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Συντομεύσεις πληκτρολογίου</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Έλεγχος του <app>Banshee</app> με χρήση συντομεύσεων πληκτρολογίου</title>
-
- <section id="playback-control">
- <title>Έλεγχος αναπαραγωγής</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Πλήκτρο</gui></p></td>
- <td><p><gui>Ενέργεια</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Πλήκτρο διαστήματος</key></p></td>
- <td><p>Αναπαραγωγή ή παύση του τρέχοντος τραγουδιού</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Αναπαραγωγή του επόμενου τραγουδιού</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Αναπαραγωγή του προηγούμενου τραγουδιού</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Αλληλεπίδραση με βιβλιοθήκη</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Πλήκτρο</gui></p></td>
- <td><p><gui>Ενέργεια</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Μεταφορά της εστίασης στο πλαίσιο αναζήτησης</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Έλεγχος</key><key>I</key></keyseq></p></td>
- <td><p>Άνοιγμα του διαλόγου εισαγωγής πολυμέσων</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Λίστες αναπαραγωγής</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Πλήκτρο</gui></p></td>
- <td><p><gui>Ενέργεια</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Έλεγχος</key><key>N</key></keyseq></p></td>
- <td><p>Δημιουργία νέας λίστας αναπαραγωγής</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Φορητές εκπομπές</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Πλήκτρο</gui></p></td>
- <td><p><gui>Ενέργεια</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Σήμανση των επιλεγμένων επεισοδίων ως παλαιών</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Διεπαφή</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Πλήκτρο</gui></p></td>
- <td><p><gui>Ενέργεια</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Εναλλαγή κατάστασης πλήρους οθόνης</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Έλεγχος</key><key>A</key></keyseq></p></td>
- <td><p>Επιλέξτε όλα τα τραγούδια στην προβολή λίστας αναπαραγωγής</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Έλεγχος</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Αποεπιλογή όλων των τραγουδιών στην προβολή λίστας αναπαραγωγής</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Έλεγχος</key><key>W</key></keyseq></p></td>
- <td><p>Απόκρυψη του παραθύρου του <app>Banshee</app> (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής ειδοποιήσεων)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Έλεγχος</key><key>Αριστερό κουμπί του ποντικιού</key></keyseq>
- </p></td>
- <td><p>Αναπαραγωγή προηγούμενου τραγουδιού (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής ειδοποιήσεων)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Έλεγχος</key><key>Δεξί κουμπί του ποντικιού</key></keyseq>
- </p></td>
- <td><p>Αναπαραγωγή επόμενου τραγουδιού (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής ειδοποιήσεων)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Έλεγχος</key><key>Μεσαίο κουμπί του ποντικιού</key></keyseq>
- </p></td>
- <td><p>Εναλλαγή αναπαραγωγής / παύσης (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής ειδοποιήσεων)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/el/keyboardshortcuts.page b/help/el/keyboardshortcuts.page
new file mode 100644
index 0000000..b075202
--- /dev/null
+++ b/help/el/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="el">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Συντομεύσεις πληκτρολογίου</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Έλεγχος του Banshee με χρήση συντομεύσεων πληκτρολογίου</title>
+
+ <section id="playbackcontrol">
+
+ <title>Έλεγχος αναπαραγωγής</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Πλήκτρο</gui></p></td> <td><p><gui>Ενέργεια</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Πλήκτρο διαστήματος</p></td> <td><p>Αναπαραγωγή ή παύση του τρέχοντος τραγουδιού</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Αναπαραγωγή του επόμενου τραγουδιού</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Αναπαραγωγή του προηγούμενου τραγουδιού</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Αλληλεπίδραση με βιβλιοθήκη</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Πλήκτρο</gui></p></td> <td><p><gui>Ενέργεια</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>Μεταφορά της εστίασης στο πεδίο αναζήτησης</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Έλεγχος</key><key>I</key></keyseq></p></td>
+ <td><p>Άνοιγμα του διαλόγου εισαγωγής πολυμέσων</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Λίστες αναπαραγωγής</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Πλήκτρο</gui></p></td> <td><p><gui>Ενέργεια</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Έλεγχος</key><key>N</key></keyseq></p></td> <td><p>Δημιουργία νέας λίστας αναπαραγωγής</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Φορητές εκπομπές</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Πλήκτρο</gui></p></td> <td><p><gui>Ενέργεια</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Σήμανση των επιλεγμένων επεισοδίων ως παλαιών</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Διεπαφή</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Πλήκτρο</gui></p></td> <td><p><gui>Ενέργεια</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Εναλλαγή κατάστασης πλήρους οθόνης</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Έλεγχος</key><key>A</key></keyseq></p></td> <td><p>Επιλέξτε όλα τα τραγούδια στην προβολή λίστας αναπαραγωγής</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Έλεγχος</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>Αποεπιλογή όλων των τραγουδιών στην προβολή λίστας αναπαραγωγής</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Έλεγχος</key><key>W</key></keyseq></p></td> <td><p>Απόκρυψη του παραθύρου του Banshee (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής ειδοποιήσεων)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Έλεγχος</key><key>Αριστερό κουμπί του ποντικιού</key></keyseq>
+ </p></td> <td><p>Αναπαραγωγή προηγούμενου τραγουδιού (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής ειδοποιήσεων)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Έλεγχος</key><key>Δεξί κουμπί του ποντικιού</key></keyseq>
+ </p></td> <td><p>Αναπαραγωγή επόμενου τραγουδιού (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής ειδοποιήσεων)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Έλεγχος</key><key>Μεσαίο κουμπί του ποντικιού</key></keyseq>
+ </p></td> <td><p>Εναλλαγή αναπαραγωγής / παύσης (Απαιτεί ενεργοποίηση του πρόσθετου περιοχής ειδοποιήσεων)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/el/lastfm.page b/help/el/lastfm.page
index 0e19d63..1a0417b 100644
--- a/help/el/lastfm.page
+++ b/help/el/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="el">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Ενεργοποιήστε το Last.fm, αναφορά τραγουδιών και το ραδιόφωνο του Last.fm.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,46 +19,83 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>Το Last.fm είναι μια δημοφιλής δικτυακή υπηρεσία που προσφέρει τόσο δωρεάν όσο και επί πληρωμή υπηρεσίες. Το Last.fm προσφέρει πληροφορίες για καλλιτέχνες της μουσικής και δίσκους και αν δημιουργήσετε μια κατατομή χρήστη, το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο <app>Banshee</app> δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε ροές μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, περιλαμβανομένου του <app>Banshee</app>. Το Last [...]
-
+ <title>Last.fm</title>
+
+ <p>Το Last.fm είναι μια δημοφιλής δικτυακή υπηρεσία που προσφέρει τόσο δωρεάν όσο και επί πληρωμή υπηρεσίες. Το Last.fm προσφέρει πληροφορίες για καλλιτέχνες της μουσικής και δίσκους και αν δημιουργήσετε ένα προφίλ χρήστη, το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο Banshee δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε ροές μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, περιλαμβανομένου του Banshee. Το Last.fm προσφέρει πολλαπλά κ [...]
+
<section id="enable-lastfm">
- <title>Ενεργοποίηση Last.fm</title>
-
- <p>Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε μια κατατομή στο Last.fm. Επισκεφθείτε το <link href="http://www.last.fm/join">http://www.last.fm/join</link> για να δημιουργήσετε ένα λογαριασμό ή επιλέξτε <guiseq><gui style="menu">Επεξεργασία</gui><gui style="menuitem">Προτιμήσεις</gui></guiseq> από το μενού του <app>Banshee</app>. Μόλις βρεθείτε στις προτιμήσεις επιλέξτε την καρτέλα <gui style="tab">Ειδική πηγή</gui> και πατήστε το πτυσσόμενο μενού <gui style="m [...]
-
- <p>Για να μπορεί το <app>Banshee</app> να αναφέρει τα τραγούδια που αναπαράγετε στον υπολογιστή σας στο Last.fm, συνδεθείτε στο Last.fm στο <app>Banshee</app> και στις προτιμήσεις <gui style="tab">Ειδική πηγή</gui>. Εισάγετε το όνομα χρήστη σας και πατήστε το κουμπί <gui style="button">Σύνδεση στο Last.fm</gui>. Θα μεταφερθείτε σε μια ιστοσελίδα του Last.fm στον περιηγητή ιστού σας για να δοθεί πρόσβαση στο <app>Banshee</app>. Πατήστε τον σύνδεσμο <gui style="button">Ναι, να επιτραπεί [...]
-
+ <title>Ενεργοποίηση Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>Για να μπορεί το Banshee να αναφέρει τα τραγούδια που αναπαράγετε στον υπολογιστή σας στο Last.fm, συνδεθείτε σε αυτό στο Banshee στις προτιμήσεις <gui>Συγκεκριμένης πηγής</gui>. Εισάγετε το όνομα χρήστη σας και πατήστε <gui>Σύνδεση στο Last.fm</gui>. Θα μεταφρεθείτε σε μια ιστοσελίδα του Last.fm στον περιηγητή ιστού σας για να δοθεί πρόσβαση στο Banshee. Πατήστε το σύνδεσμο <gui>Ναι, να επιτραπεί η πρόσβαση</gui> στον περιηγητή σας και θα επανακατευθυνθείτε σε μια ιστοσελίδα που εμ [...]
+
</section>
-
- <section id="song-reporting">
- <title>Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από το <app>Banshee</app></title>
-
- <p>Αφού έχετε επιτυχώς συνδέσει το <app>Banshee</app> με τη κατατομή σας στο Last.fm, πρέπει να βεβαιωθείτε ότι έχετε ενεργοποιήσει το <app>Banshee</app> για να αναφέρει τα τραγούδια σας. Για την ενεργοποίηση του <app>Banshee</app> ώστε να αναφέρει τα τραγούδια στην κατατομή σας στο Last.fm, πηγαίνετε στο <app>Banshee</app> και επιλέξτε τις προτιμήσεις, έπειτα επιλέξτε την καρτέλα <gui style="tab">Ειδική πηγή</gui>, επιλέξτε <gui style="menuitem">Last.fm</gui> από το πτυσσόμενο και πατ [...]
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από τη συσκευή σας</title>
-
- <p>Μετά την πετυχημένη σύνδεση του <app>Banshee</app> στη κατατομή σας του Last.fm και την ενεργοποίηση του <app>Banshee</app> για αναφορά τραγουδιών στο Last.fm, μπορείτε επίσης να ενεργοποιήσετε τις επιλογές από μια συνδεμένη συσκευή. Το <app>Banshee</app>, με τη σύνδεση της συσκευής σας, θα προσπαθήσει να διαλέξει τα τραγούδια που έχετε παίξει από την τελευταία σύνδεση της συσκευής και να τα υποβάλλει στο Last.fm.</p>
-
- <p>Για την ενεργοποίηση της επιλογής μιας συνδεμένης συσκευής πηγαίνετε στο <app>Banshee</app> και επιλέξτε προτιμήσεις, επιλέξτε την καρτέλα <gui style="tab">Ειδική πηγή</gui>, επιλέξτε <gui style="menuitem">Last.fm</gui> από την πτυσσόμενη λίστα και πατήστε το πλαίσιο ελέγχου <gui style="checkbox">Ενεργοποίηση αναφοράς τραγουδιού από συσκευή</gui>. Αν έχετε μια ενεργή διαδικτυακή σύνδεση το <app>Banshee</app>, με τη σύνδεση της συσκευής σας, θα προσπαθήσει να συλλέξει πληροφορίες σχε [...]
-
- <p>Όπως με τις κανονικές υποβολές επιλογής του <app>Banshee</app>, το Last.fm θα ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα αν οποιαδήποτε από τις πληροφορίες καλλιτέχνη, τίτλου ή δίσκου είναι εσφαλμένες (αν και συνιστούμε πάλι τη χρήση της επέκτασης Metadata Fixer για διόρθωση των αρχείων σας).</p>
-
- <p>Παρακαλούμε, σημειώστε ότι προς το παρόν το <app>Banshee</app> υποστηρίζει αυτό το γνώρισμα μόνο με προϊόντα Apple που υποστηρίζονται από την επέκταση AppleDevice.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Ακούστε το ραδιόφωνο του Last.fm</title>
-
- <p>Το ραδιόφωνο του Last.fm είναι δωρεάν για του κατοίκους των ΗΠΑ, του Ηνωμένου Βασιλείου και της Γερμανίας. Οι κάτοικοι άλλων χωρών πρέπει να πληρώσουν για ένα λογαριασμό του Last.fm για ακούσουν ραδιόφωνο. Τα επί πληρωμή μέλη, επίσης έχουν επιπλέον χαρακτηριστικά στο ραδιόφωνο: ακρόαση λιστών αναπαραγωγής και σταθμούς μουσικής που σας αρέσουν ή έχετε επισημάνει.</p>
-
- <p>Στο παράθυρο πηγών του <app>Banshee</app> στα αριστερά, θα έχετε τώρα μια ενότητα Last.fm, που συμπεριλαμβάνει τους σταθμούς σας του ραδιοφώνου Last.fm. Θα χρειαστείτε μια ενεργή σύνδεση διαδικτύου για να ακούσετε το ραδιόφωνο του Last.fm. Επιλέξτε τον ραδιοφωνικό σταθμό που θέλετε να ακούσετε και το <app>Banshee</app> θα επικοινωνήσει με το Last.fm για να συμπληρώσει τραγούδια για αυτό το ραδιοφωνικό σταθμό. Πατήστε το κουμπί <gui style="button">Αναπαραγωγή</gui> στο <app>Banshee</ [...]
-
+ <title>Ακούστε το ραδιόφωνο του Last.fm</title>
+ <p>Το ραδιόφωνο του Last.fm είναι δωρεάν για του κατοίκους των ΗΠΑ, του Ηνωμένου Βασιλείου και της Γερμανίας. Οι κάτοικοι άλλων χωρών πρέπει να πληρώσουν για ένα λογαριασμό του Last.fm για ακούσουν ραδιόφωνο. Τα επί πληρωμή μέλη, επίσης έχουν επιπλέον χαρακτηριστικά στο ραδιόφωνο: ακρόαση λιστών αναπαραγωγής και σταθμούς μουσικής που σας αρέσουν ή έχετε επισημάνει. </p>
+
+ <p>In Banshee's sources pane 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 <gui>Play</gui> button
+ in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio
+ station. You can also press the <gui>Next</gui> button in Banshee,
+ <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq>
+ to play the next song in your radio station queue.
+ </p>
+
</section>
-
+
</page>
diff --git a/help/el/manage-coverart.page b/help/el/manage-coverart.page
new file mode 100644
index 0000000..9342b92
--- /dev/null
+++ b/help/el/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="el">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Διαχείριση ή αλλαγή των εξωφύλλων των δίσκων σας.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Εξώφυλλο</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/el/manage-playlists.page b/help/el/manage-playlists.page
index 46957ba..4804506 100644
--- a/help/el/manage-playlists.page
+++ b/help/el/manage-playlists.page
@@ -1,102 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="el">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="el">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Δημιουργία και διαχείριση λιστών αναπαραγωγής.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Λίστες αναπαραγωγής</title>
-
+ <title>Λίστες αναπαραγωγής</title>
+
<p>Οι λίστες αναπαραγωγής σας επιτρέπουν να δημιουργήσετε και να αποθηκεύσετε μια λίστα μουσικών κομματιών για να αναπαραχθούν με συγκεκριμένη σειρά. Οι λίστες αναπαραγωγής είναι ένας βολικός τρόπος για τη δημιουργία μιας λίστας με τα αγαπημένα σας τραγούδια ή για να χωρίσετε τη βιβλιοθήκη σας σε μικρότερες λίστες στις οποίες είναι εύκολο να περιηγηθείτε. Μερικές φορητές συσκευές αναπαραγωγής σας επιτρέπουν ακόμα και να μεταφέρετε τη λίστα αναπαραγωγής ώστε να μπορείτε να την πάρετε μα [...]
-
- <p>Το <app>Banshee</app> υποστηρίζει κανονικές λίστες αναπαραγωγής, που περιλαμβάνουν τραγούδια που προσθέτετε στη λίστα αναπαραγωγής καθώς και έξυπνες λίστες αναπαραγωγής. Οι έξυπνες λίστες αναπαραγωγής δημιουργούν αυτόματα λίστες αναπαραγωγής βασισμένες στις συνήθειές ακρόασης σας, στην αγαπημένη σας μουσική και άλλα.</p>
-
+
+ <p>Το Banshee υποστηρίζει κανονικές λίστες αναπαραγωγής, που περιλαμβάνουν τραγούδια που προσθέτετε στη λίστα αναπαραγωγής καθώς και έξυπνες λίστες αναπαραγωγής. Οι έξυπνες λίστες αναπαραγωγής δημιουργούν αυτόματα λίστες αναπαραγωγής βασισμένες στις συνήθειές σας ακρόασης, στην αγαπημένη σας μουσική και άλλα.</p>
+
<section id="manual">
+
<title>Κανονικές λίστες αναπαραγωγής</title>
-
- <p>Μια κανονική λίστα αναπαραγωγής είναι μια λίστα τραγουδιών που έχετε προσθέσει και διαχειρίζεστε. Μπορεί να θέλετε να δημιουργήσετε τη δική σας λίστα τραγουδιών από τον αγαπημένο σας καλλιτέχνη από πολλούς δίσκους, τα τελευταία αγαπημένα σας τραγούδια ή μια λίστα με έντονο ρυθμό για να ακούτε όσο ασκείστε.</p>
-
- <p>Μπορείτε να δημιουργήσετε μια νέα λίστα αναπαραγωγής πατώντας <keyseq><key>Control</key><key>N</key></keyseq>, από το μενού επιλέγοντας <guiseq><gui style="menu">Μέσα</gui><gui style="menuitem">Νέα λίστα αναπαραγωγής</gui></guiseq> ή επιλέγοντας τα κομμάτια που θέλετε να προσθέσετε στη λίστα αναπαραγωγής. Επιλέξτε τα κομμάτια, δεξιοπατήστε τα και επιλέξτε <guiseq><gui style="menuitem">Προσθήκη στη λίστα αναπαραγωγής</gui><gui style="menuitem">Νέα λίστα αναπαραγωγής</gui></guiseq>. Μ [...]
-
- <p>Για να δώσετε στη λίστα αναπαραγωγής σας όνομα, επιλέξτε την και δεξιοπατήστε σε αυτή, πατήστε <gui style="menuitem">Μετονομασία λίστας αναπαραγωγής</gui> και εισάγετε το όνομα της λίστας σας.</p>
-
- <p>Μπορείτε να αλλάξετε τη σειρά στη λίστα αναπαραγωγής σύροντας τα τραγούδια στη νέα θέση τους στη λίστα. Τα τραγούδια μπορούν να επαναδιαταχθούν στη λίστα μόνο όταν καμία στήλη δεν είναι ταξινομημένη. Για να αποταξινομήσετε μια στήλη, κάντε κλικ πάνω της μέχρι να μην εμφανίζεται πάνω ή κάτω βέλος και η στήλη να είναι κενή και μετά επαναδιατάξτε τη λίστα αναπαραγωγής.</p>
-
- <p>Για να αφαιρέσετε ένα κομμάτι από τη λίστα αναπαραγωγής, επιλέξτε τα κομμάτια που θέλετε να απομακρύνετε. Πατήστε το <key>Delete</key>, επιλέξτε από το μενού <guiseq><gui style="menu">Επεξεργασία</gui><gui style="menuitem">Αφαίρεση από τη λίστα αναπαραγωγής</gui></guiseq> ή δεξιοπατήστε στα κομμάτια με το ποντίκι σας και πατήστε <gui style="menuitem">Αφαίρεση από τη λίστα αναπαραγωγής</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
+
+ <p>Μια κανονική λίστα αναπαραγωγής είναι μια λίστα τραγουδιών που έχετε προσθέσει και διαχειρίζεστε. Μπορεί να θέλετε να δημιουργήσετε τη δική σας λίστα τραγουδιών από τον αγαπημένο σας καλλιτέχνη από πολλαπλούς δίσκους ή μια λίστα με έντονο ρυθμό για να ακούτε όσο ασκείστε.</p>
+
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key>
+ <key>N</key></keyseq>, from the menu choosing <guiseq><gui>Media</gui>
+ <gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
+ to add to the playlist. Select the track(s), right click them, and choose
+ <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
+ 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 <gui>Music</gui>. As you drag it over <gui>Music</gui>,
+ a new option <gui><em>New Playlist</em></gui> will appear and you can drop
+ the track(s) over <gui><em>New Playlist</em></gui> to add them to the
+ playlist. You can repeat this process until you have added all the tracks
+ you want in the playlist.
+ </p>
+
+ <p>Για να δώσετε στη λίστα αναπαραγωγής όνομα, επιλέξτε τη, κάντε δεξί κλικ σε αυτή, πατήστε <gui>Μετονομασία λίστας αναπαραγωγής</gui> και εισάγετε το όνομα της λίστας.</p>
+
+ <p>Μπορείτε να αλλάξετε τη σειρά στη λίστα αναπαραγωγής σύροντας τα τραγούδια στη νέα θέση τους στη λίστα. Τα τραγούδια μπορούν να επαναδιαταχθούν στη λίστα μόνο όταν καμία στήλη δεν είναι ταξινομημένη. Για να αποταξινομήσετε μια στήλη, κάντε κλικ πάνω της μέχρι να μην εμφανίζεται πάνω ή κάτω βέλος και η στήλη να είναι κενή και μετά επαναδιατάξτε τη λίστα αναπαραγωγής.</p>
+
+ <p>Για να αφαιρέσετε ένα κομμάτι από τη λίστα αναπαραγωγής, επιλέξτε τα κομμάτια που θέλετε να αφαιρέσετε. Πατήστε το <key>Delete</key>, επιλέξτε από το μενού <guiseq><gui>Επεξεργασία</gui><gui>Αφαίρεση από τη λίστα αναπαραγωγής</gui></guiseq> ή κάντε δεξί κλικ στο κομμάτι(α) με το ποντίκι σας και πατήστε <gui>Αφαίρεση από τη λίστα αναπαραγωγής</gui>.</p>
+ </section>
+
+ <section id="smartplaylists">
<title>Έξυπνη λίστα αναπαραγωγής</title>
-
- <p>Οι έξυπνες λίστες αναπαραγωγής σας επιτρέπουν να δημιουργήσετε γρήγορα μια δυναμική λίστα βασισμένη σε ένα αριθμό προκαθορισμένων μεταβλητών. Μπορεί να δημιουργήσετε γρήγορα μια νέα λίστα αναπαραγωγής βασισμένη σε έναν καλλιτέχνη, σε αγαπημένα και άλλα.</p>
-
- <p>Για να δημιουργήσετε μια έξυπνη λίστα αναπαραγωγής, από το μενού επιλέξτε <guiseq><gui style="menu">Πολυμέσα</gui><gui style="menuitem">Νέα έξυπνη λίστα αναπαραγωγής</gui></guiseq>. Θα εμφανιστεί ένας διάλογος για δημιουργία νέας έξυπνης λίστας αναπαραγωγής. Εισάγετε το όνομα της λίστας αναπαραγωγής σας και μετά επιλέξτε τα κριτήρια στα οποία θα βασίζεται η λίστα σας. Μπορεί να επιλέξετε από οποιοδήποτε πεδίο περιλαμβάνεται στα μεταδεδομένα του τραγουδιού, όπως Δίσκος, Καλλιτέχνης ή [...]
-
+
+ <p>Οι έξυπνες λίστες αναπαραγωγής σας επιτρέπουν να δημιουργήσετε γρήγορα μια δυναμική λίστα βασισμένη σε ένα αριθμό προκαθορισμένων μεταβλητών. Μπορεί να δημιουργήσετε γρήγορα μια νέα λίστα αναπαραγωγής βασισμένη σε ένα καλλιτέχνη, σε αγαπημένα και άλλα.</p>
+
+ <p>Για να δημιουργήσετε μια έξυπνη λίστα αναπαραγωγής, από το μενού επιλέξτε <guiseq><gui>Πολυμέσα</gui><gui>Νέα έξυνπη λίστα αναπαραγωγής</gui></guiseq>. Θα εμφανιστεί ένας διάλογος για δημιουργία νέας έξυπνης λίστας αναπαραγωγής. Εισάγετε το όνομα της λίστας αναπαραγωγής σας και μετά επιλέξτε τα κριτήρια στα οποία θα βασίζεται η λίστα σας. Μπορεί να επιλέξετε από οποιοδήποτε πεδίο περιλαμβάνεται στα μεταδεδομένα του τραγουδιού, όπως Δίσκος, Καλλιτέχνης ή Έτος. Επιλέξτε τα κριτήρια [...]
+
<list>
<item><p>είναι</p></item>
- <item><p>δεν είναι</p></item>
+ <item><p>δεν είναι</p></item>
<item><p>λιγότερο από</p></item>
- <item><p>περισσότερο από</p></item>
+ <item><p>περισσότερο από</p></item>
<item><p>το πολύ</p></item>
- <item><p>τουλάχιστον</p></item>
+ <item><p>τουλάχιστον</p></item>
</list>
-
- <p>Μπορείτε επίσης να πατήσετε το κουμπί <gui style="button">+</gui> για να προσθέσετε ένα ερώτημα προσθήκης στην έξυπνη λίστα αναπαραγωγής σας. Παραδείγματος χάριν, θα μπορούσατε να δημιουργήσετε μια έξυπνη λίστα αναπαραγωγής που περιλαμβάνει όλα τα τραγούδια από το 2010 που βαθμολογήσατε με 5 αστέρια. Για να δημιουργήσετε αυτή τη λίστα θα πρέπει να επιλέξετε:</p>
-
+
+ <p>Μπορείτε επίσης να πατήσετε το κουμπί <gui>+</gui> για να προσθέσετε ένα ερώτημα προσθήκης στην έξυπνη λίστα αναπαραγωγής σας. Παραδείγματος χάριν, θα μπορούσατε να δημιουργήσετε μια έξυπνη λίστα αναπαραγωγής που περιλαμβάνει όλα τα τραγούδια από το 2010 που βαθμολογήσατε με 5 αστέρια. Για να δημιουργήσετε αυτή τη λίστα θα επιλέγατε:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Έτος</gui></p></td>
- <td><p><gui>είναι</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Έτος</gui></p></td> <td><p><gui>είναι</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Κατάταξη</gui></p></td>
- <td><p><gui>είναι</gui></p></td>
- <td><p>5 αστέρια</p></td>
+ <td><p><gui>Βαθμολογία</gui></p></td> <td><p><gui>είναι</gui></p></td>
+ <td><p><gui/>5 αστέρια</p></td>
</tr>
</table>
-
- <p>Μπορείτε τότε προαιρετικά να επιλέξετε πόσα τραγούδια περιλαμβάνονται πατώντας το πλαίσιο ελέγχου <gui style="checkbox">Περιορισμός</gui> και επιλέγοντας τον αριθμό των τραγουδιών που θα περιληφθούν.</p>
-
- <p>Το <app>Banshee</app> περιλαμβάνει επίσης έξυπνες λίστες αναπαραγωγής που έχουν δημιουργηθεί για εσάς. Πατήστε το κουμπί <gui style="button">Άνοιγμα στον επεξεργαστή</gui> για να δείτε πώς δημιουργήθηκε η λίστα αναπαραγωγής ή για να την τροποποιήσετε. Αν πατήσετε <gui style="button">Δημιουργία και αποθήκευση</gui> η λίστα αναπαραγωγής θα δημιουργηθεί αυτόματα και θα αποθηκευτεί. Περιλαμβάνονται οι ακόλουθες λίστες αναπαραγωγής:</p>
-
+
+ <p>Μπορείτε τότε προαιρετικά να επιλέξετε πόσα τραγούδια περιλαμβάνονται πατώντας το <gui>Περιορισμός</gui> στο πεδίο επιλογής και επιλέγοντας τον αριθμό των τραγουδιών που θα περιληφθούν.</p>
+
+ <p>Το Banshee περιλαμβάνει επίσης έξυπνες λίστες αναπαραγωγής που έχουν δημιουργηθεί για εσάς. Πατήστε το κουμπί <gui>Άνοιγμα στον επεξεργαστή</gui> για να δείτε πως δημιουργήθηκε η λίστα αναπαραγωγής ή για να την τροποποιήσετε. Αν πατήσετε <gui>Δημιουργία και αποθήκευση</gui> η λίστα θα δημιουργηθεί αυτόματα και θα αποθηκευτεί. Περιλαμβάνονται οι ακόλουθες λίστες αναπαραγωγής:</p>
+
<list>
- <title>Έξυπνες λίστες αναπαραγωγής του <app>Banshee</app></title>
- <item>
- <p>Αγαπημένα (τραγούδια με 4 και 5 αστέρια)</p>
- </item>
- <item>
- <p>Πρόσφατα αγαπημένα (τραγούδια που ακούστηκαν συχνά την προηγούμενη εβδομάδα)</p>
- </item>
- <item>
- <p>Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν την προηγούμενη εβδομάδα)</p>
- </item>
- <item>
- <p>Πρωτάκουστα (τραγούδια που δεν έχουν αναπαραχθεί ή παραβλεφθεί)</p>
- </item>
- <item>
- <p>Παραμελημένα αγαπημένα (αγαπημένα που δεν έχουν παιχθεί για πάνω από δύο μήνες)</p>
- </item>
- <item>
- <p>700 MB αγαπημένων (ένα CD δεδομένων γεμάτο με αγαπημένα τραγούδια)</p>
- </item>
- <item>
- <p>80 λεπτά αγαπημένων (ένα CD ήχου γεμάτο με αγαπημένα τραγούδια)</p>
- </item>
- <item>
- <p>Αβαθμολόγητα (τραγούδια που δεν έχουν αξιολογηθεί)</p>
- </item>
+ <title>Έξυπνες λίστες αναπαραγωγής του Banshee</title>
+ <item><p>Αγαπημένα (τραγούδια με 4 και 5 αστέρια)</p></item>
+ <item><p>Πρόσφατα αγαπημένα (τραγούδια που ακούστηκαν συχνά την προηγούμενη εβδομάδα)</p></item>
+ <item><p>Recently Added (Songs imported within the last week)</p></item>
+ <item><p>Δεν έχουν ακουστεί (τραγούδια που δεν έχουν αναπαραχθεί ή παραβλεφθεί)</p></item>
+ <item><p>Παραμελημένα αγαπημένα (αγαπημένα που δεν έχουν παιχθεί για πάνω από δύο μήνες)</p></item>
+ <item><p>700 MB αγαπημένων (ένα CD δεδομένων γεμάτο με αγαπημένα τραγούδια)</p></item>
+ <item><p>80 λεπτά αγαπημένων (ένα CD ήχου γεμάτο με αγαπημένα τραγούδια)</p></item>
+ <item><p>Χωρίς βαθμολογία (τραγούδια που δεν έχουν αξιολογηθεί)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/el/manage-tags.page b/help/el/manage-tags.page
index 5a16182..becf6bc 100644
--- a/help/el/manage-tags.page
+++ b/help/el/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="el">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="el">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Επεξεργασία και αλλαγή ετικετών μουσικής και μεταδεδομένων.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,34 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Μεταδεδομένα μουσικής</title>
- <p>Η ψηφιακή μουσική περιέχει μεταδεδομένα που αποθηκεύουν πληροφορίες στο μουσικό αρχείο που περιλαμβάνουν τον καλλιτέχνη, το δίσκο, το έτος ηχογράφησης, το είδος και άλλα. Σχεδόν όλη η μουσική που αγοράζεται μέσω διαδικτύου θα έχει ήδη ενσωματωμένα τα μεταδεδομένα και αν εισάγετε μουσική από CDs, το <app>Banshee</app> θα συμπεριλάβει τα μεταδεδομένα κατά την αντιγραφή από το CD, αν είναι διαθέσιμα. Για περισσότερες πληροφορίες για την αντιγραφή CD και την συμπερίληψη μεταδεδομένων δε [...]
-
- <p>Δημοφιλείς μορφές μεταδεδομένων είναι οι ID3v1 και ID3v2 για αρχεία MP3 και τα σχόλια Vorbis για αρχεία OGG Vorbis.</p>
-
- <p>Αν έχετε εισαγάγει τραγούδια που δεν περιέχουν μεταδεδομένα, το <app>Banshee</app> θα εμφανίσει <gui>Άγνωστο</gui> στα περισσότερα πεδία στη βιβλιοθήκη.</p>
-
- <section id="edit-metadata">
- <title>Επεξεργασία των μεταδεδομένων σας</title>
+ <section id="metadata">
- <p>Μπορείτε να αλλάξετε και να επεξεργαστείτε τα μεταδεδομένα των τραγουδιών σας. Επιλέξτε το τραγούδι ή τα τραγούδια που θέλετε να ενημερώσετε και πατήστε το <key>E</key>, επιλέξτε <guiseq><gui style="menu">Επεξεργασία</gui><gui style="menuitem">Επεξεργασία πληροφοριών κομματιού</gui></guiseq> από το μενού ή δεξιοπατήστε στα αρχεία και επιλέξτε <gui style="menuitem">Επεξεργασία πληροφοριών κομματιού</gui>.</p>
-
- <p>Θα εμφανιστεί ένα παράθυρο διαλόγου που εμφανίζει τα μεταδεδομένα του τραγουδιού και σας επιτρέπει να τα αλλάξετε ή να τα ενημερώσετε. Τα προεπιλεγμένα πεδία που εμφανίζονται περιλαμβάνουν:</p>
-
- <list>
- <item><p><gui>Τίτλος κομματιού</gui></p></item>
- <item><p><gui>Καλλιτέχνης κομματιού</gui></p></item>
- <item><p><gui>Τίτλος δίσκου</gui></p></item>
- <item><p><gui>Είδος</gui></p></item>
- <item><p><gui>Αριθμός κομματιού</gui></p></item>
- <item><p><gui>Αριθμός δίσκου</gui></p></item>
- <item><p><gui>Έτος</gui></p></item>
- </list>
-
- <p>Ενημερώστε τις πληροφορίες τραγουδιού. Αν έχετε επιλέξει πολλά τραγούδια για επεξεργασία, πατήστε το εικονίδιο με το δεξί βέλος στα δεξιά του πεδίου <gui>Τίτλος κομματιού</gui> ή πατήστε το κουμπί <gui style="button">Μπροστά</gui> στο κάτω μέρος του διαλόγου όταν τελειώνετε με κάθε τραγούδι. Όταν έχετε επεξεργασθεί όλα τα μεταδεδομένα, πατήστε <gui style="button">Αποθήκευση</gui>.</p>
+ <title>Μεταδεδομένα μουσικής</title>
+
+ <p>Η ψηφιακή μουσική περιέχει μεταδεδομένα που αποθηκεύουν πληροφορίες στο μουσικό αρχείο που περιλαμβάνουν τον καλλιτέχνη, το δίσκο, το έτος ηχογράφησης, το είδος και άλλα. Σχεδόν όλη η μουσική που αγοράζεται μέσω διαδικτύου θα έχει ήδη ενσωματωμένα τα μεταδεδομένα και αν εισάγετε μουσική από CD, το Banshee θα συμπεριλάβει τα μεταδεδομένα κατά την εξαγωγή από το CD, αν είναι διαθέσιμα. Για περισσότερες πληροφορίες για την εξαγωγή CD και την συμπερίληψη μεταδεδομένων δείτε την <link x [...]
+
+ <p>Δημοφιλείς μορφές μεταδεδομένων είναι οι ID3v1 και ID3v2 για αρχεία MP3 και τα σχόλια Vorbis για αρχεία OGG Vorbis.</p>
+
+ <p>Αν έχετε εισαγάγει τραγούδια που δεν περιέχουν μεταδεδομένα, το <app>Banshee</app> θα εμφανίσει <gui>Άγνωστο</gui> στα περισσότερα πεδία στη βιβλιοθήκη.</p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Επεξεργασία μεταδεδομένων</title>
+
+ <p>Μπορείτε να αλλάξετε και να επεξεργασθείτε τα μεταδεδομένα των τραγουδιών σας. Επιλέξτε το τραγούδι ή τα τραγούδια που θέλετε να ενημερώσετε και πατήστε το <key>E</key>, επιλέξτε <guiseq><gui>Επεξεργασία</gui><gui>Επεξεργασία πληροφοριών κομματιού</gui></guiseq> από το μενού ή κάντε δεξί κλικ στα αρχεία και επιλέξτε <gui>Επεξεργασία πληροφοριών κομματιού</gui>.</p>
+
+ <p>Θα εμφανιστεί ένα παράθυρο διαλόγου που εμφανίζει τα μεταδεδομένα του τραγουδιού και σας επιτρέπει να τα αλλάξετε ή να τα ενημερώσετε. Τα προεπιλεγμένα πεδία που εμφανίζονται περιλαμβάνουν:</p>
+
+ <list>
+ <item><p><gui>Track Title</gui></p></item>
+ <item><p><gui>Καλλιτέχνης κομματιού</gui></p></item>
+ <item><p><gui>Τίτλος δίσκου</gui></p></item>
+ <item><p><gui>Είδος</gui></p></item>
+ <item><p><gui>Αριθμός κομματιού</gui></p></item>
+ <item><p><gui>Αριθμός δίσκου</gui></p></item>
+ <item><p><gui>Έτος</gui></p></item>
+ </list>
+
+ <p>Ενημερώστε τις πληροφορίες τραγουδιού. Αν έχετε επιλέξει πολλαπλά τραγούδια για επεξεργασία, πατήστε το εικονίδιο με το δεξί βέλος στα δεξιά του πεδίου <gui>Τίτλος κομματιού</gui> ή πατήστε το κουμπί <gui>Μπροστά</gui> στο κάτω μέρος του διαλόγου όταν τελειώνετε με κάθε τραγούδι. Όταν έχετε επεξεργασθεί όλα τα μεταδεδομένα, πατήστε <gui>Αποθήκευση</gui>.</p>
+
</section>
</page>
diff --git a/help/el/play-queue.page b/help/el/play-queue.page
index 6897669..1949d00 100644
--- a/help/el/play-queue.page
+++ b/help/el/play-queue.page
@@ -1,68 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="el">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="el">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Προσθήκη μέσων στη <gui>σειρά αναπαραγωγής</gui> σας.</desc>
+ <desc>Προσθήκη μέσων στη σειρά αναπαραγωγής σας.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Σειρά αναπαραγωγής</title>
-
- <p>Η <gui>σειρά αναπαραγωγής</gui> μπορεί να χρησιμοποιηθεί για την αναπαραγωγή κομματιών με μια διαδοχική σειρά. Μπορείτε να προσθέσετε πολλά κομμάτια στη <gui>σειρά αναπαραγωγής</gui> και να ακούσετε πολλές ώρες μουσικής χωρίς διακοπή. Μπορείτε να προσθέσετε μεμονωμένα κομμάτια ή ολόκληρους δίσκους και να τα ταξινομήσετε ή να τα επαναδιατάξετε όπως θέλετε.</p>
-
- <section id="add-queue">
- <title>Προσθήκη μουσικής στη <gui>σειρά αναπαραγωγής</gui></title>
-
- <p>Από τη μουσική σας βιβλιοθήκη, θα χρειαστεί να επιλέξετε τα κομμάτια ή τους δίσκους που θέλετε να προσθέσετε στη <gui>σειρά αναπαραγωγής</gui>.</p>
-
- <p>Για να προσθέσετε έναν ολόκληρο δίσκο στη <gui>σειρά αναπαραγωγής</gui>, χρησιμοποιήστε το ποντίκι σας για να πατήσετε και να κρατήσετε πατημένο τον δίσκο και έπειτα να τον μεταφέρετε και να τον αποθέσετε πάνω από τη <gui>σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου.</p>
-
- <p>Μπορείτε να προσθέσετε μουσικά κομμάτια στη <gui>σειρά αναπαραγωγής</gui> μεμονωμένα ή ως ομάδα. Για να προσθέσετε ένα μεμονωμένο αρχείο, σύρετε και αφήστε το πάνω στη <gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή δεξιοπατήστε στο κομμάτι και επιλέξτε <gui style="menuitem">Προσθήκη στη σειρά αναπαραγωγής</gui>.</p>
-
- <p>Για την επιλογή πολλών κομματιών, επιλέξτε κάθε κομμάτι με το ποντίκι σας, ενώ κρατάτε πατημένο το <key>Control</key>, ή επιλέξτε μια περιοχή αρχείων πατώντας το <key>Shift</key> και πατώντας δυο φορές για να επιλέξετε την περιοχή των αρχείων. Μπορείτε μετά να σύρετε και να τα αποθέσετε πάνω στη <gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή να δεξιοπατήσετε στα κομμάτια και να επιλέξτε <gui style="menuitem">Προσθήκη στη σειρά αναπαραγωγής</gui>.</p>
-
- </section>
-
- <section id="reorder-queue">
- <title>Οργάνωση της <gui>σειράς αναπαραγωγής</gui> σας</title>
-
- <p>Η <gui>σειρά αναπαραγωγής</gui> σας οργανώνεται με τη σειρά που προσθέσατε τα κομμάτια. Τα πρώτα κομμάτια ή δίσκοι που προσθέσατε θα αναπαραχθούν πρώτα. Μπορείτε να επαναδιατάξετε τη <gui>σειρά αναπαραγωγής</gui> με το ποντίκι, σύροντας και αφήνοντας ένα κομμάτι ή ομάδα κομματιών στη λίστα. Επιλέξτε τα κομμάτια που θέλετε να επαναδιατάξετε με το ποντίκι σας και αφήστε το ποντίκι σας πάνω από τον αριθμό ή τη θέση στη λίστα που θέλετε να τοποθετηθούν αυτά τα αρχεία.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Αφαίρεση κομματιών από τη <gui>σειρά αναπαραγωγής</gui></title>
-
- <p>Μπορείτε να αφαιρέσετε ένα μεμονωμένο κομμάτι, μια ομάδα κομματιών ή να εκκαθαρίσετε όλη τη <gui>σειρά αναπαραγωγής</gui>:</p>
-
- <list>
- <item>
- <p>Για να αφαιρέσετε ένα μεμονωμένο κομμάτι, επιλέξτε το κομμάτι με το ποντίκι σας και πατήστε <key>Delete</key>.</p>
- </item>
- <item>
- <p>Για να αφαιρέσετε πολλά κομμάτια, επιλέξτε κάθε κομμάτι με το ποντίκι σας, ενώ κρατάτε πατημένο το <key>Ctrl</key>. Μόλις όλα τα επιθυμητά κομμάτια έχουν επιλεγεί, πατήστε <key>Διαγραφή</key>.</p>
- <note style="tip">
- <p>Αν επιλέξατε κατά λάθος ένα κομμάτι που δεν θέλετε να αφαιρέσετε, κρατήστε πατημένο το <key>Ctrl</key> και επιλέξτε το κομμάτι πάλι με το ποντίκι σας, για να το αποεπιλέξετε.</p>
- </note>
- </item>
- <item>
- <p>Για να καθαρίσετε όλη τη <gui>σειρά αναπαραγωγής</gui> σας, πατήστε το κουμπί <gui style="button">Καθαρισμός</gui> στην πάνω δεξιά γωνία της <gui>σειράς αναπαραγωγής</gui> ή πατήστε <keyseq><key>Ctrl</key><key>Α</key></keyseq> και πατήστε <key>Διαγραφή</key>.</p>
- </item>
- </list>
-
- </section>
-
+ <title>Σειρά αναπαραγωγής</title>
+
+ <p>Η <gui>σειρά αναπαραγωγής</gui> σας επιτρέπει να προσθέσετε μουσική για να αναπαραχθεί με τη σειρά. Μπορείτε να προσθέσετε πολλά κομμάτια για να ακούσετε πολλές ώρες μουσικής χωρίς διακοπή. Μπορείτε να προσθέσετε μεμονωμένα κομμάτια ή ολόκληρους δίσκους και να τα ταξινομήσετε ή να τα επαναδιατάξετε.</p>
+
+<section id="addqueue">
+
+ <title>Προσθήκη μουσικής στη σειρά αναπαραγωγής</title>
+
+ <p>Από τη μουσική σας βιβλιοθήκη, θα χρειαστεί να επιλέξετε τα κομμάτια ή τους δίσκους που θέλετε να προσθέσετε στη σειρά αναπαραγωγής.</p>
+
+ <p>Για να προσθέσετε έναν ολόκληρο δίσκο στη σειρά αναπαραγωγής, με το ποντίκι σύρετε το δίσκο πάνω από τη <gui>σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου.</p>
+
+ <p>Μπορείτε να προσθέσετε μουσικά κομμάτια στη σειρά αναπαραγωγής μεμονωμένα ή ως ομάδα. Για να προσθέσετε ένα μεμονωμένο αρχείο, σύρετε και αφήστε το πάνω στη <gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή κάντε δεξί κλικ στο κομμάτι και επιλέξτε <gui>Προσθήκη στη σειρά αναπαραγωγής</gui>.</p>
+
+ <p>You can select multiple files by using your mouse and pressing
+ <key>Control</key> and choosing each file with your mouse or
+ select a range of files by
+ pressing <key>Shift</key> and clicking twice to select that range of files. You can then
+ drag and drop it over the <gui>Play Queue</gui>
+ in the far left window pane or right click the tracks and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+</section>
+
+<section id="reorderqueue">
+
+ <title>Οργάνωση της σειράς αναπαραγωγής σας</title>
+
+ <p>Η σειρά αναπαραγωγής σας οργανώνεται με τη σειρά που προσθέσατε τα κομμάτια. Τα πρώτα κομμάτια ή δίσκοι που προσθέσατε θα αναπαραχθούν πρώτα. Μπορείτε να επαναδιατάξετε τη σειρά αναπαραγωγής με το ποντίκι, σύροντας και αφήνοντας ένα κομμάτι ή ομάδα κομματιών στη λίστα. Επιλέξτε το κομμάτι(α) που θέλετε να επαναδιατάξετε με το ποντίκι σας και αφήστε το κουμπί του ποντικιού πάνω από τον αριθμό ή θέση της λίστας που θέλετε να τοποθετηθούν αυτά τα αρχεία.</p>
+
+</section>
+
+<section id="removequeue">
+
+ <title>Αφαίρεση κομματιών από τη σειρά αναπαραγωγής</title>
+
+ <p>Μπορείτε να αφαιρέσετε ένα μεμονωμένο κομμάτι, μια ομάδα κομματιών ή να εκκαθαρίσετε όλη τη σειρά αναπαραγωγής.</p>
+
+ <p>Για να αφαιρέσετε ένα μεμονωμένο κομμάτι ή ομάδα κομματιών, επιλέξτε το κομμάτι με το ποντίκι σας και πατήστε <key>Delete</key>.</p>
+
+ <p>Για να εκκαθαρίσετε όλη τη σειρά αναπαραγωγής σας, πατήστε το κουμπί <gui>Εκκαθάριση</gui> στην πάνω δεξιά γωνία της σειράς αναπαραγωγής.</p>
+
+</section>
+
</page>
diff --git a/help/el/play.page b/help/el/play.page
index 87ff728..a370dcf 100644
--- a/help/el/play.page
+++ b/help/el/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Αναπαράγετε τα βίντεο και τα αρχεία σας μουσικής.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,79 +18,53 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Αναπαραγωγή των πολυμέσων σας</title>
- <section id="play-music">
- <title>Αναπαραγωγή της μουσικής σας</title>
-
- <p>Για αναπαραγωγή μουσικής στο <app>Banshee</app>, επιλέξτε την πηγή μουσική. Η βιβλιοθήκη μουσικής θα σας εμφανίσει όλους τους καλλιτέχνες στη μουσική βιβλιοθήκη, το εξώφυλλο για κάθε δίσκο και μια λίστα όλων των τραγουδιών στη βιβλιοθήκη σας.</p>
-
- <p>Επιλέξτε τον δίσκο ή το τραγούδι που θέλετε να αναπαραχθεί από τη λίστα καλλιτεχνών, δίσκων ή χρησιμοποιήστε τη γραμμή αναζήτησης στην πάνω δεξιά γωνία του <app>Banshee</app>.</p>
-
- <p>Για να αρχίσετε την αναπαραγωγή ενός τραγουδιού, διπλοπατήστε στο όνομα του τραγουδιού, πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Εκτέλεση</gui></guiseq> από το μενού του <app>Banshee</app>.</p>
-
- <p>Μπορείτε να ξεκινήσετε την αναπαραγωγή ενός δίσκου επιλέγοντας το δίσκο στην περιήγηση δίσκων με διπλό κλικ στο όνομα του τραγουδιού, πατώντας το <key>πλήκτρο διαστήματος</key> ή επιλέγοντας <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Εκτέλεση</gui></guiseq> από το μενού του <app>Banshee</app>.</p>
-
- <p>Για να αναπαραχθούν όλα τα τραγούδια ενός καλλιτέχνη, επιλέξτε τον καλλιτέχνη από την περιήγηση και πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Εκτέλεση</gui></guiseq> από το μενού του <app>Banshee</app>.</p>
-
- <p>Το <app>Banshee</app> επίσης εμφανίζει τους αγαπημένους σας δίσκους (αυτούς που ακούτε περισσότερο), τα πρόσφατα αγαπημένα, τις πρόσφατες προσθήκες και πρώτες παρουσιάσεις μουσικής. Επιλέξτε αυτό που επιθυμείτε να ακούσετε και μπορείτε να αναπαράγετε τραγούδια από το καθένα.</p>
-
- <p>Το <app>Banshee</app> μπορεί να χρησιμοποιηθεί για αναπαραγωγή μουσικής με τυχαία σειρά χρησιμοποιώντας την κατάσταση <gui style="menuitem">τυχαίας σειράς</gui>. Ενεργοποιήστε την κατάσταση στο <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Τυχαία σειρά</gui></guiseq>, ακολουθούμενη από την επιλογή τύπου τυχαίας σειράς.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">Κατά τραγούδι</gui></title>
- <p>Αναπαραγωγή κομματιών με τυχαία σειρά.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Κατά καλλιτέχνη</gui></title>
- <p>Αναπαραγωγή κομματιών από διαφορετικούς καλλιτέχνες κάθε φορά.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Κατά δίσκο</gui></title>
- <p>Αναπαραγωγή κομματιών από διαφορετικούς δίσκους κάθε φορά.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Κατά κατάταξη</gui></title>
- <p>Αναπαραγωγή κομματιών με υψηλότερη κατάταξη πιο συχνά από αβαθμολόγητα.</p>
- <note style="info">
- <p>Αν δεν υπάρχουν βαθμολογημένα κομμάτια, τα κομμάτια αναπαράγονται με τυχαία σειρά.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">Κατά βαθμολογία</gui></title>
- <p>Κομμάτια που παίζετε συχνά βαθμολογούνται υψηλότερα και παίζονται πιο συχνά.</p>
- </item>
- </terms>
-
+ <section id="playmusic">
+ <title>Αναπαραγωγή της μουσικής σας</title>
+
+ <p>Για αναπαραγωγή μουσικής στο Banshee, επιλέξτε την πηγή μουσική. Η βιβλιοθήκη μουσικής θα σας εμφανίσει όλους τους καλλιτέχνες στη βιβλιοθήκη, το εξώφυλλο για κάθε δίσκο και μια λίστα όλων των τραγουδιών στη βιβλιοθήκη σας.</p>
+
+ <p>Επιλέξτε το δίσκο ή το τραγούδι που θέλετε να αναπαραχθεί από τη λίστα καλλιτεχνών, δίσκων ή χρησιμοποιήστε τη γραμμή αναζήτησης στην πάνω δεξιά γωνία του Banshee.</p>
+
+ <p>Για να αρχίσετε την αναπαραγωγή ενός τραγουδιού, κάντε διπλό κλικ με το ποντίκι σας στο όνομα του τραγουδιού, πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee.</p>
+
+ <p>Μπορείτε να ξεκινήσετε την αναπαραγωγή ενός δίσκου επιλέγοντας το δίσκο στην περιήγηση δίσκων με διπλό κλικ στο όνομα του τραγουδιού, πατώντας το <key>πλήκτρο διαστήματος</key> ή επιλέγοντας <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee.</p>
+
+ <p>Για να αναπαραχθούν όλα τα τραγούδια ενός καλλιτέχνη, επιλέξτε τον καλλιτέχνη από την περιήγηση και πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee.</p>
+
+ <p>Το Banshee επίσης εμφανίζει τους αγαπημένους σας δίσκους (αυτούς που ακούτε περισσότερο), τα πρόσφατα αγαπημένα, τις πρόσφατες προσθήκες και αυτά που δεν έχουν αναπαραχθεί ποτέ. Επιλέξτε αυτό που επιθυμείτε να ακούσετε και μπορείτε να αναπαράγετε τραγούδια από το καθένα.</p>
+
</section>
- <section id="play-video">
- <title>Αναπαραγωγή βίντεο</title>
-
- <p>Τα εισαγόμενα βίντεο εμφανίζονται αλφαβητικά. Για την αναπαραγωγή ενός βίντεο, επιλέξτε το βίντεο που θέλετε να αναπαραχθεί από τη λίστα και πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Εκτέλεση</gui></guiseq> από το μενού του <app>Banshee</app>.</p>
-
- <p>Το <app>Banshee</app> εμφανίζει επίσης τα αγαπημένα σας βίντεο (αυτά που παρακολουθείτε περισσότερο) και αυτά που δεν έχουν προβληθεί. Επιλέξτε ένα και μπορείτε να το αναπαράγετε από τη λίστα.</p>
-
+ <section id="playvideo">
+ <title>Αναπαραγωγή βίντεο</title>
+
+ <p>Τα εισαγόμενα βίντεο εμφανίζονται αλφαβητικά. Για την αναπαραγωγή ενός βίντεο, επιλέξτε το βίντεο που θέλετε να αναπαραχθεί από τη λίστα και πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee.</p>
+
+ <p>Το Banshee εμφανίζει επίσης τα αγαπημένα σας βίντεο (αυτά που παρακολουθείτε περισσότερο) και αυτά που δεν έχουν προβληθεί. Επιλέξτε ένα και μπορείτε να το αναπαράγετε από τη λίστα.</p>
+
</section>
-
- <section id="play-podcast">
- <title>Αναπαραγωγή φορητής εκπομπής</title>
-
- <p>Οι φορητές εκπομπές (Podcasts) εμφανίζουν όλες τις φορητές εκπομπές στις οποίες είστε συνδρομητής, όλες τις διαθέσιμες φορητές εκπομπές και η περιήγηση στις φορητές εκπομπές εμφανίζει όλες τις διαθέσιμες φορητές εκπομπές με πρώτες τις πιο πρόσφατες.</p>
-
- <p>Για την αναπαραγωγή μιας φορητής εκπομπής, επιλέξτε τη φορητή εκπομπή, που θέλετε να αναπαραχθεί, από τη λίστα και πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Εκτέλεση</gui></guiseq> από το μενού του <app>Banshee</app>.</p>
-
+
+ <section id="playpodcast">
+ <title>Αναπαραγωγή φορητής εκπομπής</title>
+
+ <p>Podcasts shows you all Podcasts you're subscribed to, all Podcast
+ shows available, and the Podcast browser lists all Podcasts in order of
+ newest first.</p>
+
+ <p>Για την αναπαραγωγή μιας φορητής εκπομπής, επιλέξτε τη φορητή εκπομπή, που θέλετε να αναπαραχθεί, από τη λίστα και πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee.</p>
+
</section>
-
- <section id="play-radio">
- <title>Αναπαραγωγή διαδικτυακού ραδιοφωνικού σταθμού</title>
-
- <p>Η πηγή ραδιόφωνο σας δείχνει αλφαβητικά όλους τους διαδικτυακούς ραδιοφωνικούς σταθμούς που έχετε προσθέσει στο <app>Banshee</app>.</p>
-
- <p>Για την αναπαραγωγή ενός διαδικτυακού ραδιοφωνικού σταθμού, επιλέξτε τον σταθμό που θέλετε από τη λίστα και πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Εκτέλεση</gui></guiseq> από το μενού του <app>Banshee</app>.</p>
-
- </section>
-
+
+ <section id="playradio">
+ <title>Αναπαραγωγή διαδικτυακού ραδιοφωνικού σταθμού</title>
+
+ <p>Η πηγή ραδιόφωνο σας δείχνει αλφαβητικά όλους τους διαδικτυακούς ραδιοφωνικούς σταθμούς που έχετε προσθέσει στο Banshee.</p>
+
+ <p>Για την αναπαραγωγή ενός διαδικτυακού ραδιοφωνικού σταθμού, επιλέξτε το σταθμό, που επιθυμείτε, από τη λίστα και πατήστε το <key>πλήκτρο διαστήματος</key> ή επιλέξτε <guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee.</p>
+
+ </section>
+
</page>
diff --git a/help/el/podcast.page b/help/el/podcast.page
deleted file mode 100644
index 01a7654..0000000
--- a/help/el/podcast.page
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="el">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Προσθήκη, αφαίρεση και αναπαραγωγή φορητών εκπομπών στο <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Φορητές εκπομπές</title>
-
- <section id="podcast-description">
- <title>Τι είναι φορητή εκπομπή (Podcast);</title>
-
- <p>Οι φορητές εκπομπές είναι ηχογραφημένα προγράμματα, παρόμοια με τα ραδιοφωνικά, που είναι διαθέσιμα στο διαδίκτυο και σας επιτρέπουν να γίνετε συνδρομητής. Όταν γίνετε συνδρομητής σε μια φορητή εκπομπή στο <app>Banshee</app>, κάθε φορά που παράγεται ένα καινούριο πρόγραμμα, το <app>Banshee</app> θα μεταφορτώσει αυτόματα την εκπομπή στη βιβλιοθήκη σας.</p>
-
- <p>Υπάρχουν φορητές εκπομπές για σχεδόν κάθε θέμα, περιλαμβανομένων μουσικής, ταινιών, Λίνουξ και άλλων. Αναζητήστε στο διαδίκτυο με χρήση της αγαπημένης σας μηχανής αναζήτησης έναν όρο αναζήτησης όπως "Linux podcast" και θα εμφανιστούν πολλές επιλογές για να διαλέξετε.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Προσθήκη φορητής εκπομπής (podcast)</title>
-
- <p>Για να προσθέσετε μια φορητή εκπομπή στο <app>Banshee</app>, θα χρειαστεί πρώτα να επισκεφτείτε την ιστοσελίδα της φορητής εκπομπής. Σχεδόν όλες οι φορητές εκπομπές θα έχουν ένα κουμπί ή σύνδεσμο για να εγγραφείτε στη φορητή εκπομπή. Αντιγράψτε το δεσμό στη συνδρομή σας της φορητής εκπομπής. Στους περισσότερους περιηγητές ιστού, μπορείτε να δεξιοπατήσετε στο δεσμό και να επιλέξετε <gui style="menuitem">Αντιγραφή δεσμού</gui>.</p>
-
- <p>Στο <app>Banshee</app>, πατήστε <gui style="menuitem">Φορητή εκπομπή</gui> στο μενού στα αριστερά του παραθύρου. Έπειτα, πατήστε <gui style="menuitem">εγγραφή στις φορητές εκπομπές</gui> στο δεξιό μισό της εργαλειοθήκης, από το μενού επιλέξτε <guiseq><gui style="menu">Πολυμέσα</gui><gui style="menuitem"> Συνδρομή στη φορητή εκπομπή</gui></guiseq> ή χρησιμοποιήστε τη συντόμευση πληκτρολογίου <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>Από προεπιλογή, οι φορητές εκπομπές δεν μεταφορτώνονται, έτσι θα μπορείτε μόνο να τις ακούσετε, ενώ είσαστε συνδεμένοι στο διαδίκτυο. Όταν γράφεστε σε μια νέα φορητή εκπομπή, θα μπορείτε να διαλέξετε τις παρακάτω επιλογές:</p>
-
- <list>
- <item>
- <p>Επιλέξτε <gui style="checkbox">Μεταφόρτωση νέων επεισοδίων</gui> για αυτόματη μεταφόρτωση οποιωνδήποτε νέων επεισοδίων στον υπολογιστή σας, έτσι ώστε να μπορείτε να τα προσπελάσετε, όταν δεν έχετε διαδικτυακή σύνδεση.</p>
- </item>
- <item>
- <p>Επιλέξτε <gui style="menuitem">Αρχειοθέτηση όλων των επεισοδίων εκτός από το πιο νέο</gui> για να εμφανίζεται μόνο το πιο νέο επεισόδιο.</p>
- </item>
- </list>
-
- <p>Μετά την προσθήκη μιας τροφοδοσίας φορητής εκπομπής, το <app>Banshee</app> θα εμφανίσει το όνομα της φορητής εκπομπής, τον τίτλο κάθε επεισοδίου και την ημερομηνία δημοσίευσης.</p>
-
- <p>Μόλις μια φορητή εκπομπή αρχειοθετηθεί, θα αφαιρεθεί από τη λίστα <gui>Νέα στοιχεία</gui>, αλλά θα εμφανίζεται ακόμα στη λίστα <gui>Όλα τα στοιχεία</gui>.</p>
-
- <note style="tip">
- <p>Μπορείτε να επεξεργαστείτε τις επιλογές εγγραφής στο <gui style="menuitem">Ιδιότητες φορητής εκπομπής</gui>, που μπορεί να προσπελαστεί δεξιοπατώντας στο αντίστοιχο όνομα φορητής εκπομπής στη λίστα φορητών εκπομπών ή δεξιοπατώντας σε οποιοδήποτε επεισόδιο αυτής της εκπομπής.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Αναπαραγωγή φορητής εκπομπής</title>
-
- <p>Για <link xref="play">αναπαραγωγή</link> ενός επεισοδίου φορητής εκπομπής, διπλοπατήστε στο επεισόδιο ή επιλέξτε το, έπειτα επιλέξτε <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Εκτέλεση</gui></guiseq>. Μπορείτε επίσης να προσθέσετε το επεισόδιο στην <gui xref="play-queue">σειρά αναπαραγωγής</gui> δεξιοπατώντας στο επεισόδιο και επιλέγοντας <gui style="menuitem">Προσθήκη στη σειρά αναπαραγωγής</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Αφαίρεση φορητής εκπομπής (Podcast)</title>
-
- <p>Για την αφαίρεση φορητής εκπομπής, δεξιοπατήστε στην εκπομπή στη λίστα φορητών εκπομπών και επιλέξτε <gui style="menuitem">Απεγγραφή και διαγραφή</gui>. Αυτό θα σας απεγγράψει από τη λήψη ενημερώσεων φορητής εκπομπής και θα διαγράψει όλα τα επεισόδια της εκπομπής από τη βιβλιοθήκη σας.</p>
-
- </section>
-
-</page>
diff --git a/help/el/radio.page b/help/el/radio.page
deleted file mode 100644
index fabec00..0000000
--- a/help/el/radio.page
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="el">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Προσθήκη, αφαίρεση και αναπαραγωγή σταθμών διαδικτυακού ραδιοφώνου στο <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Διαδικτυακό ραδιόφωνο</title>
-
- <section id="radio-description">
- <title>Τι είναι το διαδικτυακό ραδιόφωνο;</title>
-
- <p>Οι διαδικτυακοί ραδιοφωνικοί σταθμοί είναι παρόμοιοι με τους κανονικούς, επιτρέποντας σε ένα άτομο ή οργανισμό να μεταδώσει ζωντανά μουσική μέσω του διαδικτύου. Οι διαδικτυακοί ραδιοφωνικοί σταθμοί μπορεί να είναι μια ταυτόχρονη ροή ενός κανονικού ραδιοφωνικού σταθμού, ενός ερασιτέχνη που μεταδίδει το δικό του σταθμό ή εμπορικών διαδικτυακών σταθμών που περιλαμβάνουν, ζωντανό πρόγραμμα και ακόμα διαφημίσεις.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Προσθήκη ραδιοφωνικού σταθμού</title>
-
- <p>Αναζήτηση για διαδικτυακούς ραδιοφωνικούς σταθμούς χρησιμοποιώντας την αγαπημένη σας μηχανή αναζήτησης. Μπορείτε να ορίσετε είδη, συχνότητες καναλιών, ονόματα σταθμών και άλλες λεπτομέρειες για τον περιορισμό της αναζήτησής σας. Πολλοί ραδιοφωνικοί σταθμοί εμφανίζουν ή ένα κουμπί ή ένα σύνδεσμο για ακρόαση της ροής τους. Στους περισσότερους περιηγητές ιστού, μπορείτε να δεξιοπατήσετε στον σύνδεσμο και να επιλέξετε <gui style="menuitem">Αντιγραφή συνδέσμου</gui>.</p>
-
- <steps>
- <title>Προσθήκη σταθμού διαδικτυακού ραδιοφώνου στο <app>Banshee</app>:</title>
- <item>
- <p>Επιλέξτε <gui>Ραδιόφωνο</gui> στο μενού στα αριστερά του παραθύρου σας, έπειτα πατήστε στο <gui style="menuitem">Προσθήκη σταθμού</gui> στην πάνω δεξιά γωνία του <app>Banshee</app>. Ή μπορείτε να επιλέξετε από το μενού, επιλέξτε <guiseq><gui style="menu">Μενού</gui><gui style="menuitem">Προσθήκη σταθμού</gui></guiseq>.</p>
- </item>
- <item>
- <p>Θα χρειαστείτε να εισάγετε κάποιες λεπτομέρειες για τον ραδιοφωνικό σταθμό που θέλετε να προσθέσετε. Τα πρώτα τρία πεδία είναι υποχρεωτικά:</p>
- <list>
- <item>
- <p>Στο πλαίσιο κειμένου <gui style="menuitem">Είδος σταθμού</gui>, περιγράψτε τον τύπο μουσικής που ο διαδικτυακός ραδιοφωνικός σταθμός παίζει δημιουργώντας μια κατάλληλη ετικέτα, ή επιλέξτε μια ετικέτα από τις διαθέσιμες πτυσσόμενες επιλογές.</p>
- </item>
- <item>
- <p>Στο πλαίσιο κειμένου <gui style="input">Όνομα σταθμού</gui>, εισάγετε ένα όνομα για τον ραδιοφωνικό σταθμό.</p>
- </item>
- <item>
- <p>Στο πεδίο <gui style="input">URL ροής</gui>, εισάγετε ή επικολλήστε το URL της ροής δεξιοπατώντας και επιλέγοντας <gui style="menuitem">Επικόλληση</gui> ή πατώντας <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>Μπορείτε επίσης να συμπληρώσετε τα πεδία για <gui style="input">Δημιουργό σταθμού</gui>, <gui style="input">Περιγραφή</gui> και <gui style="input">Βαθμολογία</gui>.</p>
- </item>
- <item>
- <p>Τελικά, πατήστε <gui style="button">Αποθήκευση</gui> για να αποθηκεύσετε τον διαδικτυακό σταθμό στο <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Αναπαραγωγή ραδιοφωνικού σταθμού</title>
-
- <p>Για <link xref="play">αναπαραγωγή</link> ραδιοφωνικού σταθμού, διπλοπατήστε τον ραδιοφωνικό σταθμό. Εναλλακτικά, δεξιοπατήστε στον σταθμό και επιλέξτε <gui style="menuitem">αναπαραγωγή</gui> ή επιλέξτε τον ραδιοφωνικό σταθμό και διαλέξτε <guiseq><gui style="menu">Αναπαραγωγή</gui><gui style="menuitem">Εκτέλεση</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>Για την προσθήκη ενός ραδιοφωνικού σταθμού στη <gui style="menuitem" xref="play-queue">Σειρά αναπαραγωγής</gui>, μπορείτε να δεξιοπατήσετε στον σταθμό και να επιλέξετε <gui style="menuitem">Προσθήκη στη σειρά αναπαραγωγής</gui>. Αυτό θα παίξει τον ραδιοφωνικό σταθμό, όταν η αναμονή έχει τελειώσει την αναπαραγωγή όλων των μέσων που είναι πριν στον σταθμό στην <gui>Σειρά αναπαραγωγής</gui>.</p>
-
- <p>Μπορείτε επίσης να δεξιοπατήσετε στον σταθμό και να επιλέξετε <gui style="menuitem">Αναπαραγωγή μετά το τρέχον κομμάτι</gui> για να προσθέσετε τον ραδιοφωνικό σταθμό στην αναμονή μετά το κομμάτι που παίζει προς το παρόν.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Αναπαραγωγή μετά το τρέχον κομμάτι</gui> ίσως να μη δουλέψει σε μερικές εγκαταστάσεις του <app>Banshee</app>.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Αφαίρεση ραδιοφωνικού σταθμού</title>
-
- <p>Για την αφαίρεση ραδιοφωνικού σταθμού από το <app>Banshee</app>, μπορείτε να δεξιοπατήσετε στον ραδιοφωνικό σταθμό και να επιλέξετε <gui style="menuitem">Αφαίρεση</gui>, ή εναλλακτικά, μπορείτε να επιλέξετε τον σταθμό με το ποντίκι σας και να πατήσετε <key>Διαγραφή</key>. Όταν σας ζητηθεί επιβεβαίωση, πατήστε το κουμπί <gui style="button">Αφαίρεση</gui> για να απομακρυνθεί ο ραδιοφωνικός σταθμός.</p>
-
- </section>
-
-</page>
diff --git a/help/el/rb-import.page b/help/el/rb-import.page
new file mode 100644
index 0000000..61bf005
--- /dev/null
+++ b/help/el/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="el">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Εισάγετε μουσική και κατηγοριοποιήσεις από το <app>Rhythmbox</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Εισάγετε τη βιβλιοθήκη σας του <app>Rhythmbox</app></title>
+
+</page>
diff --git a/help/el/search.page b/help/el/search.page
index 7df5dc3..0d68ff5 100644
--- a/help/el/search.page
+++ b/help/el/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,76 +19,81 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Αναζήτηση στη βιβλιοθήκη σας του <app>Banshee</app></title>
-
- <p>Το <app>Banshee</app> έχει μια ισχυρή γλώσσα αναζήτησης. Μπορείτε να ψάξετε εύκολα και γρήγορα στη βιβλιοθήκη σας με βασικούς όρους αναζήτησης ή να κάνετε λεπτομερείς αναζητήσεις με την προχωρημένη ορολογία αναζήτησης του <app>Banshee</app>.</p>
-
- <p>Για να εκτελέσετε μια αναζήτηση μέσων στο <app>Banshee</app>, πατήστε το <key>S</key> ή πατήστε το πλαίσιο <gui>Αναζήτηση</gui> στην πάνω δεξιά γωνία της προβολής βιβλιοθήκης στο <app>Banshee</app>.</p>
-
- <p>Ένα ερώτημα αναζήτησης αποτελείται από μερικούς βασικούς όρους, παραδείγματος χάριν, <em>dave matthews</em>. Εισάγοντας <em>dave matthews</em> στο πεδίο αναζήτησης, το <app>Banshee</app> θα ψάξει σε όλα τα πεδία μεταδεδομένων, περιλαμβανομένων των τίτλου κομματιού, τίτλου δίσκου, καλλιτέχνη δίσκου, έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα μεταδεδομένα περιλαμβάνουν το <em>dave</em> και το <em>matthews</em> θα επιστραφεί. Οι όροι αναζήτησης δεν ξεχωρίζουν πεζά-κεφαλαία, δηλαδή δ [...]
-
- <section id="operators">
- <title>Βασικοί τελεστές</title>
-
- <p>Οι τελεστές μπορεί να τοποθετηθούν μεταξύ οποιωνδήποτε δύο αναζητούμενων λέξεων ή πριν από μια αναζητούμενη λέξη. Η προεπιλεγμένη λειτουργία είναι <gui>ΚΑΙ</gui> και χρησιμοποιείται όταν δεν έχουν ορισθεί άλλοι τελεστές μεταξύ δύο όρων της αναζήτησης. Επειδή είναι η προεπιλογή, δεν εμφανίζεται ρητά ο τελεστής ΚΑΙ.</p>
-
+ <title>Αναζήτηση στη βιβλιοθήκη σας του Banshee</title>
+
+ <p>Το Banshee έχει μια ισχυρή γλώσσα αναζήτησης. Μπορείτε να ψάξετε εύκολα και γρήγορα στη βιβλιοθήκη σας με βασικούς όρους αναζήτησης ή να κάνετε λεπτομερείς αναζητήσεις με την προχωρημένη ορολογία αναζήτησης του Banshee.</p>
+
+ <p>Για να εκτελέσετε μια αναζήτηση στη βιβλιοθήκη των μέσων σας στο Banshee, πατήστε το <key>S</key> ή κάντε κλικ στο πεδίο <gui>Αναζήτηση</gui> στην πάνω δεξιά γωνία της προβολής βιβλιοθήκης στο Banshee.</p>
+
+ <p>A search query consists of some basic terms, for example,
+ <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
+ Banshee will search all metadata fields including Track Title, Album Title,
+ Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
+ and <em>matthews</em> will be returned. Search terms are case insensitive, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ all mean the same thing when searching.</p>
+
+<section id="operators">
+ <title>Βασικοί τελεστές</title>
+ <p>Οι τελεστές μπορεί να τοποθετηθούν μεταξύ οποιωνδήποτε δύο αναζητούμενων λέξεων ή πριν από μια αναζητούμενη λέξη. Η προεπιλεγμένη λειτουργία είναι <gui/> και χρησιμοποιείται όταν δεν έχουν ορισθεί άλλοι τελεστές μεταξύ δύο όρων της αναζήτησης. Επειδή είναι η προεπιλογή, δεν εμφανίζεται το AND ως τελεστής.</p>
+
<p>Άλλοι βασικοί τελεστές περιλαμβάνουν το <gui>OR</gui> και το <gui>NOT</gui>. Μαζί, αυτοί οι τρεις τελεστές μπορούν να συνθέσουν πολύ ισχυρά ερωτήματα για να σας βοηθήσουν στην αναζήτηση των μέσων σας.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Λογικοί τελεστές και παραδείγματα</title>
-
+<section id="logical">
+ <title>Λογικοί τελεστές και παραδείγματα</title>
<p>Η ακόλουθη είναι μια λίστα λογικών τελεστών και παραδειγμάτων των αποτελεσμάτων κατά την αναζήτηση με χρήση τους.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Τελεστής</gui></p></td>
- <td><p><gui>Περιγραφή</gui></p></td>
+ <td><p><gui>Τελεστής</gui></p></td> <td><p><gui>Περιγραφή</gui></p></td>
</tr>
<tr>
- <td><p><em>προεπιλογή</em>, <em>κενό διάστημα</em></p></td>
- <td><p>Αναζήτηση για δύο όρους με ένα διάστημα μεταξύ των δύο λέξεων ή όρων.</p></td>
+ <td><p><em>προεπιλογή</em>, <em>κενό διάστημα</em></p></td> <td><p>Αναζήτηση για δύο όρους με ένα διάστημα μεταξύ των δύο λέξεων ή όρων.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Τα αποτελέσματα θα είναι δύο τραγούδια με οποιοδήποτε από τα δύο αποτελέσματα σε οποιοδήποτε πεδίο.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Τα αποτελέσματα θα είναι δύο τραγούδια με οποιοδήποτε από τα δύο αποτελέσματα σε οποιοδήποτε πεδίο.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Να μην εμφανισθούν αποτελέσματα αναζήτησης με οποιοδήποτε όρο αναζήτησης που ακολουθεί τον τελεστή NOT, not,<key>-</key>.</p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>Να μην εμφανισθούν αποτελέσματα με οποιοδήποτε όρο που ακολουθεί μετά τον τελεστή NOT, not,<key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Παραδείγματα λογικών αναζητήσεων περιλαμβάνουν:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Ερώτημα</gui></p></td>
- <td><p><gui>Περιγραφή</gui></p></td>
+ <td><p><gui>Ερώτημα</gui></p></td> <td><p><gui>Περιγραφή</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Ταιριάζει με οποιαδήποτε πεδία σε ένα κομμάτι περιέχουν και το <em>dave</em> και το <em>matthews</em>.</p></td>
+ <td><p>dave matthews</p></td> <td><p>Ταιριάζει με οποιαδήποτε πεδία σε ένα κομμάτι περιέχουν και το <em>dave</em> και το <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού που περιλαμβάνουν το <em>dave</em> ή το <em>matthews</em>.</p></td>
+ <td><p>dave, matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
+ <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού που περιλαμβάνουν το <em>dave</em> ή το <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave or matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
+ <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού που περιλαμβάνουν το <em>dave</em> ή το <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave | matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
+ <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Εμφανίζει όλα τα κομμάτια των οποίων τα πεδία δεν περιέχουν <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>
+ Displays all tracks whose fields do not contain <em>dave
+ matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Για περισσότερες πληροφορίες για την εκτέλεση πιο σύνθετων ερωτημάτων αναζήτησης, δείτε τη σελίδα <link xref="adv-search"/>.</p>
+
</section>
-
+
</page>
diff --git a/help/el/sort.page b/help/el/sort.page
index ca74e82..16f71d4 100644
--- a/help/el/sort.page
+++ b/help/el/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,19 +23,17 @@
<section id="addcolumn">
- <title>Προσθήκη στηλών</title>
-
+ <title>Προσθήκη στηλών</title>
+
<p>Καθώς η βιβλιοθήκη σας μεγαλώνει, μπορεί να θέλετε να αλλάξετε την προβολή της για να προσθέσετε επιπλέον πληροφορίες για τα τραγούδια σας ή να αλλάξετε τον τρόπο προβολής και ταξινόμησης για τα τραγούδια, καλλιτέχνες ή δίσκους σας.</p>
-
- <p>Μπορείτε να προσθέσετε περισσότερες στήλες στην προβολή βιβλιοθήκης στο <app>Banshee</app> για να έχετε περισσότερες πληροφορίες για τα τραγούδια και επίσης να μπορείτε να τα ταξινομήσετε. Ως προεπιλογή, το <app>Banshee</app> εμφανίζει για τα τραγούδια στήλες που περιλαμβάνουν <gui>Όνομα</gui>, <gui>Καλλιτέχνη</gui>, <gui>Δίσκο</gui> και <gui>Διάρκεια</gui>. Για να προσθέσετε επιπλέον στήλες, δεξιοπατήστε σε οποιαδήποτε από τις στήλες και το <app>Banshee</app> θα εμφανίσει όλες τις [...]
-
+
+ <p>Μπορείτε να προσθέσετε περισσότερες στήλες στην προβολή βιβλιοθήκης στο <app>Banshee</app> για να έχετε περισσότερες πληροφορίες για τα τραγούδια και επίσης να μπορείτε να τα ταξινομήσετε. Ως προεπιλογή, το Banshee εμφανίζει για τα τραγούδια στήλες που περιλαμβάνουν <gui>Όνομα</gui>, <gui>Καλλιτέχνη</gui>, <gui>Δίσκο</gui> και <gui>Διάρκεια</gui>. Για να προσθέσετε επιπλέον στήλες, κάντε δεξί κλικ με το ποντίκι σας σε οποιαδήποτε από τις στήλες και το Banshee θα εμφανίσει όλες τις δ [...]
+
</section>
-
+
<section id="sorting">
<title>Ταξινόμηση στηλών</title>
-
- <p>Μπορείτε να ταξινομήσετε τη βιβλιοθήκη σας δεξιοπατώντας σε οποιαδήποτε στήλη εμφανίζεται στην προβολή βιβλιοθήκης. Αν θέλετε να ταξινομήσετε τη μουσική σας βιβλιοθήκη κατά καλλιτέχνη, πατήστε στην επικεφαλίδα της στήλης <gui>Καλλιτέχνης</gui> και το <app>Banshee</app> αυτόματα θα την ταξινομήσει αλφαβητικά. Πατώντας τη στήλη <gui>Καλλιτέχνης</gui> ξανά, θα την ταξινομήσει με αντίστροφη αλφαβητική σειρά.</p>
-
+ <p>Μπορείτε να ταξινομήσετε τη βιβλιοθήκη σας κάνοντας κλικ με το ποντίκι σε οποιαδήποτε στήλη εμφανίζεται στην προβολή βιβλιοθήκης. Αν επιθυμείτε να ταξινομήσετε τη μουσική σας βιβλιοθήκη κατά καλλιτέχνη, κάντε κλικ στην επικεφαλίδα της στήλης <gui>Καλλιτέχνης</gui> και το Banshee αυτόματα θα την ταξινομήσει αλφαβητικά. Κάνοντας πάλι κλικ στη στήλη <gui>Καλλιτέχνης</gui> το Banshee θα την ταξινομήσει με αντίστροφη αλφαβητική σειρά.</p>
</section>
-
+
</page>
diff --git a/help/el/sync.page b/help/el/sync.page
index 16e910c..aee3011 100644
--- a/help/el/sync.page
+++ b/help/el/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Συγχρονίστε τα πολυμέσα σας με μια φορητή συσκευή αναπαραγωγής ή ένα έξυπνο κινητό.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,79 +19,80 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Συγχρονισμός</title>
-
- <p>Το <app>Banshee</app> υποστηρίζει το συγχρονισμό της μουσικής σας με φορητούς αναπαραγωγείς μέσων και έξυπνα κινητά. Μπορείτε να προσθέσετε συγκεκριμένα μουσικά κομμάτια, δίσκους ή λίστες αναπαραγωγής ή να επιτρέψετε στο <app>Banshee</app> να συγχρονίσει τη συσκευή σας με ολόκληρη τη βιβλιοθήκη σας. Αφού η συσκευή σας συνδεθεί στον υπολογιστή σας μπορείτε επίσης να αναπαράγετε τα τραγούδια που είναι σε αυτή μέσω του <app>Banshee</app>. Όταν συγχρονίζετε μουσική σε μη απωλεστική μορφ [...]
-
+ <title>Συγχρονισμός</title>
+
+ <p>Το Banshee υποστηρίζει το συγχρονισμό της μουσικής σας με φορητούς αναπαραγωγείς και κινητά. Μπορείτε να προσθέσετε συγκεκριμένα μουσικά κομμάτια, δίσκους ή λίστες αναπαραγωγής ή να επιτρέψετε στο Banshee να συγχρονίσει τη συσκευή σας με ολόκληρη τη βιβλιοθήκη σας. Αφού η συσκευή σας συνδεθεί στον υπολογιστή σας μπορείτε επίσης να αναπαράγετε τα τραγούδια που είναι σε αυτή μέσω του Banshee. Όταν συγχρονίζετε μουσική σε μη απωλεστική μορφή, όπως το FLAC, το Banshee αυτόματα θα μετατρ [...]
+
<section id="devices">
<title>Υποστήριξη συσκευών</title>
-
- <p>Το <app>Banshee</app> υποστηρίζει σχεδόν όλες τις σύγχρονες φορητές συσκευές αναπαραγωγής και τα έξυπνα κινητά με την αξιοσημείωτη εξαίρεση των iPhone, iPad και iPod Touch της Apple.</p>
-
- <p>Όταν συνδέσετε τη συσκευή σας, το <app>Banshee</app> θα την εμφανίσει στο αριστερό μενού. Πατώντας το εικονίδιο της συσκευής θα μεταφερθείτε στην αρχική της σελίδα στο <app>Banshee</app> όπου εμφανίζονται οι προτιμήσεις σας συγχρονισμού.</p>
-
+ <p>Το Banshee υποστηρίζει σχεδόν όλες τις σύγχρονες φορητές συσκευές αναπαραγωγής και τα «έξυπνα» κινητά με την αξιοσημείωτη εξαίρεση των iPhone, iPad και iPod Touch της Apple.</p>
+
+ <p>Όταν συνδέσετε τη συσκευή σας, το Banshee θα την εμφανίσει στο αριστερό μενού. Πατώντας το εικονίδιο της συσκευής θα μεταφερθείτε στην αρχική της σελίδα στο Banshee όπου εμφανίζονται οι προτιμήσεις σας συγχρονισμού.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Συγχρονισμός της μουσικής σας</title>
-
- <p>Μπορείτε να επιλέξετε να διαχειρίζεστε τα πολυμέσα στη φορητή σας συσκευή βάζοντας το <app>Banshee</app> να κάνει αυτόματο συγχρονισμό ή να διαχειρίζεστε τη μουσική και τα πολυμέσα σας χειροκίνητα.</p>
-
- <p>Επιλέξτε τη συσκευή σας από το μενού του <app>Banshee</app> και μετά επιλέξτε πώς θέλετε να συγχρονίσετε τα πολυμέσα σας, συμπεριλαμβανομένων:</p>
-
- <list>
- <item><p>Μουσικής</p></item>
- <item><p>Ηχογραφημένων βιβλίων</p></item>
- <item><p>Βίντεο</p></item>
- <item><p>Φορητές εκπομπές</p></item>
- </list>
-
- <p>Από το αναπτυσσόμενο μενού δίπλα σε κάθε μέσο, επιλέξτε από:</p>
-
- <list>
- <item><p>Χειροκίνητη διαχείριση</p></item>
- <item><p>Συγχρονισμός όλης της βιβλιοθήκης</p></item>
- </list>
-
- <note style="warning">
- <p>Αν επιλέξετε να συγχρονίσετε όλη τη βιβλιοθήκη σας αυτόματα με τη φορητή συσκευή σας αναπαραγωγής βεβαιωθείτε ότι η φορητή συσκευή σας έχει αρκετό χώρο αποθήκευσης. Αν η βιβλιοθήκη σας είναι μεγαλύτερη από τον χώρο στη φορητή συσκευή σας, το <app>Banshee</app> θα συγχρονίσει μέχρι να γεμίσει η συσκευή και μετά θα σταματήσει.</p>
- </note>
-
- <p>Αν έχετε δημιουργήσει λίστες αναπαραγωγής ή έξυπνες λίστες αναπαραγωγής στη μουσική σας βιβλιοθήκη, θα εμφανιστούν και αυτές ως επιλογή συγχρονισμού για τη μουσική. Αυτό μπορεί να βοηθά κατά τη δημιουργία έξυπνων λιστών αναπαραγωγής, καθώς αυτές θα ενημερώνονται αυτόματα κατά την προθήκη νέου περιεχόμενου με βάση τους κανόνες της λίστας και το <app>Banshee</app> θα συγχρονίζει τη νέα λίστα με τη συσκευή σας κάθε φορά που τη συνδέετε.</p>
-
- <p>Το <app>Banshee</app> θα εμφανίσει το συνολικό χώρο του σκληρού δίσκου της φορητής συσκευής σας αναπαραγωγής με ένα γράφημα στο κέντρο και κάτω στο <app>Banshee</app>. Το γράφημα θα σας δείξει πόσος χώρος καταλαμβάνεται από αρχεία ήχου, βίντεο και άλλα και τον ελεύθερο χώρο. Ακριβώς από κάτω το <app>Banshee</app> θα εμφανίσει πόσα συνολικά στοιχεία είναι αποθηκευμένα στη συσκευή σας, σε πόσες ώρες ή ημέρες ακρόασης αντιστοιχούν και το συνολικό χώρο που χρησιμοποιείται.</p>
-
+
+ <section id="sync-settings">
+ <title>Συγχρονίστε τη μουσική σας</title>
+ <p>Μπορείτε να επιλέξετε να διαχειρίζεστε τα πολυμέσα στη φορητή σας συσκευή βάζοντας το Banshee να κάνει αυτόματο συγχρονισμό ή να διαχειρίζεστε τη μουσική και τα πολυμέσα σας χειροκίνητα.</p>
+
+ <p>Επιλέξτε τη συσκευή σας από το μενού του Banshee και μετά επιλέξτε πως θέλετε να συγχρονίσετε τα πολυμέσα σας, συμπεριλαμβανομένων:</p>
+ <list>
+ <item><p>Μουσικής</p></item>
+ <item><p>Ηχογραφημένων βιβλίων</p></item>
+ <item><p>Βίντεο</p></item>
+ <item><p>Φορητών εκπομπών (podcast)</p></item>
+ </list>
+
+ <p>Από το αναπτυσσόμενο μενού δίπλα σε κάθε μέσο, επιλέξτε από:</p>
+ <list>
+ <item><p>Χειροκίνητη διαχείριση</p></item>
+ <item><p>Συγχρονισμός όλης της βιβλιοθήκης</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Αν επιλέξετε να συγχρονίσετε όλη τη βιβλιοθήκη σας αυτόματα με τη φορητή συσκευή σας αναπαραγωγής βεβαιωθείτε ότι η συσκευή έχει αρκετό χώρο αποθήκευσης. Αν η βιβλιοθήκη σας είναι μεγαλύτερη από το χώρο στη συσκευή, το Banshee θα συγχρονίσει μέχρι να γεμίσει η συσκευή και μετά θα σταματήσει.</p>
+ </note>
+
+ <p>Αν έχετε δημιουργήσει λίστες αναπαραγωγής ή έξυπνες λίστες αναπαραγωγής στη μουσική σας βιβλιοθήκη, θα εμφανιστούν και αυτές ως επιλογή συγχρονισμού για τη μουσική. Αυτό μπορεί να βοηθά κατά τη δημιουργία έξυπνων λιστών αναπαραγωγής, καθώς αυτές θα ενημερώνονται αυτόματα κατά την προθήκη νέου περιεχόμενου με βάση τους κανόνες της λίστας και το Banshee θα συγχρονίζει τη νέα λίστα με τη συσκευή σας κάθε φορά που τη συνδέετε.</p>
+
+ <p>Το Banshee θα εμφανίσει το συνολικό χώρο του σκληρού δίσκου της φορητής συσκευής σας αναπαραγωγής με ένα γράφημα στο κέντρο και κάτω στο Banshee. Το γράφημα θα σας δείξει πόσος χώρος καταλαμβάνεται από αρχεία ήχου, βίντεο και άλλα και τον ελεύθερο χώρο. Ακριβώς από κάτω το Banshee θα εμφανίσει πόσα συνολικά αντικείμενα είναι αποθηκευμένα στη συσκευή σας, σε πόσες ώρες ή ημέρες ακρόασης αντιστοιχούν και το συνολικό χώρο που χρησιμοποιείται.</p>
+
</section>
<section id="sync-manually">
- <title>Συγχρονισμός όλης της βιβλιοθήκης σας</title>
-
- <p>Μπορείτε να σύρετε και να αφήσετε μέσα στη φορητή σας συσκευή από το <app>Banshee</app>. Επιλέξετε το αρχεία ή τα αρχεία που θέλετε να αντιγράψετε στη φορητή σας συσκευή αναπαραγωγής και μετά πατήστε και κρατήστε πατημένο το δεξί κουμπί του ποντικού και σύρετε το αρχείο ή τα αρχεία στο εικονίδιο της φορητής σας συσκευής στο <app>Banshee</app>. Αυτό θα αντιγράψει τα αρχεία στη συσκευή σας.</p>
-
- <p>Αν η μουσική σας βιβλιοθήκη είναι κωδικοποιημένη σε μορφή που δεν υποστηρίζει η φορητή σας συσκευή, όπως OGG ή FLAC, και έχετε τους απαραίτητους κωδικοποιητές εγκατεστημένους, το <app>Banshee</app> θα μετατρέψει αυτόματα αυτά τα αρχεία σε MP3 κατά τη μεταφορά τους στη φορητή συσκευή αναπαραγωγής. Ελέγξτε τη διανομή σας Linux για τους απαραίτητους κωδικοποιητές-αποκωδικοποιητές καθώς είναι εκτός του πεδίου αυτής της βοήθειας και διαφέρει ανά διανομή.</p>
-
- <note style="tip">
- <p>Μπορεί να χρειαστεί να αφαιρέσετε τη συσκευή σας για να φορτωθούν τα αρχεία σωστά στη φορητή συσκευή σας. Για να το κάνετε αυτό στο <app>Banshee</app>, δεξιοπατήστε τη συσκευή στο μενού του <app>Banshee</app> και πατήστε <gui style="menuitem">Αποσύνδεση</gui>.</p>
- </note>
+ <title>Συγχρονισμός ολόκληρης της βιβλιοθήκης σας</title>
+ <p>You can drag and drop media to your portable music player from 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.
+ </p>
+
+ <p>Αν η μουσική σας βιβλιοθήκη είναι κωδικοποιημένη σε μορφή που δεν υποστηρίζει η φορητή σας συσκευή, όπως OGG ή FLAC, και έχετε τους απαραίτητους κωδικοποιητές εγκατεστημένους, το Banshee θα μετατρέψει αυτόματα αυτά τα αρχεία σε MP3 κατά τη μεταφορά τους στη φορητή συσκευή αναπαραγωγής. Ελέγξτε τη διανομή σας Linux για τους απαραίτητους κωδικοποιητές καθώς είναι εκτός του πεδίου αυτής της βοήθειας και διαφέρει ανά διανομή.</p>
+
+ <note style="tip">
+ <p>Μπορεί να χρειασθεί να αφαιρέσετε τη φορητή συσκευή σας για να φορτωθούν τα αρχεία σωστά σε αυτή. Για να το κάνετε αυτό στο Banshee, κάντε δεξί κλικ με το ποντίκι πάνω στη συσκευή στο μενού του Banshee και πατήστε <gui>Αποσύνδεση</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
<title>Αναπαραγωγή μουσικής από τη φορητή σας συσκευή αναπαραγωγής</title>
-
- <p>Μπορείτε να αναπαράγετε μουσική αποθηκευμένη στη φορητή σας συσκευή απευθείας στο <app>Banshee</app>. Επιλέξτε την από το μενού του <app>Banshee</app> αριστερά και θα εμφανιστεί η βιβλιοθήκη μουσικής που περιέχει. Μπορείτε έπειτα, να αναπαράγετε τη μουσική στο <app>Banshee</app> ακριβώς όπως θα κάνατε με τη μουσική της βιβλιοθήκης σας.</p>
-
+ <p>Μπορείτε να αναπαράγετε μουσική αποθηκευμένη στη φορητή σας συσκευή απευθείας στο Banshee. Επιλέξτε τη από το μενού του Banshee αριστερά και θα εμφανιστεί η βιβλιοθήκη μουσικής που περιέχει. Μπορείτε εν συνεχεία να αναπαράγετε τη μουσική ακριβώς όπως με τη μουσική της βιβλιοθήκης σας.</p>
</section>
-
+
<section id="pmp-delete">
<title>Αφαιρέστε μουσική από τη φορητή σας συσκευή αναπαραγωγής</title>
-
- <p>Για να αφαιρέσετε τραγούδια αποθηκευμένα στη φορητή σας συσκευή, επιλέξτε τη στο <app>Banshee</app> για να δείτε τη βιβλιοθήκη της. Έπειτα επιλέξτε τα κομμάτια που θα θέλατε να αφαιρέσετε και δεξιοπατήστε στα κομμάτια και επιλέξτε <gui style="menuitem">Διαγραφή</gui> ή από το μενού επιλέξτε <guiseq><gui style="menu">Επεξεργασία</gui><gui style="menuitem">Διαγραφή</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Η διαγραφή αρχείων από τη φορητή σας συσκευή θα διαγράψει μόνιμα τα αρχεία και δεν θα είναι δυνατό να τα ανακτήσετε.</p>
- </note>
-
+ <p>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 <gui>Delete</gui> or from the
+ menu choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Η διαγραφή αρχείων από τη φορητή σας συσκευή θα διαγράψει μόνιμα τα αρχεία και δεν θα είναι δυνατό να τα ανακτήσετε.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/el/ui.page b/help/el/ui.page
index 52be6f7..65d459d 100644
--- a/help/el/ui.page
+++ b/help/el/ui.page
@@ -4,17 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>.</desc>
+ <desc>Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app></desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -24,66 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Η διεπαφή χρήστη του <app>Banshee</app></title>
+ <title>Εισαγωγή στη διεπαφή χρήστη του Banshee</title>
<figure>
<title>Παράθυρο <gui>Αναπαραγωγή πολυμέσων Banshee</gui></title>
<desc><app>Αναπαραγωγή πολυμέσων Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Διεπαφή βιβλιοθήκης <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Πηγές</title>
+ <p>Οι πηγές για τη μουσική και τα βίντεό σας εμφανίζονται στα αριστερά στο Banshee. Οι πηγές σας δίνουν γρήγορη πρόσβαση στη Σειρά αναπαραγωγής σας, στη Μουσική, στα Βίντεο, στο Amazon, στο Last.fm, στις Φορητές εκπομπές (Podcasts) και άλλα.</p>
+
+ <note style="tip">
+ <p>Οι επιλογές του μενού θα αλλάζουν ανάλογα με την πηγή που έχετε επιλέξει. Παραδείγματος χάριν, για να χρησιμοποιήσετε το μενού για την εισαγωγή μιας φορητής εκπομπής (podcast), πρέπει να επιλέξετε την πηγή Φορητές εκπομπές. Η επιλογή του μενού για εισαγωγή φορητής εκπομπής δεν είναι διαθέσιμη όταν βλέπετε τη βιβλιοθήκη των βίντεο ή της μουσικής.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Περιηγητής βιβλιοθήκης</title>
+ <p>Όταν επιλέγετε μια πηγή μουσικής ή βίντεο από τις πηγές σας, το Banshee θα εμφανίσει το περιεχόμενό σας στον περιηγητή βιβλιοθήκης. Ανάλογα με την πηγή που επιλέγετε, το Banshee μπορεί να εμφανίσει τη βιβλιοθήκη σας μουσικής ή βίντεο ή ακόμα το κατάστημα μουσικής του Amazon για να σας επιτρέψει να αγοράσετε μουσική.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Προβολή τρέχουσας αναπαραγωγής</title>
+ <p>Βοηθάει όταν χρησιμοποιείτε το Banshee σε κατάσταση πλήρους οθόνης, η κατάσταση τρέχουσας αναπαραγωγής αποκρύπτει τη βιβλιοθήκη για να σας δώσει μια μεγαλύτερη προβολή της μουσικής ή του βίντεο που παρακολουθείτε. Όταν ακούτε μουσική, η προβολή τρέχουσας αναπαραγωγής θα εμφανίσει το όνομα του καλλιτέχνη, το δίσκο και το εξώφυλλο, αν είναι διαθέσιμα. Αν παρακολουθείτε βίντεο το Banshee θα εμφανίσει το βίντεο.</p>
+
+ <p>Για να αλλάξετε την τρέχουσα αναπαραγωγή για να αποκρυφτεί η διεπαφή χρήστη του Banshee και να χρησιμοποιηθεί η κατάσταση πλήρους οθόνης, πατήστε το <key>F</key> ή το κουμπί <gui>Πλήρης οθόνη</gui> στην πάνω δεξιά γωνία του Banshee ή επιλέξτε <guiseq>Προβολή<gui/>Πλήρης οθόνη<gui/></guiseq> για να αρχίσετε την κατάσταση πλήρους οθόνης.</p>
+
+</section>
+
+<section id="library">
+ <title>Βιβλιοθήκη</title>
+ <p>Η προβολή βιβλιοθήκης στο Banshee θα αλλάξει ανάλογα με την πηγή που έχετε επιλέξει. Η βιβλιοθήκη μουσικής θα εμφανίσει εξώφυλλο, καλλιτέχνες στη βιβλιοθήκη σας και λίστα τραγουδιών. Η βιβλιοθήκη φορητών εκπομπών θα εμφανίσει τις συνδρομές σας σε φορητές εκπομπές, εκπομπές που έχουν ή δεν έχουν μεταφορτωθεί και όλες, τις νέες ή τις παλιές εκπομπές. Παρακαλούμε δείτε τη σελίδα βοήθειας κάθε πηγής για λεπτομερείς πληροφορίες για τη διαχείρισή της.</p>
+</section>
- <section id="context">
- <title>Πηγές</title>
-
- <p>Οι πηγές για τη μουσική και τα βίντεό σας εμφανίζονται στα αριστερά στο <app>Banshee</app>. Οι πηγές σας δίνουν γρήγορη πρόσβαση στη <gui>Σειρά αναπαραγωγής</gui>, στη <gui>Μουσική</gui>, στα <gui>Βίντεο</gui>, στο <gui>Κατάστημα MP3 του Amazon</gui>, στο <gui>Last.fm</gui>, στις <gui>Φορητές εκπομπές</gui> και άλλα.</p>
-
- <note style="tip">
- <p>Οι επιλογές του μενού θα αλλάζουν ανάλογα με την πηγή που έχετε επιλέξει. Παραδείγματος χάριν, για να χρησιμοποιήσετε το μενού για την εισαγωγή μιας φορητής εκπομπής (podcast), πρέπει να επιλέξετε την πηγή <gui>Φορητές εκπομπές</gui>. Η επιλογή του μενού για εισαγωγή φορητής εκπομπής δεν είναι διαθέσιμη όταν βλέπετε τη βιβλιοθήκη των βίντεο ή της μουσικής.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Περιηγητής βιβλιοθήκης</title>
-
- <p>Όταν επιλέγετε μια πηγή μουσικής ή βίντεο από τις πηγές σας, το <app>Banshee</app> θα εμφανίσει το περιεχόμενό σας στον περιηγητή βιβλιοθήκης. Ανάλογα με την πηγή που επιλέγετε, το <app>Banshee</app> μπορεί να εμφανίσει τη βιβλιοθήκη σας μουσικής ή βίντεο ή ακόμα το κατάστημα μουσικής του Amazon για να σας επιτρέψει να αγοράσετε μουσική.</p>
-
- </section>
-
- <section id="now-playing">
- <title>Προβολή <gui>τρέχουσας αναπαραγωγής</gui></title>
-
- <p>Βοηθάει όταν χρησιμοποιείτε το <app>Banshee</app> σε κατάσταση πλήρους οθόνης, η κατάσταση <gui>τρέχουσας αναπαραγωγής</gui> αποκρύπτει τη βιβλιοθήκη για να σας δώσει μια μεγαλύτερη προβολή της μουσικής ή του βίντεο που παρακολουθείτε. Όταν ακούτε μουσική, η προβολή <gui>τρέχουσας αναπαραγωγής</gui> θα εμφανίσει το όνομα του καλλιτέχνη, τον δίσκο και το εξώφυλλο, αν είναι διαθέσιμα. Αν παρακολουθείτε βίντεο το <app>Banshee</app> θα εμφανίσει το βίντεο.</p>
-
- <p>Για αλλαγή της κατάστασης <gui>τρέχουσας αναπαραγωγής</gui> για να κρύψετε τη διεπαφή χρήστη του <app>Banshee</app> και να προβάλετε τα μέσα σας σε κατάσταση πλήρους οθόνης, μπορείτε να κάνετε οποιοδήποτε από τα παρακάτω:</p>
-
- <list>
- <item>
- <p>Διπλοπατήστε την προβολή με το ποντίκι σας.</p>
- </item>
- <item>
- <p>Πατήστε <key>F</key>.</p>
- </item>
- <item>
- <p>Πατήστε <key>F11</key>.</p>
- </item>
- <item>
- <p>Πατήστε το κουμπί <gui style="button">Πλήρης οθόνη</gui> στην πάνω δεξιά γωνία του <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Επιλέξτε <guiseq><gui style="menu">Προβολή</gui><gui style="menuitem">Πλήρης οθόνη</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Βιβλιοθήκες</title>
-
- <p>Η προβολή <gui>βιβλιοθήκες</gui> στο <app>Banshee</app> θα αλλάξει ανάλογα με την πηγή που έχετε επιλέξει. Για παράδειγμα, η βιβλιοθήκη <gui>μουσική</gui> θα εμφανίσει εξώφυλλο, καλλιτέχνες στη βιβλιοθήκη σας και λίστα τραγουδιών και η βιβλιοθήκη <gui>Φορητών εκπομπών</gui> θα εμφανίσει τις συνδρομές σας σε φορητές εκπομπές, εκπομπές που έχουν ή δεν έχουν μεταφορτωθεί και όλες, τις νέες ή τις παλιές εκπομπές. Παρακαλούμε, δείτε τη σελίδα βοήθειας κάθε πηγής για λεπτομερείς πληροφορί [...]
-
- </section>
</page>
diff --git a/help/en_GB/add-podcast.page b/help/en_GB/add-podcast.page
new file mode 100644
index 0000000..d2252ae
--- /dev/null
+++ b/help/en_GB/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="en_GB">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play podcasts in Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>What is a Podcast?</title>
+
+ <p>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.</p>
+
+ <p>There are podcasts on almost any subject including music, movies, Linux, and more. Search the internet using your favourite search engine with a search term such as "movie podcast" and you will be presented with many options to choose from.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Add a Podcast</title>
+
+ <p>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 <gui>Copy link</gui>.</p>
+
+ <p>In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the upper right hand corner, from the menu choose <guiseq><gui>Media</gui><gui> Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
+
+ <p>Banshee will then allow you to choose how you want to download new podcasts from a drop down menu. Your choices include:</p>
+
+ <list>
+ <item><p>Download the Most Recent Episode (This will automatically download the last episode that was released).</p></item>
+ <item><p>Download All Episodes (This will download all episodes).</p></item>
+ <item><p>Let Me Decide Which Episodes to Download (This will allow you to choose which episodes you would like to download).</p></item>
+ </list>
+
+ <p>After you have added a Podcast feed, Banshee will display:</p>
+
+ <list>
+ <item><p><gui>Name</gui>: (Name of the specific episode)</p></item>
+ <item><p><gui>Podcast</gui>: (Name of the Podcast)</p></item>
+ <item><p><gui>Published</gui> (Date the episode was published or released)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/en_GB/add-radio.page b/help/en_GB/add-radio.page
new file mode 100644
index 0000000..38d61e8
--- /dev/null
+++ b/help/en_GB/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="en_GB">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play internet radio stations in Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Internet Radio</title>
+
+ <section id="radiodescription">
+ <title>What is Internet Radio?</title>
+
+ <p>Internet radio stations are similar to regular radio stations, allowing an individual or organisation 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 publicity.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Add Radio Station</title>
+
+ <p>To add an internet radio station to Banshee, press <gui>Add Station</gui> in the upper right hand corner of Banshee or, from the menu, choose <guiseq><gui>Media</gui><gui>Add Station</gui></guiseq>.</p>
+
+ <p>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 <gui>Copy Link</gui>.</p>
+
+
+ <p>Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the kind of music the internet radio station plays from the available drop down selections. You will then need to enter the <gui>Station Name</gui>. Enter a name for the radio station. Then press tab or use your mouse to select the <gui>Stream URL</gui> field to paste the URL of the radio station. Using your mouse right click and choose <gui>Paste</gui> or press <keyseq><key>Control</key><key>V</key></keyseq>.</p>
+
+ <p>You can optionally also fill out the fields for <gui>Station Creator</gui>, <gui>Description</gui>, and <gui>Rating</gui>.</p>
+
+ <p>Then press <gui>Save</gui> to save the internet radio station in Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/en_GB/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/en_GB/advanced.page
index 468ad23..8022616 100644
--- a/help/zh_CN/extensions.page
+++ b/help/en_GB/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="en_GB">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Get help for advanced actions.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Advanced Options and Help</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Keyboard Shortcuts</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Keyboard Shortcuts</title>
</section>
-
+
</page>
diff --git a/help/en_GB/amazon.page b/help/en_GB/amazon.page
index 7e0a663..7761969 100644
--- a/help/en_GB/amazon.page
+++ b/help/en_GB/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Sync and purchase music from the Amazon MP3 Store.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Amazon MP3 Store</title>
+
+ <p>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.</p>
+
+ <note style="important">
+ <p>Banshee uses an Amazon affiliate code for all music purchases. All money made via this affiliate code is donated to the GNOME Foundation</p>
+ </note>
+
<section id="amazon-browser">
- <title>Purchase Amazon MP3s in your web browser</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Purchase Amazon MP3s in your web browser</title>
+
+ <p>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.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Buy Amazon MP3s in Banshee</title>
+
+ <p>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.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Import Amazon MP3s manually</title>
-
- <p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ <title>Import Amazon MP3s manually</title>
+
+ <p>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 <guiseq><gui>Media</gui><gui>Import Media</gui></guiseq> 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.</p>
+
<note style="warning">
<p>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.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/en_GB/emusic.page b/help/en_GB/emusic.page
new file mode 100644
index 0000000..d6b8f9c
--- /dev/null
+++ b/help/en_GB/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="en_GB">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music purchased from eMusic</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your eMusic tracks</title>
+
+</page>
diff --git a/help/en_GB/extensions.page b/help/en_GB/extensions.page
index 74ef5cc..1c77a56 100644
--- a/help/en_GB/extensions.page
+++ b/help/en_GB/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="en_GB">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="en_GB">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Add additional functionality to Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Banshee Extensions</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Official Banshee Extensions</title>
</info>
+ <title>Manage extensions for Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Community Banshee Extensions</title>
+ </info>
+ <title>Add community built extensions for Banshee</title>
</section>
+
</page>
diff --git a/help/en_GB/import.page b/help/en_GB/import.page
index 7c62765..8eebd90 100644
--- a/help/en_GB/import.page
+++ b/help/en_GB/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Add music and videos from your computer to your Banshee library.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Import music & videos</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>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.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>To import music or video files on your computer, choose <guiseq><gui>Media</gui><gui>Import Media</gui></guiseq>. A dialogue box will appear with a number of choices.</p>
- <note style="tip">
+ <note>
<p>Plugins may add additional import choices. See <link xref="#plugins"/> below.</p>
</note>
@@ -53,27 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>You can safely import from a folder you have already imported from without worrying about duplicate entries in your library.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Import from a Playlist</title>
+ <p>You can also import music from playlists. Most playlist files end in <em>m3u</em>. To import from a playlist, from the Banshee menu choose <guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and locate the playlist file in your folder, select it and press <gui>Import</gui>.</p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Plugins may add additional import choices. The following additional sources will be available if the appropriate plugins are enabled:</p>
-
+ <title>Additional Import Sources</title>
+ <p>Plugins may add additional import choices. The following additional sources will be available if the appropriate plugins are enabled:</p>
</section>
-
+
</page>
diff --git a/help/en_GB/index.page b/help/en_GB/index.page
index 300784e..89cc856 100644
--- a/help/en_GB/index.page
+++ b/help/en_GB/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Banshee Media Player</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Add, Remove & Play</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Manage & Sort</title>
</section>
-
+
<section id="sync" style="2column">
<title>Sync your media with a portable music player</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Add additional functionality to Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Advances options and help</title>
+ <title>Advances options and help</title>
</section>
</page>
diff --git a/help/en_GB/introduction.page b/help/en_GB/introduction.page
index 065a199..1e38528 100644
--- a/help/en_GB/introduction.page
+++ b/help/en_GB/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>Introduction to the <app>Banshee Media Player</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>Introduction</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p><app>Banshee</app> 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.</p>
<p><app>Banshee</app> includes features to import your media, manage its metadata, and play your music and videos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>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.</p>
+<!--
<figure>
<title><gui>Banshee Media Player</gui> window</title>
<desc><app>Banshee Media Player</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/en_GB/itunes-import.page b/help/en_GB/itunes-import.page
new file mode 100644
index 0000000..7cbf3a2
--- /dev/null
+++ b/help/en_GB/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="en_GB">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorisations from the <app>iTunes</app> media player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>iTunes</app> library</title>
+
+</page>
diff --git a/help/en_GB/keyboard-shortcuts.page b/help/en_GB/keyboard-shortcuts.page
deleted file mode 100644
index 62be19e..0000000
--- a/help/en_GB/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="en_GB">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Play or Pause the current song</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Play the next song</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Play the previous song</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Move the focus to the search box</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Open import media dialogue</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Playlists</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Create New Playlist</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Mark the selected episodes as old</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interface</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Toggle full-screen mode</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Select all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Unselect all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Previous Song (Requires Notification Area Plug-in Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Next Song (Requires Notification Area Plug-in Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
- </p></td>
- <td><p>Toggle Play / Pause (Requires Notification Area Plug-in Enabled</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/en_GB/keyboardshortcuts.page b/help/en_GB/keyboardshortcuts.page
new file mode 100644
index 0000000..7e2fc15
--- /dev/null
+++ b/help/en_GB/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="en_GB">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Keyboard Shortcuts</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Control Banshee using Keyboard Shortcuts</title>
+
+ <section id="playbackcontrol">
+
+ <title>Playback Control</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Space Bar</p></td> <td><p>Play or Pause the current song</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Play the next song</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Play the previous song</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Library Interaction</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>Move the focus to the search box</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Open import media dialogue</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Playlists</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>Create New Playlist</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Mark the selected episodes as old</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interface</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Toggle full-screen mode</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>Select all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>Unselect all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>Hide Banshee Window (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
+ </p></td> <td><p>Play Previous Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
+ </p></td> <td><p>Play Next Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
+ </p></td> <td><p>Toggle Play / Pause (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/en_GB/lastfm.page b/help/en_GB/lastfm.page
index 172d006..0018f9c 100644
--- a/help/en_GB/lastfm.page
+++ b/help/en_GB/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="en_GB">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Enable Last.fm, song reporting and Last.fm radio</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,74 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>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, you [...]
+
<section id="enable-lastfm">
- <title>Enable Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Enable Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>To enable Banshee to report the songs you play on your computer to Last.fm, sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences. Enter your username and press the <gui>Log in to Last.fm</gui> button. You will be directed to a Last.fm webpage in your browser to grant Banshee access. Press the <gui>Yes, allow access</gui> 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 Banshe [...]
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Listen to Last.fm Radio</title>
<p>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.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+
+ <p>In Banshee's sources pane 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 <gui>Play</gui> button in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio station. You can also press the <gui>Next</gui> button in [...]
+
</section>
-
+
</page>
diff --git a/help/en_GB/manage-coverart.page b/help/en_GB/manage-coverart.page
new file mode 100644
index 0000000..e2d6d38
--- /dev/null
+++ b/help/en_GB/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="en_GB">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Manage of change your album cover art</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Cover art</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/en_GB/manage-playlists.page b/help/en_GB/manage-playlists.page
index 5641bd7..a8dc043 100644
--- a/help/en_GB/manage-playlists.page
+++ b/help/en_GB/manage-playlists.page
@@ -1,144 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="en_GB">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="en_GB">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Create and manage playlists.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Playlists</title>
-
+ <title>Playlists</title>
+
<p>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 favourite 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.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>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, favourite music, or more.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>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 favourite artist from multiple albums, your latest favourite songs, or an upbeat playlist to listen to while you exercise.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>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.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>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, favourites or more.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Normal Playlists</title>
+
+ <p>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 favourite artist from multiple albums, your latest favourite songs, or an upbeat playlist to listen to while you exercise.</p>
+
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key><key>N</key></keyseq>, from the menu choosing <guiseq><gui>Media</gui><gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like to add to the playlist. Select the track(s), right click them, and choose <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. 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 < [...]
+
+ <p>To give your playlist its own name, select the playlist, right click on the playlist and press <gui>Rename Playlist</gui> and enter the name of your playlist.</p>
+
+ <p>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.</p>
+
+ <p>To remove a track from the playlist, select the track(s) you wish to remove. Press the <key>Delete</key>, from the menu choose <guiseq><gui>Edit</gui><gui>Remove from Playlist</gui></guiseq> or right click the track(s) with your mouse and press <gui>Remove from Playlist</gui>.</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Smart Playlist</title>
+
+ <p>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, favourites or more.</p>
+
+ <p>To create a new Smart Playlist, choose <guiseq><gui>Media</gui><gui>New Smart Playlist</gui></guiseq> from the menu. You will be presented with a dialogue 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 metadata, such as Album, Artist or Year. Choose the criteria and then choose from one of the following:</p>
+
<list>
<item><p>is</p></item>
- <item><p>is not</p></item>
+ <item><p>is not</p></item>
<item><p>less than</p></item>
- <item><p>more than</p></item>
+ <item><p>more than</p></item>
<item><p>at most</p></item>
- <item><p>at least</p></item>
+ <item><p>at least</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>You can also press the <gui>+</gui> 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:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Year</gui></p></td>
- <td><p><gui>is</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Year</gui></p></td> <td><p><gui>is</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Rating</gui></p></td>
- <td><p><gui>is</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Rating</gui></p></td> <td><p><gui>is</gui></p></td>
+ <td><p><gui/>5 stars</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>You can then optionally select how many songs are included by pressing the <gui>Limit</gui> to checkbox and choosing the number of songs to be included.</p>
+
+ <p>Banshee also includes smart playlists already created for you. Press the <gui>Open in editor</gui> button to view how the playlist created was or to modify it. If you press <gui>Create and save</gui> the playlist will be automatically generated and saved for you. The following playlists are included:</p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Favourites (Songs rated four and five stars)</p>
- </item>
- <item>
- <p>Recent Favourites (Songs listened to often in the past week)</p>
- </item>
- <item>
- <p>Recently Added (Songs imported within the last week)</p>
- </item>
- <item>
- <p>Unheard (Songs that have not been played or skipped)</p>
- </item>
- <item>
- <p>Neglected Favourites (Favourites not played in over two months)</p>
- </item>
- <item>
- <p>700 MB of Favourites (A data CD worth of favourite songs)</p>
- </item>
- <item>
- <p>80 Minutes of Favourites (An audio CD worth of favourite songs)</p>
- </item>
- <item>
- <p>Unrated (Songs that haven't been rated)</p>
- </item>
+ <title>Banshee Smart Playlists</title>
+ <item><p>Favourites (Songs rated four and five stars)</p></item>
+ <item><p>Recent Favourites (Songs listened to often in the past week)</p></item>
+ <item><p>Recently Added (Songs imported within the last week)</p></item>
+ <item><p>Unheard (Songs that have not been played or skipped)</p></item>
+ <item><p>Neglected Favourites (Favourites not played in over two months)</p></item>
+ <item><p>700 MB of Favourites (A data CD worth of favourite songs)</p></item>
+ <item><p>80 Minutes of Favourites (An audio CD worth of favourite songs)</p></item>
+ <item><p>Unrated (Songs that haven't been rated)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/en_GB/manage-tags.page b/help/en_GB/manage-tags.page
index 6373443..4a10699 100644
--- a/help/en_GB/manage-tags.page
+++ b/help/en_GB/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="en_GB">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="en_GB">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Edit and change music tags and metadata.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,49 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Music Metadata</title>
+
+ <section id="metadata">
+
+ <title>Music metadata</title>
+
+ <p>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 <link xref="import"/>.</p>
+
+ <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis comments for OGG Vorbis files.</p>
+
+ <p>If you have imported songs that do not contain metadata, <app>Banshee</app> will display <gui>Unknown</gui> for most fields in the library.</p>
+
+ </section>
- <title>Music metadata</title>
-
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis comments for OGG Vorbis files.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
-
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>A dialogue box will appear that shows the song's metadata and allows you to change or update it. The default fields displayed include:</p>
-
- <list>
- <item><p><gui>Track Title</gui></p></item>
- <item><p><gui>Track Artist</gui></p></item>
- <item><p><gui>Album Title</gui></p></item>
- <item><p><gui>Genre</gui></p></item>
- <item><p><gui>Track Number</gui></p></item>
- <item><p><gui>Disc Number</gui></p></item>
- <item><p><gui>Year</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
-
+ <section id="editmetadata">
+
+ <title>Edit Your Metadata</title>
+
+ <p>You can change and edit the metadata of your songs. Select the song or songs you want to update and hit the <key>E</key>, choose <guiseq><gui>Edit</gui><gui>Edit Track Information</gui></guiseq> from the menu, or use your mouse and right click on the files and select <gui>Edit Track Information</gui>.</p>
+
+ <p>A dialogue box will appear that shows the song's metadata and allows you to change or update it. The default fields displayed include:</p>
+
+ <list>
+ <item><p><gui>Track Title</gui></p></item>
+ <item><p><gui>Track Artist</gui></p></item>
+ <item><p><gui>Album Title</gui></p></item>
+ <item><p><gui>Genre</gui></p></item>
+ <item><p><gui>Track Number</gui></p></item>
+ <item><p><gui>Disc Number</gui></p></item>
+ <item><p><gui>Year</gui></p></item>
+ </list>
+
+ <p>Update the song's information. If you have selected multiple songs to edit press the right arrow icon to the right of the <gui>Track Title</gui> field or press the <gui>Forward</gui> button at the bottom of the dialogue when finished with each song. When you have completed editing all metadata, press <gui>Save</gui>.</p>
+
</section>
</page>
diff --git a/help/en_GB/play-queue.page b/help/en_GB/play-queue.page
index bf33394..20f2cd9 100644
--- a/help/en_GB/play-queue.page
+++ b/help/en_GB/play-queue.page
@@ -1,96 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="en_GB">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="en_GB">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Add media to your play queue.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
+ <title>Play Queue</title>
+
+ <p>The <gui>Play Queue</gui> 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.</p>
+
+<section id="addqueue">
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
+ <title>Add Music to the Play Queue</title>
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
+ <p>From your music library, you will need to select the music tracks or albums you want to add to the play queue.</p>
+
+ <p>To add an entire album to the Play Queue, using your mouse press and hold the album and drag the album over <gui>Play Queue</gui> in the far left window pane.</p>
+
+ <p>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 <gui>Play Queue</gui> in the far left window pane, or right click the track and choose <gui>Add to Play Queue</gui>.</p>
+
+ <p>You can select multiple files by using your mouse and pressing <key>Control</key> and choosing each file with your mouse or select a range of files by pressing <key>Shift</key> and clicking twice to select that range of files. You can then drag and drop it over the <gui>Play Queue</gui> in the far left window pane or right click the tracks and choose <gui>Add to Play Queue</gui>.</p>
+
+</section>
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
+<section id="reorderqueue">
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
+ <title>Organise Your Play Queue</title>
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+ <p>Your Play Queue is organised 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.</p>
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>Removing Tracks from the Play Queue</title>
+ <p>You can remove an individual track, a group of tracks, or clear your entire play queue.</p>
+
+ <p>To remove an individual track or group of tracks, select the track with your mouse and then press <key>Delete</key>.</p>
+
+ <p>To clear your entire Play Queue, press the <gui>Clear</gui> button in the upper right hand corner of the Play Queue.</p>
+
+</section>
+
</page>
diff --git a/help/en_GB/play.page b/help/en_GB/play.page
index 2b5f873..6fc7069 100644
--- a/help/en_GB/play.page
+++ b/help/en_GB/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Play your videos and music files.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Play your music</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>Play a video</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+
+ <title>Play Your Media</title>
+
+ <section id="playmusic">
+ <title>Play your music</title>
+
+ <p>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.</p>
+
+ <p>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.</p>
+
+ <p>To start playing a song, use your mouse to double click the song name, press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>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 <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>To play all songs by one artist, choose the artist in the artist browser and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>Banshee also displays your Favourite albums (those you play the most), Recent Favourites, Recently Added and Unheard music. Choose the one you wish to listen to and you can play songs from each.</p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>Play a video</title>
+
+ <p>Your imported videos are listed alphabetically. To play a video, choose the video you wish to play from the list and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>Banshee also shows you your Favourite videos (those you watch the most) and Unwanted videos. Choose one and you can play a video from the list.</p>
+
</section>
-
- <section id="play-radio">
- <title>Play an internet radio station</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>Play a Podcast</title>
+
+ <p>Podcasts shows you all Podcasts you're subscribed to, all Podcast shows available, and the Podcast browser lists all Podcasts in order of newest first.</p>
+
+ <p>To play a Podcast, choose the Podcast you wish to play from the list and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu.</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>Play an internet radio station</title>
+
+ <p>The Radio source shows you all internet radio stations you have added to Banshee alphabetically.</p>
+
+ <p>To play an internet radio station, choose the radio station you wish to play from the list and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ </section>
+
</page>
diff --git a/help/en_GB/podcast.page b/help/en_GB/podcast.page
deleted file mode 100644
index 821ca06..0000000
--- a/help/en_GB/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="en_GB">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/en_GB/radio.page b/help/en_GB/radio.page
deleted file mode 100644
index 24ca10d..0000000
--- a/help/en_GB/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="en_GB">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/en_GB/rb-import.page b/help/en_GB/rb-import.page
new file mode 100644
index 0000000..e81bccb
--- /dev/null
+++ b/help/en_GB/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="en_GB">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorisations from the <app>Rhythmbox</app> music player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>Rhythmbox</app> library</title>
+
+</page>
diff --git a/help/en_GB/search.page b/help/en_GB/search.page
index e7b94ef..848785d 100644
--- a/help/en_GB/search.page
+++ b/help/en_GB/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,90 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Searching your Banshee Library</title>
+
+ <p>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.</p>
+
+ <p>To perform a search of your media in Banshee, press the <key>S</key> or click the <gui>Search</gui> box in the upper right hand corner of the Library view in Banshee.</p>
+
+ <p>A search query consists of some basic terms, for example, <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box, Banshee will search all metadata fields including Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</em> will be returned. Search terms are case insensitive, meaning you don't have to capitalise. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
+
+<section id="operators">
+ <title>Basic Operators</title>
+ <p>Operators can be placed between any two search words or placed before a search word. The default operation is <gui>AND</gui> and is used when no other operators are used between two search terms. Because it is the default, there is no explicit AND operator.</p>
+
<p>Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together, these three operations can yield very powerful queries to help you search your media.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Logical Operators and Examples</title>
<p>The following is a list of logical operators and examples of the search results when searching using them.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operator</gui></p></td>
- <td><p><gui>Description</gui></p></td>
+ <td><p><gui>Operator</gui></p></td> <td><p><gui>Description</gui></p></td>
</tr>
<tr>
- <td><p><em>default</em>, <em>white space</em></p></td>
- <td><p>Search for two terms with a space between the two words or terms.</p></td>
+ <td><p><em>default</em>, <em>white space</em></p></td> <td><p>Search for two terms with a space between the two words or terms.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Search results will be two songs with either result in any field.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Search results will be two songs with either result in any field.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>Do not display search results with any search term that follows the operator of NOT, not, <key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Examples of logical operations include:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Query</gui></p></td>
- <td><p><gui>Description</gui></p></td>
+ <td><p><gui>Query</gui></p></td> <td><p><gui>Description</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Matches any fields in a track containing both <em>dave</em> and <em>matthews</em>.</p></td>
+ <td><p>dave matthews</p></td> <td><p>Matches any fields in a track containing both <em>dave</em> and <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or <em>matthews</em>.</p></td>
+ <td><p>dave, matthews</p></td> <td><p>Matches any fields in a track containing either <em>dave</em> or <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave or matthews</p></td> <td><p>Matches any fields in a track containing either <em>dave</em> or <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave | matthews</p></td> <td><p>Matches any fields in a track containing either <em>dave</em> or <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Displays all tracks whose fields do not contain <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>Displays all tracks whose fields do not contain <em>dave matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>For more information on performing more complex search queries, see the <link xref="adv-search"/> page.</p>
+
</section>
-
+
</page>
diff --git a/help/en_GB/sort.page b/help/en_GB/sort.page
index fb1efd2..c538fc3 100644
--- a/help/en_GB/sort.page
+++ b/help/en_GB/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Adding Columns</title>
+
<p>As your library grows, you may want to change your library view to add additional information about the songs in your library or change the way you can view and sort your songs, artists or albums.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>You can add additional columns to the library view in <app>Banshee</app> to give you more information about the songs and also allow you to sort by. By default, Banshee displays columns for songs including <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To add additional columns, using your mouse right click on any of the columns and Banshee will display all available columns to choose from. Click the checkbox next to the name of the column you wish to add [...]
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Sorting Columns</title>
+ <p>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 <gui>Artist</gui> column header and Banshee will automatically sort that column alphabetically. Clicking the <gui>Artist</gui> column again will sort the column in reverse alphabetical order.</p>
</section>
-
+
</page>
diff --git a/help/en_GB/sync.page b/help/en_GB/sync.page
index 45fea34..fb9ef94 100644
--- a/help/en_GB/sync.page
+++ b/help/en_GB/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Sync your media to a portable media player or smartphone.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Sync</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Sync</title>
+
+ <p>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 y [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Device Support</title>
+ <p>Banshee supports almost all modern portable music players and smartphones with the notable exception of the Apple iPhone, iPad and iPod Touch.</p>
+
+ <p>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.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Music</p></item>
- <item><p>Audiobooks</p></item>
- <item><p>Videos</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>From the dropdown menu next to each of the media, choose from:</p>
-
- <list>
- <item><p>Manage manually</p></item>
- <item><p>Sync entire library</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Sync Your Music</title>
+ <p>You can choose to manage the media on your portable music by having Banshee automatically sync it or manage your music and media manually.</p>
+
+ <p>Choose your device from the Banshee menu and then choose how you want to sync your media, including:</p>
+ <list>
+ <item><p>Music</p></item>
+ <item><p>Audiobooks</p></item>
+ <item><p>Videos</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>From the dropdown menu next to each of the media, choose from:</p>
+ <list>
+ <item><p>Manage manually</p></item>
+ <item><p>Sync entire library</p></item>
+ </list>
+
+ <note style="warning">
+ <p>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.</p>
+ </note>
+
+ <p>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.</p>
+
+ <p>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.</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Sync Your Entire Library</title>
+ <p>You can drag and drop media to your portable music player from 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.</p>
+
+ <p>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.</p>
+
+ <note style="tip">
+ <p>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 <gui>Disconnect</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Play Music From Your Portable Music Player</title>
+ <p>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.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Deleting files from your portable music player will permanently remove the files and you will not be able to recover them.</p>
- </note>
-
+ <title>Remove Music From your Portable Music Player</title>
+ <p>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 <gui>Delete</gui> or from the menu choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Deleting files from your portable music player will permanently remove the files and you will not be able to recover them.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/en_GB/ui.page b/help/en_GB/ui.page
index 6994197..f862bd5 100644
--- a/help/en_GB/ui.page
+++ b/help/en_GB/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>An overview of <app>Banshee's</app> user interface.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Introduction to the Banshee User Interface</title>
<figure>
<title><gui>Banshee Media Player</gui> window</title>
<desc><app>Banshee Media Player</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshee</app> library interface</p>
</media>
</figure>
+
+<section id="context">
+ <title>Sources</title>
+ <p>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.</p>
+
+ <note style="tip">
+ <p>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.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Library Browser</title>
+ <p>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.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Now Playing View</title>
+ <p>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.</p>
+
+ <p>To change Now Playing to hide the Banshee user interface and use the full screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui> button in the upper right hand corner of Banshee, or choose <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen mode.</p>
+
+</section>
+
+<section id="library">
+ <title>Library</title>
+ <p>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.</p>
+</section>
- <section id="context">
- <title>Sources</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/es/add-podcast.page b/help/es/add-podcast.page
new file mode 100644
index 0000000..605848d
--- /dev/null
+++ b/help/es/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="es">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Añadir, eliminar y reproducir podcasts en Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>¿Qué es un podcast?</title>
+
+ <p>Los podcasts son programas grabados, parecidos a los de radio, que se encuentran disponibles en Internet y a los que puede suscribirse. Cuando se suscriba a un podcast en Banshee, el programa irá descargando los nuevos programas automáticamente y le permitirá escucharlos.</p>
+
+ <p>Se pueden encontrar podcasts sobre prácticamente cualquier tema, como música, películas, Linux y mucho más. Para encontrar podcasts en Internet, utilice su buscador preferido e introduzca términos como «podcasts música» para encontrar un gran número de opciones donde elegir.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Añadir un podcast</title>
+
+ <p>Para añadir un podcast a Banshee, primero deberá visitar la página web del podcast en Internet. Casi todos los podcasts cuentan con un botón o un enlace que permite suscribirse al podcast. Copie dicho enlace. En la mayoría de los navegadores puede pulsar con el botón derecho en el enlace y seleccionar <gui>Copiar enlace</gui>.</p>
+
+ <p>En Banshee, pulse en <gui>Subcribirse a un podcast</gui> en la esquina superior derecha o, desde el menú, pulse en <guiseq><gui>Multimedia</gui><gui>Añadir podcast…</gui></guiseq> o bien pulse <keyseq><key>Máyus</key><key>Control</key><key>F</key></keyseq>.</p>
+
+ <p>Entonces, Banshee le permitirá elegir cómo desea descargar nuevos capítulos desde un menú desplegable. Las opciones son:</p>
+
+ <list>
+ <item><p>Descargar los episodios más recientes (esto descargará automáticamente el último episodio publicado del programa).</p></item>
+ <item><p>Descargar todos los episodios (esto descargará todos los episodios).</p></item>
+ <item><p>Dejar que el usuario decida qué episodios descargar (esto le permitirá elegir qué episodios desea descargar).</p></item>
+ </list>
+
+ <p>Después de añadir un podcast, Banshee le mostrará:</p>
+
+ <list>
+ <item><p><gui>Nombre</gui>: (Nombre del episodio)</p></item>
+ <item><p><gui>Podcast</gui>: (Nombre del podcast)</p></item>
+ <item><p><gui>Publicado</gui> (Fecha en que se publicó el episodio)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/es/add-radio.page b/help/es/add-radio.page
new file mode 100644
index 0000000..4c30034
--- /dev/null
+++ b/help/es/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="es">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Añadir, eliminar y reproducir emisoras de radio por Internet en Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Radio por Internet</title>
+
+ <section id="radiodescription">
+ <title>¿Qué es la radio por Internet?</title>
+
+ <p>Las emisoras de radio por Internet son parecidas a las emisoras de radio normales. Permiten a una persona u organización emitir música en directo por medio de Internet. Las emisoras de radio por Internet pueden consistir en una emisión simultánea de una emisora corriente, una persona emitiendo su propio programa, o emisiones de tipo comercial que pueden incluir, por ejemplo, sesiones de DJ o incluso anuncios.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Añadir emisoras de radio</title>
+
+ <p>Para añadir una emisora de radio por Internet a Banshee, pulse en <gui>Añadir emisora</gui> en la esquina superior derecha de Banshee o, desde el menú, pulse en <guiseq><gui>Multimedia</gui><gui>Añadir emisora</gui></guiseq>.</p>
+
+ <p>En la página web de la emisora de radio, copie en enlace a la URL del podcast en el navegador. En la mayoría de los navegadores, puede pulsar con el botón derecho del ratón en el enlace y seleccionar <gui>Copiar enlace</gui>.</p>
+
+
+ <p>Banshee le pedirá que introduzca el <gui>Género de la emisora</gui>. Elija el tipo de música que emite la estación de radio del menú desplegable. Después, tendrá que introducir el <gui>Nombre de la emisora</gui>. Escriba un nombre para la emisora de radio. A continuación, pulse el tabulador o seleccione el campo <gui>URL del flujo</gui> y pegue la URL de la emisora de radio. Puede hacer esto pulsando con el botón derecho del ratón y seleccionando <gui>Pegar</gui> o pulsando las tecl [...]
+
+ <p>Adicionalmente, también puede completar los campos para <gui>Creador de la emisora</gui>, <gui>Descripción</gui> y <gui>Valoración</gui>.</p>
+
+ <p>Para acabar, pulse en <gui>Guardar</gui> para guardar la estación de radio por Internet en Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/es/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/es/advanced.page
index 468ad23..171aee5 100644
--- a/help/zh_CN/extensions.page
+++ b/help/es/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="es">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Obtener ayuda para acciones avanzadas.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Opciones avanzadas y ayuda</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Atajos de teclado</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Atajos de teclado</title>
</section>
-
+
</page>
diff --git a/help/es/amazon.page b/help/es/amazon.page
index a14da09..425b91b 100644
--- a/help/es/amazon.page
+++ b/help/es/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Sincronizar y comprar música de la tienda de Amazon MP3.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,37 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Tienda MP3 de Amazon</title>
-
- <p><app>Banshee</app> permite descargar e importar música de la tienda de Amazon MP3. Puede importar de forma manual sus archivos de música, comprar música desde su navegador web o comprar música desde el propio <app>Banshee</app>. Amazon sólo permite la compra de música en MP3 en algunos países, por lo que dependiendo de su ubicación es posible que no pueda comprar música en MP3 de Amazon.</p>
-
- <note style="important">
- <p><app>Banshee</app> usa un código de afiliado de Amazon para todas las compras de música. Todo el dinero que se gana por medio de este código de afiliado se dona a la Fundación GNOME.</p>
- </note>
-
+ <title>Tienda de Amazon MP3</title>
+
+ <p>Banshee le permite descargar e importar música de la tienda de Amazon MP3. Puede importar de forma manual sus archivos comprados en Amazon, adquirir música desde el navegador o comprar música desde el propio Banshee. Amazon sólo permite la compra de música en MP3 en algunos países, por lo que dependiendo de su ubicación es posible que no pueda comprar MP3 de Amazon.</p>
+
+ <note style="important">
+ <p>Banshee emplea un código de afiliado con Amazon en todas las compras de música. Todo el dinero que se gana por medio de este código es donado a la Fundación GNOME.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Comprar música en MP3 desde Amazon desde el navegador</title>
-
- <p>La música comprada desde la tienda MP3 de Amazon puede ser descargada e importada a <app>Banshee</app> automáticamente. <app>Banshee</app> se asocia con los archivos .amz que Amazon proporciona en la compra de música en MP3. Cuando compre música en Amazon, su navegador web descargará el archivo .amz y <app>Banshee</app> lo abrirá automáticamente y comenzará la descarga e importación de música.</p>
-
+ <title>Comprar música en MP3 desde Amazon desde el navegador</title>
+
+ <p>La música que se compra desde la tienda de Amazon MP3 puede ser descargada e importada a Banshee automáticamente. El programa se asocia con los archivos .amz que Amazon proporciona en la compra de música en MP3. Cuando compre música en Amazon, el navegador descargará el archivo .amz y Banshee lo abrirá automáticamente y comenzará la descarga e importación.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Comprar música en MP3 de Amazon en <app>Banshee</app></title>
-
- <p>También puede buscar canciones en Amazon desde <app>Banshee</app>. Elija la tienda de Amazon MP3 desde el menú de <app>Banshee</app> de la izquierda. Esto cargará la tienda de Amazon MP3 como si estuviera en un navegador web. Tras iniciar sesión en Amazon, podrá buscar la música que desea comprar y comprarla con una sola pulsación. <app>Banshee</app> de forma automática descargará e importará la música comprada en la colección.</p>
-
+ <title>Comprar música en MP3 de Amazon desde Banshee</title>
+
+ <p>También puede buscar canciones en Amazon desde Banshee. Elija la Tienda de Amazon MP3 desde el menú de la izquierda. Esto cargará la tienda de Amazon MP3 como si la estuviera viendo en el navegador. Tras iniciar sesión en Amazon, podrá buscar música que desea comprar y descargarla con una sola pulsación. Banshee descargará e importará la música comprada a su colección de forma automática.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Importar música en MP3 de Amazon manualmente</title>
-
- <p>Cuando compra música en Amazon a través del navegador, se descarga un archivo con la extensión .amz que se guarda en su disco duro. Para importar de forma manual la música comprada en Amazon, en <app>Banshee</app> elija <guiseq><gui style="menu">Multimedia</gui><gui style="menuitem">Importar multimedia</gui></guiseq> del menú y seleccione el archivo *.amz que desea importar. <app>Banshee</app> abrirá este archivo y se conectará a la tienda de Amazon MP3 para comenzar la descarga.</p>
-
+ <title>Importar música en MP3 de Amazon manualmente</title>
+
+ <p>Cuando compra música en Amazon a través del navegador, se descarga un archivo con la extensión .amz que se guarda en su disco duro. Para importar de forma manual la música comprada en Amazon, vaya a <guiseq><gui>Multimedia</gui><gui>Importar contenido multimedia…</gui></guiseq> y seleccione el archivo *.amz que desea importar. Banshee abrirá el archivo y se conectará a la tienda de Amazon MP3 para comenzar la descarga.</p>
+
<note style="warning">
<p>Los archivos .amz de Amazon sólo tienen validez por un periodo corto de tiempo. Si tarda mucho en descargar su música, el archivo expirará y no podrá utilizarlo para descargar música desde Amazon. La tienda no da información precisa sobre cuánto tiempo pueden ser utilizados los archivos. Se recomienda que descargue e importe la música de la tienda Amazon MP3 como máximo una hora después de la compra.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/es/emusic.page b/help/es/emusic.page
new file mode 100644
index 0000000..d6d02b3
--- /dev/null
+++ b/help/es/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="es">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importar música comprada en eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importar canciones de eMusic</title>
+
+</page>
diff --git a/help/es/es.po b/help/es/es.po
index 4d18f51..d010b8d 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -5,14 +5,13 @@
# Jorge González <jorgegonz at svn.gnome.org>, 2010, 2011.
# Ángel Sanz <mizo0mizo at gmail.com>, 2010, 2011.
# Benjamín Valero Espinosa <benjavalero at gmail.com>, 2010, 2011, 2012.
-# Milagros Alessandra Infante Montero <maim92 at gmail.com>, 2013.
# Daniel Mustieles <daniel.mustieles at gmail.com>, 2011, 2012, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: banshee-help.master\n"
-"POT-Creation-Date: 2013-07-01 09:16+0000\n"
-"PO-Revision-Date: 2013-07-08 13:27+0200\n"
+"POT-Creation-Date: 2013-04-14 20:58+0000\n"
+"PO-Revision-Date: 2013-04-16 13:17+0200\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
"Language-Team: Español <gnome-es-list at gnome.org>\n"
"Language: \n"
@@ -20,196 +19,149 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.6\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:35(None) C/introduction.page:44(None)
-msgid ""
-"@@image: 'figures/main-window.png'; md5=a4b2814f0dce9333bceb0d05e910a796"
-msgstr ""
-"@@image: 'figures/main-window.png'; md5=a4b2814f0dce9333bceb0d05e910a796"
+#: C/ui.page:29(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:9(desc)
-msgid "An overview of the <app>Banshee</app> user interface."
+#: C/ui.page:8(desc)
+msgid "An overview of <app>Banshee's</app> user interface."
msgstr "Una vista general de la interfaz de usuario de <app>Banshee</app>."
#: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name)
-#: C/search.page:12(name) C/radio.page:14(name) C/podcast.page:15(name)
-#: C/play.page:14(name) C/play-queue.page:18(name) C/manage-tags.page:12(name)
-#: C/manage-playlists.page:12(name) C/lastfm.page:12(name)
-#: C/keyboard-shortcuts.page:10(name) C/introduction.page:10(name)
-#: C/index.page:11(name) C/import.page:12(name) C/extensions.page:11(name)
-#: C/amazon.page:11(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:10(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/radio.page:15(email) C/podcast.page:16(email)
-#: C/play.page:15(email) C/play-queue.page:19(email)
-#: C/manage-tags.page:13(email) C/manage-playlists.page:13(email)
-#: C/lastfm.page:13(email) C/keyboard-shortcuts.page:11(email)
-#: C/introduction.page:11(email) C/index.page:12(email)
-#: C/import.page:13(email) C/extensions.page:12(email) C/amazon.page:12(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:11(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 at gnome.org"
msgstr "pcutler at gnome.org"
-#: C/ui.page:16(name) C/sync.page:16(name) C/sort.page:16(name)
-#: C/radio.page:18(name) C/play.page:22(name) C/play-queue.page:13(name)
-#: C/lastfm.page:16(name) C/introduction.page:14(name) C/index.page:19(name)
-#: C/import.page:20(name) C/amazon.page:15(name)
-msgid "Aruna Sankaranarayanan"
-msgstr "Aruna Sankaranarayanan"
-
-#: C/ui.page:17(email) C/sync.page:17(email) C/sort.page:17(email)
-#: C/search.page:17(email) C/radio.page:19(email) C/play.page:23(email)
-#: C/play-queue.page:14(email) C/lastfm.page:17(email)
-#: C/introduction.page:15(email) C/index.page:20(email)
-#: C/import.page:21(email) C/amazon.page:16(email)
-msgid "aruna.evam at gmail.com"
-msgstr "aruna.evam at gmail.com"
-
-#: C/ui.page:29(title)
-msgid "The <app>Banshee</app> user interface"
-msgstr "Interfaz de usuario de <app>Banshee</app>"
-
-#: C/ui.page:32(title) C/introduction.page:41(title)
+#: 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)
msgid "<gui>Banshee Media Player</gui> window"
msgstr "Ventana del <gui>Reproductor multimedia Banshee</gui>"
-#: C/ui.page:33(app) C/introduction.page:42(app)
+#: C/ui.page:28(app) C/index.page:26(title)
msgid "Banshee Media Player"
msgstr "Reproductor multimedia Banshee"
-#: C/ui.page:36(p) C/introduction.page:45(p)
+#: C/ui.page:30(p)
msgid "<app>Banshee</app> library interface"
msgstr "Interfaz de la colección de <app>Banshee</app>"
-#: C/ui.page:41(title)
+#: C/ui.page:35(title)
msgid "Sources"
msgstr "Fuentes"
-#: C/ui.page:43(p)
+#: C/ui.page:36(p)
msgid ""
-"Your music and video sources are shown on the left in <app>Banshee</app>. "
-"The sources give you quick access to your <gui>Play Queue</gui>, <gui>Music</"
-"gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>, <gui>Last.fm</gui>, "
-"<gui>Podcasts</gui> and more."
+"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 ""
-"Su música y sus fuentes de video se muestran a la izquierda de <app>Banshee</"
-"app>. Las fuentes le dan acceso directo a la <app>cola de reproducción</"
-"app>, <gui>música</gui>, <gui>vídeos</gui>, <gui>Tienda MP3 de Amazon</gui>, "
-"<gui>Last.fm</gui>, <gui>Podcasts</gui> y más."
+"Su música y sus fuentes se muestran a la izquierda de Banshee. Las fuentes "
+"le dan acceso directo a la cola de reproducción, música, vídeos, Amazon, "
+"Last.fm, podcasts, etc."
-#: C/ui.page:49(p)
+#: 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 "
-"<gui>Podcasts</gui> source. The menu option for importing a podcast is not "
-"available when viewing the video or music library."
+"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 ""
"Las opciones a elegir en el menú cambiarán según la fuente que se elija. Por "
-"ejemplo, para importar un podcast, tendrá que utilizar la fuente "
-"<gui>Podcast</gui>. La opción del menú para importar un podcast no estará "
-"disponible cuando esté viendo la colección de video o música."
+"ejemplo, para importar un podcast, tendrá que utilizar el menú en la fuente "
+"Podcast. Así, la opción de importar podcasts no aparecerá cuando esté viendo "
+"la colección de vídeos o música."
-#: C/ui.page:58(title)
-msgid "Library browser"
-msgstr "Navegador de colecciones"
-
-#: C/ui.page:60(p)
-msgid ""
-"When you select a music or video source from Sources, <app>Banshee</app> "
-"will display your content in the library browser. Depending on the source "
-"you choose, <app>Banshee</app> can display your music or video library, "
-"podcast subscriptions or even the Amazon Music Store to allow you to buy "
-"music."
-msgstr ""
-"Cuando selecciona una fuente de canción o vídeo desde Fuentes, <app>Banshee</"
-"app> mostrará su contenido en el navegador de colecciones. Dependiendo de la "
-"fuente que elija, <app>Banshee</app> podrá mostrar su colección de música o "
-"vídeo, subscripciones a podcasts o incluso la tienda de música de Amazon "
-"para permitirle comprar música."
-
-#: C/ui.page:68(title)
-msgid "<gui>Now Playing</gui> view"
-msgstr "Vista <gui>En reproducción</gui>"
-
-#: C/ui.page:70(p)
-msgid ""
-"Helpful when using <app>Banshee</app> in full screen mode, the <gui>Now "
-"Playing</gui> mode hides the library to give you a larger view of the music "
-"or video you are watching. When listening to music, the <gui>Now Playing</"
-"gui> view will show you the artist name, album and cover art if available. "
-"If you are watching a video, <app>Banshee</app> will display the video."
-msgstr ""
-"Útil cuando se usa <app>Banshee</app> en modo de pantalla completa, el modo "
-"<gui>En reproducción</gui> oculta la colección para darle una vista más "
-"grande de la música o del vídeo que está viendo. Cuando escucha música, la "
-"vista <gui>En reproducción</gui> le mostrará el nombre del artista, el álbum "
-"y la portada, si está disponible. Si está viendo un vídeo, <app>Banshee</"
-"app> mostrará el vídeo."
+#: C/ui.page:50(title)
+msgid "Library Browser"
+msgstr "Examinador de colecciones"
-#: C/ui.page:77(p)
+#: C/ui.page:51(p)
msgid ""
-"To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app> "
-"user interface and view your media in full screen mode instead, you can do "
-"any of the following:"
+"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 ""
-"Para cambiar el modo <gui>En reproducción</gui> para esconder la interfaz de "
-"usuario de <app>Banshee</app> y ver el contenido multimedia en el modo de "
-"pantalla completa, puede hacer lo siguiente:"
-
-#: C/ui.page:83(p)
-msgid "Double-click the view with your mouse."
-msgstr "Pulse dos veces en la vista con el ratón."
-
-#: C/ui.page:86(p)
-msgid "Press <key>F</key>."
-msgstr "Pulse <key>F</key>."
-
-#: C/ui.page:89(p)
-msgid "Press <key>F11</key>."
-msgstr "Pulse <key>F11</key>."
-
-#: C/ui.page:92(p)
-msgid ""
-"Press the <gui style=\"button\">Fullscreen</gui> button in the upper right "
-"hand corner of <app>Banshee</app>."
-msgstr ""
-"Pulse el botón <gui style=\"button\">Pantalla completa</gui> en la esquina "
-"superior derecha de <app>Banshee</app>."
-
-#: C/ui.page:96(p)
-msgid ""
-"Select <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem"
-"\">Fullscreen</gui></guiseq>."
-msgstr ""
-"Seleccione <guiseq><gui style=\"menu\">Vista</gui><gui style=\"menuitem"
-"\">Pantalla completa</gui></guiseq>."
-
-#: C/ui.page:104(title)
-msgid "Libraries"
-msgstr "Colecciones"
+"Cuando selecciona una canción o un vídeo desde «Fuentes», Banshee mostrará su "
+"contenido en el «Examinador de colecciones». Dependiendo de la fuente que "
+"elija, Banshee podrá mostrar su colección de música o de vídeo, "
+"subscripciones a Podcasts o incluso la tienda de música de Amazon para "
+"permitirle comprar música."
-#: C/ui.page:106(p)
-msgid ""
-"The <gui>Libraries</gui> view in <app>Banshee</app> will change depending on "
-"the Source you have chosen. For example, the <gui>Music</gui> library will "
-"display cover art, artists in your library, and list of songs and the "
-"<gui>Podcasts</gui> library will display your podcast subscriptions, "
-"podcasts that are downloaded or not downloaded, and all, new or old "
-"podcasts. Please see the help page of each source for detailed information "
+#: C/ui.page:58(title)
+msgid "Now Playing View"
+msgstr "Vista «En reproducción»"
+
+#: 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 ""
+"Útil cuando se usa Banshee en modo a pantalla completa, el modo «En "
+"reproducción» oculta la colección para darle una vista más grande de la "
+"música o del vídeo que está viendo. Cuando escucha música, la vista «En "
+"reproducción» le mostrará el nombre del artista, el álbum y la portada, si "
+"está disponible. Si está viendo un vídeo, Banshee mostrará el vídeo."
+
+#: 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 <key>F</key>, press the <gui>Fullscreen</gui> "
+"button in the upper right hand corner of Banshee, or choose "
+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen "
+"mode."
+msgstr ""
+"Para cambiar la vista «En reproducción» para ocultar la interfaz de usuario "
+"de Banshee y usar el modo a pantalla completa, puede pulsar <key>F</key>, "
+"pulsar el botón <gui>Pantalla completa</gui> en la esquina superior derecha "
+"de Banshee o elegir <guiseq><gui>Ver</gui><gui>Pantalla completa</gui></"
+"guiseq> para iniciar el modo a pantalla completa."
+
+#: C/ui.page:74(title)
+msgid "Library"
+msgstr "Colección"
+
+#: 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 ""
-"La vista <gui>Colecciones</gui> en <app>Banshee</app> cambiará dependiendo "
-"de la fuente que haya elegido. La «Colección de música» mostrará la carátula, "
-"los artistas en su colección y lista de canciones. Por ejemplo, la colección "
-"<gui>Música</gui> mostrtará la portada, artistas en su colección y la lista "
-"de canciones de la colección <gui>Podcasts</gui> mostrará sus subscripciones "
-"a podcast, los podcast que ha descargado y los que no, y todos los podcast, "
-"nuevos o antiguos. Consulte la página de ayuda de cada fuente para obtener "
-"información detallada sobre cómo gestionar una fuente."
+"La vista «Colección» de Banshee cambiará dependiendo de la fuente que haya "
+"elegido. La «Colección de música» mostrará la carátula, los artistas en su "
+"colección y lista de canciones. La «Colección de podcast» mostrará sus "
+"subscripciones a podcast, los podcast que se han bajado y los que no, y "
+"todos los podcast, nuevos o antiguos. Consulte la página de ayuda de "
+"«Fuentes» para obtener información detallada sobre cómo gestionar una fuente."
#: C/sync.page:9(desc)
msgid "Sync your media to a portable media player or smartphone."
@@ -217,242 +169,230 @@ msgstr ""
"Sincronizar su contenido multimedia con un reproductor portátil o un "
"teléfono inteligente."
-#: C/sync.page:28(title)
+#: C/sync.page:24(title)
msgid "Sync"
msgstr "Sincronizar"
-#: C/sync.page:30(p)
+#: C/sync.page:26(p)
msgid ""
-"<app>Banshee</app> supports syncing your music to portable media players and "
+"Banshee supports syncing your music to portable media players and "
"smartphones. You can add specific music tracks, albums or playlist or allow "
-"<app>Banshee</app> 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 <app>Banshee</app>. When syncing "
-"music in a lossless format, such as FLAC, <app>Banshee</app> 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 ""
-"<app>Banshee</app> soporta sincronizar su música con reproductores "
-"multimedia portátiles y teléfonos inteligentes. Puede añadir pistas de "
-"música específicas, álbumes o listas de reproducción, o permitir que "
-"<app>Banshee</app> mantenga su reproductor de música en sincronización con "
-"su colección entera. Al conectar su reproductor portátil al equipo también "
-"puede reproducir las canciones de su reproductor portátil en <app>Banshee</"
-"app>. Al sincronizar música en un formato sin pérdida como FLAC, "
-"<app>Banshee</app> transcodificará su música automáticamente a un formato "
-"con pérdida como Ogg Vorbis o MP3, siempre y cuando tenga los códecs "
-"correctos instalados."
-
-#: C/sync.page:40(title)
-msgid "Device support"
-msgstr "Soporte de dispositivo"
-
-#: C/sync.page:42(p)
-msgid ""
-"<app>Banshee</app> supports almost all modern portable music players and "
-"smartphones with the notable exception of the Apple iPhone, iPad and iPod "
+"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 ""
+"Banshee permite sincronizar su música con reproductores portátiles y "
+"teléfonos inteligentes. Puede añadir canciones, álbumes enteros o listas de "
+"reproducción, o hacer que Banshee sincronice automáticamente su reproductor "
+"portátil con toda su colección. Al conectar su reproductor portátil al "
+"ordenador también puede reproducir las canciones que se encuentran en él. Al "
+"sincronizar archivos que se encuentren en un formato de alta calidad como "
+"FLAC, Banshee los convertirá automáticamente a un formato con pérdida como "
+"Ogg Vorbis o MP3, siempre y cuando tenga los códecs necesarios instalados."
+
+#: C/sync.page:37(title)
+msgid "Device Support"
+msgstr "Soporte de dispositivos"
+
+#: 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 ""
+"Banshee cuenta con soporte para casi todos los reproductores multimedia "
+"portátiles y teléfonos inteligentes a excepción del iPhone, iPad y iPod "
"Touch."
-msgstr ""
-"<app>Banshee</app> soporta casi todos los reproductores de música portátiles "
-"modernos y teléfonos inteligentes con la notable excepción del Apple iPhone, "
-"iPad e iPod Touch."
-#: C/sync.page:46(p)
+#: C/sync.page:42(p)
msgid ""
-"When you plug your device in, <app>Banshee</app> will display it in the left "
-"menu. Pressing the device icon will take you to your device home page in "
-"<app>Banshee</app> displaying your sync preferences."
+"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 ""
-"Cuando conecte su dispositivo, <app>Banshee</app> lo mostrará en el menú de "
-"la izquierda. Al pulsar en el icono del dispositivo, lo llevará a la página "
-"principal del dispositivo en <app>Banshee</app>, mostrando sus preferencias "
-"de sincronización."
+"Cuando conecte su dispositivo, Banshee lo mostrará en el menú de la "
+"izquierda. Al pulsar en el icono del dispositivo, le llevará a la página "
+"principal del dispositivo en Banshee, mostrando sus preferencias de "
+"sincronización."
-#: C/sync.page:53(title)
-msgid "Sync your music"
+#: C/sync.page:50(title)
+msgid "Sync Your Music"
msgstr "Sincronizar su música"
-#: C/sync.page:55(p)
+#: C/sync.page:51(p)
msgid ""
-"You can choose to manage the media on your portable music by having "
-"<app>Banshee</app> automatically sync it or manage your music and media "
-"manually."
+"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 ""
-"Puede elegir gestionar el contenido multimedia de su música portátil "
-"haciendo que <app>Banshee</app> lo sincronice automáticamente, o puede "
+"Puede elegir gestionar el contenido multimedia de su reproductor de música "
+"portátil haciendo que Banshee lo sincronice automáticamente, o puede "
"gestionar su música y sus archivos multimedia manualmente."
-#: C/sync.page:59(p)
+#: C/sync.page:56(p)
msgid ""
-"Choose your device from the <app>Banshee</app> menu and then choose how you "
-"want to sync your media, including:"
+"Choose your device from the Banshee menu and then choose how you want to "
+"sync your media, including:"
msgstr ""
-"Elija su dispositivo desde el menú de <app>Banshee</app> y luego elija cómo "
-"quiere sincronizar sus archivos multimedia, incluyendo:"
+"Seleccione su dispositivo desde el menú de Banshee y elija cómo quiere "
+"sincronizar sus archivos multimedia, incluyendo:"
-#: C/sync.page:63(p)
+#: C/sync.page:60(p)
msgid "Music"
msgstr "Música"
-#: C/sync.page:64(p)
+#: C/sync.page:61(p)
msgid "Audiobooks"
msgstr "Audiolibros"
-#: C/sync.page:65(p)
+#: C/sync.page:62(p)
msgid "Videos"
msgstr "Vídeos"
-#: C/sync.page:66(p) C/podcast.page:31(title)
-#: C/keyboard-shortcuts.page:90(title)
-msgid "Podcasts"
+#: C/sync.page:63(p)
+msgid "Podcast"
msgstr "Podcasts"
-#: C/sync.page:69(p)
+#: C/sync.page:66(p)
msgid "From the dropdown menu next to each of the media, choose from:"
msgstr ""
"En el menú desplegable junto a cada uno de los archivos multimedia, "
"seleccione una opción:"
-#: C/sync.page:72(p)
+#: C/sync.page:69(p)
msgid "Manage manually"
msgstr "Gestionar de forma manual"
-#: C/sync.page:73(p)
+#: C/sync.page:70(p)
msgid "Sync entire library"
msgstr "Sincronizar toda la colección"
-#: C/sync.page:77(p)
+#: 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, "
-"<app>Banshee</app> will sync media until your player is full and then stop."
+"Banshee will sync media until your player is full and then stop."
msgstr ""
-"Si elige sincronizar automáticamente su colección entera con su reproductor "
-"multimedia portátil, asegúrese de que su reproductor multimedia portátil "
-"tiene suficiente espacio de almacenamiento. Si su colección es más grande "
-"que el espacio de su reproductor multimedia portátil, <app>Banshee</app> "
-"sincronizará el contenido multimedia hasta que su reproductor esté lleno y "
-"luego se detenga."
+"Si elige sincronizar automáticamente su colección completa con su "
+"dispositivo portátil, asegúrese de que su reproductor multimedia tiene "
+"espacio suficiente. Si su colección es más grande que el espacio de su "
+"reproductor multimedia, Banshee sincronizará el contenido hasta que el "
+"reproductor esté lleno."
-#: C/sync.page:84(p)
+#: 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 <app>Banshee</app> "
-"will sync the new playlist to your device every time you plug it in."
+"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 ""
"si ha creado listas de reproducción o listas de reproducción inteligentes en "
"su colección de música, también se mostrarán como una opción de "
-"sincronización de Música. Esto puede ser útil para crear listas de "
-"reproducción inteligentes, como listas de reproducción inteligentes que se "
-"actualizarán automáticamente a medida que se añade nuevo contenido basado en "
-"las reglas de la lista de reproducción, y <app>Banshee</app> sincronizará la "
-"nueva lista de reproducción con su dispositivo cada vez que lo conecte."
-
-#: C/sync.page:90(p)
-msgid ""
-"<app>Banshee</app> will display the total hard drive space of your portable "
-"music player in a graph in the bottom center of <app>Banshee</app>. The "
-"graph will show you how much space is taken by audio files, video, other and "
-"free space. Directly below that <app>Banshee</app> 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 ""
-"<app>Banshee</app> mostrará el espacio total del disco duro de su "
-"reproductor de música portátil en un gráfico centrado en el centro inferior "
-"de <app>Banshee</app>. El gráfico mostrará cuánto espacio ocupan los "
-"archivos de sonido, vídeo, otros y el espacio libre. Justo debajo "
-"<app>Banshee</app> mostrará cuántos elementos en total hay almacenados en su "
-"reproductor de música portátil, a cuántas horas o días de reproducción "
-"equivalen y el espacio total usado."
+"sincronización de «Música». Esto puede ser útil para crear listas de "
+"reproducción inteligentes, ya que las listas de reproducción inteligentes se "
+"actualizarán automáticamente a medida que se añade contenido basado en las "
+"reglas de la lista de reproducción, y Banshee sincronizará automáticamente "
+"la nueva lista de reproducción con su dispositivo cada vez que lo conecte."
+
+#: 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 ""
+"Banshee mostrará el espacio total del disco de su reproductor multimedia "
+"portátil en un gráfico centrado en la parte inferior de Banshee. El gráfico "
+"mostrará cuánto espacio ocupan los archivos de sonido, vídeo, otros y el "
+"espacio libre. Justo debajo Banshee mostrará cuántos elementos en total hay "
+"almacenados en su reproductor portátil de música, a cuántas horas o días de "
+"reproducción equivalen y el espacio usado total."
#: C/sync.page:100(title)
-msgid "Sync your entire library"
-msgstr "Sincronizar su colección entera"
+msgid "Sync Your Entire Library"
+msgstr "Sincronizar su biblioteca completa"
-#: C/sync.page:102(p)
+#: C/sync.page:101(p)
msgid ""
-"You can drag and drop media to your portable music player from <app>Banshee</"
-"app>. 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 <app>Banshee</app>. This will copy the "
-"files to your device."
+"You can drag and drop media to your portable music player from 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 ""
-"Puede arrastrar y soltar archivos multimedia a su reproductor de música "
-"portátil desde <app>Banshee</app>. Seleccione el archivo o los archivos que "
-"quiera copiar en su reproductor multimedia portátil y luego mantenga pulsado "
-"el botón derecho del ratón y arrastre los archivos al icono de su "
-"reproductor multimedia portátil en <app>Banshee</app>. Esto copiará los "
-"archivos a su dispositivo."
+"Puede arrastrar y soltar archivos multimedia en su reproductor de música "
+"portátil desde Banshee. Seleccione el archivo o los archivos que quiera "
+"copiar en su reproductor multimedia portátil y mantenga pulsado el botón del "
+"ratón mientras arrastra los archivos al icono de su reproductor multimedia "
+"portátil en Banshee. Esto copiará los archivos a su dispositivo."
#: 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, <app>Banshee</app> can automatically transcode these files to MP3 "
-"when transferring to your portable media player. Check with your Linux "
+"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 ""
"Si su colección de música está codificada en un formato que su reproductor "
"multimedia portátil no soporta, como OGG o FLAC, y tiene instalados los "
-"códecs necesarios, <app>Banshee</app> puede transcodificar automáticamente "
-"estos archivos a MP3 al transferirlos a su reproductor multimedia portátil. "
-"Compruebe que su distribución de Linux tiene los códecs necesarios, ya que "
-"esto está fuera del alcance de esta ayuda y varía según la distribución."
+"códecs necesarios, Banshee puede convertir automáticamente estos archivos a "
+"MP3 al transferirlos a su reproductor multimedia portátil. Compruebe que su "
+"distribución de Linux tiene los códecs necesarios, ya que esto está fuera "
+"del objetivo de esta ayuda y varía según la distribución."
-#: C/sync.page:116(p)
+#: 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 <app>Banshee</app>, using "
-"your mouse right click the device in the <app>Banshee</app> menu and press "
-"<gui style=\"menuitem\">Disconnect</gui>."
+"portable music player. To eject your device in Banshee, using your mouse "
+"right click the device in the Banshee menu and press <gui>Disconnect</gui>."
msgstr ""
"Puede necesitar expulsar su dispositivo para cargar los archivos "
-"correctamente en su reproductor de música portátil. Para expulsar su "
-"dispositivo en <app>Banshee</app>, pulse con el botón derecho del ratón "
-"sobre el dispositivo en el menú de <app>Banshee</app> y pulse <gui style="
-"\"menuitem\">Desconectar</gui>."
+"correctamente en su reproductor multimedia portátil. Para expulsar su "
+"dispositivo desde Banshee, pulse con el botón derecho del ratón sobre el "
+"dispositivo en el menú de Banshee y pulse <gui>Desconectar</gui>."
-#: C/sync.page:125(title)
-msgid "Play music from your portable music player"
-msgstr "Reproducir música desde su reproductor de música portátil"
+#: C/sync.page:127(title)
+msgid "Play Music From Your Portable Music Player"
+msgstr "Reproducir música desde su reproductor portátil"
-#: C/sync.page:127(p)
+#: C/sync.page:128(p)
msgid ""
-"You can play music stored on your portable music player directly in "
-"<app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the "
-"left and your portable music player's library will be displayed. You can "
-"then play music in <app>Banshee</app> just as you would music in your own "
-"library."
+"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 ""
"Puede reproducir música almacenada en su reproductor de música portátil "
-"directamente en <app>Banshee</app>. Elija su reproductor en el menú de "
-"<app>Banshee</app> en la parte izquierda y se mostrará la colección de su "
-"reproductor de música portátil. Entonces puede reproducir música en "
-"<app>Banshee</app> igual que lo haría desde su propia colección."
+"directamente en Banshee. Elija su reproductor en el menú de Banshee en la "
+"parte izquierda y se mostrará la colección de su reproductor de música "
+"portátil. Entonces puede reproducir la música en Banshee igual que lo haría "
+"desde su propia colección."
-#: C/sync.page:136(title)
-msgid "Remove music from your portable music player"
-msgstr "Quitar música de su reproductor de música portátil"
+#: C/sync.page:135(title)
+msgid "Remove Music From your Portable Music Player"
+msgstr "Quitar música de su reproductor portátil"
-#: C/sync.page:138(p)
+#: C/sync.page:136(p)
msgid ""
"To remove songs stored on your portable music player, choose your player in "
-"<app>Banshee</app> to view its library. Then choose the tracks you would "
-"like to remove and right click the tracks and choose <gui style=\"menuitem"
-"\">Delete</gui> or from the menu choose <guiseq><gui style=\"menu\">Edit</"
-"gui><gui style=\"menuitem\">Delete</gui></guiseq>."
+"Banshee to view its library. Then choose the tracks you would like to remove "
+"and right click the tracks and choose <gui>Delete</gui> or from the menu "
+"choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
msgstr ""
"Para quitar canciones almacenadas en su reproductor de música portátil, "
-"elija su reproductor en <app>Banshee</app> para ver su colección. Elija las "
-"pistas que quiere quitar, pulse con el botón derecho la pista y elija <gui "
-"style=\"menuitem\">Eliminar</gui>, o del menú elija <guiseq><gui style=\"menu"
-"\">Editar</gui><gui style=\"menuitem\">Eliminar</gui></guiseq>."
+"elija su reproductor en Banshee para ver su colección. Elija las pistas que "
+"quiere quitar, pulse con el botón derecho sobre las pistas y elija "
+"«Eliminar», o elija <guiseq><gui>Editar</gui><gui>Eliminar</gui></guiseq> en "
+"el menú."
-#: C/sync.page:146(p)
+#: C/sync.page:142(p)
msgid ""
"Deleting files from your portable music player will permanently remove the "
"files and you will not be able to recover them."
@@ -464,15 +404,15 @@ msgstr ""
msgid "Sort your media and add additional columns."
msgstr "Ordenar su contenido multimedia y añadir columnas adicionales."
-#: C/sort.page:28(title)
+#: C/sort.page:24(title)
msgid "Sort your media"
msgstr "Ordenar su contenido multimedia "
-#: C/sort.page:32(title)
-msgid "Adding columns"
+#: C/sort.page:28(title)
+msgid "Adding Columns"
msgstr "Añadir columnas"
-#: C/sort.page:34(p)
+#: C/sort.page:30(p)
msgid ""
"As your library grows, you may want to change your library view to add "
"additional information about the songs in your library or change the way you "
@@ -483,116 +423,108 @@ msgstr ""
"colección o cambiar la forma en que puede ver y ordenar sus canciones, "
"artistas o álbumes."
-#: C/sort.page:38(p)
+#: C/sort.page:34(p)
msgid ""
"You can add additional columns to the library view in <app>Banshee</app> to "
"give you more information about the songs and also allow you to sort by. By "
-"default, <app>Banshee</app> displays columns for songs including <gui>Name</"
-"gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To add "
-"additional columns, using your mouse right click on any of the columns and "
-"<app>Banshee</app> 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 ""
-"Puede añadir columnas adicionales a la vista de colección en <app>Banshee</"
-"app> para obtener más información sobre las canciones y también para "
-"permitirle ordenarlas. De manera predeterminada, <app>Banshee</app> muestra "
-"columnas para las canciones que incluyen <gui>Nombre</gui>, <gui>Artista</"
-"gui>, <gui>Álbum</gui> y <gui>Duración</gui>. Para añadir columnas "
-"adicionales, pulse con el botón derecho del ratón en cualquiera de las "
-"columnas y <app>Banshee</app> mostrará todas las columnas disponibles para "
-"elegir. Pulse en la casilla de verificación junto al nombre de la columna "
-"que quiere añadir a la vista de colección."
-
-#: C/sort.page:50(title)
-msgid "Sorting columns"
+"default, Banshee displays columns for songs including <gui>Name</gui>, "
+"<gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. 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 ""
+"Puede añadir más columnas a la vista de colección en <app>Banshee</app> para "
+"obtener más información sobre las canciones y para permitirle ordenarlas. De "
+"manera predeterminada, Banshee muestra columnas para las canciones que "
+"incluyen <gui>Nombre</gui>, <gui>Artista</gui>, <gui>Álbum</gui> y "
+"<gui>Duración</gui>. Para añadir columnas adicionales, pulse con el botón "
+"derecho del ratón en cualquiera de las columnas y Banshee mostrará todas las "
+"columnas disponibles para elegir. Pulse en la casilla junto al nombre de la "
+"columna que quiere añadir a la vista de colección."
+
+#: C/sort.page:46(title)
+msgid "Sorting Columns"
msgstr "Ordenar columnas"
-#: C/sort.page:52(p)
+#: 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 <gui>Artist</gui> column header and <app>Banshee</app> will "
-"automatically sort that column alphabetically. Clicking the <gui>Artist</"
-"gui> column again will sort the column in reverse alphabetical order."
+"click the <gui>Artist</gui> column header and Banshee will automatically "
+"sort that column alphabetically. Clicking the <gui>Artist</gui> column again "
+"will sort the column in reverse alphabetical order."
msgstr ""
"Puede ordenar su colección usando su ratón para pulsar en cualquiera de las "
"columnas mostradas en la vista de colección. Si quiere ordenar su colección "
"de música por artista, pulse en la cabecera de la columna <gui>Artista</gui> "
-"y <app>Banshee</app> ordenará automáticamente esa columna por orden "
-"alfabético. Pulsando otra vez en la columna <gui>Artista</gui>, la columna "
-"se ordenará en orden alfabético inverso."
+"y Banshee ordenará automáticamente esa columna por orden alfabético. "
+"Pulsando otra vez en la columna <gui>Artista</gui>, la columna se ordenará "
+"en orden alfabético inverso."
#: C/search.page:9(desc)
msgid "Search your media and perfom basic queries."
msgstr "Buscar su contenido multimedia y realizar consultas básicas."
-#: C/search.page:16(name)
-msgid "Aruna sankaranarayanan"
-msgstr "Aruna sankaranarayanan"
-
-#: C/search.page:28(title)
-msgid "Searching your <app>Banshee</app> library"
-msgstr "Buscando su colección de <app>Banshee</app>"
+#: C/search.page:24(title)
+msgid "Searching your Banshee Library"
+msgstr "Buscar en su colección de Banshee"
-#: C/search.page:30(p)
+#: C/search.page:26(p)
msgid ""
-"<app>Banshee</app> features a powerful search language. You can search your "
-"library quickly and easily with basic search terms or perform detailed "
-"searches with the <app>Banshee</app> advanced search terminology."
+"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 ""
-"<app>Banshee</app> ofrece un lenguaje de búsqueda potente. Puede buscar en "
-"su colección rápida y fácilmente con términos de búsqueda básicos, o "
-"realizar búsquedas detalladas con la terminología de búsqueda avanzada de "
-"<app>Banshee</app>."
+"Banshee tiene un lenguaje de búsquedas potente. Puede buscar en su colección "
+"rápida y fácilmente con términos de búsqueda básicos, o realizar búsquedas "
+"detalladas con la terminología de búsqueda avanzada de Banshee."
-#: C/search.page:34(p)
+#: C/search.page:30(p)
msgid ""
-"To perform a search of your media in <app>Banshee</app>, press the <key>S</"
-"key> or click the <gui>Search</gui> box in the upper right hand corner of "
-"the Library view in <app>Banshee</app>."
+"To perform a search of your media in Banshee, press the <key>S</key> or "
+"click the <gui>Search</gui> box in the upper right hand corner of the "
+"Library view in Banshee."
msgstr ""
-"Para realizar una búsqueda de su contenido multimedia en <app>Banshee</app>, "
-"pulse <key>S</key> o pulse en la caja <gui>Buscar</gui> en la esquina "
-"superior derecha en la vista de colección en <app>Banshee</app>."
+"Para realizar una búsqueda de su contenido multimedia en Banshee, presione "
+"<key>S</key> o pulse en la caja <gui>Buscar</gui> en la esquina superior "
+"derecha en la vista de colección de Banshee."
-#: C/search.page:38(p)
+#: C/search.page:35(p)
msgid ""
"A search query consists of some basic terms, for example, <em>dave matthews</"
-"em>. By entering <em>dave matthews</em> in the search box, <app>Banshee</"
-"app> will search all metadata fields including Track Title, Album Title, "
-"Album Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
-"<em>matthews</em> will be returned. Search terms are case insensitive, "
-"meaning you do not have to capitalize. <em>dave</em>, <em>Dave</em>, and "
-"<em>DAVE</em> all mean the same thing when searching."
-msgstr ""
-"Una consulta de búsqueda consiste de algunos términos básicos, por ejemplo, "
+"em>. By entering <em>dave matthews</em> in the search box, Banshee will "
+"search all metadata fields including Track Title, Album Title, Album Artist, "
+"Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</"
+"em> will be returned. Search terms are case insensitive, meaning you don't "
+"have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean "
+"the same thing when searching."
+msgstr ""
+"Una consulta de búsqueda consiste en algunos términos básicos, por ejemplo, "
"<em>dave matthews</em>. Al introducir <em>dave matthews</em> en la caja de "
-"búsqueda, <app>Banshee</app> buscará todos los campos de metadatos, "
-"incluyendo título de la pista, título del álbum, Artista del álbum, año, "
-"etc. Se devolverá cualquier pista cuyos metadatos incluyan <em>dave</em> y "
-"<em>matthews</em>. Los términos de búsqueda no son sensibles a las "
-"mayúsculas, lo que significa que no tiene que ponerlas en mayúsculas. "
-"<em>dave</em>, <em>Dave</em> y <em>DAVE</em> todos son lo mismo al buscar."
-
-#: C/search.page:47(title)
-msgid "Basic operators"
+"búsqueda, Banshee buscará todos los campos de metadatos, incluyendo «Pista», "
+"«Título de la pista», «Título del álbum», «Artista», «Año», etc. Se devolverá "
+"cualquier pista cuyos metadatos incluyan <em>dave</em> y <em>matthews</em>. "
+"Los términos de búsqueda no son sensibles a las mayúsculas, lo que significa "
+"que no tiene que preocuparse de usarlas. <em>dave</em>, <em>Dave</em> y "
+"<em>DAVE</em> tienen todos el mismo significado a la hora de buscar."
+
+#: C/search.page:43(title)
+msgid "Basic Operators"
msgstr "Operadores básicos"
-#: C/search.page:49(p)
+#: 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 <gui>AND</gui> and is used when no "
-"other operators are used between two search terms. Since it is the default, "
-"there is no explicit AND operator."
+"other operators are used between two search terms. Because it is the "
+"default, there is no explicit AND operator."
msgstr ""
-"Los operadores se pueden poner entre dos palabras de búsqueda o ponerse "
-"antes de una palabra de búsqueda. La operación predeterminada es <gui>AND</"
+"Los operadores se pueden poner entre dos palabras de la búsqueda o ponerse "
+"antes de una palabra de la búsqueda. El operador predeterminado es <gui>AND</"
"gui> y se usa cuando no se usan otros operadores entre dos términos de "
-"búsqueda. Al ser el predeterminado, no existe de manera explícita el "
-"operador AND."
+"búsqueda. Al ser el operador predeterminado, no existe de manera explícita."
-#: C/search.page:54(p)
+#: C/search.page:49(p)
msgid ""
"Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together, "
"these three operations can yield very powerful queries to help you search "
@@ -602,11 +534,11 @@ msgstr ""
"tres operadores puede generar consultas muy potentes para ayudarle a buscar "
"sus archivos multimedia."
-#: C/search.page:61(title)
-msgid "Logical operators and examples"
+#: C/search.page:56(title)
+msgid "Logical Operators and Examples"
msgstr "Operadores lógicos y ejemplos"
-#: C/search.page:63(p)
+#: C/search.page:57(p)
msgid ""
"The following is a list of logical operators and examples of the search "
"results when searching using them."
@@ -614,59 +546,59 @@ msgstr ""
"Lo siguiente es una lista de operadores lógicos y ejemplos de resultados de "
"búsquedas realizadas usándolos."
-#: C/search.page:68(gui)
+#: C/search.page:62(gui)
msgid "Operator"
msgstr "Operador"
-#: C/search.page:69(gui) C/search.page:93(gui)
+#: C/search.page:62(gui) C/search.page:84(gui)
msgid "Description"
msgstr "Descripción"
-#: C/search.page:72(p)
+#: C/search.page:65(p)
msgid "<em>default</em>, <em>white space</em>"
msgstr "<em>predeterminado</em>, <em>espacio en blanco</em>"
-#: C/search.page:73(p)
+#: C/search.page:65(p)
msgid "Search for two terms with a space between the two words or terms."
msgstr ""
"Buscar dos términos con un espacio en blanco entre las dos palabras o "
"términos."
-#: C/search.page:77(p)
+#: C/search.page:69(p)
msgid "OR, or, <key>|</key>, <key>,</key>"
msgstr "OR, or, <key>|</key>, <key>,</key>"
-#: C/search.page:78(p)
+#: C/search.page:69(p)
msgid "Search results will be two songs with either result in any field."
msgstr ""
"Los resultados de la búsqueda serán dos canciones con resultados en "
"cualquier campo."
-#: C/search.page:82(p)
+#: C/search.page:73(p)
msgid "NOT, not,<key>-</key>"
msgstr "NOT, not, <key>-</key>"
-#: C/search.page:83(p)
+#: C/search.page:73(p)
msgid ""
"Do not display search results with any search term that follows the operator "
-"of NOT, not,<key>-</key>"
+"of NOT, not,<key>-</key>."
msgstr ""
"No mostrar los resultados de la búsqueda con cualquier término de búsqueda "
"que sigue al operador NOT, not, <key>-</key>."
-#: C/search.page:88(p)
+#: C/search.page:80(p)
msgid "Examples of logical operations include:"
msgstr "Los ejemplos de operaciones lógicas incluyen:"
-#: C/search.page:92(gui)
+#: C/search.page:84(gui)
msgid "Query"
msgstr "Consulta"
-#: C/search.page:96(p)
+#: C/search.page:87(p)
msgid "dave matthews"
msgstr "dave matthews"
-#: C/search.page:97(p)
+#: C/search.page:87(p)
msgid ""
"Matches any fields in a track containing both <em>dave</em> and "
"<em>matthews</em>."
@@ -674,11 +606,11 @@ msgstr ""
"Busca cualquier campo de una pista que contenga <em>dave</em> y "
"<em>matthews</em>."
-#: C/search.page:101(p)
+#: C/search.page:92(p)
msgid "dave, matthews"
msgstr "dave, matthews"
-#: C/search.page:102(p) C/search.page:107(p) C/search.page:112(p)
+#: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p)
msgid ""
"Matches any fields in a track containing either <em>dave</em> or "
"<em>matthews</em>."
@@ -686,783 +618,336 @@ msgstr ""
"Busca cualquier campo de una pista de una pista que contenga <em>dave</em> o "
"<em>matthews</em>."
-#: C/search.page:106(p)
+#: C/search.page:97(p)
msgid "dave or matthews"
msgstr "dave or matthews"
-#: C/search.page:111(p)
+#: C/search.page:102(p)
msgid "dave | matthews"
msgstr "dave | matthews"
-#: C/search.page:116(p)
+#: C/search.page:107(p)
msgid "-\"dave matthews\""
msgstr "-\"dave matthews\""
-#: C/search.page:117(p)
+#: C/search.page:107(p)
msgid "Displays all tracks whose fields do not contain <em>dave matthews</em>."
msgstr ""
"Muestra todas las pistas cuyos campos no contienen <em>dave matthews</em>."
-#: C/radio.page:10(desc)
-msgid "Add, remove and play internet radio stations in <app>Banshee</app>."
-msgstr ""
-"Añadir, quitar y reproducir emisoras de radio por Internet en <app>Banshee</"
-"app>."
-
-#: C/radio.page:30(title)
-msgid "Internet radio"
-msgstr "Radio por Internet"
-
-#: C/radio.page:33(title)
-msgid "What is internet radio?"
-msgstr "¿Qué es la radio por Internet?"
-
-#: C/radio.page:35(p)
-msgid ""
-"Internet radio stations are similar to regular radio stations, allowing an "
-"individual or an organization to stream music live over the internet. "
-"Internet radio stations can be a simultaneous stream of a regular radio "
-"station, amateurs broadcasting their own station, or commercial radio "
-"stations that include live DJs and even commercials."
-msgstr ""
-"Las emisoras de radio por Internet son parecidas a las emisoras de radio "
-"normales. Permiten a una persona u organización emitir música en directo a "
-"través de Internet. Las emisoras de radio por Internet pueden consistir en "
-"una emisión simultánea de una emisora corriente, una persona emitiendo su "
-"propio programa, o emisiones de tipo comercial que pueden incluir, por "
-"ejemplo, sesiones de DJ o incluso anuncios."
-
-#: C/radio.page:44(title)
-msgid "Add radio station"
-msgstr "Añadir una emisora de radio"
-
-#: C/radio.page:46(p)
-msgid ""
-"Search for internet radio stations using your favourite search engine. You "
-"can specify genres, channel frequencies, names of stations and other details "
-"to narrow down your search. Many radio stations display either a button or a "
-"link to listen to their stream. In most web-browsers, you can right click on "
-"the link and choose <gui style=\"menuitem\">Copy Link</gui>."
-msgstr ""
-"Buscar emisoras de radio en Internet usando su motor de búsqueda favorito. "
-"Puede especificar géneros, frecuencias de canal, nombres de emisoras y otros "
-"detalles para ajustar la búsqueda. Muchas emisoras de radio muestran un "
-"botón o un enlace para escuchar la emisión. En la mayoría de los navegadores "
-"web, puede pulsar con el botón derecho sobre el enlace y elegir <gui style="
-"\"menuitem\">Copiar enlace</gui>."
-
-#: C/radio.page:54(title)
-msgid "To add an internet radio station to <app>Banshee</app>:"
-msgstr "Para añadir una emisora de radio por Internet a <app>Banshee</app>:"
-
-#: C/radio.page:56(p)
-msgid ""
-"Select <gui>Radio</gui> in the menu on the left hand side of your window, "
-"then click on <gui style=\"menuitem\">Add Station</gui> on the upper right "
-"hand corner of <app>Banshee</app>. Or, you can select <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">Add Station</gui></guiseq> from "
-"the menu."
-msgstr ""
-"Seleccione <gui>Radio</gui> en el menú de la izquierda de la ventana y pulse "
-"en <gui style=\"menuitem\">Añadir emisora</gui> en la esquina superior "
-"derecha de <app>Banshee</app>. O también puede seleccionar <guiseq><gui "
-"style=\"menu\">Multimedia</gui><gui style=\"menuitem\">Añadir emisora</gui></"
-"guiseq> del menú."
-
-#: C/radio.page:63(p)
-msgid ""
-"You will need to enter some details about the radio station that you wish to "
-"add. The first three fields are mandatory:"
-msgstr ""
-"Necesitará introducir algunos detalles sobre la emisora que quiere añadir. "
-"Los tres primeros campos son obligatorios:"
-
-#: C/radio.page:67(p)
-msgid ""
-"In the <gui style=\"menuitem\">Station Genre</gui> text box, describe the "
-"type of music the internet radio station plays by creating an appropriate "
-"label, or choose a label from the available drop down selections."
-msgstr ""
-"En la caja de texto <gui style=\"menuitem\">Género de la emisora</gui>, "
-"describa el tipo de música que la emisora de radio por internet reproduce "
-"creando una etiqueta apropiada, o elija una etiqueta de entre las "
-"selecciones disponibles en los desplegables."
-
-#: C/radio.page:73(p)
-msgid ""
-"In the <gui style=\"input\">Station Name</gui> text box, enter a name for "
-"the radio station."
-msgstr ""
-"En la caja de texto <gui style=\"input\">Nombre de la emisora</gui>, "
-"introduzca un nombre para la emisora de radio."
-
-#: C/radio.page:77(p)
-msgid ""
-"In the <gui style=\"input\">Stream URL</gui> field, enter or paste the URL "
-"of the stream by right clicking and selecting <gui style=\"menuitem\">Paste</"
-"gui> or pressing <keyseq><key>Control</key><key>V</key></keyseq>."
-msgstr ""
-"En el campo <gui style=\"input\">URL del flujo</gui> introduzca o pegue el "
-"URL del flujo pulsando con el botón derecho y seleccionando <gui style="
-"\"menuitem\">Pegar</gui> o pulsando <keyseq><key>Ctrl</key><key>V</key></"
-"keyseq>."
-
-#: C/radio.page:85(p)
-msgid ""
-"You can also fill out the fields for <gui style=\"input\">Station Creator</"
-"gui>, <gui style=\"input\">Description</gui>, and <gui style=\"input"
-"\">Rating</gui>."
-msgstr ""
-"También puede rellenar los campos <gui style=\"input\">Creador de la "
-"emisora</gui>, <gui style=\"input\">Descripción</gui> y <gui style=\"input"
-"\">Valoración</gui>."
-
-#: C/radio.page:91(p)
-msgid ""
-"Finally, click <gui style=\"button\">Save</gui> to save the internet radio "
-"station in <app>Banshee</app>."
-msgstr ""
-"Para terminar, pulse en <gui style=\"button\">Guardar</gui> para guardar la "
-"estación de radio por Internet en <app>Banshee</app>."
-
-#: C/radio.page:99(title)
-msgid "Play a radio station"
-msgstr "Reproducir una emisora de radio"
-
-#: C/radio.page:101(p)
-msgid ""
-"To <link xref=\"play\">play</link> a radio station, double click on the "
-"radio station. Alternatively, right click on the station and select <gui "
-"style=\"menuitem\">Play</gui> or select the radio station and choose "
-"<guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem\">Play</"
-"gui></guiseq>."
-msgstr ""
-"Para <link xref=\"play\">reproducir</link> una emisora de radio, pulse dos "
-"veces sobre la emisora. Alternativamente, pulse con el botón derecho sobre "
-"la emisora y elija <gui style=\"menuitem\">Reproducir</gui> o seleccione la "
-"emisora de radio y elija <guiseq><gui style=\"menu\">Reproducción</gui><gui "
-"style=\"menuitem\">Reproducir</gui></guiseq>."
-
-#. Not sure about play queue and play after current track
-#: C/radio.page:109(p)
-msgid ""
-"To add a radio station to the <gui style=\"menuitem\" xref=\"play-queue"
-"\">Play Queue</gui>, you can right click on the station and select <gui "
-"style=\"menuitem\">Add to Play Queue</gui>. This will play the radio station "
-"when the queue has finished playing all media which is ahead of the station "
-"in the <gui>Play Queue</gui>."
-msgstr ""
-"Para añadir una emisora de radio a la <gui style=\"menuitem\" xref=\"play-"
-"queue\">Cola de reproducción</gui>, puede pulsar con el botón derecho sobre "
-"la emisora y elegir <gui style=\"menuitem\">Añadir a la cola de "
-"reproducción</gui>. Esto reproducirá la emisora de radio cuando la cola "
-"termine de reproducir todo lo que haya por delante de la emisora en la "
-"<gui>Cola de reproducción</gui>."
-
-#: C/radio.page:115(p)
-msgid ""
-"You can also right click the station and select <gui style=\"menuitem\">Play "
-"after Current Track</gui> to add the radio station to the queue after the "
-"track that is currently playing."
-msgstr ""
-"También puede pulsar con el botón derecho sobre la emisora y seleccionar "
-"<gui style=\"menuitem\">Reproducir después de la pista actual</gui> para "
-"añadir la emisora de radio a la cola después de la pista que se esté "
-"reproduciendo actualmente."
-
-#: C/radio.page:120(p)
-msgid ""
-"<gui style=\"menuitem\">Play after Current Track</gui> may not work on some "
-"<app>Banshee</app> installations."
-msgstr ""
-"<gui style=\"menuitem\">Reproducir después de la pista actual</gui> puede no "
-"funcionar en algunas instalaciones de <app>Banshee</app>."
-
-#: C/radio.page:127(title)
-msgid "Remove a radio station"
-msgstr "Quitar una emisora de radio"
-
-#: C/radio.page:129(p)
-msgid ""
-"To remove a radio station from <app>Banshee</app>, you can right click on "
-"the radio station and select <gui style=\"menuitem\">Remove</gui>, or "
-"alternatively, you can select the station with your mouse and press "
-"<key>Delete</key>. When you are prompted for confirmation, click the <gui "
-"style=\"button\">Remove</gui> button to remove the radio station."
-msgstr ""
-"Para quitar una emisora de rardio de <app>Banshee</app>, puede pulsar con el "
-"botón derecho en la estación de radio y seleccionar <gui style=\"menuitem"
-"\">Quitar</gui>, o alternativamente, puede seleccionar la estación con el "
-"ratón y pulsar <key>Supr</key>. Cuando se le pida que confirme, pulse el "
-"botón <gui style=\"button\">Quitar</gui> para quitar la emisora de radio."
-
-#: C/podcast.page:11(desc)
-msgid "Add, remove and play podcasts in <app>Banshee</app>."
-msgstr "Añadir, quitar y reproducir podcasts en <app>Banshee</app>."
-
-#: C/podcast.page:19(name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/podcast.page:20(email)
-msgid "kittykat3756 at gmail.com"
-msgstr "kittykat3756 at gmail.com"
-
-#: C/podcast.page:34(title)
-msgid "What is a podcast?"
-msgstr "¿Qué es un podcast?"
-
-#: C/podcast.page:36(p)
-msgid ""
-"Podcasts are recorded programs, similar to radio programs, that are "
-"available on the internet and allow you to subscribe to them. When you "
-"subscribe to a podcast in <app>Banshee</app>, each time a new program is "
-"released, <app>Banshee</app> will automatically download the podcast to your "
-"library."
-msgstr ""
-"Los podcasts son programas grabados, parecidos a los de radio, que se "
-"encuentran disponibles en Internet y a los que puede suscribirse. Cuando se "
-"suscriba a un podcast en <app>Banshee</app>, y cada vez que se publica un "
-"programa nuevo, <app>Banshee</app> lo descargará automáticamente y lo "
-"añadirá a su colección."
-
-#: C/podcast.page:42(p)
-msgid ""
-"Podcasts have been made on almost any subject, including music, movies, "
-"Linux and more. Search the internet using your favorite search engine with a "
-"search term such as \"Linux podcast\" and you will be presented with many "
-"options to choose from."
-msgstr ""
-"Se pueden encontrar podcasts sobre prácticamente cualquier tema, como "
-"música, películas, Linux y mucho más. Para encontrar podcasts en Internet, "
-"utilice su buscador preferido e introduzca términos como «podcast Linux» para "
-"encontrar un gran número de opciones donde elegir."
-
-#: C/podcast.page:50(title)
-msgid "Add a podcast"
-msgstr "Añadir un podcast"
-
-#: C/podcast.page:52(p)
-msgid ""
-"To add a podcast to <app>Banshee</app>, you will first need to visit the "
-"podcast home page. Most podcasts will have a button or link displayed to "
-"subscribe to the podcast. Copy the link to the podcast subscription feed. In "
-"most web browsers, you can right click on the link and choose <gui style="
-"\"menuitem\">Copy link</gui>."
-msgstr ""
-"Para añadir un podcast a <app>Banshee</app>, primero deberá visitar la "
-"página web del podcast en Internet. Casi todos los podcasts cuentan con un "
-"botón o un enlace que permite suscribirse al podcast. Copie dicho enlace. En "
-"la mayoría de los navegadores puede pulsar con el botón derecho en el enlace "
-"y seleccionar <gui style=\"menuitem\">Copiar enlace</gui>."
-
-#: C/podcast.page:58(p)
+#: C/search.page:114(p)
msgid ""
-"In <app>Banshee</app>, click <gui style=\"menuitem\">Podcast</gui> in the "
-"menu on the left side of the window. Then, click <gui style=\"menuitem"
-"\">Subscribe to Podcasts</gui> in the right half of the toolbar, from the "
-"menu choose <guiseq><gui style=\"menu\">Media</gui><gui style=\"menuitem"
-"\">Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
-"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
+"For more information on performing more complex search queries, see the "
+"<link xref=\"adv-search\"/> page."
msgstr ""
-"En <app>Banshee</app>, pulse <gui style=\"menuitem\">Podcast</gui> en el "
-"menú de la parte izquierda de la ventana. Luego pulse en <gui style="
-"\"menuitem\">Suscribirse a podcasts</gui> en la mitad derecha de la barra de "
-"herramientas, elija <guiseq><gui style=\"menu\">Multimedia</gui><gui style="
-"\"menuitem\">Suscribirse a podcasts</gui></guiseq> en el menú o use el atajo "
-"de teclado <keyseq><key>Mayús</key><key>Ctrl</key><key>F</key></keyseq>."
+"Para obtener más información sobre cómo realizar consultas de búsqueda más "
+"complejas, consulte la <link xref=\"adv-search\"/>"
-#: C/podcast.page:65(p)
+#: C/rb-import.page:8(desc)
msgid ""
-"By default, the podcasts will not be downloaded, so you will only be able to "
-"listen to them while you are connected to the internet. When you subscribe "
-"to a new podcast, you will be able to select the following options:"
+"Import music and categorizations from the <app>Rhythmbox</app> music player."
msgstr ""
-"De manera predeterminada, los podcasts no se descargarán, por lo que sólo "
-"podrá escucharlos mientras esté conectado a Internet. Cuando se suscriba a "
-"un podcast nuevo, podrá seleccionar las siguientes opciones."
+"Importar musica y categorías desde el reproductor de música <app>Rhythmbox</"
+"app>. "
-#: C/podcast.page:71(p)
-msgid ""
-"Select <gui style=\"checkbox\">Download new episodes</gui> to automatically "
-"download any new episodes to your computer so that you can access them when "
-"you do not have an internet connection."
-msgstr ""
-"Seleccione <gui style=\"checkbox\">Descargar episodios nuevos</gui> para "
-"descargar automáticamente los episodios nuevos a su equipo para poder "
-"acceder a ellos cuando no tenga conexión a Internet."
-
-#: C/podcast.page:76(p)
-msgid ""
-"Select <gui style=\"menuitem\">Archive all episodes except the newest one</"
-"gui> to have only the newest episode displayed."
-msgstr ""
-"Seleccione <gui style=\"menuitem\">Archivar todos los episodios excepto el "
-"más reciente</gui> para que sólo se muestre el episodio más reciente."
-
-#: C/podcast.page:81(p)
-msgid ""
-"After you have added a podcast feed, <app>Banshee</app> will display the "
-"name of the podcast, the title of each episode and the date that it was "
-"published on."
-msgstr ""
-"Después de añadir el proveedor de podcast, <app>Banshee</app> mostrará el "
-"nombre del podcast, el título de cada episodio y la fecha en la que se "
-"publicó."
-
-#: C/podcast.page:85(p)
-msgid ""
-"Once a podcast has been archived, it will be removed from the <gui>New "
-"Items</gui> list, but it will still appear in the <gui>All Items</gui> list."
-msgstr ""
-"Cuando se archive un podcast, se quitará de la lista de <gui>Elementos "
-"nuevos</gui>, pero seguirá apareciendo en la lista de <gui>Todos los "
-"elementos</gui>."
-
-#: C/podcast.page:90(p)
-msgid ""
-"You can edit the subscription options the <gui style=\"menuitem\">Podcast "
-"Properties</gui>, which can be accessed by right clicking on the "
-"corresponding podcast name in the podcast list or by right clicking on any "
-"episode of that podcast."
-msgstr ""
-"Puede editar las opciones de suscripción a un podcast en las <gui style="
-"\"menuitem\">Propiedades del podcast</gui>, a las que puede acceder pulsando "
-"con el botón derecho sobre el nombre del podcast correspondiente en la lista "
-"de podcasts o pulsando con el botón derecho sobre cualquier episodio de ese "
-"podcast."
-
-#: C/podcast.page:99(title) C/play.page:121(title)
-msgid "Play a podcast"
-msgstr "Reproducir un podcast"
-
-#: C/podcast.page:101(p)
-msgid ""
-"To <link xref=\"play\">play</link> a podcast episode, double click on the "
-"episode or select it, then select <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq>. You can also add the "
-"episode to the <gui xref=\"play-queue\">Play Queue</gui> by right clicking "
-"on the episode and selecting <gui style=\"menuitem\">Add to Play Queue</gui>."
-msgstr ""
-"Para <link xref=\"play\">reproducir</link> un episodio de un podcast, pulse "
-"dos veces sobre el episodio o selecciónelo, luego elija <guiseq><gui style="
-"\"menu\">Reproducción</gui><gui style=\"menuitem\">Reproducir</gui></"
-"guiseq>. También puede añadir el episodio a la <link xref=\"queue"
-"\"><gui>Cola de reproducción</gui></link> pulsando con el botón derecho "
-"sobre el episodio y seleccionando <gui style=\"menuitem\">Añadir a la cola "
-"de reproducción</gui>."
-
-#: C/podcast.page:110(title)
-msgid "Remove a podcast"
-msgstr "Quitar un podcast"
-
-#: C/podcast.page:112(p)
-msgid ""
-"To remove a podcast, right click on the podcast in the podcast list and "
-"select <gui style=\"menuitem\">Unsubscribe and Delete</gui>. This will "
-"unsubscribe you from receiving podcast updates and will delete all the "
-"episodes of the podcast from your library."
-msgstr ""
-"Para quitar un podcast, pulse con el botón derecho sobre el podcast en la "
-"lista de podcasts y elija <gui style=\"menuitem\">Desuscribirse y eliminar</"
-"gui>. Esto cancelará la suscripción de actualizaciones del podcast y "
-"eliminará todos los episodios del podcast de su colección."
+#: C/rb-import.page:12(title)
+msgid "Import your <app>Rhythmbox</app> library"
+msgstr "Importar su colección de <app>Rhythmbox</app>"
#: C/play.page:9(desc)
msgid "Play your videos and music files."
msgstr "Reproducir sus archivos de vídeo y música."
-#: C/play.page:18(name) C/index.page:15(name)
-msgid "Sindhu S"
-msgstr "Sindhu S"
-
-#: C/play.page:19(email) C/index.page:16(email)
-msgid "sindhus at live.in"
-msgstr "sindhus at live.in"
-
-#: C/play.page:34(title)
-msgid "Play your media"
+#: C/play.page:24(title)
+msgid "Play Your Media"
msgstr "Reproducir su contenido multimedia"
-#: C/play.page:37(title)
+#: C/play.page:27(title)
msgid "Play your music"
msgstr "Reproducir de música"
-#: C/play.page:39(p)
+#: C/play.page:29(p)
msgid ""
-"To play music in <app>Banshee</app>, 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."
+"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 <app>Banshee</app>, elija la fuente Música. La "
-"colección de música mostrará todos los artistas en su colección de música, "
-"la portada de cada álbum y una lista de todas las canciones de su colección."
+"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:43(p)
+#: 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 <app>Banshee</app>."
+"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, "
-"álbumes o use la barra de búsqueda en la esquina superior derecha de "
-"<app>Banshee</app>."
+"Elija el álbum o canción que desea reproducir desde la lista de artistas o "
+"álbumes, o bien use la barra de búsqueda de la esquina superior derecha de "
+"Banshee."
-#: C/play.page:47(p)
+#: C/play.page:37(p)
msgid ""
"To start playing a song, use your mouse to double click the song name, press "
-"the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
+"gui></guiseq> from the Banshee menu."
msgstr ""
"Para empezar a reproducir una canción, pulse dos veces en el nombre de la "
-"canción, pulse <key>Espacio</key> o elija <guiseq><gui style=\"menu"
-"\">Reproducción</gui><gui style=\"menuitem\">Reproducir</gui></guiseq> en el "
-"menú de <app>Banshee</app>."
+"canción, pulse la <key>barra espaciadora</key> o elija "
+"<guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú "
+"de Banshee."
-#: C/play.page:53(p)
+#: C/play.page:42(p)
msgid ""
"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 "
-"<key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</gui><gui "
-"style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> menu."
+"<key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></"
+"guiseq> from the Banshee menu."
msgstr ""
-"También puede empezar a reproducir un álbum, eligiéndolo del navegador de "
-"álbumes y pulsando dos veces sobre el nombre de la canción, pulse "
-"<key>Espacio</key> o elija <guiseq><gui style=\"menu\">Reproducción</"
-"gui><gui style=\"menuitem\">Reproducir</gui></guiseq> en el menú de "
-"<app>Banshee</app>."
+"Para empezar a reproducir un álbum, puede elegirlo de la lista de álbumes y "
+"hacer doble clic en el nombre de la canción, pulsar la <key>barra "
+"espaciadora</key> o elegir <guiseq><gui>Reproducción</gui><gui>Reproducir</"
+"gui></guiseq> desde el menú de Banshee."
-#: C/play.page:59(p)
+#: C/play.page:48(p)
msgid ""
"To play all songs by one artist, choose the artist in the artist browser and "
-"press the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
-"Para reproducir todas las canciones de un artista, elija el artista en el "
-"navegador de artistas y pulse <key>Espacio</key>, o elija <guiseq><gui style="
-"\"menu\">Reproducción</gui><gui style=\"menuitem\">Reproducir</gui></guiseq> "
-"desde el menú de <app>Banshee</app>."
+"Para reproducir todas las canciones de un artista, elija el artista en la "
+"lista de artistas y pulse la <key>barra espaciadora</key>, o elija "
+"<guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú "
+"de Banshee."
-#: C/play.page:65(p)
-msgid ""
-"<app>Banshee</app> 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 ""
-"<app>Banshee</app> también muestra sus álbumes favoritos (aquellos que más "
-"escucha), favoritos recientes, añadidos recientemente y música no oída. "
-"Elija el que quiere escuchar y puede reproducir canciones de cada uno de "
-"ellos."
-
-#: C/play.page:69(p)
-msgid ""
-"<app>Banshee</app> can be used to play music in a random order using the "
-"<gui style=\"menuitem\">Shuffle</gui> mode. Enable the mode in <guiseq><gui "
-"style=\"menu\">Playback</gui><gui style=\"menuitem\">Shuffle</gui></guiseq>, "
-"followed by a shuffle type selection."
-msgstr ""
-"<app>Banshee</app> se puede usar para reproducir música en orden aleatorio "
-"usando el modo <gui style=\"menuitem\">Aleatorio</gui>. Active este modo en "
-"<guiseq><gui style=\"menu\">Reproducción</gui><gui style=\"menuitem"
-"\">Aleatorio</gui></guiseq>, seguido de la selección de tipo aleatoria."
-
-#: C/play.page:77(gui)
-msgid "By Song"
-msgstr "Por canción"
-
-#: C/play.page:78(p)
-msgid "Play tracks in a random order."
-msgstr "Reproducir pistas en orden aleatorio."
-
-#: C/play.page:81(gui)
-msgid "By Artist"
-msgstr "Por artista"
-
-#: C/play.page:82(p)
-msgid "Play tracks by different artists every time."
-msgstr "Reproducir pistas de diferentes artistas cada vez."
-
-#: C/play.page:85(gui)
-msgid "By Album"
-msgstr "Por álbum"
-
-#: C/play.page:86(p)
-msgid "Play tracks from different albums every time."
-msgstr "Reproducir pistas de diferentes álbumes cada vez."
-
-#: C/play.page:89(gui)
-msgid "By Rating"
-msgstr "Por valoración"
-
-#: C/play.page:90(p)
-msgid "Play tracks with higher ratings more often than unrated ones."
-msgstr ""
-"Reproducir canciones con puntuaciones más altas más a menudo que las no "
-"valoradas."
-
-#: C/play.page:92(p)
-msgid "If there are no rated tracks, the tracks are played in a random order."
-msgstr ""
-"Si no hay pistas puntuadas, las pistas se reproducen en orden aleatorio."
-
-#: C/play.page:97(gui)
-msgid "By Score"
-msgstr "Por puntuación"
-
-#: C/play.page:98(p)
+#: C/play.page:53(p)
msgid ""
-"Tracks that you play frequently are scored higher and played more often."
+"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 ""
-"Las pistas que reproduce frecuentemente se puntúan más alto y se reproducen "
-"más veces."
+"Banshee también muestra sus álbumes favoritos (aquellos que más escucha), "
+"favoritos recientes, añadidos recientemente y música no oída. Seleccione el "
+"que quiere escuchar y puede reproducir canciones de cada uno de ellos."
-#: C/play.page:106(title)
+#: C/play.page:61(title)
msgid "Play a video"
msgstr "Reproducir un vídeo"
-#: C/play.page:108(p)
+#: 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 <key>Space</key>, or "
-"choose <guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem"
-"\">Play</gui></guiseq> from the <app>Banshee</app> menu."
+"video you wish to play from the list and press the <key>Spacebar</key>, or "
+"choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> 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 <key>Espacio</key>, o elija "
-"<guiseq><gui style=\"menu\">Reproducción</gui><gui style=\"menuitem"
-"\">Reproducir</gui></guiseq> desde el menú de <app>Banshee</app>."
+"escoja el vídeo que desee de la lista y pulse la <key>barra espaciadora</"
+"key>, o elija <guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> "
+"desde el menú de Banshee."
-#: C/play.page:114(p)
+#: C/play.page:68(p)
msgid ""
-"<app>Banshee</app> also shows your Favorite videos (those you watch the "
-"most) and Unwatched videos. Choose one and you can play a video from the "
-"list."
+"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 ""
-"<app>Banshee</app> también muestra sus vídeos favoritos (aquellos que más "
-"ve) y vídeos no vistos. Seleccione uno y puede reproducir un vídeo desde la "
-"lista."
+"Banshee también muestra sus vídeos favoritos (aquellos que más ve) y vídeos "
+"no vistos. Seleccione uno y puede reproducir un vídeo desde la lista."
+
+#: C/play.page:74(title)
+msgid "Play a Podcast"
+msgstr "Reproducir un podcast"
-#: C/play.page:123(p)
+#: C/play.page:76(p)
msgid ""
-"Podcasts shows you all podcasts you are subscribed to, all podcast shows "
-"available, and the podcast browser lists all podcasts in order of newest "
+"Podcasts shows you all Podcasts you're subscribed to, all Podcast shows "
+"available, and the Podcast browser lists all Podcasts in order of newest "
"first."
msgstr ""
-"Los podcasts le mostrarán todos los podcasts a los que está suscrito, todos "
-"los podcasts disponibles, y el explorador de podcasts lista todos los "
-"podcasts en orden del más reciente primero."
+"La colección Podcasts le mostrará todos los podcasts a los que está "
+"suscrito, todos las emisiones disponibles, y el explorador de podcasts lista "
+"todos los podcasts en orden de más reciente a más antiguo."
-#: C/play.page:127(p)
+#: C/play.page:80(p)
msgid ""
-"To play a podcast, choose the podcast you wish to play from the list and "
-"press the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"To play a Podcast, choose the Podcast you wish to play from the list and "
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
-"Para reproducir un podcast, elija el podcast que quiere reproducir de la "
-"lista y pulse <key>Espacio</key>, o elija <guiseq><gui style=\"menu"
-"\">Reproducción</gui><gui style=\"menuitem\">Reproducir</gui></guiseq> desde "
-"el menú de <app>Banshee</app>."
+"Para reproducir un podcast, elija el que quiere reproducir de la lista y "
+"pulse <key>Espacio</key> o elija <guiseq><gui>Reproducción</"
+"gui><gui>Reproducir</gui></guiseq> desde el menú de Banshee."
-#: C/play.page:136(title)
+#: C/play.page:88(title)
msgid "Play an internet radio station"
msgstr "Reproducir una emisora de radio de Internet"
-#: C/play.page:138(p)
+#: C/play.page:90(p)
msgid ""
"The Radio source shows you all internet radio stations you have added to "
-"<app>Banshee</app> alphabetically."
+"Banshee alphabetically."
msgstr ""
-"La fuente Radio le muestra alfabéticamente todas las emisoras de radio de "
-"Internet que ha añadido a <app>Banshee</app>."
+"La fuente «Radio» le muestra, alfabéticamente, todas las emisoras de radio de "
+"Internet que ha añadido a Banshee."
-#: C/play.page:141(p)
+#: 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 <key>Space</key>, or choose <guiseq><gui style="
-"\"menu\">Playback</gui><gui style=\"menuitem\">Play</gui></guiseq> from the "
-"<app>Banshee</app> menu."
+"from the list and press the <key>Spacebar</key>, or choose "
+"<guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
"Para reproducir una emisora de radio de Internet, elija la emisora de radio "
"que quiere reproducir de la lista y pulse <key>Espacio</key> o elija "
-"<guiseq><gui style=\"menu\">Reproducción</gui><gui style=\"menuitem"
-"\">Reproducir</gui></guiseq> desde el menú de <app>Banshee</app>."
+"<guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú "
+"de Banshee."
#: C/play-queue.page:9(desc)
-msgid "Add media to your <gui>Play Queue</gui>."
-msgstr "Añadir archivos multimedia a su <gui>Cola de reproducción</gui>."
-
-#: C/play-queue.page:15(years)
-msgid "2013"
-msgstr "2013"
+msgid "Add media to your play queue."
+msgstr "Añadir archivos multimedia a su cola de reproducción."
-#: C/play-queue.page:24(title)
-msgid "Play queue"
+#: C/play-queue.page:18(title)
+msgid "Play Queue"
msgstr "Cola de reproducción"
-#: C/play-queue.page:26(p)
+#: C/play-queue.page:20(p)
msgid ""
-"The <gui>Play Queue</gui> can be used to play tracks in a sequential order. "
-"You can add many tracks to the <gui>Play Queue</gui> and listen to hours of "
-"music non-stop. You can add individual tracks or entire albums, and sort or "
-"re-order them as you wish."
+"The <gui>Play Queue</gui> 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 ""
-"La <gui>Cola de reproducción</gui> se puede usar para reproducir pistas en "
-"orden secuencial. Puede añadir varias pistas a la <gui>Cola de reproducción</"
-"gui> y escuchar horas de música sin parar. Puede añadir pistas individuales "
-"o álbumes completos, y ordenarlos o reordenarlos como quiera."
+"La <gui>Cola de reproducción</gui> le permite añadir música para "
+"reproducirla en orden secuencial. Puede añadir varias pistas para escuchar "
+"horas de música sin parar. Puede añadir pistas individuales o álbumes "
+"completos, y ordenarlos o reordenarlos."
-#: C/play-queue.page:32(title)
-msgid "Add music to the <gui>Play Queue</gui>"
-msgstr "Añadir música a la <gui>Cola de reproducción</gui>"
+#: C/play-queue.page:26(title)
+msgid "Add Music to the Play Queue"
+msgstr "Añadir música a la cola de reproducción"
-#: C/play-queue.page:34(p)
+#: 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 <gui>Play Queue</gui>."
+"you want to add to the play queue."
+msgstr ""
+"Desde su colección de música, deberá seleccionar las pistas de música o los "
+"álbumes que quiere añadir a la cola de reproducción."
+
+#: 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 <gui>Play Queue</gui> in the far left "
+"window pane."
msgstr ""
-"Desde su colección de música, necesitará seleccionar las pistas de música o "
-"álbumes que quiere añadir a la <gui>Cola de reproducción</gui>."
+"Para añadir un álbum completo a la cola de reproducción, usando su ratón "
+"pulse en el álbum y, manteniéndolo pulsado, arrástrelo hasta la <gui>Cola de "
+"reproducción</gui> en el panel izquierdo de la ventana."
#: C/play-queue.page:37(p)
msgid ""
-"To add an entire album to the <gui>Play Queue</gui>, use your mouse to press "
-"and hold the album and drag and drop it over <gui>Play Queue</gui> in the "
-"far left window pane."
-msgstr ""
-"Para añadir un álbum completo a la <gui>Cola de reproducción</gui>, use su "
-"ratón para mantener pulsado el álbum, arrastrelo y suéltelo sobre la "
-"<gui>Cola de reproducción</gui> en el panel izquierdo de la ventana."
-
-#: C/play-queue.page:41(p)
-msgid ""
-"You can add music tracks to the <gui>Play Queue</gui> individually or as a "
-"group. To add an individual file, drag and drop it over the <gui>Play Queue</"
-"gui> in the far left window pane, or right click the track and choose <gui "
-"style=\"menuitem\">Add to Play Queue</gui>."
-msgstr ""
-"Puede añadir pistas de música a la <gui>Cola de reproducción</gui> "
-"individualmente o como en grupo. Para añadir un archivo individual, arrastre "
-"y suéltelo sobre la <gui>Cola de reproducción</gui> en en panel izquierdo de "
-"la ventana, o pulse con el botón derecho sobre la pista y elija <gui style="
-"\"menuitem\">Añadir a la cola de reproducción</gui>."
-
-#: C/play-queue.page:46(p)
-msgid ""
-"To select multiple tracks, select each track with your mouse while holding "
-"down <key>Ctrl</key> or select a range of files by pressing <key>Shift</key> "
-"and clicking twice to select that range of files. You can then drag and drop "
-"it over the <gui>Play Queue</gui> in the far left window pane or right click "
-"the tracks and choose <gui style=\"menuitem\">Add to Play Queue</gui>."
-msgstr ""
-"Para seleccionar varias pistas, seleccione cada pista con el ratón mientras "
-"mantiene pulsado <key>Ctrl</key> o seleccione un rango de archivos pulsando "
-"la tecla <key>Mayús</key> y pulsando dos veces para seleccionar el rango de "
-"archivos. Entonces puede arrastrar y soltar sobre la <gui>Cola de "
-"reproducción</gui> en el panel izquierdo de la ventana o pulsar con el botón "
-"derecho sobre las pistas y elegir <gui style=\"menuitem\">Añadir a la cola "
-"de reproducción</gui>."
+"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 <gui>Play Queue</gui> in "
+"the far left window pane, or right click the track and choose <gui>Add to "
+"Play Queue</gui>."
+msgstr ""
+"Puede añadir pistas de música a la cola de reproducción individualmente o en "
+"grupo. Para añadir un archivo individual, arrastre y suéltelo sobre la "
+"<gui>Cola de reproducción</gui> en en panel izquierdo de la ventana, o pulse "
+"con el botón derecho sobre la pista y elija <gui>Añadir a la cola de "
+"reproducción</gui>."
+
+#: C/play-queue.page:43(p)
+msgid ""
+"You can select multiple files by using your mouse and pressing <key>Control</"
+"key> and choosing each file with your mouse or select a range of files by "
+"pressing <key>Shift</key> and clicking twice to select that range of files. "
+"You can then drag and drop it over the <gui>Play Queue</gui> in the far left "
+"window pane or right click the tracks and choose <gui>Add to Play Queue</"
+"gui>."
+msgstr ""
+"Puede seleccionar varios archivos usando su ratón y pulsando <key>Ctrl</key> "
+"y eligiendo cada archivo con su ratón, o seleccionando un rango de archivos "
+"pulsando <key>Mayús</key> dos veces para seleccionar el rango de archivos. "
+"Entonces puede arrastrar y soltar sobre la <gui>Cola de reproducción</gui> "
+"en el panel izquierdo de la ventana o pulsar con el botón derecho sobre las "
+"pistas y seleccionar <gui>Añadir a la cola de reproducción</gui>."
#: C/play-queue.page:56(title)
-msgid "Organize your <gui>Play Queue</gui>"
-msgstr "Organizar su <gui>Cola de reproducción</gui>"
+msgid "Organize Your Play Queue"
+msgstr "Organizar la cola de reproducción"
#: C/play-queue.page:58(p)
msgid ""
-"Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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."
+"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 ""
-"Su <gui>Cola de reproducción</gui> está organizada en el orden en que añade "
-"las pistas. Las primeras pistas o álbumes que añade a la cola serán las "
-"primeras que se reproduzcan. Puede reordenar su <gui>Cola de reproducción</"
-"gui> usando su ratón y arrastrando y soltando una pista o un grupo de pistas "
-"en la lista. Elija las pistas que quiere con el ratón y suelte el ratón "
-"encima del número o del sitio en la lista en que desea que estén esos "
-"archivos en la cola."
+"Su cola de reproducción está organizada en el orden en que añade las pistas. "
+"Las primeras pistas o álbumes que añade a la cola serán las primeras que se "
+"reproduzcan. Puede reordenar su cola de reproducción usando su ratón y "
+"arrastrando y soltando una pista o un grupo de pistas en la lista. Elija con "
+"su ratón la pista o las pistas que quiere reordenar y suelte el ratón encima "
+"del número o del sitio en la lista en que quiere que estén esas pistas en la "
+"cola."
-#: C/play-queue.page:68(title)
-msgid "Removing tracks from the <gui>Play Queue</gui>"
-msgstr "Quitar pistas de la <gui>Cola de reproducción</gui>"
+#: C/play-queue.page:70(title)
+msgid "Removing Tracks from the Play Queue"
+msgstr "Quitar pistas de la cola de reproducción"
-#: C/play-queue.page:70(p)
+#: C/play-queue.page:72(p)
msgid ""
"You can remove an individual track, a group of tracks, or clear your entire "
-"<gui>Play Queue</gui>:"
-msgstr ""
-"Puede quitar una pista individual, un grupo de pistas, o limpiar la "
-"<gui>Cola de reproducción</gui> completa."
-
-#: C/play-queue.page:75(p)
-msgid ""
-"To remove an individual track, select the track with your mouse and then "
-"press <key>Delete</key>."
+"play queue."
msgstr ""
-"Para quitar una pista individual, seleccione la pista con su ratón y luego "
-"pulse <key>Supr</key>."
+"Puede quitar una pista individual, un grupo de pistas o limpiar la cola de "
+"reproducción completa."
-#: C/play-queue.page:79(p)
+#: C/play-queue.page:76(p)
msgid ""
-"To remove multiple tracks, select each track with your mouse while holding "
-"down <key>Ctrl</key>. Once all the desired tracks have been selected, press "
-"<key>Delete</key>."
+"To remove an individual track or group of tracks, select the track with your "
+"mouse and then press <key>Delete</key>."
msgstr ""
-"Para quitar varias pistas, seleccione cada pista con su ratón mientras "
-"mantiene pulsada la tecla <key>Ctrl</key>. Una vez que ha seleccionado todas "
-"las pistas que quiere quitar, pulse <key>Supr</key>."
+"Para quitar una pista individual o un grupo de pistas, seleccione la pista "
+"con su ratón y pulse <key>Supr</key>."
-#: C/play-queue.page:83(p)
+#: C/play-queue.page:80(p)
msgid ""
-"If you accidentally select a track you do not want to remove, hold down "
-"<key>Ctrl</key> and select the track again with your mouse, to unselect it."
+"To clear your entire Play Queue, press the <gui>Clear</gui> button in the "
+"upper right hand corner of the Play Queue."
msgstr ""
-"Si accidentalmente selecciona una pista que no quería quitar, mantenga "
-"pulsado <key>Ctrl</key> y seleccione la pista nuevamente con su ratón, para "
-"deseleccionarla."
+"Para limpiar la cola de reproducción completa, pulse el botón <gui>Limpiar</"
+"gui> en la esquina superior derecha de la cola de reproducción."
-#: C/play-queue.page:89(p)
-msgid ""
-"To clear your entire <gui>Play Queue</gui>, press the <gui style=\"button"
-"\">Clear</gui> button in the upper right hand corner of the <gui>Play Queue</"
-"gui> or press <keyseq><key>Ctrl</key><key>A</key></keyseq> and press "
-"<key>Delete</key>."
-msgstr ""
-"Para limpiar su <gui>Cola de reproducción</gui> completa, pulse el botón "
-"<gui style=\"button\">Limpiar</gui> en la esquina superior derecha de la "
-"<gui>cola de reproducción</gui> o pulse <keyseq><key>Ctrl</key><key>A</key></"
-"keyseq> y pulse <key>Supr</key>."
-
-#: C/manage-tags.page:9(desc)
+#: C/manage-tags.page:10(desc)
msgid "Edit and change music tags and metadata."
msgstr "Editar y cambiar las etiquetas y metadatos de su música."
-#: C/manage-tags.page:24(title)
+#: C/manage-tags.page:25(title)
+msgid "Music Metadata"
+msgstr "Metadatos de música"
+
+#: C/manage-tags.page:29(title)
msgid "Music metadata"
msgstr "Metadatos de música"
-#: C/manage-tags.page:26(p)
+#: 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, <app>Banshee</app> will include the "
-"metadata when ripping the CD if available. For more information on ripping "
-"CDs and including the metadata see the <link xref=\"import\"/>."
+"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 <link xref=\"import\"/>."
msgstr ""
"La música digital contiene metadatos que almacenan información en el archivo "
-"de música, incluyendo el artista, el álbum, el año de grabación, el género y "
-"más. La mayor parte de la música comprada por Internet tendrá los metadatos "
-"ya incrustados y si importa música desde CD, <app>Banshee</app> incluirá los "
-"metadatos al extraer música del CD si está disponible. Para obtener más "
-"información sobre cómo extraer música de CD e incluir los metadatos, "
-"consulte la <link xref=\"import\"/>."
+"de música, incluyendo el artista, el álbum, el año de grabación, el género, "
+"etc. La mayor parte de la música comprada por Internet tendrá los metadatos "
+"ya incrustados, y si importa música desde CD, Banshee incluirá los metadatos "
+"al extraer el CD, si están disponibles. Para obtener más información sobre "
+"cómo extraer CD e incluir los metadatos, consulte la <link xref=\"import\"/>."
-#: C/manage-tags.page:33(p)
+#: C/manage-tags.page:39(p)
msgid ""
"Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis "
"comments for OGG Vorbis files."
@@ -1470,35 +955,34 @@ msgstr ""
"Formatos de metadatos populares son ID3v1 y ID3v2 para archivos MP3 y "
"comentarios Vorbis para archivos OGG Vorbis."
-#: C/manage-tags.page:36(p)
+#: C/manage-tags.page:42(p)
msgid ""
-"If you have imported songs that do not contain metadata,<app>Banshee</app> "
+"If you have imported songs that do not contain metadata, <app>Banshee</app> "
"will display <gui>Unknown</gui> for most fields in the library."
msgstr ""
"Si ha importado canciones que no contienen metadatos, <app>Banshee</app> "
"mostrará <gui>Desconocido</gui> para la mayoría de los campos de la "
"colección."
-#: C/manage-tags.page:40(title)
-msgid "Edit your metadata"
+#: C/manage-tags.page:50(title)
+msgid "Edit Your Metadata"
msgstr "Editar sus metadatos"
-#: C/manage-tags.page:42(p)
+#: 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 <key>E</key>, choose <guiseq><gui style=\"menu"
-"\">Edit</gui><gui style=\"menuitem\">Edit Track Information</gui></guiseq> "
-"from the menu, or use your mouse and right click on the files and select "
-"<gui style=\"menuitem\">Edit Track Information</gui>."
+"you want to update and hit the <key>E</key>, choose <guiseq><gui>Edit</"
+"gui><gui>Edit Track Information</gui></guiseq> from the menu, or use your "
+"mouse and right click on the files and select <gui>Edit Track Information</"
+"gui>."
msgstr ""
"Puede cambiar y editar los metadatos de sus canciones. Seleccione la canción "
"o las canciones que quiere actualizar y pulse <key>E</key>, elija "
-"<guiseq><gui style=\"menu\">Editar</gui><gui style=\"menuitem\">Editar la "
-"información de la pista</gui></guiseq> desde el menú o pulse con el botón "
-"derecho del ratón sobre los archivos y seleccione <gui style=\"menuitem"
-"\">Editar la información de la pista</gui>."
+"<guiseq><gui>Editar</gui><gui>Editar la información de la pista</gui></"
+"guiseq> desde el menú o pulse con el botón derecho del ratón sobre los "
+"archivos y seleccione <gui>Editar la información de la pista</gui>."
-#: C/manage-tags.page:49(p)
+#: 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:"
@@ -1507,58 +991,57 @@ msgstr ""
"permitirá cambiarlos o actualizarlos. Los campos predeterminados mostrados "
"incluyen:"
-#: C/manage-tags.page:53(gui)
+#: C/manage-tags.page:63(gui)
msgid "Track Title"
msgstr "Título de la pista"
-#: C/manage-tags.page:54(gui)
+#: C/manage-tags.page:64(gui)
msgid "Track Artist"
msgstr "Artista de la pista"
-#: C/manage-tags.page:55(gui)
+#: C/manage-tags.page:65(gui)
msgid "Album Title"
msgstr "Título del álbum"
-#: C/manage-tags.page:56(gui)
+#: C/manage-tags.page:66(gui)
msgid "Genre"
msgstr "Género"
-#: C/manage-tags.page:57(gui)
+#: C/manage-tags.page:67(gui)
msgid "Track Number"
msgstr "Número de pista"
-#: C/manage-tags.page:58(gui)
+#: C/manage-tags.page:68(gui)
msgid "Disc Number"
msgstr "Número de disco:"
-#: C/manage-tags.page:59(gui) C/manage-playlists.page:107(gui)
+#: C/manage-tags.page:69(gui) C/manage-playlists.page:109(gui)
msgid "Year"
msgstr "Año"
-#: C/manage-tags.page:62(p)
+#: 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 <gui>Track Title</gui> field "
-"or press the <gui style=\"button\">Forward</gui> button at the bottom of the "
-"dialog when finished with each song. When you have completed editing all "
-"metadata, press <gui style=\"button\">Save</gui>."
+"or press the <gui>Forward</gui> button at the bottom of the dialog when "
+"finished with each song. When you have completed editing all metadata, press "
+"<gui>Save</gui>."
msgstr ""
"Actualice la información de la canción. Si ha seleccionado varias canciones, "
"para editarlas pulse el icono con una flecha a la derecha del campo "
-"<gui>Título de la pista</gui> o pulse el botón <gui style=\"button"
-"\">Adelante</gui> en la parte inferior del diálogo cuando termine con cada "
-"canción. Cuando haya terminado de editar todos los metadatos, pulse <gui "
-"style=\"button\">Guardar</gui>."
+"<gui>Título de la pista</gui> o pulse el botón <gui>Adelante</gui> en la "
+"parte inferior del diálogo cuando termine con cada canción. Cuando haya "
+"terminado de editar todos los metadatos, pulse <gui>Guardar</gui>."
-#: C/manage-playlists.page:9(desc)
+#: C/manage-playlists.page:10(desc)
msgid "Create and manage playlists."
msgstr "Crear y gestionar listas de reproducción."
-#: C/manage-playlists.page:18(title) C/keyboard-shortcuts.page:73(title)
+#: C/manage-playlists.page:19(title) C/keyboardshortcuts.page:69(title)
msgid "Playlists"
msgstr "Listas de reproducción"
-#: C/manage-playlists.page:20(p)
+#: 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 "
@@ -1573,23 +1056,22 @@ msgstr ""
"explorar. Algunos reproductores multimedia portátiles le permiten incluso "
"transferir la lista de reproducción para que pueda llevarla consigo."
-#: C/manage-playlists.page:26(p)
+#: C/manage-playlists.page:28(p)
msgid ""
-"<app>Banshee</app> supports normal playlists, which include songs you add to "
-"the playlist, as well as smart playlists. Smart Playlists are automatically "
+"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 ""
-"<app>Banshee</app> soporta tanto listas de reproducción normales, que "
-"incluyen canciones que añade a la lista de reproducción, como listas de "
-"reproducción inteligentes. Las listas de reproducción inteligentes son "
-"listas de reproducción generadas automáticamente basadas en sus hábitos de "
-"escucha, su música favorita y más."
+"Banshee soporta tanto listas de reproducción normales, que incluyen "
+"canciones que añade a la lista, como listas de reproducción inteligentes. "
+"Las listas de reproducción inteligentes son listas de reproducción generadas "
+"automáticamente basadas en sus hábitos de escucha, su música favorita, etc."
-#: C/manage-playlists.page:32(title)
-msgid "Normal playlists"
+#: C/manage-playlists.page:34(title)
+msgid "Normal Playlists"
msgstr "Listas de reproducción normales"
-#: C/manage-playlists.page:34(p)
+#: 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 "
@@ -1601,49 +1083,45 @@ msgstr ""
"favorito desde varios álbumes, sus últimas canciones favoritas o una lista "
"de reproducción animada para escuchar mientras hace ejercicio."
-#: C/manage-playlists.page:39(p)
+#: C/manage-playlists.page:42(p)
msgid ""
"You can create a new playlist by pressing <keyseq><key>Control</key><key>N</"
-"key></keyseq>, from the menu choosing <guiseq><gui style=\"menu\">Media</"
-"gui><gui style=\"menuitem\">New Playlist</gui></guiseq> or by selecing the "
-"track(s) you would like to add to the playlist. Select the track(s), right "
-"click them, and choose <guiseq><gui style=\"menuitem\">Add to Playlist</"
-"gui><gui style=\"menuitem\">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you drag it over "
-"<gui>Music</gui>, a new option <gui style=\"menuitem\"><em>New Playlist</"
-"em></gui> will appear and you can drop the track(s) over <gui style="
-"\"menuitem\"><em>New Playlist</em></gui> to add them to the playlist. You "
-"can repeat this process until you have added all the tracks you want in the "
-"playlist."
+"key></keyseq>, from the menu choosing <guiseq><gui>Media</gui><gui>New "
+"Playlist</gui></guiseq> or by selecing the track(s) you would like to add to "
+"the playlist. Select the track(s), right click them, and choose "
+"<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you "
+"drag it over <gui>Music</gui>, a new option <gui><em>New Playlist</em></gui> "
+"will appear and you can drop the track(s) over <gui><em>New Playlist</em></"
+"gui> to add them to the playlist. You can repeat this process until you have "
+"added all the tracks you want in the playlist."
msgstr ""
"Puede crear una nueva lista de reproducción pulsando <keyseq><key>Ctrl</"
-"key><key>N</key></keyseq>, eligiendo desde el menú <guiseq><gui style=\"menu"
-"\">Multimedia</gui><gui style=\"menuitem\">Lista de reproducción nueva</"
-"gui></guiseq> o seleccionando las pistas que le gustaría añadir a la lista "
-"de reproducción. Seleccione las pistas, pulse con el botón derecho y elija "
-"<guiseq><gui style=\"menuitem\">Añadir a la lista de reproducción</"
-"gui><gui>Lista de reproducción nueva</gui></guiseq>. También puede arrastrar "
-"y soltarlas a la nueva lista de reproducción seleccionando las pistas y "
-"arrastrándolas al panel izquierdo sobre <gui>Música</gui>. Al arrastrar "
-"sobre <gui>Música</gui>, aparecerá una nueva opción <gui><em>Lista de "
-"reproducción nueva</em></gui> y podrá soltar las pistas sobre <gui style="
-"\"menuitem\"><em>Lista de reproducción nueva</em></gui> para añadirlas a la "
-"lista. Puede repetir este proceso hasta que haya añadido a la lista de "
-"reproducción todas las pistas que quiera."
+"key><key>N</key></keyseq>, eligiendo desde el menú <guiseq><gui>Multimedia</"
+"gui><gui>Lista de reproducción nueva</gui></guiseq> o seleccionando las "
+"pistas que le gustaría añadir a la lista de reproducción. Seleccione las "
+"pistas, pulse con el botón derecho y elija <guiseq><gui>Añadir a la lista de "
+"reproducción</gui><gui>Lista de reproducción nueva</gui></guiseq>. También "
+"puede arrastrar y soltarlas a la nueva lista de reproducción seleccionando "
+"las pistas y arrastrándolas al panel izquierdo sobre <gui>Música</gui>. Al "
+"arrastrar sobre <gui>Música</gui>, aparecerá una nueva opción <gui><em>Lista "
+"de reproducción nueva</em></gui> y podrá soltar las pistas sobre "
+"<gui><em>Lista de reproducción nueva</em></gui> para añadirlas a la lista. "
+"Puede repetir este proceso hasta que haya añadido a la lista de reproducción "
+"todas las pistas que quiera."
#: 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 <gui style=\"menuitem\">Rename Playlist</gui> and "
-"enter the name of your playlist."
+"the playlist and press <gui>Rename Playlist</gui> and enter the name of your "
+"playlist."
msgstr ""
"Para darle a su lista de reproducción un nombre propio, seleccione la lista "
-"de reproducción, pulse con el botón derecho en la lista, pulse <gui style="
-"\"menuitem\">Renombrar</gui> e introduzca el nombre de la lista de "
-"reproducción."
+"de reproducción, pulse con el botón derecho en la lista, pulse "
+"<gui>Renombrar</gui> e introduzca el nombre de la lista de reproducción."
-#: C/manage-playlists.page:60(p)
+#: 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 "
@@ -1658,22 +1136,21 @@ msgstr ""
"hasta que ya no aparezcan las flechas de arriba o abajo y la columna esté en "
"blanco, y entonces reordene la lista de reproducción."
-#: C/manage-playlists.page:66(p)
+#: C/manage-playlists.page:68(p)
msgid ""
"To remove a track from the playlist, select the track(s) you wish to remove. "
-"Press the <key>Delete</key>, from the menu choose <guiseq><gui style=\"menu"
-"\">Edit</gui><gui style=\"menuitem\">Remove from Playlist</gui></guiseq> or "
-"right click the track(s) with your mouse and press <gui style=\"menuitem"
-"\">Remove from Playlist</gui>."
+"Press the <key>Delete</key>, from the menu choose <guiseq><gui>Edit</"
+"gui><gui>Remove from Playlist</gui></guiseq> or right click the track(s) "
+"with your mouse and press <gui>Remove from Playlist</gui>."
msgstr ""
"Para quitar una pista de la lista de reproducción, seleccione las pistas que "
-"quiere quitar. Pulse <key>Supr</key>, elija desde el menú <guiseq><gui "
-"style=\"menu\">Editar</gui><gui style=\"menuitem\">Quitar de la lista de "
-"reproducción</gui></guiseq> o pulse con el botón derecho y luego pulse <gui "
-"style=\"menuitem\">Quitar de la lista de reproducción</gui>."
+"quiere quitar. Pulse <key>Supr</key>, elija desde el menú "
+"<guiseq><gui>Editar</gui><gui>Quitar de la lista de reproducción</gui></"
+"guiseq> o pulse con el botón derecho y luego pulse <gui>Quitar de la lista "
+"de reproducción</gui>."
#: C/manage-playlists.page:76(title)
-msgid "Smart playlist"
+msgid "Smart Playlist"
msgstr "Lista de reproducción inteligente"
#: C/manage-playlists.page:78(p)
@@ -1687,314 +1164,300 @@ msgstr ""
"Puede crear rápidamente una lista de reproducción nueva basada en un artista "
"específico, favoritos, etc."
-#: C/manage-playlists.page:82(p)
+#: C/manage-playlists.page:83(p)
msgid ""
-"To create a new Smart Playlist, from the menu choose <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">New Smart Playlist</gui></"
-"guiseq>. 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:"
+"To create a new Smart Playlist, from the menu choose <guiseq><gui>Media</"
+"gui><gui>New Smart Playlist</gui></guiseq>. 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 ""
"Para crear una lista de reproducción inteligente nueva, elija desde el menú "
-"<guiseq><gui style=\"menu\">Multimedia</gui><gui style=\"menuitem\">Nueva "
-"lista de reproducción inteligente</gui></guiseq>. Aparecerá un diálogo para "
-"crear una lista de reproducción inteligente nueva. Introduzca el nombre de "
-"la lista y después elija los criterios en los que se basará su lista de "
-"reproducción. Puede elegir cualquier campo incluido en los metadatos de una "
-"canción, como el álbum, el artista o el año. Escoja los criterios y luego "
-"elija uno de los siguientes:"
-
-#: C/manage-playlists.page:92(p) C/manage-playlists.page:108(gui)
+"<guiseq><gui>Multimedia</gui><gui>Lista de reproducción inteligente nueva</"
+"gui></guiseq>. Aparecerá un diálogo para crear una lista de reproducción "
+"inteligente nueva. Introduzca el nombre de la lista y después elija los "
+"criterios en los que se basará su lista de reproducción. Puede elegir "
+"cualquier campo incluido en los metadatos de una canción, como el álbum, el "
+"artista o el año. Escoja los criterios y luego elija uno de los siguientes:"
+
+#: C/manage-playlists.page:93(p) C/manage-playlists.page:109(gui)
#: C/manage-playlists.page:113(gui)
msgid "is"
msgstr "es"
-#: C/manage-playlists.page:93(p)
+#: C/manage-playlists.page:94(p)
msgid "is not"
msgstr "no es"
-#: C/manage-playlists.page:94(p)
+#: C/manage-playlists.page:95(p)
msgid "less than"
msgstr "menos que"
-#: C/manage-playlists.page:95(p)
+#: C/manage-playlists.page:96(p)
msgid "more than"
msgstr "más que"
-#: C/manage-playlists.page:96(p)
+#: C/manage-playlists.page:97(p)
msgid "at most"
msgstr "como mucho"
-#: C/manage-playlists.page:97(p)
+#: C/manage-playlists.page:98(p)
msgid "at least"
msgstr "al menos"
-#: C/manage-playlists.page:100(p)
+#: C/manage-playlists.page:101(p)
msgid ""
-"You can also press the <gui style=\"button\">+</gui> 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:"
+"You can also press the <gui>+</gui> 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 ""
-"También puede pulsar el botón <gui style=\"button\">+</gui> para añadir una "
-"nueva condición a la lista de reproducción inteligente. Por ejemplo, puede "
-"crear una lista de reproducción inteligente que incluya todas las canciones "
-"desde 2010 y valoradas con 5 estrellas. Para crear esta lista de "
-"reproducción, podría elegir:"
+"También puede pulsar el botón <gui>+</gui> para añadir una nueva condición a "
+"la lista de reproducción inteligente. Por ejemplo, puede crear una lista de "
+"reproducción inteligente que incluya todas las canciones desde 2010 y "
+"valoradas con 5 estrellas. Para crear esta lista de reproducción, podría "
+"elegir:"
-#: C/manage-playlists.page:109(p)
+#: C/manage-playlists.page:110(gui)
msgid "2010"
msgstr "2010"
-#: C/manage-playlists.page:112(gui)
+#: C/manage-playlists.page:113(gui)
msgid "Rating"
msgstr "Valoración"
#: C/manage-playlists.page:114(p)
-msgid "5 stars"
-msgstr "5 estrellas"
+msgid "<gui/>5 stars"
+msgstr "<gui/>5 estrellas"
#: C/manage-playlists.page:118(p)
msgid ""
"You can then optionally select how many songs are included by pressing the "
-"<gui style=\"checkbox\">Limit to</gui> checkbox and choosing the number of "
-"songs to be included."
+"<gui>Limit</gui> to checkbox and choosing the number of songs to be included."
msgstr ""
"Luego puede seleccionar opcionalmente cuántas canciones se incluirán "
-"pulsando en la casilla <gui style=\"checkbox\">Limitar a</gui> y eligiendo "
-"el número de canciones que se incluirán."
+"pulsando en la casilla <gui>Limitar a</gui> y eligiendo el número de "
+"canciones que se incluirán."
-#: C/manage-playlists.page:122(p)
+#: C/manage-playlists.page:123(p)
msgid ""
-"<app>Banshee</app> also includes smart playlists already created for you. "
-"Press the <gui style=\"button\">Open in editor</gui> button to view how the "
-"playlist created was or to modify it. If you press <gui style=\"button"
-"\">Create and save</gui> the playlist will be automatically generated and "
-"saved for you. The following playlists are included:"
+"Banshee also includes smart playlists already created for you. Press the "
+"<gui>Open in editor</gui> button to view how the playlist created was or to "
+"modify it. If you press <gui>Create and save</gui> the playlist will be "
+"automatically generated and saved for you. The following playlists are "
+"included:"
msgstr ""
-"<app>Banshee</app> también incluye listas de reproducción inteligentes "
-"creadas para usted. Pulse el botón <gui style=\"button\">Abrir en editor</"
-"gui> para ver cómo fue la lista de reproducción creada o para modificarla. "
-"Si pulsa <gui style=\"button\">Crear y guardar</gui>, la lista de "
-"reproducción se generará y se guardará automáticamente. Se incluyen las "
-"siguientes listas de reproducción:"
+"Banshee también incluye listas de reproducción inteligentes creadas para "
+"usted. Pulse el botón <gui>Abrir en el editor</gui> para ver cómo se creó la "
+"lista de reproducción o para modificarla."
-#: C/manage-playlists.page:130(title)
-msgid "<app>Banshee</app> smart playlists"
-msgstr "Listas de reproducción inteligentes de <app>Banshee</app>"
+#: C/manage-playlists.page:131(title)
+msgid "Banshee Smart Playlists"
+msgstr "Listas de reproducción inteligentes de Banshee"
#: C/manage-playlists.page:132(p)
msgid "Favorites (Songs rated four and five stars)"
msgstr "Favoritos (Canciones valoradas con cuatro o cinco estrellas)"
-#: C/manage-playlists.page:135(p)
+#: C/manage-playlists.page:133(p)
msgid "Recent Favorites (Songs listened to often in the past week)"
msgstr ""
"Favoritos recientes (Canciones escuchadas a menudo en la última semana)"
-#: C/manage-playlists.page:138(p)
+#: C/manage-playlists.page:135(p)
msgid "Recently Added (Songs imported within the last week)"
msgstr "Añadidas recientemente (Canciones importadas durante la última semana)"
-#: C/manage-playlists.page:141(p)
+#: C/manage-playlists.page:136(p)
msgid "Unheard (Songs that have not been played or skipped)"
msgstr "No oídas (Canciones omitidas o no reproducidas)"
-#: C/manage-playlists.page:144(p)
+#: C/manage-playlists.page:137(p)
msgid "Neglected Favorites (Favorites not played in over two months)"
msgstr "Favoritos abandonados (Favoritos no reproducidos en más de dos meses)"
-#: C/manage-playlists.page:147(p)
+#: C/manage-playlists.page:139(p)
msgid "700 MB of Favorites (A data CD worth of favorite songs)"
msgstr "700 MB de favoritos (Un CD de datos lleno de canciones favoritas)"
-#: C/manage-playlists.page:150(p)
+#: C/manage-playlists.page:140(p)
msgid "80 Minutes of Favorites (An audio CD worth of favorite songs)"
msgstr "80 minutos de favoritos (Un CD de sonido lleno de canciones favoritas)"
-#: C/manage-playlists.page:153(p)
+#: C/manage-playlists.page:142(p)
msgid "Unrated (Songs that haven't been rated)"
msgstr "No valoradas (Canciones que no se han valorado)"
+#: C/manage-coverart.page:9(desc)
+msgid "Manage or change your albums cover art."
+msgstr "Gestionar o cambiar las portadas de sus álbumes."
+
+#: C/manage-coverart.page:24(title)
+msgid "Cover art"
+msgstr "Portada"
+
#: C/lastfm.page:9(desc)
msgid "Enable Last.fm, song reporting and Last.fm radio."
msgstr "Activar Last.fm, el informe de canciones y la radio Last.fm."
-#: C/lastfm.page:28(title)
+#: C/lastfm.page:24(title)
msgid "Last.fm"
msgstr "Last.fm"
-#: C/lastfm.page:30(p)
+#: 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 "
-"<app>Banshee</app> for free. If you subscribe as a paying member, you can "
-"also listen to streaming music from Last.fm in various music clients, "
-"including <app>Banshee</app>. Last.fm offers multiple channels to stream, "
-"including recommended music for you based on your listening habits, your "
-"favorites and more."
-msgstr ""
-"Last.fm es un servicio en línea popular que ofrece versión libre y de pago. "
-"Last.fm ofrece información sobre artistas y álbumes musicales y si crea un "
+"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."
+msgstr ""
+"Last.fm es un popular servicio en línea que ofrece versión libre y de pago. "
+"Last.fm ofrece información sobre artistas y álbumes musicales y, si crea un "
"perfil de usuario, Last.fm le permite seguir la música que escucha en "
-"<app>Banshee</app> gratuitamente. Si se suscribe como miembro de pago, "
-"también puede escuchar transmisión de música desde Last.fm en varios "
-"clientes de música, incluyendo <app>Banshee</app>. Last.fm ofrece varios "
-"canales para transmitir, incluyendo música recomendada basada en sus hábitos "
-"de escucha, sus favoritos y más."
+"Banshee gratuitamente. Si se suscribe como miembro de pago, también puede "
+"escuchar música en «streaming» desde Last.fm en varios clientes de música, "
+"incluyendo a Banshee. Last.fm ofrece varios canales, incluyendo música "
+"recomendada basada en sus hábitos de escucha, sus favoritos, etc."
-#: C/lastfm.page:40(title)
+#: C/lastfm.page:35(title)
msgid "Enable Last.fm"
msgstr "Activar Last.fm"
-#: C/lastfm.page:42(p)
+#: C/lastfm.page:36(p)
msgid ""
"To get the most out of Last.fm, you will want to create a Last.fm profile. "
"Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> "
-"to create an account or choose <guiseq><gui style=\"menu\">Edit</gui><gui "
-"style=\"menuitem\">Preferences</gui></guiseq> from the <app>Banshee</app> "
-"menu. Once in the preferences select the <gui style=\"tab\">Source Specific</"
-"gui> tab, press the <gui style=\"menu\">Source</gui> drop down menu, choose "
-"<gui style=\"menuitem\">Last.fm</gui> and finally select the <em>Sign up for "
-"Last.fm</em> link."
-msgstr ""
-"Para obtener el máximo provecho de Last.fm, querrá crear un perfil de Last."
-"fm. Visite <link href=\"http://www.last.fm/join\">http://www.last.fm/join</"
-"link> para crear una cuenta o elija <guiseq><gui style=\"menu\">Editar</"
-"gui><gui style=\"menuitem\">Preferencias</gui></guiseq> del menú "
-"<app>Banshee</app>. Una vez en las preferencias seleccione la pestaña <gui "
-"style=\"tab\">Específicas de las fuentes</gui>, pulse el menú desplegable "
-"<gui style=\"menu\">Fuente</gui>, elegir <gui style=\"menuitem\">Last.fm</"
-"gui> y finalmente seleccionar el enlace <em>Iniciar sesión por Last.fm</em>."
-
-#: C/lastfm.page:53(p)
-msgid ""
-"To enable <app>Banshee</app> to report the songs you play on your computer "
-"to Last.fm, sign in to Last.fm in <app>Banshee</app> in the <gui style=\"tab"
-"\">Source Specific</gui> preferences. Enter your username and press the <gui "
-"style=\"button\">Log in to Last.fm</gui> button. You will be directed to a "
-"Last.fm webpage in your browser to grant <app>Banshee</app> access. Press "
-"the <gui style=\"button\">Yes, allow access</gui> link in your browser and "
-"you will be redirected to a webpage that displays a message that "
-"<app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app> "
-"and press the <gui style=\"button\">Finish Logging In</gui> button to "
-"complete the process."
-msgstr ""
-"Para permitir que <app>Banshee</app> informe las canciones que reproduce en "
-"su equipo a Last.fm, inicie sesión en Last.fm en <app>Banshee</app> en las "
+"to create an account or choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq> from the Banshee menu. Once in the preferences select the "
+"<gui>Source Specific</gui> tab, press the <gui>Source</gui> drop down menu, "
+"choose <gui>Last.fm</gui> and finally select the <em>Sign up for Last.fm</"
+"em> link."
+msgstr ""
+"Para obtener el máximo de Last.fm, querrá crear un perfil de Last.fm. Visite "
+"<link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> para "
+"crear una cuenta o elija <guiseq><gui>Editar</gui><gui>Preferencias</gui></"
+"guiseq> desde el menú de Banshee. Una vez que esté en las preferencias, "
+"seleccione la pestaña <gui>Específicas de las fuentes</gui>, pulse la lista "
+"desplegable <gui>Fuente</gui>, elija <gui>Last.fm</gui> y finalmente "
+"seleccione el enlace <em>Registrarse en Last.fm</em>."
+
+#: 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 <gui>Source Specific</gui> preferences. "
+"Enter your username and press the <gui>Log in to Last.fm</gui> button. You "
+"will be directed to a Last.fm webpage in your browser to grant Banshee "
+"access. Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</"
+"gui> button to complete the process."
+msgstr ""
+"Para permitir que Banshee informe sobre las canciones que reproduce en su "
+"equipo a Last.fm, inicie sesión en Last.fm dentro de Banshee en las "
"preferencias <gui>Específicas de las fuentes</gui>. Introduzca su nombre de "
-"usuario y pulse el botón <gui style=\"button\">Iniciar sesión en Last.fm</"
-"gui>. Se le redirigirá a una página web de Last.fm en su navegador para "
-"conceder acceso a <app>Banshee</app>. Pulse el enlace <gui style=\"button"
-"\">Sí, permitir acceso</gui> en su navegador y se le redirigirá a una página "
-"web que mostrará un mensaje indicando que <app>Banshee</app> ya tiene acceso "
-"a Last.fm. Vuelva a <app>Banshee</app> y pulse el botón <gui style=\"button"
-"\">Finalizar inicio de sesión</gui> para completar el proceso."
-
-#: C/lastfm.page:68(title)
-msgid "Enable Last.fm song reporting from <app>Banshee</app>"
-msgstr "Activar el informe de canciones de Last.fm desde <app>Banshee</app>"
-
-#: C/lastfm.page:70(p)
-msgid ""
-"After you have successfully linked <app>Banshee</app> to your Last.fm "
-"profile you must ensure that you have enabled <app>Banshee</app> to report "
-"your songs. To enable <app>Banshee</app> to report the songs to your Last.fm "
-"profile go to <app>Banshee</app> and select preferences, then select the "
-"<gui style=\"tab\">Source Specific</gui> tab, select <gui style=\"menuitem"
-"\">Last.fm</gui> from the dropdown, and press the <gui style=\"checkbox"
-"\">Enable Song Reporting From <app>Banshee</app></gui> checkbox. If you have "
-"an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata Fixer extension "
-"to correct your files instead)."
-msgstr ""
-"Después de enlazar correctamente <app>Banshee</app> a su perfil de Last.fm "
-"debe asegurarse de que ha activado que <app>Banshee</app> informe sus "
-"canciones. Para permitir que <app>Banshee</app> informe las canciones a su "
-"perfil de Last.fm, vaya a <app>Banshee</app> y selecciones preferencias, "
-"luego seleccione la pestaña <gui style=\"tab\">Específicas de las fuentes</"
-"gui>, seleccione <gui style=\"menuitem\">Last.fm</gui> en la lista "
-"desplegable y pulse la casilla de verificación <gui style=\"checkbox"
-"\">Activar informe de canciones desde <app>Banshee</app></gui>. Si tiene una "
-"conexión activa a Internet, <app>Banshee</app> ahora enviará a Last.fm "
-"información acerca de las canciones que reproduce. Para ver su historial de "
-"reproducción visite su perfil en el sitio web de Last.fm. Last.fm "
-"actualizará automáticamente los metadatos de su música si alguno de sus "
-"artistas, canciones o información de álbum no es correcta (aunque le "
-"recomendamos que use en su lugar, la extensión Reparar metadatos para "
-"corregir sus archivos)."
-
-#: C/lastfm.page:87(title)
-msgid "Enable Last.fm song reporting from your device"
-msgstr "Activar el informe de canciones de Last.fm desde su dispositivo"
+"usuario y pulse el botón <gui>Iniciar sesión en Last.fm</gui>. Se le "
+"redirigirá a una web de Last.fm en su navegador para conceder acceso a "
+"Banshee. Pulse el enlace <gui>Sí, permitir acceso</gui> en su navegador y se "
+"le redirigirá a una web que mostrará un mensaje indicando que Banshee ya "
+"tiene acceso a Last.fm. Vuelva a Banshee y pulse el botón <gui>Finalizar el "
+"inicio de sesión</gui> para completar el proceso."
+
+#: C/lastfm.page:58(title)
+msgid "Enable Last.fm Song Reporting From Banshee"
+msgstr "Activar el informe de canciones en Last.fm desde Banshee"
+
+#: C/lastfm.page:59(p)
+msgid ""
+"After you have successfully linked Banshee to your Last.fm profile you must "
+"ensure that you have enabled Banshee to report your songs. To enable Banshee "
+"to report the songs to your Last.fm profile go to Banshee's preferences, "
+"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
+"the dropdown, and press the <gui>Enable Song Reporting From Banshee</gui> "
+"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 (although we recommend that you use the Metadata Fixer "
+"extension to correct your files instead)."
+msgstr ""
+"Tras enlazar Banshee con éxito a su perfil de Last.fm, debe asegurarse de "
+"que ha permitido que Banshee informe sobre sus canciones. Para permitir que "
+"Banshee informe las canciones a su perfil de Last.fm, vaya a las "
+"preferencias de Banshee, seleccione la pestaña <gui>Específicas de las "
+"fuentes</gui>, seleccione <gui>Last.fm</gui> en la lista desplegable y pulse "
+"la casilla <gui>Activar informe de canciones desde Banshee</gui>. Si tiene "
+"una conexión activa a Internet, Banhee enviará a Last.fm información "
+"relacionada con las canciones que reproduce. Last.fm actualizará "
+"automáticamente los metadatos de su música si la información del artista, "
+"canción o álbum no es correcta (aunque le recomendamos que, en lugar de eso, "
+"use la extensión «Reparar metadatos» para corregir sus archivos)."
+
+#: C/lastfm.page:75(title)
+msgid "Enable Last.fm Song Reporting From Your Device"
+msgstr "Activar el informe de canciones en Last.fm desde su dispositivo"
+
+#: C/lastfm.page:76(p)
+msgid ""
+"After successfully linking Banshee to your Last.fm profile and enabling "
+"Banshee to report songs to Last.fm you can also enable scrobbling from a "
+"connected device. Banshee will, upon connection of your device, attempt to "
+"scrobble the songs you have played since the device was last connected and "
+"submit them to Last.fm."
+msgstr ""
+"Una vez que haya enlazado Banshee con su perfil de Last.fm y haya activado "
+"el informe de canciones a Last.fm desde Banshee, también podrá activar el "
+"«scrobbling» desde su dispositivo conectado. Al establecer la conexión de su "
+"dispositivo, Banshee intentará hacer el «scrobble» de las canciones que se "
+"han reproducido desde que el dispositivo se conectó por última vez, y "
+"enviarlos a Last.fm."
+
+#: C/lastfm.page:82(p)
+msgid ""
+"To enable scrobbling of a connected device go to Banshee's preferences, "
+"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
+"the dropdown, and press the <gui>Enable Song Reporting From Device</gui> "
+"checkbox. If you have an active internet connection Banshee will, upon "
+"connection of your device, now attempt to gather information regarding the "
+"songs that you have played since it was last connected."
+msgstr ""
+"Para activar el «scrobbling» de un dispositivo conectado, vaya a las "
+"preferencias de Banshee, seleccione la pestaña <gui>Específicas de las "
+"fuentes</gui>, seleccione <gui>Last.fm</gui> de la lista desplegable y "
+"marque la casilla <gui>Activar informe de canciones desde Banshee</gui>.Si "
+"tiene una conexión a Internet activa, Banshee, Banshee tratará de obtener "
+"información acerca de las canciones que ha reproducido desde la última vez "
+"que conectó el dispositivo."
#: C/lastfm.page:89(p)
msgid ""
-"After successfully linking <app>Banshee</app> to your Last.fm profile and "
-"enabling <app>Banshee</app> to report songs to Last.fm you can also enable "
-"scrobbling from a connected device. <app>Banshee</app> will, upon connection "
-"of your device, attempt to scrobble the songs you have played since the "
-"device was last connected and submit them to Last.fm."
-msgstr ""
-"Después de enlazar éxitosamente <app>Banshee</app> a su perfil de Last.fm y "
-"activar <app>Banshee</app> para informar canciones a Last.fm también puede "
-"activar el scrobbling desde un dispositivo conectado. <app>Banshee</app> al "
-"establecer la conexión de su dispositivo, intentará hacer el scrobble de las "
-"canciones que se han reproducido desde que el dispositivo se conectó por "
-"última vez y los presentó a Last.fm."
-
-#: C/lastfm.page:95(p)
-msgid ""
-"To enable scrobbling of a connected device go to <app>Banshee</app> and "
-"select Preferences, select the <gui style=\"tab\">Source Specific</gui> tab, "
-"select <gui style=\"menuitem\">Last.fm</gui> from the dropdown, and press "
-"the <gui style=\"checkbox\">Enable Song Reporting From Device</gui> "
-"checkbox. If you have an active internet connection <app>Banshee</app> will, "
-"upon connection of your device, now attempt to gather information regarding "
-"the songs that you have played since it was last connected."
-msgstr ""
-"Para activar el scrobbling de un dispositivo conectado vaya a <app>Banshee</"
-"app> y seleccione preferencias, seleccione la pestaña <gui style=\"tab"
-"\">Específicas de las fuentes</gui>, seleccione <gui style=\"menuitem\">Last."
-"fm</gui> de la lista desplegable y marque la casilla de verificación <gui "
-"style=\"checkbox\">Activar informe de canciones desde dispositivo</gui>.Si "
-"tiene una conexión a Internet activa, <app>Banshee</app> después de la "
-"conexión de su dispositivo, tratará de reunir información acerca de las "
-"canciones que ha reproducido desde la última vez que conectó."
-
-#: C/lastfm.page:103(p)
-msgid ""
-"As with regular <app>Banshee</app> scrobbling submissions Last.fm will "
-"automatically update your music metadata if any of your artist, title, or "
-"album information is incorrect (although we again recommend that you use the "
+"As with regular Banshee scrobbling submissions Last.fm will automatically "
+"update your music metadata if any of your artist, title, or album "
+"information is incorrect (although we again recommend that you use the "
"Metadata Fixer extension to correct your files instead)."
msgstr ""
-"Al igual que con las presentaciones de scrobbling de <app>Banshee</app>, "
-"Last.fm actualizará automáticamente los metadatos de su música si alguno de "
-"sus artistas, títulos o información del álbum no es correcta (aunque, de "
-"nuevo, recomendamos que use la extensión Reparador de metadatos para "
-"corregir sus archivos en su lugar)."
+"Al igual que con los informes regulares de Banshee a Last.fm, los metadatos "
+"de música se actualizarán automáticamente si el artista, título o la "
+"información del álbum no es correcta (aunque, de nuevo, recomendamos que use "
+"la extensión «Reparador de metadatos» para corregir sus archivos en su lugar)."
-#: C/lastfm.page:108(p)
+#: C/lastfm.page:94(p)
msgid ""
-"Please note that currently <app>Banshee</app> only supports this feature "
-"with Apple products that are supported by the AppleDevice extension."
+"Please note that currently Banshee only supports this feature with Apple "
+"products that are supported by the AppleDevice extension."
msgstr ""
-"Tenga en cuenta que el actual <app>Banshee</app> sólo soporta esta "
+"Tenga en cuenta que la versión actual de Banshee sólo soporta esta "
"característica con productos de Apple soportados por la extensión "
"AppleDevice."
-#: C/lastfm.page:114(title)
-msgid "Listen to Last.fm radio"
+#: C/lastfm.page:101(title)
+msgid "Listen to Last.fm Radio"
msgstr "Escuchar la radio de Last.fm"
-#: C/lastfm.page:116(p)
+#: C/lastfm.page:102(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 "
@@ -2009,206 +1472,219 @@ msgstr ""
"escuchar las listas de reproducción y las emisoras de música que ha "
"etiquetado o marcado como favoritas."
-#: C/lastfm.page:122(p)
-msgid ""
-"In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will communicate "
-"with Last.fm to populate songs for that radio station. Press the <gui style="
-"\"button\">Play</gui> button in <app>Banshee</app> or <key>Space</key> to "
-"start streaming a Last.fm radio station. You can also press the <gui style="
-"\"button\">Next</gui> button in <app>Banshee</app>, <key>N</key> or choose "
-"<guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem\">Next</"
-"gui></guiseq> to play the next song in your radio station queue."
-msgstr ""
-"En el panel de fuentes al lado izquierdo de <app>Banshee</app>, tendrá ahora "
-"una sección de Last.fm, incluyendo sus emisoras de radio de Last.fm. "
-"Necesitará una conexión a Internet activa para escuchar la radio de Last.fm. "
-"Elija la emisora de radio que desea escuchar y <app>Banshee</app> se "
-"comunicará con Last.fm para rellenar canciones para esta emisora de radio. "
-"Pulse el botón <gui style=\"button\">Reproducir</gui> en <app>Banshee</app> "
-"o <key>Espacio</key> para empezar la transmisión de una emisora de radio de "
-"Last.fm. También puede pulsar el botón <gui style=\"button\">Siguiente</gui> "
-"en <app>Banshee</app>, <key>N</key> o elegir <guiseq><gui style=\"menu"
-"\">Reproducción</gui><gui style=\"menuitem\">Siguiente</gui></guiseq> para "
-"reproducir la siguiente canción en la cola de su emisora de radio."
-
-#: C/keyboard-shortcuts.page:7(desc)
-msgid "Keyboard shortcuts"
+#: C/lastfm.page:109(p)
+msgid ""
+"In Banshee's sources pane 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 <gui>Play</gui> button in Banshee or "
+"<key>Spacebar</key> to start streaming a Last.fm radio station. You can also "
+"press the <gui>Next</gui> button in Banshee, <key>N</key> or choose "
+"<guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in "
+"your radio station queue."
+msgstr ""
+"En el panel de fuentes de Banshee a la izquierda, tendrá ahora una sección "
+"de Last.fm, incluyendo sus emisoras de radio de Last.fm. Necesitará una "
+"conexión a Internet activa para escuchar la radio de Last.fm. Elija la "
+"emisora de radio que desea escuchar y Banshee se comunicará con Last.fm para "
+"reproducir canciones de la radio de Last.fm. Pulse el botón <gui>Reproducir</"
+"gui> en Banshee o la <key>barra espaciadora</key> para empezar a reproducir "
+"una emisora de radio de Last.fm. También puede pulsar el botón "
+"<gui>Siguiente</gui> en Banshee, <key>N</key> o escoger "
+"<guiseq><gui>Reproducción</gui><gui>Siguiente</gui></guiseq> para reproducir "
+"la siguiente canción en la cola de su emisora de radio."
+
+#: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title)
+#: C/advanced.page:29(title)
+msgid "Keyboard Shortcuts"
msgstr "Atajos de teclado"
-#: C/keyboard-shortcuts.page:24(title)
-msgid "Control <app>Banshee</app> using keyboard shortcuts"
-msgstr "Controlar <app>Banshee</app> usando atajos de teclado"
+#: C/keyboardshortcuts.page:24(title)
+msgid "Control Banshee using Keyboard Shortcuts"
+msgstr "Controlar Banshee por medio de atajos de teclado"
-#: C/keyboard-shortcuts.page:27(title)
-msgid "Playback control"
+#: C/keyboardshortcuts.page:28(title)
+msgid "Playback Control"
msgstr "Control de reproducción"
-#: C/keyboard-shortcuts.page:31(gui) C/keyboard-shortcuts.page:55(gui)
-#: C/keyboard-shortcuts.page:77(gui) C/keyboard-shortcuts.page:94(gui)
-#: C/keyboard-shortcuts.page:111(gui)
+#: 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 "Tecla"
-#: C/keyboard-shortcuts.page:32(gui) C/keyboard-shortcuts.page:56(gui)
-#: C/keyboard-shortcuts.page:78(gui) C/keyboard-shortcuts.page:95(gui)
-#: C/keyboard-shortcuts.page:112(gui)
+#: 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 "Acción"
-#: C/keyboard-shortcuts.page:35(key)
-msgid "Space"
-msgstr "Espacio"
+#: C/keyboardshortcuts.page:35(p)
+msgid "Space Bar"
+msgstr "Barra espaciadora"
-#: C/keyboard-shortcuts.page:36(p)
+#: C/keyboardshortcuts.page:35(p)
msgid "Play or Pause the current song"
msgstr "Reproducir o pausar la canción actual"
-#: C/keyboard-shortcuts.page:39(key) C/keyboard-shortcuts.page:81(key)
+#: C/keyboardshortcuts.page:38(p) C/keyboardshortcuts.page:76(key)
msgid "N"
msgstr "N"
-#: C/keyboard-shortcuts.page:40(p)
+#: C/keyboardshortcuts.page:38(p)
msgid "Play the next song"
msgstr "Reproducir la canción siguiente"
-#: C/keyboard-shortcuts.page:43(key)
+#: C/keyboardshortcuts.page:41(p)
msgid "B"
msgstr "B"
-#: C/keyboard-shortcuts.page:44(p)
+#: C/keyboardshortcuts.page:41(p)
msgid "Play the previous song"
msgstr "Reproducir la canción anterior"
-#: C/keyboard-shortcuts.page:51(title)
-msgid "Library interaction"
-msgstr "Interacción de la colección"
+#: C/keyboardshortcuts.page:49(title)
+msgid "Library Interaction"
+msgstr "Interacción con la colección"
-#: C/keyboard-shortcuts.page:59(p)
-msgid "<key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq>"
-msgstr "<key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq>"
+#: C/keyboardshortcuts.page:56(p)
+msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
+msgstr "<key>/</key>, <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-#: C/keyboard-shortcuts.page:61(p)
+#: C/keyboardshortcuts.page:56(p)
msgid "Move the focus to the search box"
msgstr "Mover el foco a la caja de búsqueda"
-#: C/keyboard-shortcuts.page:64(key) C/keyboard-shortcuts.page:81(key)
-#: C/keyboard-shortcuts.page:119(key) C/keyboard-shortcuts.page:123(key)
-#: C/keyboard-shortcuts.page:128(key) C/keyboard-shortcuts.page:133(key)
-#: C/keyboard-shortcuts.page:139(key) C/keyboard-shortcuts.page:145(key)
+#: C/keyboardshortcuts.page:60(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 "Ctrl"
-#: C/keyboard-shortcuts.page:64(key)
+#: C/keyboardshortcuts.page:60(key)
msgid "I"
msgstr "I"
-#: C/keyboard-shortcuts.page:65(p)
+#: C/keyboardshortcuts.page:61(p)
msgid "Open import media dialog"
msgstr "Abrir diálogo de importación de contenido multimedia"
-#: C/keyboard-shortcuts.page:82(p)
+#: C/keyboardshortcuts.page:76(p)
msgid "Create New Playlist"
msgstr "Crear una nueva lista de reproducción"
-#: C/keyboard-shortcuts.page:98(key)
+#: C/keyboardshortcuts.page:86(title) C/add-podcast.page:26(title)
+msgid "Podcasts"
+msgstr "Podcasts"
+
+#: C/keyboardshortcuts.page:93(key)
msgid "Y"
msgstr "Y"
-#: C/keyboard-shortcuts.page:99(p)
+#: C/keyboardshortcuts.page:93(p)
msgid "Mark the selected episodes as old"
msgstr "Marcar los episodios seleccionados como antiguos"
-#: C/keyboard-shortcuts.page:107(title)
+#: C/keyboardshortcuts.page:103(title)
msgid "Interface"
msgstr "Interfaz"
-#: C/keyboard-shortcuts.page:115(key)
+#: C/keyboardshortcuts.page:110(key)
msgid "F"
msgstr "F"
-#: C/keyboard-shortcuts.page:116(p)
+#: C/keyboardshortcuts.page:110(p)
msgid "Toggle full-screen mode"
msgstr "Conmutar el modo de pantalla completa"
-#: C/keyboard-shortcuts.page:119(key) C/keyboard-shortcuts.page:123(key)
+#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
msgid "A"
msgstr "A"
-#: C/keyboard-shortcuts.page:120(p)
+#: C/keyboardshortcuts.page:114(p)
msgid "Select all songs in playlist view"
msgstr "Seleccionar todas las canciones en la vista de lista de reproducción"
-#: C/keyboard-shortcuts.page:123(key)
+#: C/keyboardshortcuts.page:118(key)
msgid "Shift"
msgstr "Mayús"
-#: C/keyboard-shortcuts.page:125(p)
+#: C/keyboardshortcuts.page:119(p)
msgid "Unselect all songs in playlist view"
msgstr "Deseleccionar todas las canciones en la vista de lista de reproducción"
-#: C/keyboard-shortcuts.page:128(key)
+#: C/keyboardshortcuts.page:123(key)
msgid "W"
msgstr "W"
-#: C/keyboard-shortcuts.page:129(p)
-msgid ""
-"Hide <app>Banshee</app> Window (Requires Notification Area Plug-in Enabled)"
+#: C/keyboardshortcuts.page:123(p)
+msgid "Hide Banshee Window (Requires Notification Area Plug-in Enabled"
msgstr ""
-"Ocultar la ventana de <app>Banshee</app> (requiere tener activado el "
-"complemento de área de notificación)"
+"Ocultar la ventana de Banshee (requiere tener activada la extensión «Icono en "
+"el área de notificación»)"
-#: C/keyboard-shortcuts.page:133(key)
+#: C/keyboardshortcuts.page:127(key)
msgid "Left Mouse Button"
msgstr "Botón izquierdo del ratón"
-#: C/keyboard-shortcuts.page:135(p)
+#: C/keyboardshortcuts.page:128(p)
msgid "Play Previous Song (Requires Notification Area Plug-in Enabled"
msgstr ""
"Reproducir la canción anterior (requiere tener activada la extensión «Icono "
"en el área de notificación»)"
-#: C/keyboard-shortcuts.page:139(key)
+#: C/keyboardshortcuts.page:132(key)
msgid "Right Mouse Button"
msgstr "Botón derecho del ratón"
-#: C/keyboard-shortcuts.page:141(p)
+#: C/keyboardshortcuts.page:133(p)
msgid "Play Next Song (Requires Notification Area Plug-in Enabled"
msgstr ""
"Reproducir la canción siguiente (requiere tener activada la extensión «Icono "
"en el área de notificación»)"
-#: C/keyboard-shortcuts.page:145(key)
+#: C/keyboardshortcuts.page:137(key)
msgid "Middle Mouse Button"
msgstr "Botón central del ratón"
-#: C/keyboard-shortcuts.page:147(p)
+#: C/keyboardshortcuts.page:138(p)
msgid "Toggle Play / Pause (Requires Notification Area Plug-in Enabled"
msgstr ""
"Alternar entre Reproducir / Pausar (requiere tener activada la extensión "
"«Icono en el área de notificación»)"
+#: C/itunes-import.page:8(desc)
+msgid ""
+"Import music and categorizations from the <app>iTunes</app> media player."
+msgstr ""
+"Importar música y clasificaciones desde el reproductor multimedia "
+"<app>iTunes</app>."
+
+#: C/itunes-import.page:12(title)
+msgid "Import your <app>iTunes</app> library"
+msgstr "Importar su colección de <app>iTunes</app>"
+
#: C/introduction.page:8(desc)
-msgid "Introduction to the <app>Banshee</app> media player."
-msgstr "Introducción al reproductor multimedia de <app>Banshee</app>."
+msgid "Introduction to the <app>Banshee Media Player</app>."
+msgstr "Introducción al <app>Reproductor multimedia Banshee</app>."
-#: C/introduction.page:26(title)
+#: C/introduction.page:24(title)
msgid "Introduction"
msgstr "Introducción"
-#: C/introduction.page:28(p)
+#: C/introduction.page:26(p)
msgid ""
"<app>Banshee</app> is a media player that allows you to play your music, "
-"videos and other media, as well as sync it with portable devices to take "
-"your media on the go."
+"videos, and other media as well sync it with portable devices to take your "
+"media on the go."
msgstr ""
"<app>Banshee</app> en un reproductor multimedia que le permite reproducir su "
-"música, vídeos y otro contenido multimedia así como sincronizarlo con "
+"música, vídeos y otro contenido multimedia así como sincronizarse con "
"dispositivos portátiles para llevar su contenido multimedia consigo."
-#: C/introduction.page:32(p)
+#: C/introduction.page:31(p)
msgid ""
"<app>Banshee</app> includes features to import your media, manage its "
"metadata, and play your music and videos."
@@ -2218,81 +1694,83 @@ msgstr ""
#: C/introduction.page:35(p)
msgid ""
-"<app>Banshee</app> also helps you sync your music and videos to popular "
-"portable devices, such as digital audio players and smartphones. "
-"<app>Banshee</app> supports popular devices including most iPods, Sandisk "
-"and Creative MP3 players, and Android powered phones."
+"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 ""
-"<app>Banshee</app> también le ayuda a sincronizar su música y sus vídeos con "
+"Banshee también le ayuda a sincronizar su música y sus vídeos con "
"dispositivos portátiles populares, como reproductores de sonido digitales y "
-"teléfonos inteligentes. <app>Banshee</app> soporta dispositivos populares "
-"incluyendo la mayoría de reproductores MP3 iPod, Sandisk y Creative y "
-"teléfonos con Android."
+"teléfonos inteligentes. Banshee soporta dispositivos populares incluyendo la "
+"mayoría de reproductores MP3, iPod, Sandisk y Creative y teléfonos con "
+"Android."
-#: C/index.page:31(title)
-msgid "<app>Banshee</app> media player"
-msgstr "Reproductor multimedia de <app>Banshee</app>"
+#: C/index.page:14(name)
+msgid "Sindhu S"
+msgstr "Sindhu S"
+
+#: C/index.page:15(email)
+msgid "sindhus at live.in"
+msgstr "sindhus at live.in"
-#: C/index.page:34(title)
-msgid "Add, remove & play"
+#: C/index.page:29(title)
+msgid "Add, Remove & Play"
msgstr "Añadir, quitar y reproducir"
-#: C/index.page:38(title)
-msgid "Manage & sort"
+#: C/index.page:33(title)
+msgid "Manage & Sort"
msgstr "Gestionar y ordenar"
-#: C/index.page:42(title)
+#: C/index.page:37(title)
msgid "Sync your media with a portable music player"
msgstr ""
"Sincronizar su contenido multimedia con un reproductor de música portátil"
-#: C/index.page:46(title)
-msgid "Add additional functionality to <app>Banshee</app>"
-msgstr "Agregar funcionalidad adicional a <app>Banshee</app>."
+#: C/index.page:41(title)
+msgid "Add additional functionality to Banshee"
+msgstr "Agregar una funcionalidad adicional a Banshee"
-#: C/index.page:50(title)
+#: C/index.page:45(title)
msgid "Advanced options and help"
msgstr "Opciones avanzadas y ayuda"
-#: C/import.page:7(desc)
-msgid ""
-"Add music and videos from your computer to your <app>Banshee</app> library."
-msgstr ""
-"Añadir música y vídeos de su equipo a su colección de <app>Banshee</app>.."
+#: 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:16(name)
+#: C/import.page:15(name)
msgid "Shaun McCance"
msgstr "Shaun McCance"
-#: C/import.page:17(email)
+#: C/import.page:16(email)
msgid "shaunm at gnome.org"
msgstr "shaunm at gnome.org"
-#: C/import.page:26(title)
+#: C/import.page:21(title)
msgid "Import music & videos"
msgstr "Importar música y vídeos"
-#: C/import.page:28(p)
+#: C/import.page:23(p)
msgid ""
-"You can import music and videos stored on your computer into <app>Banshee</"
-"app>. Imported files appear in your sources and can be edited and managed "
-"like any other media in <app>Banshee</app>."
+"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 almacenados en su equipo en <app>Banshee</"
-"app>. Los archivos importados aparecen en sus fuentes y pueden editarse y "
-"gestionarse como cualquier otro archivo multimedia en <app>Banshee</app>."
+"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:32(p)
+#: C/import.page:27(p)
msgid ""
-"To import music or video files on your computer, choose <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">Import Media</gui></guiseq>. A "
-"dialog wil appear with a number of choices."
+"To import music or video files on your computer, choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq>. A dialog will appear with a number of "
+"choices."
msgstr ""
"Para importar archivos de música o vídeo desde su equipo, seleccione "
-"<guiseq><gui style=\"menu\">Multimedia</gui><gui>Importar contenido "
-"multimedia</gui></guiseq>. Aparecerá un diálogo con varias opciones."
+"<guiseq><gui>Multimedia</gui><gui>Importar contenido multimedia</gui></"
+"guiseq>. Aparecerá un diálogo con varias opciones."
-#: C/import.page:37(p)
+#: C/import.page:31(p)
msgid ""
"Plugins may add additional import choices. See <link xref=\"#plugins\"/> "
"below."
@@ -2300,11 +1778,11 @@ msgstr ""
"Los complementos pueden añadir opciones adicionales de importación. Consulte "
"la <link xref=\"#plugins\"/> abajo."
-#: C/import.page:43(gui)
+#: C/import.page:37(gui)
msgid "Local Folders"
msgstr "Carpetas locales"
-#: C/import.page:44(p)
+#: 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 "
@@ -2314,11 +1792,11 @@ msgstr ""
"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:49(gui)
+#: C/import.page:43(gui)
msgid "Local Files"
msgstr "Archivos locales"
-#: C/import.page:50(p)
+#: 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."
@@ -2327,11 +1805,11 @@ msgstr ""
"seleccione. Se mostrará un diálogo en el que podrá elegir qué archivos "
"importar."
-#: C/import.page:55(gui)
+#: C/import.page:49(gui)
msgid "Home Folder"
msgstr "Carpeta de inicio"
-#: C/import.page:56(p)
+#: 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."
@@ -2339,11 +1817,11 @@ msgstr ""
"Elija esta opción para importar todos los archivos de música y vídeo en su "
"carpeta personal, incluyendo los archivos de las subcarpetas."
-#: C/import.page:60(gui)
+#: C/import.page:54(gui)
msgid "Videos From Photos Folder"
msgstr "Vídeos de la carpeta de Imágenes"
-#: C/import.page:61(p)
+#: C/import.page:55(p)
msgid ""
"Many digital cameras can take short videos, and photo-management "
"applications often download these videos directly into your Photos folder. "
@@ -2355,7 +1833,7 @@ msgstr ""
"carpeta «Imágenes». Elija esta opción para importar cualquier vídeo que se "
"haya guardado en la carpeta «Imágenes»."
-#: C/import.page:69(p)
+#: 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."
@@ -2363,31 +1841,29 @@ msgstr ""
"Puede importar con seguridad desde una carpeta desde la que ya haya "
"importado antes sin riesgo de crear entradas duplicadas en su colección."
-#: C/import.page:74(title)
-msgid "Import from a playlist"
+#: C/import.page:68(title)
+msgid "Import from a Playlist"
msgstr "Importar desde una lista de reproducción"
-#: C/import.page:76(p)
+#: C/import.page:69(p)
msgid ""
"You can also import music from playlists. Most playlist files end in "
-"<em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu "
-"choose <guiseq><gui style=\"menu\">Media</gui><gui style=\"menuitem\">Import "
-"Playlist</gui></guiseq> and locate the playlist file in your folder, select "
-"it and press <gui style=\"button\">Import</gui>."
+"<em>m3u</em>. To import from a playlist, from the Banshee menu choose "
+"<guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and locate the "
+"playlist file in your folder, select it and press <gui>Import</gui>."
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 <em>m3u</em>. Para importar "
-"desde una lista de reproducción, desde el menú de <app>Banshee</app> elija "
-"<guiseq><gui style=\"menu\">Multimedia</gui><gui style=\"menuitem\">Importar "
-"lista de reproducción</gui></guiseq> y localice el archivo de la lista de "
-"reproducción en su carpeta, selecciónelo y pulse <gui style=\"button"
-"\">Importar</gui>."
+"una lista de reproducción, desde el menú de Banshee seleccione "
+"<guiseq><gui>Multimedia</gui><gui>Importar lista de reproducción</gui></"
+"guiseq> y localice el archivo de la lista de reproducción en su carpeta, "
+"selecciónelo y pulse <gui>Importar</gui>."
-#: C/import.page:86(title)
-msgid "Additional import sources"
-msgstr "Fuentes de importación adicionales"
+#: C/import.page:78(title)
+msgid "Additional Import Sources"
+msgstr "Importar desde otras fuentes"
-#: C/import.page:88(p)
+#: 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:"
@@ -2397,115 +1873,127 @@ msgstr ""
"complementos adecuados:"
#: C/extensions.page:8(desc)
-msgid "Add additional functionality to <app>Banshee</app>."
-msgstr "Agregar funcionalidad adicional a <app>Banshee</app>."
+msgid "Add additional functionality to Banshee."
+msgstr "Agregar funcionalidad adicional a Banshee."
#: C/extensions.page:23(title)
-msgid "<app>Banshee</app> extensions"
-msgstr "Extensiones de <app>Banshee</app>"
+msgid "Banshee Extensions"
+msgstr "Extensiones de Banshee"
#: C/extensions.page:27(title)
-msgid "Official <app>Banshee</app> extensions"
-msgstr "Extensiones oficiales de <app>Banshee</app>"
+msgid "Official Banshee Extensions"
+msgstr "Extensiones oficiales de Banshee"
+
+#: C/extensions.page:29(title)
+msgid "Manage extensions for Banshee"
+msgstr "Gestionar extensiones de Banshee"
+
+#: C/extensions.page:34(title)
+msgid "Community Banshee Extensions"
+msgstr "Extensiones de la comunidad de Banshee"
+
+#: C/extensions.page:36(title)
+msgid "Add community built extensions for Banshee"
+msgstr "Añadir extensiones desarrolladas por la comunidad de Banshee"
-#: C/extensions.page:30(title)
-msgid "Manage extensions for <app>Banshee</app>"
-msgstr "Gestionar extensiones de <app>Banshee</app>"
+#: C/emusic.page:8(desc)
+msgid "Import music purchased from eMusic."
+msgstr "Importar música comprada en eMusic."
-#: C/amazon.page:8(desc)
+#: C/emusic.page:12(title)
+msgid "Import your eMusic tracks"
+msgstr "Importar canciones de eMusic"
+
+#: C/amazon.page:9(desc)
msgid "Sync and purchase music from the Amazon MP3 Store."
msgstr "Sincronizar y comprar música de la tienda de Amazon MP3."
-#: C/amazon.page:28(title)
-msgid "Amazon MP3 store"
-msgstr "Tienda MP3 de Amazon"
+#: C/amazon.page:24(title)
+msgid "Amazon MP3 Store"
+msgstr "Tienda de Amazon MP3"
-#: C/amazon.page:30(p)
+#: C/amazon.page:26(p)
msgid ""
-"<app>Banshee</app> 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 <app>Banshee</app>. 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 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 ""
-"<app>Banshee</app> permite descargar e importar música de la tienda de "
-"Amazon MP3. Puede importar de forma manual sus archivos de música, comprar "
-"música desde su navegador web o comprar música desde el propio <app>Banshee</"
-"app>. Amazon sólo permite la compra de música en MP3 en algunos países, por "
-"lo que dependiendo de su ubicación es posible que no pueda comprar música en "
-"MP3 de Amazon."
+"Banshee le permite descargar e importar música de la tienda de Amazon MP3. "
+"Puede importar de forma manual sus archivos comprados en Amazon, adquirir "
+"música desde el navegador o comprar música desde el propio Banshee. Amazon "
+"sólo permite la compra de música en MP3 en algunos países, por lo que "
+"dependiendo de su ubicación es posible que no pueda comprar MP3 de Amazon."
-#: C/amazon.page:37(p)
+#: C/amazon.page:34(p)
msgid ""
-"<app>Banshee</app> uses an Amazon affiliate code for all music purchases. "
-"All money made via this affiliate code is donated to the GNOME Foundation."
+"Banshee uses an Amazon affiliate code for all music purchases. All money "
+"made via this affiliate code is donated to the GNOME Foundation."
msgstr ""
-"<app>Banshee</app> usa un código de afiliado de Amazon para todas las "
-"compras de música. Todo el dinero que se gana por medio de este código de "
-"afiliado se dona a la Fundación GNOME."
+"Banshee emplea un código de afiliado con Amazon en todas las compras de "
+"música. Todo el dinero que se gana por medio de este código es donado a la "
+"Fundación GNOME."
-#: C/amazon.page:43(title)
+#: C/amazon.page:40(title)
msgid "Purchase Amazon MP3s in your web browser"
msgstr "Comprar música en MP3 desde Amazon desde el navegador"
-#: C/amazon.page:45(p)
-msgid ""
-"Music purchased from the Amazon MP3 store can be automatically downloaded "
-"and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app> "
-"will automatically open it and begin the download and import the music."
-msgstr ""
-"La música comprada desde la tienda MP3 de Amazon puede ser descargada e "
-"importada a <app>Banshee</app> automáticamente. <app>Banshee</app> se asocia "
-"con los archivos .amz que Amazon proporciona en la compra de música en MP3. "
-"Cuando compre música en Amazon, su navegador web descargará el archivo .amz "
-"y <app>Banshee</app> lo abrirá automáticamente y comenzará la descarga e "
-"importación de música."
-
-#: C/amazon.page:54(title)
-msgid "Buy Amazon MP3s in <app>Banshee</app>"
-msgstr "Comprar música en MP3 de Amazon en <app>Banshee</app>"
-
-#: C/amazon.page:56(p)
-msgid ""
-"You can also search for songs on Amazon within <app>Banshee</app>. Choose "
-"the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and "
-"import your purchase into the library."
-msgstr ""
-"También puede buscar canciones en Amazon desde <app>Banshee</app>. Elija la "
-"tienda de Amazon MP3 desde el menú de <app>Banshee</app> de la izquierda. "
-"Esto cargará la tienda de Amazon MP3 como si estuviera en un navegador web. "
-"Tras iniciar sesión en Amazon, podrá buscar la música que desea comprar y "
-"comprarla con una sola pulsación. <app>Banshee</app> de forma automática "
-"descargará e importará la música comprada en la colección."
-
-#: C/amazon.page:66(title)
+#: 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 ""
+"La música que se compra desde la tienda de Amazon MP3 puede ser descargada e "
+"importada a Banshee automáticamente. El programa se asocia con los archivos ."
+"amz que Amazon proporciona en la compra de música en MP3. Cuando compre "
+"música en Amazon, el navegador descargará el archivo .amz y Banshee lo "
+"abrirá automáticamente y comenzará la descarga e importación."
+
+#: C/amazon.page:51(title)
+msgid "Buy Amazon MP3s in Banshee"
+msgstr "Comprar música en MP3 de Amazon desde Banshee"
+
+#: 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 your purchase into the "
+"library."
+msgstr ""
+"También puede buscar canciones en Amazon desde Banshee. Elija la Tienda de "
+"Amazon MP3 desde el menú de la izquierda. Esto cargará la tienda de Amazon "
+"MP3 como si la estuviera viendo en el navegador. Tras iniciar sesión en "
+"Amazon, podrá buscar música que desea comprar y descargarla con una sola "
+"pulsación. Banshee descargará e importará la música comprada a su colección "
+"de forma automática."
+
+#: C/amazon.page:63(title)
msgid "Import Amazon MP3s manually"
msgstr "Importar música en MP3 de Amazon manualmente"
-#: C/amazon.page:68(p)
+#: 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 <app>Banshee</app> choose <guiseq><gui "
-"style=\"menu\">Media</gui><gui style=\"menuitem\">Import Media</gui></"
-"guiseq> from the menu and select the *.amz file to be imported. "
-"<app>Banshee</app> will then open this file and connect to the Amazon MP3 "
-"store to begin the download."
+"purchased manually from Amazon, in Banshee choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq> 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 ""
"Cuando compra música en Amazon a través del navegador, se descarga un "
"archivo con la extensión .amz que se guarda en su disco duro. Para importar "
-"de forma manual la música comprada en Amazon, en <app>Banshee</app> elija "
-"<guiseq><gui style=\"menu\">Multimedia</gui><gui style=\"menuitem\">Importar "
-"multimedia</gui></guiseq> del menú y seleccione el archivo *.amz que desea "
-"importar. <app>Banshee</app> abrirá este archivo y se conectará a la tienda "
-"de Amazon MP3 para comenzar la descarga."
+"de forma manual la música comprada en Amazon, vaya a "
+"<guiseq><gui>Multimedia</gui><gui>Importar contenido multimedia…</gui></"
+"guiseq> y seleccione el archivo *.amz que desea importar. Banshee abrirá el "
+"archivo y se conectará a la tienda de Amazon MP3 para comenzar la descarga."
-#: C/amazon.page:78(p)
+#: 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 "
@@ -2520,6 +2008,208 @@ msgstr ""
"Se recomienda que descargue e importe la música de la tienda Amazon MP3 como "
"máximo una hora después de la compra."
+#: C/advanced.page:8(desc)
+msgid "Get help for advanced actions."
+msgstr "Obtener ayuda para acciones avanzadas."
+
+#: C/advanced.page:23(title)
+msgid "Advanced Options and Help"
+msgstr "Opciones avanzadas y ayuda"
+
+#: C/add-radio.page:11(desc)
+msgid "Add, remove and play internet radio stations in Banshee."
+msgstr ""
+"Añadir, eliminar y reproducir emisoras de radio por Internet en Banshee."
+
+#: C/add-radio.page:26(title)
+msgid "Internet Radio"
+msgstr "Radio por Internet"
+
+#: C/add-radio.page:29(title)
+msgid "What is Internet Radio?"
+msgstr "¿Qué es la radio por Internet?"
+
+#: 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 broadcasting their own station, or commercial internet radio "
+"stations that include live DJs and even commercials."
+msgstr ""
+"Las emisoras de radio por Internet son parecidas a las emisoras de radio "
+"normales. Permiten a una persona u organización emitir música en directo por "
+"medio de Internet. Las emisoras de radio por Internet pueden consistir en "
+"una emisión simultánea de una emisora corriente, una persona emitiendo su "
+"propio programa, o emisiones de tipo comercial que pueden incluir, por "
+"ejemplo, sesiones de DJ o incluso anuncios."
+
+#: C/add-radio.page:41(title)
+msgid "Add Radio Station"
+msgstr "Añadir emisoras de radio"
+
+#: C/add-radio.page:43(p)
+msgid ""
+"To add an internet radio station to Banshee, press <gui>Add Station</gui> in "
+"the upper right hand corner of Banshee or, from the menu, choose "
+"<guiseq><gui>Media</gui><gui>Add Station</gui></guiseq>."
+msgstr ""
+"Para añadir una emisora de radio por Internet a Banshee, pulse en "
+"<gui>Añadir emisora</gui> en la esquina superior derecha de Banshee o, desde "
+"el menú, pulse en <guiseq><gui>Multimedia</gui><gui>Añadir emisora</gui></"
+"guiseq>."
+
+#: 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 <gui>Copy Link</gui>."
+msgstr ""
+"En la página web de la emisora de radio, copie en enlace a la URL del "
+"podcast en el navegador. En la mayoría de los navegadores, puede pulsar con "
+"el botón derecho del ratón en el enlace y seleccionar <gui>Copiar enlace</"
+"gui>."
+
+#: C/add-radio.page:54(p)
+msgid ""
+"Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
+"kind of music the internet radio station plays from the available drop down "
+"selections. You will then need to enter the <gui>Station Name</gui>. Enter a "
+"name for the radio station. Then press tab or use your mouse to select the "
+"<gui>Stream URL</gui> field to paste the URL of the radio station. Using "
+"your mouse right click and choose <gui>Paste</gui> or press "
+"<keyseq><key>Control</key><key>V</key></keyseq>."
+msgstr ""
+"Banshee le pedirá que introduzca el <gui>Género de la emisora</gui>. Elija "
+"el tipo de música que emite la estación de radio del menú desplegable. "
+"Después, tendrá que introducir el <gui>Nombre de la emisora</gui>. Escriba "
+"un nombre para la emisora de radio. A continuación, pulse el tabulador o "
+"seleccione el campo <gui>URL del flujo</gui> y pegue la URL de la emisora de "
+"radio. Puede hacer esto pulsando con el botón derecho del ratón y "
+"seleccionando <gui>Pegar</gui> o pulsando las teclas <keyseq><key>Control</"
+"key><key>V</key></keyseq>."
+
+#: C/add-radio.page:62(p)
+msgid ""
+"You can optionally also fill out the fields for <gui>Station Creator</gui>, "
+"<gui>Description</gui>, and <gui>Rating</gui>."
+msgstr ""
+"Adicionalmente, también puede completar los campos para <gui>Creador de la "
+"emisora</gui>, <gui>Descripción</gui> y <gui>Valoración</gui>."
+
+#: C/add-radio.page:66(p)
+msgid ""
+"Then press <gui>Save</gui> to save the internet radio station in Banshee."
+msgstr ""
+"Para acabar, pulse en <gui>Guardar</gui> para guardar la estación de radio "
+"por Internet en Banshee."
+
+#: C/add-podcast.page:11(desc)
+msgid "Add, remove and play podcasts in Banshee."
+msgstr "Añadir, eliminar y reproducir podcasts en Banshee."
+
+#: C/add-podcast.page:29(title)
+msgid "What is a Podcast?"
+msgstr "¿Qué es un podcast?"
+
+#: 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 ""
+"Los podcasts son programas grabados, parecidos a los de radio, que se "
+"encuentran disponibles en Internet y a los que puede suscribirse. Cuando se "
+"suscriba a un podcast en Banshee, el programa irá descargando los nuevos "
+"programas automáticamente y le permitirá escucharlos."
+
+#: 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 ""
+"Se pueden encontrar podcasts sobre prácticamente cualquier tema, como "
+"música, películas, Linux y mucho más. Para encontrar podcasts en Internet, "
+"utilice su buscador preferido e introduzca términos como «podcasts música» "
+"para encontrar un gran número de opciones donde elegir."
+
+#: C/add-podcast.page:44(title)
+msgid "Add a Podcast"
+msgstr "Añadir un podcast"
+
+#: 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 <gui>Copy link</gui>."
+msgstr ""
+"Para añadir un podcast a Banshee, primero deberá visitar la página web del "
+"podcast en Internet. Casi todos los podcasts cuentan con un botón o un "
+"enlace que permite suscribirse al podcast. Copie dicho enlace. En la mayoría "
+"de los navegadores puede pulsar con el botón derecho en el enlace y "
+"seleccionar <gui>Copiar enlace</gui>."
+
+#: C/add-podcast.page:53(p)
+msgid ""
+"In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the upper "
+"right hand corner, from the menu choose <guiseq><gui>Media</gui><gui> "
+"Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
+"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
+msgstr ""
+"En Banshee, pulse en <gui>Subcribirse a un podcast</gui> en la esquina "
+"superior derecha o, desde el menú, pulse en <guiseq><gui>Multimedia</"
+"gui><gui>Añadir podcast…</gui></guiseq> o bien pulse <keyseq><key>Máyus</"
+"key><key>Control</key><key>F</key></keyseq>."
+
+#: 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 ""
+"Entonces, Banshee le permitirá elegir cómo desea descargar nuevos capítulos "
+"desde un menú desplegable. Las opciones son:"
+
+#: C/add-podcast.page:63(p)
+msgid ""
+"Download the Most Recent Episode (This will automatically download the last "
+"episode that was released)."
+msgstr ""
+"Descargar los episodios más recientes (esto descargará automáticamente el "
+"último episodio publicado del programa)."
+
+#: C/add-podcast.page:65(p)
+msgid "Download All Episodes (This will download all episodes)."
+msgstr "Descargar todos los episodios (esto descargará todos los episodios)."
+
+#: 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 ""
+"Dejar que el usuario decida qué episodios descargar (esto le permitirá "
+"elegir qué episodios desea descargar)."
+
+#: C/add-podcast.page:70(p)
+msgid "After you have added a Podcast feed, Banshee will display:"
+msgstr "Después de añadir un podcast, Banshee le mostrará:"
+
+#: C/add-podcast.page:73(p)
+msgid "<gui>Name</gui>: (Name of the specific episode)"
+msgstr "<gui>Nombre</gui>: (Nombre del episodio)"
+
+#: C/add-podcast.page:74(p)
+msgid "<gui>Podcast</gui>: (Name of the Podcast)"
+msgstr "<gui>Podcast</gui>: (Nombre del podcast)"
+
+#: C/add-podcast.page:75(p)
+msgid "<gui>Published</gui> (Date the episode was published or released)"
+msgstr "<gui>Publicado</gui> (Fecha en que se publicó el episodio)"
+
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
msgid "translator-credits"
@@ -2528,165 +2218,5 @@ msgstr ""
"Benjamín Valero Espinosa <benjavalero at gmail.com>, 2010, 2011\n"
"Ángel Sanz <mizo0mizo at gmail.com>, 2011"
-#~ msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
-#~ msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
-
-#~ msgid "Introduction to the Banshee User Interface"
-#~ msgstr "Introducción a la interfaz de usuario de Banshee"
-
-#~ msgid ""
-#~ "To change Now Playing to hide the <app>Banshee</app> user interface and "
-#~ "use the full screen mode, you can press <key>F</key>, <key>F11</key>, "
-#~ "press the <gui style=\"button\">Fullscreen</gui> button in the upper "
-#~ "right hand corner of <app>Banshee</app>, or choose <guiseq><gui style="
-#~ "\"menu\">View</gui><gui style=\"menuitem\">Fullscreen</gui></guiseq> to "
-#~ "start Fullscreen mode."
-#~ msgstr ""
-#~ "Para cambiar En reproducción a ocultar la interfaz de usuario de "
-#~ "<app>Banshee</app> y usar el modo de pantalla completa, puede pulsar "
-#~ "<key>F</key>, <key>F11</key>, pulse el botón <gui style=\"button"
-#~ "\">Pantalla completa</gui> en la esquina superior derecha de "
-#~ "<app>Banshee</app> o elegir <guiseq><gui style=\"menu\">Ver</gui><gui "
-#~ "style=\"menuitem\">Pantalla completa</gui></guiseq> para iniciar el modo "
-#~ "a pantalla completa."
-
-#~ msgid "Podcast"
-#~ msgstr "Podcasts"
-
-#~ msgid "Sync Your Entire Library"
-#~ msgstr "Sincronizar su colección completa"
-
-#~ msgid ""
-#~ "For more information on performing more complex search queries, see the "
-#~ "<link xref=\"adv-search\"/> page."
-#~ msgstr ""
-#~ "Para obtener más información sobre cómo realizar consultas de búsqueda "
-#~ "más complejas, consulte la <link xref=\"adv-search\"/>"
-
-#~ msgid "Aruna S"
-#~ msgstr "Aruna S"
-
-#~ msgid ""
-#~ "To remove a radio station from <app>Banshee</app>, right click on the "
-#~ "radio station and select <gui style=\"menuitem\">Remove</gui>."
-#~ msgstr ""
-#~ "PAra quitar una emisora de radio de <app>Banshee</app>, pulse con el "
-#~ "botón derecho sobre la emisora y elija <gui style=\"menuitem\">Quitar</"
-#~ "gui>."
-
-#~ msgid "Play podcast"
-#~ msgstr "Reproducir un podcast"
-
-#~ msgid "Music Metadata"
-#~ msgstr "Metadatos de música"
-
-#~ msgid ""
-#~ "Import music and categorizations from the <app>Rhythmbox</app> music "
-#~ "player."
-#~ msgstr ""
-#~ "Importar musica y categorías desde el reproductor de música "
-#~ "<app>Rhythmbox</app>. "
-
-#~ msgid "Import your <app>Rhythmbox</app> library"
-#~ msgstr "Importar su colección de <app>Rhythmbox</app>"
-
-#~ msgid "Manage or change your albums cover art."
-#~ msgstr "Gestionar o cambiar las portadas de sus álbumes."
-
-#~ msgid "Cover art"
-#~ msgstr "Portada"
-
-#~ msgid ""
-#~ "Import music and categorizations from the <app>iTunes</app> media player."
-#~ msgstr ""
-#~ "Importar música y clasificaciones desde el reproductor multimedia "
-#~ "<app>iTunes</app>."
-
-#~ msgid "Import your <app>iTunes</app> library"
-#~ msgstr "Importar su colección de <app>iTunes</app>"
-
-#~ msgid "Community Banshee Extensions"
-#~ msgstr "Extensiones de la comunidad de Banshee"
-
-#~ msgid "Add community built extensions for Banshee"
-#~ msgstr "Añadir extensiones desarrolladas por la comunidad de Banshee"
-
-#~ msgid "Import music purchased from eMusic."
-#~ msgstr "Importar música comprada en eMusic."
-
-#~ msgid "Import your eMusic tracks"
-#~ msgstr "Importar canciones de eMusic"
-
-#~ msgid "Get help for advanced actions."
-#~ msgstr "Obtener ayuda para acciones avanzadas."
-
-#~ msgid "Advanced Options and Help"
-#~ msgstr "Opciones avanzadas y ayuda"
-
-#~ 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 <gui>Copy Link</gui>."
-#~ msgstr ""
-#~ "En la página web de la emisora de radio, copie en enlace a la URL del "
-#~ "podcast en el navegador. En la mayoría de los navegadores, puede pulsar "
-#~ "con el botón derecho del ratón en el enlace y seleccionar <gui>Copiar "
-#~ "enlace</gui>."
-
-#~ msgid ""
-#~ "Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
-#~ "kind of music the internet radio station plays from the available drop "
-#~ "down selections. You will then need to enter the <gui>Station Name</gui>. "
-#~ "Enter a name for the radio station. Then press tab or use your mouse to "
-#~ "select the <gui>Stream URL</gui> field to paste the URL of the radio "
-#~ "station. Using your mouse right click and choose <gui>Paste</gui> or "
-#~ "press <keyseq><key>Control</key><key>V</key></keyseq>."
-#~ msgstr ""
-#~ "Banshee le pedirá que introduzca el <gui>Género de la emisora</gui>. "
-#~ "Elija el tipo de música que emite la estación de radio del menú "
-#~ "desplegable. Después, tendrá que introducir el <gui>Nombre de la emisora</"
-#~ "gui>. Escriba un nombre para la emisora de radio. A continuación, pulse "
-#~ "el tabulador o seleccione el campo <gui>URL del flujo</gui> y pegue la "
-#~ "URL de la emisora de radio. Puede hacer esto pulsando con el botón "
-#~ "derecho del ratón y seleccionando <gui>Pegar</gui> o pulsando las teclas "
-#~ "<keyseq><key>Control</key><key>V</key></keyseq>."
-
-#~ msgid ""
-#~ "Banshee will then allow you to choose how you want to download new "
-#~ "podcasts from a drop down menu. Your choices include:"
-#~ msgstr ""
-#~ "Entonces, Banshee le permitirá elegir cómo desea descargar nuevos "
-#~ "capítulos desde un menú desplegable. Las opciones son:"
-
-#~ msgid ""
-#~ "Download the Most Recent Episode (This will automatically download the "
-#~ "last episode that was released)."
-#~ msgstr ""
-#~ "Descargar los episodios más recientes (esto descargará automáticamente el "
-#~ "último episodio publicado del programa)."
-
-#~ msgid "Download All Episodes (This will download all episodes)."
-#~ msgstr ""
-#~ "Descargar todos los episodios (esto descargará todos los episodios)."
-
-#~ msgid ""
-#~ "Let Me Decide Which Episodes to Download (This will allow you to choose "
-#~ "which episodes you would like to download)."
-#~ msgstr ""
-#~ "Dejar que el usuario decida qué episodios descargar (esto le permitirá "
-#~ "elegir qué episodios desea descargar)."
-
-#~ msgid "After you have added a Podcast feed, Banshee will display:"
-#~ msgstr "Después de añadir un podcast, Banshee le mostrará:"
-
-#~ msgid "<gui>Name</gui>: (Name of the specific episode)"
-#~ msgstr "<gui>Nombre</gui>: (Nombre del episodio)"
-
-#~ msgid "<gui>Podcast</gui>: (Name of the Podcast)"
-#~ msgstr "<gui>Podcast</gui>: (Nombre del podcast)"
-
-#~ msgid "<gui>Published</gui> (Date the episode was published or released)"
-#~ msgstr "<gui>Publicado</gui> (Fecha en que se publicó el episodio)"
-
#~ msgid "Common Problems"
#~ msgstr "Problemas comunes"
diff --git a/help/es/extensions.page b/help/es/extensions.page
index c5a99fe..e47fd05 100644
--- a/help/es/extensions.page
+++ b/help/es/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="es">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="es">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Agregar funcionalidad adicional a <app>Banshee</app>.</desc>
+ <desc>Agregar funcionalidad adicional a Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Extensiones de <app>Banshee</app></title>
+ <title>Extensiones de Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Extensiones oficiales de <app>Banshee</app></title>
+ <title type="link">Extensiones oficiales de Banshee</title>
</info>
+ <title>Gestionar extensiones de Banshee</title>
+ </section>
- <title>Gestionar extensiones de <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Extensiones de la comunidad de Banshee</title>
+ </info>
+ <title>Añadir extensiones desarrolladas por la comunidad de Banshee</title>
</section>
+
</page>
diff --git a/help/es/import.page b/help/es/import.page
index 51af794..9bb58ac 100644
--- a/help/es/import.page
+++ b/help/es/import.page
@@ -3,7 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Añadir música y vídeos de su equipo a su colección de <app>Banshee</app>..</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Añadir música y vídeos de su equipo a su colección de Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -13,20 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Importar música y vídeos</title>
- <p>Puede importar música y vídeos almacenados en su equipo en <app>Banshee</app>. Los archivos importados aparecen en sus fuentes y pueden editarse y gestionarse como cualquier otro archivo multimedia en <app>Banshee</app>.</p>
+ <p>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.</p>
- <p>Para importar archivos de música o vídeo desde su equipo, seleccione <guiseq><gui style="menu">Multimedia</gui><gui>Importar contenido multimedia</gui></guiseq>. Aparecerá un diálogo con varias opciones.</p>
+ <p>Para importar archivos de música o vídeo desde su equipo, seleccione <guiseq><gui>Multimedia</gui><gui>Importar contenido multimedia</gui></guiseq>. Aparecerá un diálogo con varias opciones.</p>
- <note style="tip">
+ <note>
<p>Los complementos pueden añadir opciones adicionales de importación. Consulte la <link xref="#plugins"/> abajo.</p>
</note>
@@ -49,22 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Puede importar con seguridad desde una carpeta desde la que ya haya importado antes sin riesgo de crear entradas duplicadas en su colección.</p>
</note>
-
+
<section id="import-playlist">
<title>Importar desde una lista de reproducción</title>
-
- <p>También puede importar música desde listas de reproducción. La mayoría de los archivos de listas de reproducción acaban en <em>m3u</em>. Para importar desde una lista de reproducción, desde el menú de <app>Banshee</app> elija <guiseq><gui style="menu">Multimedia</gui><gui style="menuitem">Importar lista de reproducción</gui></guiseq> y localice el archivo de la lista de reproducción en su carpeta, selecciónelo y pulse <gui style="button">Importar</gui>.</p>
-
+ <p>También puede importar música desde listas de reproducción. La mayoría de los archivos de listas de reproducción acaban en <em>m3u</em>. Para importar una lista de reproducción, desde el menú de Banshee seleccione <guiseq><gui>Multimedia</gui><gui>Importar lista de reproducción</gui></guiseq> y localice el archivo de la lista de reproducción en su carpeta, selecciónelo y pulse <gui>Importar</gui>.</p>
</section>
-
+
<section id="plugins">
- <title>Fuentes de importación adicionales</title>
-
- <p>Algunos complementos le permiten añadir opciones adicionales de importación. Las siguientes fuentes adicionales estarán disponibles si se activan los complementos adecuados:</p>
-
+ <title>Importar desde otras fuentes</title>
+ <p>Algunos complementos le permiten añadir opciones adicionales de importación. Las siguientes fuentes adicionales estarán disponibles si se activan los complementos adecuados:</p>
</section>
-
+
</page>
diff --git a/help/es/index.page b/help/es/index.page
index 614efb0..71bd342 100644
--- a/help/es/index.page
+++ b/help/es/index.page
@@ -12,20 +12,16 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Reproductor multimedia de <app>Banshee</app></title>
+ <title>Reproductor multimedia Banshee</title>
<section id="media" style="2column">
<title>Añadir, quitar y reproducir</title>
@@ -34,17 +30,17 @@
<section id="manage" style="2column">
<title>Gestionar y ordenar</title>
</section>
-
+
<section id="sync" style="2column">
<title>Sincronizar su contenido multimedia con un reproductor de música portátil</title>
</section>
<section id="extensions" style="2column">
- <title>Agregar funcionalidad adicional a <app>Banshee</app>.</title>
+ <title>Agregar una funcionalidad adicional a Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Opciones avanzadas y ayuda</title>
+ <title>Opciones avanzadas y ayuda</title>
</section>
</page>
diff --git a/help/es/introduction.page b/help/es/introduction.page
index ee84221..1ef5f12 100644
--- a/help/es/introduction.page
+++ b/help/es/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introducción al reproductor multimedia de <app>Banshee</app>.</desc>
+ <desc>Introducción al <app>Reproductor multimedia Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,18 +20,16 @@
<title>Introducción</title>
- <p><app>Banshee</app> en un reproductor multimedia que le permite reproducir su música, vídeos y otro contenido multimedia así como sincronizarlo con dispositivos portátiles para llevar su contenido multimedia consigo.</p>
-
+ <p><app>Banshee</app> en un reproductor multimedia que le permite reproducir su música, vídeos y otro contenido multimedia así como sincronizarse con dispositivos portátiles para llevar su contenido multimedia consigo.</p>
<p><app>Banshee</app> incluye características como importar su contenido multimedia, gestionar sus metadatos y reproducir su música y sus vídeos.</p>
-
- <p><app>Banshee</app> también le ayuda a sincronizar su música y sus vídeos con dispositivos portátiles populares, como reproductores de sonido digitales y teléfonos inteligentes. <app>Banshee</app> soporta dispositivos populares incluyendo la mayoría de reproductores MP3 iPod, Sandisk y Creative y teléfonos con Android.</p>
-
+ <p>Banshee también le ayuda a sincronizar su música y sus vídeos con dispositivos portátiles populares, como reproductores de sonido digitales y teléfonos inteligentes. Banshee soporta dispositivos populares incluyendo la mayoría de reproductores MP3, iPod, Sandisk y Creative y teléfonos con Android.</p>
+<!--
<figure>
- <title>Ventana del <gui>Reproductor multimedia Banshee</gui></title>
- <desc><app>Reproductor multimedia Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Interfaz de la colección de <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/es/itunes-import.page b/help/es/itunes-import.page
new file mode 100644
index 0000000..1311847
--- /dev/null
+++ b/help/es/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="es">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importar música y clasificaciones desde el reproductor multimedia <app>iTunes</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importar su colección de <app>iTunes</app></title>
+
+</page>
diff --git a/help/es/keyboard-shortcuts.page b/help/es/keyboard-shortcuts.page
deleted file mode 100644
index 9baa15e..0000000
--- a/help/es/keyboard-shortcuts.page
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="es">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Atajos de teclado</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Controlar <app>Banshee</app> usando atajos de teclado</title>
-
- <section id="playback-control">
- <title>Control de reproducción</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acción</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Espacio</key></p></td>
- <td><p>Reproducir o pausar la canción actual</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Reproducir la canción siguiente</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Reproducir la canción anterior</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Interacción de la colección</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acción</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Mover el foco a la caja de búsqueda</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
- <td><p>Abrir diálogo de importación de contenido multimedia</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Listas de reproducción</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acción</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td>
- <td><p>Crear una nueva lista de reproducción</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acción</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Marcar los episodios seleccionados como antiguos</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interfaz</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Acción</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Conmutar el modo de pantalla completa</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td>
- <td><p>Seleccionar todas las canciones en la vista de lista de reproducción</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Mayús</key><key>A</key></keyseq></p>
- </td>
- <td><p>Deseleccionar todas las canciones en la vista de lista de reproducción</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td>
- <td><p>Ocultar la ventana de <app>Banshee</app> (requiere tener activado el complemento de área de notificación)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Botón izquierdo del ratón</key></keyseq>
- </p></td>
- <td><p>Reproducir la canción anterior (requiere tener activada la extensión «Icono en el área de notificación»)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Botón derecho del ratón</key></keyseq>
- </p></td>
- <td><p>Reproducir la canción siguiente (requiere tener activada la extensión «Icono en el área de notificación»)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Botón central del ratón</key></keyseq>
- </p></td>
- <td><p>Alternar entre Reproducir / Pausar (requiere tener activada la extensión «Icono en el área de notificación»)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/es/keyboardshortcuts.page b/help/es/keyboardshortcuts.page
new file mode 100644
index 0000000..c72ff89
--- /dev/null
+++ b/help/es/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="es">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Atajos de teclado</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Controlar Banshee por medio de atajos de teclado</title>
+
+ <section id="playbackcontrol">
+
+ <title>Control de reproducción</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acción</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Barra espaciadora</p></td> <td><p>Reproducir o pausar la canción actual</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Reproducir la canción siguiente</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Reproducir la canción anterior</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Interacción con la colección</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acción</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Ctrl</key><key>F</key></keyseq></p></td> <td><p>Mover el foco a la caja de búsqueda</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
+ <td><p>Abrir diálogo de importación de contenido multimedia</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Listas de reproducción</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acción</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td> <td><p>Crear una nueva lista de reproducción</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acción</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Marcar los episodios seleccionados como antiguos</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interfaz</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acción</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Conmutar el modo de pantalla completa</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td> <td><p>Seleccionar todas las canciones en la vista de lista de reproducción</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Mayús</key><key>A</key></keyseq></p>
+ </td> <td><p>Deseleccionar todas las canciones en la vista de lista de reproducción</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td> <td><p>Ocultar la ventana de Banshee (requiere tener activada la extensión «Icono en el área de notificación»)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Botón izquierdo del ratón</key></keyseq>
+ </p></td> <td><p>Reproducir la canción anterior (requiere tener activada la extensión «Icono en el área de notificación»)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Botón derecho del ratón</key></keyseq>
+ </p></td> <td><p>Reproducir la canción siguiente (requiere tener activada la extensión «Icono en el área de notificación»)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Botón central del ratón</key></keyseq>
+ </p></td> <td><p>Alternar entre Reproducir / Pausar (requiere tener activada la extensión «Icono en el área de notificación»)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/es/lastfm.page b/help/es/lastfm.page
index 4a391a5..095e5ab 100644
--- a/help/es/lastfm.page
+++ b/help/es/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="es">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Activar Last.fm, el informe de canciones y la radio Last.fm.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,46 +19,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>Last.fm es un servicio en línea popular que ofrece versión libre y de pago. Last.fm ofrece información sobre artistas y álbumes musicales y si crea un perfil de usuario, Last.fm le permite seguir la música que escucha en <app>Banshee</app> gratuitamente. Si se suscribe como miembro de pago, también puede escuchar transmisión de música desde Last.fm en varios clientes de música, incluyendo <app>Banshee</app>. Last.fm ofrece varios canales para transmitir, incluyendo música recomendad [...]
-
+ <title>Last.fm</title>
+
+ <p>Last.fm es un popular servicio en línea que ofrece versión libre y de pago. Last.fm ofrece información sobre artistas y álbumes musicales y, si crea un perfil de usuario, Last.fm le permite seguir la música que escucha en Banshee gratuitamente. Si se suscribe como miembro de pago, también puede escuchar música en «streaming» desde Last.fm en varios clientes de música, incluyendo a Banshee. Last.fm ofrece varios canales, incluyendo música recomendada basada en sus hábitos de escucha, [...]
+
<section id="enable-lastfm">
- <title>Activar Last.fm</title>
-
- <p>Para obtener el máximo provecho de Last.fm, querrá crear un perfil de Last.fm. Visite <link href="http://www.last.fm/join">http://www.last.fm/join</link> para crear una cuenta o elija <guiseq><gui style="menu">Editar</gui><gui style="menuitem">Preferencias</gui></guiseq> del menú <app>Banshee</app>. Una vez en las preferencias seleccione la pestaña <gui style="tab">Específicas de las fuentes</gui>, pulse el menú desplegable <gui style="menu">Fuente</gui>, elegir <gui style="menuitem [...]
-
- <p>Para permitir que <app>Banshee</app> informe las canciones que reproduce en su equipo a Last.fm, inicie sesión en Last.fm en <app>Banshee</app> en las preferencias <gui>Específicas de las fuentes</gui>. Introduzca su nombre de usuario y pulse el botón <gui style="button">Iniciar sesión en Last.fm</gui>. Se le redirigirá a una página web de Last.fm en su navegador para conceder acceso a <app>Banshee</app>. Pulse el enlace <gui style="button">Sí, permitir acceso</gui> en su navegador [...]
-
+ <title>Activar Last.fm</title>
+ <p>Para obtener el máximo de Last.fm, querrá crear un perfil de Last.fm. Visite <link href="http://www.last.fm/join">http://www.last.fm/join</link> para crear una cuenta o elija <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> desde el menú de Banshee. Una vez que esté en las preferencias, seleccione la pestaña <gui>Específicas de las fuentes</gui>, pulse la lista desplegable <gui>Fuente</gui>, elija <gui>Last.fm</gui> y finalmente seleccione el enlace <em>Registrarse en Last. [...]
+
+ <p>Para permitir que Banshee informe sobre las canciones que reproduce en su equipo a Last.fm, inicie sesión en Last.fm dentro de Banshee en las preferencias <gui>Específicas de las fuentes</gui>. Introduzca su nombre de usuario y pulse el botón <gui>Iniciar sesión en Last.fm</gui>. Se le redirigirá a una web de Last.fm en su navegador para conceder acceso a Banshee. Pulse el enlace <gui>Sí, permitir acceso</gui> en su navegador y se le redirigirá a una web que mostrará un mensaje indi [...]
+
</section>
-
- <section id="song-reporting">
- <title>Activar el informe de canciones de Last.fm desde <app>Banshee</app></title>
-
- <p>Después de enlazar correctamente <app>Banshee</app> a su perfil de Last.fm debe asegurarse de que ha activado que <app>Banshee</app> informe sus canciones. Para permitir que <app>Banshee</app> informe las canciones a su perfil de Last.fm, vaya a <app>Banshee</app> y selecciones preferencias, luego seleccione la pestaña <gui style="tab">Específicas de las fuentes</gui>, seleccione <gui style="menuitem">Last.fm</gui> en la lista desplegable y pulse la casilla de verificación <gui styl [...]
-
+
+ <section id="songreporting">
+ <title>Activar el informe de canciones en Last.fm desde Banshee</title>
+ <p>Tras enlazar Banshee con éxito a su perfil de Last.fm, debe asegurarse de que ha permitido que Banshee informe sobre sus canciones. Para permitir que Banshee informe las canciones a su perfil de Last.fm, vaya a las preferencias de Banshee, seleccione la pestaña <gui>Específicas de las fuentes</gui>, seleccione <gui>Last.fm</gui> en la lista desplegable y pulse la casilla <gui>Activar informe de canciones desde Banshee</gui>. Si tiene una conexión activa a Internet, Banhee enviará a [...]
+
</section>
- <section id="device-song-reporting">
- <title>Activar el informe de canciones de Last.fm desde su dispositivo</title>
-
- <p>Después de enlazar éxitosamente <app>Banshee</app> a su perfil de Last.fm y activar <app>Banshee</app> para informar canciones a Last.fm también puede activar el scrobbling desde un dispositivo conectado. <app>Banshee</app> al establecer la conexión de su dispositivo, intentará hacer el scrobble de las canciones que se han reproducido desde que el dispositivo se conectó por última vez y los presentó a Last.fm.</p>
+ <section id="devicesongreporting">
+ <title>Activar el informe de canciones en Last.fm desde su dispositivo</title>
+ <p>Una vez que haya enlazado Banshee con su perfil de Last.fm y haya activado el informe de canciones a Last.fm desde Banshee, también podrá activar el «scrobbling» desde su dispositivo conectado. Al establecer la conexión de su dispositivo, Banshee intentará hacer el «scrobble» de las canciones que se han reproducido desde que el dispositivo se conectó por última vez, y enviarlos a Last.fm.</p>
- <p>Para activar el scrobbling de un dispositivo conectado vaya a <app>Banshee</app> y seleccione preferencias, seleccione la pestaña <gui style="tab">Específicas de las fuentes</gui>, seleccione <gui style="menuitem">Last.fm</gui> de la lista desplegable y marque la casilla de verificación <gui style="checkbox">Activar informe de canciones desde dispositivo</gui>.Si tiene una conexión a Internet activa, <app>Banshee</app> después de la conexión de su dispositivo, tratará de reunir info [...]
+ <p>Para activar el «scrobbling» de un dispositivo conectado, vaya a las preferencias de Banshee, seleccione la pestaña <gui>Específicas de las fuentes</gui>, seleccione <gui>Last.fm</gui> de la lista desplegable y marque la casilla <gui>Activar informe de canciones desde Banshee</gui>.Si tiene una conexión a Internet activa, Banshee, Banshee tratará de obtener información acerca de las canciones que ha reproducido desde la última vez que conectó el dispositivo.</p>
- <p>Al igual que con las presentaciones de scrobbling de <app>Banshee</app>, Last.fm actualizará automáticamente los metadatos de su música si alguno de sus artistas, títulos o información del álbum no es correcta (aunque, de nuevo, recomendamos que use la extensión Reparador de metadatos para corregir sus archivos en su lugar).</p>
+ <p>Al igual que con los informes regulares de Banshee a Last.fm, los metadatos de música se actualizarán automáticamente si el artista, título o la información del álbum no es correcta (aunque, de nuevo, recomendamos que use la extensión «Reparador de metadatos» para corregir sus archivos en su lugar).</p>
- <p>Tenga en cuenta que el actual <app>Banshee</app> sólo soporta esta característica con productos de Apple soportados por la extensión AppleDevice.</p>
+ <p>Tenga en cuenta que la versión actual de Banshee sólo soporta esta característica con productos de Apple soportados por la extensión AppleDevice.</p>
</section>
-
+
<section id="lastfm-radio">
- <title>Escuchar la radio de Last.fm</title>
-
+ <title>Escuchar la radio de Last.fm</title>
<p>La radio de Last.fm es gratuita para los residentes en Estados Unidos, Reino Unido y Alemania. Los residentes en otros países tendrán que obtener una cuenta de pago de Last.fm para escuchar la radio. Los miembros de pago, en todos los países, también reciben características adicionales para la radio: escuchar las listas de reproducción y las emisoras de música que ha etiquetado o marcado como favoritas.</p>
-
- <p>En el panel de fuentes al lado izquierdo de <app>Banshee</app>, tendrá ahora una sección de Last.fm, incluyendo sus emisoras de radio de Last.fm. Necesitará una conexión a Internet activa para escuchar la radio de Last.fm. Elija la emisora de radio que desea escuchar y <app>Banshee</app> se comunicará con Last.fm para rellenar canciones para esta emisora de radio. Pulse el botón <gui style="button">Reproducir</gui> en <app>Banshee</app> o <key>Espacio</key> para empezar la transmisi [...]
-
+
+ <p>En el panel de fuentes de Banshee a la izquierda, tendrá ahora una sección de Last.fm, incluyendo sus emisoras de radio de Last.fm. Necesitará una conexión a Internet activa para escuchar la radio de Last.fm. Elija la emisora de radio que desea escuchar y Banshee se comunicará con Last.fm para reproducir canciones de la radio de Last.fm. Pulse el botón <gui>Reproducir</gui> en Banshee o la <key>barra espaciadora</key> para empezar a reproducir una emisora de radio de Last.fm. Tambié [...]
+
</section>
-
+
</page>
diff --git a/help/es/manage-coverart.page b/help/es/manage-coverart.page
new file mode 100644
index 0000000..cfebb3d
--- /dev/null
+++ b/help/es/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="es">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Gestionar o cambiar las portadas de sus álbumes.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Portada</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/es/manage-playlists.page b/help/es/manage-playlists.page
index 6b4a369..77c5354 100644
--- a/help/es/manage-playlists.page
+++ b/help/es/manage-playlists.page
@@ -1,102 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="es">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="es">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Crear y gestionar listas de reproducción.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Listas de reproducción</title>
-
+ <title>Listas de reproducción</title>
+
<p>Las listas de reproducción le permiten crear y guardar una lista de pistas de música para reproducirlas en un orden específico. Las listas de reproducción son adecuadas para crear una lista de sus canciones favoritas o para partir su colección en listas más pequeñas que sean más sencillas de explorar. Algunos reproductores multimedia portátiles le permiten incluso transferir la lista de reproducción para que pueda llevarla consigo.</p>
-
- <p><app>Banshee</app> soporta tanto listas de reproducción normales, que incluyen canciones que añade a la lista de reproducción, como listas de reproducción inteligentes. Las listas de reproducción inteligentes son listas de reproducción generadas automáticamente basadas en sus hábitos de escucha, su música favorita y más.</p>
-
+
+ <p>Banshee soporta tanto listas de reproducción normales, que incluyen canciones que añade a la lista, como listas de reproducción inteligentes. Las listas de reproducción inteligentes son listas de reproducción generadas automáticamente basadas en sus hábitos de escucha, su música favorita, etc.</p>
+
<section id="manual">
+
<title>Listas de reproducción normales</title>
-
- <p>Una lista de reproducción normal es una lista de canciones que puede añadir y gestionar. Podría querer crear su propia lista de canciones de su artista favorito desde varios álbumes, sus últimas canciones favoritas o una lista de reproducción animada para escuchar mientras hace ejercicio.</p>
-
- <p>Puede crear una nueva lista de reproducción pulsando <keyseq><key>Ctrl</key><key>N</key></keyseq>, eligiendo desde el menú <guiseq><gui style="menu">Multimedia</gui><gui style="menuitem">Lista de reproducción nueva</gui></guiseq> o seleccionando las pistas que le gustaría añadir a la lista de reproducción. Seleccione las pistas, pulse con el botón derecho y elija <guiseq><gui style="menuitem">Añadir a la lista de reproducción</gui><gui>Lista de reproducción nueva</gui></guiseq>. Tam [...]
-
- <p>Para darle a su lista de reproducción un nombre propio, seleccione la lista de reproducción, pulse con el botón derecho en la lista, pulse <gui style="menuitem">Renombrar</gui> e introduzca el nombre de la lista de reproducción.</p>
-
- <p>Puede cambiar el orden de la lista de reproducción arrastrando y soltando la canción a la nueva posición dentro de la lista. Las canciones sólo se pueden reordenar en la lista de reproducción cuando no se está ordenando por ninguna columna. Para dejar de ordenar por una columna, pulse la columna hasta que ya no aparezcan las flechas de arriba o abajo y la columna esté en blanco, y entonces reordene la lista de reproducción.</p>
-
- <p>Para quitar una pista de la lista de reproducción, seleccione las pistas que quiere quitar. Pulse <key>Supr</key>, elija desde el menú <guiseq><gui style="menu">Editar</gui><gui style="menuitem">Quitar de la lista de reproducción</gui></guiseq> o pulse con el botón derecho y luego pulse <gui style="menuitem">Quitar de la lista de reproducción</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
+
+ <p>Una lista de reproducción normal es una lista de canciones que puede añadir y gestionar. Podría querer crear su propia lista de canciones de su artista favorito desde varios álbumes, sus últimas canciones favoritas o una lista de reproducción animada para escuchar mientras hace ejercicio.</p>
+
+ <p>Puede crear una nueva lista de reproducción pulsando <keyseq><key>Ctrl</key><key>N</key></keyseq>, eligiendo desde el menú <guiseq><gui>Multimedia</gui><gui>Lista de reproducción nueva</gui></guiseq> o seleccionando las pistas que le gustaría añadir a la lista de reproducción. Seleccione las pistas, pulse con el botón derecho y elija <guiseq><gui>Añadir a la lista de reproducción</gui><gui>Lista de reproducción nueva</gui></guiseq>. También puede arrastrar y soltarlas a la nueva l [...]
+
+ <p>Para darle a su lista de reproducción un nombre propio, seleccione la lista de reproducción, pulse con el botón derecho en la lista, pulse <gui>Renombrar</gui> e introduzca el nombre de la lista de reproducción.</p>
+
+ <p>Puede cambiar el orden de la lista de reproducción arrastrando y soltando la canción a la nueva posición dentro de la lista. Las canciones sólo se pueden reordenar en la lista de reproducción cuando no se está ordenando por ninguna columna. Para dejar de ordenar por una columna, pulse la columna hasta que ya no aparezcan las flechas de arriba o abajo y la columna esté en blanco, y entonces reordene la lista de reproducción.</p>
+
+ <p>Para quitar una pista de la lista de reproducción, seleccione las pistas que quiere quitar. Pulse <key>Supr</key>, elija desde el menú <guiseq><gui>Editar</gui><gui>Quitar de la lista de reproducción</gui></guiseq> o pulse con el botón derecho y luego pulse <gui>Quitar de la lista de reproducción</gui>.</p>
+ </section>
+
+ <section id="smartplaylists">
<title>Lista de reproducción inteligente</title>
-
- <p>Las listas de reproducción inteligentes le permiten generar rápidamente una lista de reproducción dinámica basada en diversas variables preestablecidas. Puede crear rápidamente una lista de reproducción nueva basada en un artista específico, favoritos, etc.</p>
-
- <p>Para crear una lista de reproducción inteligente nueva, elija desde el menú <guiseq><gui style="menu">Multimedia</gui><gui style="menuitem">Nueva lista de reproducción inteligente</gui></guiseq>. Aparecerá un diálogo para crear una lista de reproducción inteligente nueva. Introduzca el nombre de la lista y después elija los criterios en los que se basará su lista de reproducción. Puede elegir cualquier campo incluido en los metadatos de una canción, como el álbum, el artista o el añ [...]
-
+
+ <p>Las listas de reproducción inteligentes le permiten generar rápidamente una lista de reproducción dinámica basada en diversas variables preestablecidas. Puede crear rápidamente una lista de reproducción nueva basada en un artista específico, favoritos, etc.</p>
+
+ <p>Para crear una lista de reproducción inteligente nueva, elija desde el menú <guiseq><gui>Multimedia</gui><gui>Lista de reproducción inteligente nueva</gui></guiseq>. Aparecerá un diálogo para crear una lista de reproducción inteligente nueva. Introduzca el nombre de la lista y después elija los criterios en los que se basará su lista de reproducción. Puede elegir cualquier campo incluido en los metadatos de una canción, como el álbum, el artista o el año. Escoja los criterios y lu [...]
+
<list>
<item><p>es</p></item>
- <item><p>no es</p></item>
+ <item><p>no es</p></item>
<item><p>menos que</p></item>
- <item><p>más que</p></item>
+ <item><p>más que</p></item>
<item><p>como mucho</p></item>
- <item><p>al menos</p></item>
+ <item><p>al menos</p></item>
</list>
-
- <p>También puede pulsar el botón <gui style="button">+</gui> para añadir una nueva condición a la lista de reproducción inteligente. Por ejemplo, puede crear una lista de reproducción inteligente que incluya todas las canciones desde 2010 y valoradas con 5 estrellas. Para crear esta lista de reproducción, podría elegir:</p>
-
+
+ <p>También puede pulsar el botón <gui>+</gui> para añadir una nueva condición a la lista de reproducción inteligente. Por ejemplo, puede crear una lista de reproducción inteligente que incluya todas las canciones desde 2010 y valoradas con 5 estrellas. Para crear esta lista de reproducción, podría elegir:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Año</gui></p></td>
- <td><p><gui>es</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Año</gui></p></td> <td><p><gui>es</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Valoración</gui></p></td>
- <td><p><gui>es</gui></p></td>
- <td><p>5 estrellas</p></td>
+ <td><p><gui>Valoración</gui></p></td> <td><p><gui>es</gui></p></td>
+ <td><p><gui/>5 estrellas</p></td>
</tr>
</table>
-
- <p>Luego puede seleccionar opcionalmente cuántas canciones se incluirán pulsando en la casilla <gui style="checkbox">Limitar a</gui> y eligiendo el número de canciones que se incluirán.</p>
-
- <p><app>Banshee</app> también incluye listas de reproducción inteligentes creadas para usted. Pulse el botón <gui style="button">Abrir en editor</gui> para ver cómo fue la lista de reproducción creada o para modificarla. Si pulsa <gui style="button">Crear y guardar</gui>, la lista de reproducción se generará y se guardará automáticamente. Se incluyen las siguientes listas de reproducción:</p>
-
+
+ <p>Luego puede seleccionar opcionalmente cuántas canciones se incluirán pulsando en la casilla <gui>Limitar a</gui> y eligiendo el número de canciones que se incluirán.</p>
+
+ <p>Banshee también incluye listas de reproducción inteligentes creadas para usted. Pulse el botón <gui>Abrir en el editor</gui> para ver cómo se creó la lista de reproducción o para modificarla.</p>
+
<list>
- <title>Listas de reproducción inteligentes de <app>Banshee</app></title>
- <item>
- <p>Favoritos (Canciones valoradas con cuatro o cinco estrellas)</p>
- </item>
- <item>
- <p>Favoritos recientes (Canciones escuchadas a menudo en la última semana)</p>
- </item>
- <item>
- <p>Añadidas recientemente (Canciones importadas durante la última semana)</p>
- </item>
- <item>
- <p>No oídas (Canciones omitidas o no reproducidas)</p>
- </item>
- <item>
- <p>Favoritos abandonados (Favoritos no reproducidos en más de dos meses)</p>
- </item>
- <item>
- <p>700 MB de favoritos (Un CD de datos lleno de canciones favoritas)</p>
- </item>
- <item>
- <p>80 minutos de favoritos (Un CD de sonido lleno de canciones favoritas)</p>
- </item>
- <item>
- <p>No valoradas (Canciones que no se han valorado)</p>
- </item>
+ <title>Listas de reproducción inteligentes de Banshee</title>
+ <item><p>Favoritos (Canciones valoradas con cuatro o cinco estrellas)</p></item>
+ <item><p>Favoritos recientes (Canciones escuchadas a menudo en la última semana)</p></item>
+ <item><p>Añadidas recientemente (Canciones importadas durante la última semana)</p></item>
+ <item><p>No oídas (Canciones omitidas o no reproducidas)</p></item>
+ <item><p>Favoritos abandonados (Favoritos no reproducidos en más de dos meses)</p></item>
+ <item><p>700 MB de favoritos (Un CD de datos lleno de canciones favoritas)</p></item>
+ <item><p>80 minutos de favoritos (Un CD de sonido lleno de canciones favoritas)</p></item>
+ <item><p>No valoradas (Canciones que no se han valorado)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/es/manage-tags.page b/help/es/manage-tags.page
index 28e30c0..94ca7ad 100644
--- a/help/es/manage-tags.page
+++ b/help/es/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="es">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="es">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Editar y cambiar las etiquetas y metadatos de su música.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,34 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Metadatos de música</title>
- <p>La música digital contiene metadatos que almacenan información en el archivo de música, incluyendo el artista, el álbum, el año de grabación, el género y más. La mayor parte de la música comprada por Internet tendrá los metadatos ya incrustados y si importa música desde CD, <app>Banshee</app> incluirá los metadatos al extraer música del CD si está disponible. Para obtener más información sobre cómo extraer música de CD e incluir los metadatos, consulte la <link xref="import"/>.</p>
-
- <p>Formatos de metadatos populares son ID3v1 y ID3v2 para archivos MP3 y comentarios Vorbis para archivos OGG Vorbis.</p>
+ <section id="metadata">
- <p>Si ha importado canciones que no contienen metadatos, <app>Banshee</app> mostrará <gui>Desconocido</gui> para la mayoría de los campos de la colección.</p>
+ <title>Metadatos de música</title>
+
+ <p>La música digital contiene metadatos que almacenan información en el archivo de música, incluyendo el artista, el álbum, el año de grabación, el género, etc. La mayor parte de la música comprada por Internet tendrá los metadatos ya incrustados, y si importa música desde CD, Banshee incluirá los metadatos al extraer el CD, si están disponibles. Para obtener más información sobre cómo extraer CD e incluir los metadatos, consulte la <link xref="import"/>.</p>
+
+ <p>Formatos de metadatos populares son ID3v1 y ID3v2 para archivos MP3 y comentarios Vorbis para archivos OGG Vorbis.</p>
+
+ <p>Si ha importado canciones que no contienen metadatos, <app>Banshee</app> mostrará <gui>Desconocido</gui> para la mayoría de los campos de la colección.</p>
+
+ </section>
- <section id="edit-metadata">
+ <section id="editmetadata">
+
<title>Editar sus metadatos</title>
-
- <p>Puede cambiar y editar los metadatos de sus canciones. Seleccione la canción o las canciones que quiere actualizar y pulse <key>E</key>, elija <guiseq><gui style="menu">Editar</gui><gui style="menuitem">Editar la información de la pista</gui></guiseq> desde el menú o pulse con el botón derecho del ratón sobre los archivos y seleccione <gui style="menuitem">Editar la información de la pista</gui>.</p>
-
- <p>Aparecerá un cuadro de diálogo que mostrará los metadatos de la canción y le permitirá cambiarlos o actualizarlos. Los campos predeterminados mostrados incluyen:</p>
-
- <list>
- <item><p><gui>Título de la pista</gui></p></item>
- <item><p><gui>Artista de la pista</gui></p></item>
- <item><p><gui>Título del álbum</gui></p></item>
- <item><p><gui>Género</gui></p></item>
- <item><p><gui>Número de pista</gui></p></item>
- <item><p><gui>Número de disco:</gui></p></item>
- <item><p><gui>Año</gui></p></item>
- </list>
-
- <p>Actualice la información de la canción. Si ha seleccionado varias canciones, para editarlas pulse el icono con una flecha a la derecha del campo <gui>Título de la pista</gui> o pulse el botón <gui style="button">Adelante</gui> en la parte inferior del diálogo cuando termine con cada canción. Cuando haya terminado de editar todos los metadatos, pulse <gui style="button">Guardar</gui>.</p>
-
+
+ <p>Puede cambiar y editar los metadatos de sus canciones. Seleccione la canción o las canciones que quiere actualizar y pulse <key>E</key>, elija <guiseq><gui>Editar</gui><gui>Editar la información de la pista</gui></guiseq> desde el menú o pulse con el botón derecho del ratón sobre los archivos y seleccione <gui>Editar la información de la pista</gui>.</p>
+
+ <p>Aparecerá un cuadro de diálogo que mostrará los metadatos de la canción y le permitirá cambiarlos o actualizarlos. Los campos predeterminados mostrados incluyen:</p>
+
+ <list>
+ <item><p><gui>Título de la pista</gui></p></item>
+ <item><p><gui>Artista de la pista</gui></p></item>
+ <item><p><gui>Título del álbum</gui></p></item>
+ <item><p><gui>Género</gui></p></item>
+ <item><p><gui>Número de pista</gui></p></item>
+ <item><p><gui>Número de disco:</gui></p></item>
+ <item><p><gui>Año</gui></p></item>
+ </list>
+
+ <p>Actualice la información de la canción. Si ha seleccionado varias canciones, para editarlas pulse el icono con una flecha a la derecha del campo <gui>Título de la pista</gui> o pulse el botón <gui>Adelante</gui> en la parte inferior del diálogo cuando termine con cada canción. Cuando haya terminado de editar todos los metadatos, pulse <gui>Guardar</gui>.</p>
+
</section>
</page>
diff --git a/help/es/play-queue.page b/help/es/play-queue.page
index af77709..cc45f57 100644
--- a/help/es/play-queue.page
+++ b/help/es/play-queue.page
@@ -1,68 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="es">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="es">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Añadir archivos multimedia a su <gui>Cola de reproducción</gui>.</desc>
+ <desc>Añadir archivos multimedia a su cola de reproducción.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Cola de reproducción</title>
+ <title>Cola de reproducción</title>
+
+ <p>La <gui>Cola de reproducción</gui> le permite añadir música para reproducirla en orden secuencial. Puede añadir varias pistas para escuchar horas de música sin parar. Puede añadir pistas individuales o álbumes completos, y ordenarlos o reordenarlos.</p>
+
+<section id="addqueue">
- <p>La <gui>Cola de reproducción</gui> se puede usar para reproducir pistas en orden secuencial. Puede añadir varias pistas a la <gui>Cola de reproducción</gui> y escuchar horas de música sin parar. Puede añadir pistas individuales o álbumes completos, y ordenarlos o reordenarlos como quiera.</p>
+ <title>Añadir música a la cola de reproducción</title>
- <section id="add-queue">
- <title>Añadir música a la <gui>Cola de reproducción</gui></title>
+ <p>Desde su colección de música, deberá seleccionar las pistas de música o los álbumes que quiere añadir a la cola de reproducción.</p>
+
+ <p>Para añadir un álbum completo a la cola de reproducción, usando su ratón pulse en el álbum y, manteniéndolo pulsado, arrástrelo hasta la <gui>Cola de reproducción</gui> en el panel izquierdo de la ventana.</p>
+
+ <p>Puede añadir pistas de música a la cola de reproducción individualmente o en grupo. Para añadir un archivo individual, arrastre y suéltelo sobre la <gui>Cola de reproducción</gui> en en panel izquierdo de la ventana, o pulse con el botón derecho sobre la pista y elija <gui>Añadir a la cola de reproducción</gui>.</p>
+
+ <p>Puede seleccionar varios archivos usando su ratón y pulsando <key>Ctrl</key> y eligiendo cada archivo con su ratón, o seleccionando un rango de archivos pulsando <key>Mayús</key> dos veces para seleccionar el rango de archivos. Entonces puede arrastrar y soltar sobre la <gui>Cola de reproducción</gui> en el panel izquierdo de la ventana o pulsar con el botón derecho sobre las pistas y seleccionar <gui>Añadir a la cola de reproducción</gui>.</p>
+
+</section>
- <p>Desde su colección de música, necesitará seleccionar las pistas de música o álbumes que quiere añadir a la <gui>Cola de reproducción</gui>.</p>
+<section id="reorderqueue">
- <p>Para añadir un álbum completo a la <gui>Cola de reproducción</gui>, use su ratón para mantener pulsado el álbum, arrastrelo y suéltelo sobre la <gui>Cola de reproducción</gui> en el panel izquierdo de la ventana.</p>
+ <title>Organizar la cola de reproducción</title>
- <p>Puede añadir pistas de música a la <gui>Cola de reproducción</gui> individualmente o como en grupo. Para añadir un archivo individual, arrastre y suéltelo sobre la <gui>Cola de reproducción</gui> en en panel izquierdo de la ventana, o pulse con el botón derecho sobre la pista y elija <gui style="menuitem">Añadir a la cola de reproducción</gui>.</p>
+ <p>Su cola de reproducción está organizada en el orden en que añade las pistas. Las primeras pistas o álbumes que añade a la cola serán las primeras que se reproduzcan. Puede reordenar su cola de reproducción usando su ratón y arrastrando y soltando una pista o un grupo de pistas en la lista. Elija con su ratón la pista o las pistas que quiere reordenar y suelte el ratón encima del número o del sitio en la lista en que quiere que estén esas pistas en la cola.</p>
- <p>Para seleccionar varias pistas, seleccione cada pista con el ratón mientras mantiene pulsado <key>Ctrl</key> o seleccione un rango de archivos pulsando la tecla <key>Mayús</key> y pulsando dos veces para seleccionar el rango de archivos. Entonces puede arrastrar y soltar sobre la <gui>Cola de reproducción</gui> en el panel izquierdo de la ventana o pulsar con el botón derecho sobre las pistas y elegir <gui style="menuitem">Añadir a la cola de reproducción</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organizar su <gui>Cola de reproducción</gui></title>
-
- <p>Su <gui>Cola de reproducción</gui> está organizada en el orden en que añade las pistas. Las primeras pistas o álbumes que añade a la cola serán las primeras que se reproduzcan. Puede reordenar su <gui>Cola de reproducción</gui> usando su ratón y arrastrando y soltando una pista o un grupo de pistas en la lista. Elija las pistas que quiere con el ratón y suelte el ratón encima del número o del sitio en la lista en que desea que estén esos archivos en la cola.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Quitar pistas de la <gui>Cola de reproducción</gui></title>
-
- <p>Puede quitar una pista individual, un grupo de pistas, o limpiar la <gui>Cola de reproducción</gui> completa.</p>
-
- <list>
- <item>
- <p>Para quitar una pista individual, seleccione la pista con su ratón y luego pulse <key>Supr</key>.</p>
- </item>
- <item>
- <p>Para quitar varias pistas, seleccione cada pista con su ratón mientras mantiene pulsada la tecla <key>Ctrl</key>. Una vez que ha seleccionado todas las pistas que quiere quitar, pulse <key>Supr</key>.</p>
- <note style="tip">
- <p>Si accidentalmente selecciona una pista que no quería quitar, mantenga pulsado <key>Ctrl</key> y seleccione la pista nuevamente con su ratón, para deseleccionarla.</p>
- </note>
- </item>
- <item>
- <p>Para limpiar su <gui>Cola de reproducción</gui> completa, pulse el botón <gui style="button">Limpiar</gui> en la esquina superior derecha de la <gui>cola de reproducción</gui> o pulse <keyseq><key>Ctrl</key><key>A</key></keyseq> y pulse <key>Supr</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>Quitar pistas de la cola de reproducción</title>
+ <p>Puede quitar una pista individual, un grupo de pistas o limpiar la cola de reproducción completa.</p>
+
+ <p>Para quitar una pista individual o un grupo de pistas, seleccione la pista con su ratón y pulse <key>Supr</key>.</p>
+
+ <p>Para limpiar la cola de reproducción completa, pulse el botón <gui>Limpiar</gui> en la esquina superior derecha de la cola de reproducción.</p>
+
+</section>
+
</page>
diff --git a/help/es/play.page b/help/es/play.page
index 0ee4a92..8252202 100644
--- a/help/es/play.page
+++ b/help/es/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Reproducir sus archivos de vídeo y música.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,79 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Reproducir su contenido multimedia</title>
- <section id="play-music">
- <title>Reproducir de música</title>
-
- <p>Para reproducir música en <app>Banshee</app>, elija la fuente Música. La colección de música mostrará todos los artistas en su colección de música, la portada de cada álbum y una lista de todas las canciones de su colección.</p>
-
- <p>Elija el álbum o canción que desea reproducir desde la lista de artistas, álbumes o use la barra de búsqueda en la esquina superior derecha de <app>Banshee</app>.</p>
-
- <p>Para empezar a reproducir una canción, pulse dos veces en el nombre de la canción, pulse <key>Espacio</key> o elija <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Reproducir</gui></guiseq> en el menú de <app>Banshee</app>.</p>
-
- <p>También puede empezar a reproducir un álbum, eligiéndolo del navegador de álbumes y pulsando dos veces sobre el nombre de la canción, pulse <key>Espacio</key> o elija <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Reproducir</gui></guiseq> en el menú de <app>Banshee</app>.</p>
-
- <p>Para reproducir todas las canciones de un artista, elija el artista en el navegador de artistas y pulse <key>Espacio</key>, o elija <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Reproducir</gui></guiseq> desde el menú de <app>Banshee</app>.</p>
-
- <p><app>Banshee</app> también muestra sus álbumes favoritos (aquellos que más escucha), favoritos recientes, añadidos recientemente y música no oída. Elija el que quiere escuchar y puede reproducir canciones de cada uno de ellos.</p>
-
- <p><app>Banshee</app> se puede usar para reproducir música en orden aleatorio usando el modo <gui style="menuitem">Aleatorio</gui>. Active este modo en <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Aleatorio</gui></guiseq>, seguido de la selección de tipo aleatoria.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">Por canción</gui></title>
- <p>Reproducir pistas en orden aleatorio.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Por artista</gui></title>
- <p>Reproducir pistas de diferentes artistas cada vez.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Por álbum</gui></title>
- <p>Reproducir pistas de diferentes álbumes cada vez.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Por valoración</gui></title>
- <p>Reproducir canciones con puntuaciones más altas más a menudo que las no valoradas.</p>
- <note style="info">
- <p>Si no hay pistas puntuadas, las pistas se reproducen en orden aleatorio.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">Por puntuación</gui></title>
- <p>Las pistas que reproduce frecuentemente se puntúan más alto y se reproducen más veces.</p>
- </item>
- </terms>
-
+ <section id="playmusic">
+ <title>Reproducir de música</title>
+
+ <p>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.</p>
+
+ <p>Elija el álbum o canción que desea reproducir desde la lista de artistas o álbumes, o bien use la barra de búsqueda de la esquina superior derecha de Banshee.</p>
+
+ <p>Para empezar a reproducir una canción, pulse dos veces en el nombre de la canción, pulse la <key>barra espaciadora</key> o elija <guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú de Banshee.</p>
+
+ <p>Para empezar a reproducir un álbum, puede elegirlo de la lista de álbumes y hacer doble clic en el nombre de la canción, pulsar la <key>barra espaciadora</key> o elegir <guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú de Banshee.</p>
+
+ <p>Para reproducir todas las canciones de un artista, elija el artista en la lista de artistas y pulse la <key>barra espaciadora</key>, o elija <guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú de Banshee.</p>
+
+ <p>Banshee también muestra sus álbumes favoritos (aquellos que más escucha), favoritos recientes, añadidos recientemente y música no oída. Seleccione el que quiere escuchar y puede reproducir canciones de cada uno de ellos.</p>
+
</section>
- <section id="play-video">
- <title>Reproducir un vídeo</title>
-
- <p>Los vídeos importados se listan alfabéticamente. Para reproducir un vídeo, escoja el vídeo que desee de la lista y pulse <key>Espacio</key>, o elija <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Reproducir</gui></guiseq> desde el menú de <app>Banshee</app>.</p>
-
- <p><app>Banshee</app> también muestra sus vídeos favoritos (aquellos que más ve) y vídeos no vistos. Seleccione uno y puede reproducir un vídeo desde la lista.</p>
-
+ <section id="playvideo">
+ <title>Reproducir un vídeo</title>
+
+ <p>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 <key>barra espaciadora</key>, o elija <guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú de Banshee.</p>
+
+ <p>Banshee también muestra sus vídeos favoritos (aquellos que más ve) y vídeos no vistos. Seleccione uno y puede reproducir un vídeo desde la lista.</p>
+
</section>
-
- <section id="play-podcast">
- <title>Reproducir un podcast</title>
-
- <p>Los podcasts le mostrarán todos los podcasts a los que está suscrito, todos los podcasts disponibles, y el explorador de podcasts lista todos los podcasts en orden del más reciente primero.</p>
-
- <p>Para reproducir un podcast, elija el podcast que quiere reproducir de la lista y pulse <key>Espacio</key>, o elija <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Reproducir</gui></guiseq> desde el menú de <app>Banshee</app>.</p>
-
+
+ <section id="playpodcast">
+ <title>Reproducir un podcast</title>
+
+ <p>La colección Podcasts le mostrará todos los podcasts a los que está suscrito, todos las emisiones disponibles, y el explorador de podcasts lista todos los podcasts en orden de más reciente a más antiguo.</p>
+
+ <p>Para reproducir un podcast, elija el que quiere reproducir de la lista y pulse <key>Espacio</key> o elija <guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú de Banshee.</p>
+
</section>
-
- <section id="play-radio">
- <title>Reproducir una emisora de radio de Internet</title>
-
- <p>La fuente Radio le muestra alfabéticamente todas las emisoras de radio de Internet que ha añadido a <app>Banshee</app>.</p>
-
- <p>Para reproducir una emisora de radio de Internet, elija la emisora de radio que quiere reproducir de la lista y pulse <key>Espacio</key> o elija <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Reproducir</gui></guiseq> desde el menú de <app>Banshee</app>.</p>
-
- </section>
-
+
+ <section id="playradio">
+ <title>Reproducir una emisora de radio de Internet</title>
+
+ <p>La fuente «Radio» le muestra, alfabéticamente, todas las emisoras de radio de Internet que ha añadido a Banshee.</p>
+
+ <p>Para reproducir una emisora de radio de Internet, elija la emisora de radio que quiere reproducir de la lista y pulse <key>Espacio</key> o elija <guiseq><gui>Reproducción</gui><gui>Reproducir</gui></guiseq> desde el menú de Banshee.</p>
+
+ </section>
+
</page>
diff --git a/help/es/podcast.page b/help/es/podcast.page
deleted file mode 100644
index f6924da..0000000
--- a/help/es/podcast.page
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="es">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Añadir, quitar y reproducir podcasts en <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>¿Qué es un podcast?</title>
-
- <p>Los podcasts son programas grabados, parecidos a los de radio, que se encuentran disponibles en Internet y a los que puede suscribirse. Cuando se suscriba a un podcast en <app>Banshee</app>, y cada vez que se publica un programa nuevo, <app>Banshee</app> lo descargará automáticamente y lo añadirá a su colección.</p>
-
- <p>Se pueden encontrar podcasts sobre prácticamente cualquier tema, como música, películas, Linux y mucho más. Para encontrar podcasts en Internet, utilice su buscador preferido e introduzca términos como «podcast Linux» para encontrar un gran número de opciones donde elegir.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Añadir un podcast</title>
-
- <p>Para añadir un podcast a <app>Banshee</app>, primero deberá visitar la página web del podcast en Internet. Casi todos los podcasts cuentan con un botón o un enlace que permite suscribirse al podcast. Copie dicho enlace. En la mayoría de los navegadores puede pulsar con el botón derecho en el enlace y seleccionar <gui style="menuitem">Copiar enlace</gui>.</p>
-
- <p>En <app>Banshee</app>, pulse <gui style="menuitem">Podcast</gui> en el menú de la parte izquierda de la ventana. Luego pulse en <gui style="menuitem">Suscribirse a podcasts</gui> en la mitad derecha de la barra de herramientas, elija <guiseq><gui style="menu">Multimedia</gui><gui style="menuitem">Suscribirse a podcasts</gui></guiseq> en el menú o use el atajo de teclado <keyseq><key>Mayús</key><key>Ctrl</key><key>F</key></keyseq>.</p>
-
- <p>De manera predeterminada, los podcasts no se descargarán, por lo que sólo podrá escucharlos mientras esté conectado a Internet. Cuando se suscriba a un podcast nuevo, podrá seleccionar las siguientes opciones.</p>
-
- <list>
- <item>
- <p>Seleccione <gui style="checkbox">Descargar episodios nuevos</gui> para descargar automáticamente los episodios nuevos a su equipo para poder acceder a ellos cuando no tenga conexión a Internet.</p>
- </item>
- <item>
- <p>Seleccione <gui style="menuitem">Archivar todos los episodios excepto el más reciente</gui> para que sólo se muestre el episodio más reciente.</p>
- </item>
- </list>
-
- <p>Después de añadir el proveedor de podcast, <app>Banshee</app> mostrará el nombre del podcast, el título de cada episodio y la fecha en la que se publicó.</p>
-
- <p>Cuando se archive un podcast, se quitará de la lista de <gui>Elementos nuevos</gui>, pero seguirá apareciendo en la lista de <gui>Todos los elementos</gui>.</p>
-
- <note style="tip">
- <p>Puede editar las opciones de suscripción a un podcast en las <gui style="menuitem">Propiedades del podcast</gui>, a las que puede acceder pulsando con el botón derecho sobre el nombre del podcast correspondiente en la lista de podcasts o pulsando con el botón derecho sobre cualquier episodio de ese podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Reproducir un podcast</title>
-
- <p>Para <link xref="play">reproducir</link> un episodio de un podcast, pulse dos veces sobre el episodio o selecciónelo, luego elija <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Reproducir</gui></guiseq>. También puede añadir el episodio a la <link xref="queue"><gui>Cola de reproducción</gui></link> pulsando con el botón derecho sobre el episodio y seleccionando <gui style="menuitem">Añadir a la cola de reproducción</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Quitar un podcast</title>
-
- <p>Para quitar un podcast, pulse con el botón derecho sobre el podcast en la lista de podcasts y elija <gui style="menuitem">Desuscribirse y eliminar</gui>. Esto cancelará la suscripción de actualizaciones del podcast y eliminará todos los episodios del podcast de su colección.</p>
-
- </section>
-
-</page>
diff --git a/help/es/radio.page b/help/es/radio.page
deleted file mode 100644
index 2a6c2dd..0000000
--- a/help/es/radio.page
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="es">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Añadir, quitar y reproducir emisoras de radio por Internet en <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Radio por Internet</title>
-
- <section id="radio-description">
- <title>¿Qué es la radio por Internet?</title>
-
- <p>Las emisoras de radio por Internet son parecidas a las emisoras de radio normales. Permiten a una persona u organización emitir música en directo a través de Internet. Las emisoras de radio por Internet pueden consistir en una emisión simultánea de una emisora corriente, una persona emitiendo su propio programa, o emisiones de tipo comercial que pueden incluir, por ejemplo, sesiones de DJ o incluso anuncios.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Añadir una emisora de radio</title>
-
- <p>Buscar emisoras de radio en Internet usando su motor de búsqueda favorito. Puede especificar géneros, frecuencias de canal, nombres de emisoras y otros detalles para ajustar la búsqueda. Muchas emisoras de radio muestran un botón o un enlace para escuchar la emisión. En la mayoría de los navegadores web, puede pulsar con el botón derecho sobre el enlace y elegir <gui style="menuitem">Copiar enlace</gui>.</p>
-
- <steps>
- <title>Para añadir una emisora de radio por Internet a <app>Banshee</app>:</title>
- <item>
- <p>Seleccione <gui>Radio</gui> en el menú de la izquierda de la ventana y pulse en <gui style="menuitem">Añadir emisora</gui> en la esquina superior derecha de <app>Banshee</app>. O también puede seleccionar <guiseq><gui style="menu">Multimedia</gui><gui style="menuitem">Añadir emisora</gui></guiseq> del menú.</p>
- </item>
- <item>
- <p>Necesitará introducir algunos detalles sobre la emisora que quiere añadir. Los tres primeros campos son obligatorios:</p>
- <list>
- <item>
- <p>En la caja de texto <gui style="menuitem">Género de la emisora</gui>, describa el tipo de música que la emisora de radio por internet reproduce creando una etiqueta apropiada, o elija una etiqueta de entre las selecciones disponibles en los desplegables.</p>
- </item>
- <item>
- <p>En la caja de texto <gui style="input">Nombre de la emisora</gui>, introduzca un nombre para la emisora de radio.</p>
- </item>
- <item>
- <p>En el campo <gui style="input">URL del flujo</gui> introduzca o pegue el URL del flujo pulsando con el botón derecho y seleccionando <gui style="menuitem">Pegar</gui> o pulsando <keyseq><key>Ctrl</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>También puede rellenar los campos <gui style="input">Creador de la emisora</gui>, <gui style="input">Descripción</gui> y <gui style="input">Valoración</gui>.</p>
- </item>
- <item>
- <p>Para terminar, pulse en <gui style="button">Guardar</gui> para guardar la estación de radio por Internet en <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Reproducir una emisora de radio</title>
-
- <p>Para <link xref="play">reproducir</link> una emisora de radio, pulse dos veces sobre la emisora. Alternativamente, pulse con el botón derecho sobre la emisora y elija <gui style="menuitem">Reproducir</gui> o seleccione la emisora de radio y elija <guiseq><gui style="menu">Reproducción</gui><gui style="menuitem">Reproducir</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>Para añadir una emisora de radio a la <gui style="menuitem" xref="play-queue">Cola de reproducción</gui>, puede pulsar con el botón derecho sobre la emisora y elegir <gui style="menuitem">Añadir a la cola de reproducción</gui>. Esto reproducirá la emisora de radio cuando la cola termine de reproducir todo lo que haya por delante de la emisora en la <gui>Cola de reproducción</gui>.</p>
-
- <p>También puede pulsar con el botón derecho sobre la emisora y seleccionar <gui style="menuitem">Reproducir después de la pista actual</gui> para añadir la emisora de radio a la cola después de la pista que se esté reproduciendo actualmente.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Reproducir después de la pista actual</gui> puede no funcionar en algunas instalaciones de <app>Banshee</app>.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Quitar una emisora de radio</title>
-
- <p>Para quitar una emisora de rardio de <app>Banshee</app>, puede pulsar con el botón derecho en la estación de radio y seleccionar <gui style="menuitem">Quitar</gui>, o alternativamente, puede seleccionar la estación con el ratón y pulsar <key>Supr</key>. Cuando se le pida que confirme, pulse el botón <gui style="button">Quitar</gui> para quitar la emisora de radio.</p>
-
- </section>
-
-</page>
diff --git a/help/es/rb-import.page b/help/es/rb-import.page
new file mode 100644
index 0000000..885e297
--- /dev/null
+++ b/help/es/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="es">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importar musica y categorías desde el reproductor de música <app>Rhythmbox</app>. </desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importar su colección de <app>Rhythmbox</app></title>
+
+</page>
diff --git a/help/es/search.page b/help/es/search.page
index c2f39b8..c474c83 100644
--- a/help/es/search.page
+++ b/help/es/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,76 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Buscando su colección de <app>Banshee</app></title>
-
- <p><app>Banshee</app> ofrece un lenguaje de búsqueda potente. Puede buscar en su colección rápida y fácilmente con términos de búsqueda básicos, o realizar búsquedas detalladas con la terminología de búsqueda avanzada de <app>Banshee</app>.</p>
-
- <p>Para realizar una búsqueda de su contenido multimedia en <app>Banshee</app>, pulse <key>S</key> o pulse en la caja <gui>Buscar</gui> en la esquina superior derecha en la vista de colección en <app>Banshee</app>.</p>
-
- <p>Una consulta de búsqueda consiste de algunos términos básicos, por ejemplo, <em>dave matthews</em>. Al introducir <em>dave matthews</em> en la caja de búsqueda, <app>Banshee</app> buscará todos los campos de metadatos, incluyendo título de la pista, título del álbum, Artista del álbum, año, etc. Se devolverá cualquier pista cuyos metadatos incluyan <em>dave</em> y <em>matthews</em>. Los términos de búsqueda no son sensibles a las mayúsculas, lo que significa que no tiene que ponerla [...]
-
- <section id="operators">
- <title>Operadores básicos</title>
-
- <p>Los operadores se pueden poner entre dos palabras de búsqueda o ponerse antes de una palabra de búsqueda. La operación predeterminada es <gui>AND</gui> y se usa cuando no se usan otros operadores entre dos términos de búsqueda. Al ser el predeterminado, no existe de manera explícita el operador AND.</p>
-
+ <title>Buscar en su colección de Banshee</title>
+
+ <p>Banshee tiene un lenguaje de búsquedas potente. Puede buscar en su colección rápida y fácilmente con términos de búsqueda básicos, o realizar búsquedas detalladas con la terminología de búsqueda avanzada de Banshee.</p>
+
+ <p>Para realizar una búsqueda de su contenido multimedia en Banshee, presione <key>S</key> o pulse en la caja <gui>Buscar</gui> en la esquina superior derecha en la vista de colección de Banshee.</p>
+
+ <p>Una consulta de búsqueda consiste en algunos términos básicos, por ejemplo, <em>dave matthews</em>. Al introducir <em>dave matthews</em> en la caja de búsqueda, Banshee buscará todos los campos de metadatos, incluyendo «Pista», «Título de la pista», «Título del álbum», «Artista», «Año», etc. Se devolverá cualquier pista cuyos metadatos incluyan <em>dave</em> y <em>matthews</em>. Los términos de búsqueda no son sensibles a las mayúsculas, lo que significa que no tiene que preocuparse [...]
+
+<section id="operators">
+ <title>Operadores básicos</title>
+ <p>Los operadores se pueden poner entre dos palabras de la búsqueda o ponerse antes de una palabra de la búsqueda. El operador predeterminado es <gui>AND</gui> y se usa cuando no se usan otros operadores entre dos términos de búsqueda. Al ser el operador predeterminado, no existe de manera explícita.</p>
+
<p>Otros operadores básicos son <gui>OR</gui> y <gui>NOT</gui>. Juntos, estos tres operadores puede generar consultas muy potentes para ayudarle a buscar sus archivos multimedia.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Operadores lógicos y ejemplos</title>
-
+<section id="logical">
+ <title>Operadores lógicos y ejemplos</title>
<p>Lo siguiente es una lista de operadores lógicos y ejemplos de resultados de búsquedas realizadas usándolos.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operador</gui></p></td>
- <td><p><gui>Descripción</gui></p></td>
+ <td><p><gui>Operador</gui></p></td> <td><p><gui>Descripción</gui></p></td>
</tr>
<tr>
- <td><p><em>predeterminado</em>, <em>espacio en blanco</em></p></td>
- <td><p>Buscar dos términos con un espacio en blanco entre las dos palabras o términos.</p></td>
+ <td><p><em>predeterminado</em>, <em>espacio en blanco</em></p></td> <td><p>Buscar dos términos con un espacio en blanco entre las dos palabras o términos.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Los resultados de la búsqueda serán dos canciones con resultados en cualquier campo.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Los resultados de la búsqueda serán dos canciones con resultados en cualquier campo.</p></td>
</tr>
<tr>
- <td><p>NOT, not, <key>-</key></p></td>
- <td><p>No mostrar los resultados de la búsqueda con cualquier término de búsqueda que sigue al operador NOT, not, <key>-</key>.</p></td>
- </tr>
- </table>
+ <td><p>NOT, not, <key>-</key></p></td> <td><p>No mostrar los resultados de la búsqueda con cualquier término de búsqueda que sigue al operador NOT, not, <key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Los ejemplos de operaciones lógicas incluyen:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Consulta</gui></p></td>
- <td><p><gui>Descripción</gui></p></td>
+ <td><p><gui>Consulta</gui></p></td> <td><p><gui>Descripción</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Busca cualquier campo de una pista que contenga <em>dave</em> y <em>matthews</em>.</p></td>
+ <td><p>dave matthews</p></td> <td><p>Busca cualquier campo de una pista que contenga <em>dave</em> y <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Busca cualquier campo de una pista de una pista que contenga <em>dave</em> o <em>matthews</em>.</p></td>
+ <td><p>dave, matthews</p></td> <td><p>Busca cualquier campo de una pista de una pista que contenga <em>dave</em> o <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Busca cualquier campo de una pista de una pista que contenga <em>dave</em> o <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave or matthews</p></td> <td><p>Busca cualquier campo de una pista de una pista que contenga <em>dave</em> o <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Busca cualquier campo de una pista de una pista que contenga <em>dave</em> o <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave | matthews</p></td> <td><p>Busca cualquier campo de una pista de una pista que contenga <em>dave</em> o <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Muestra todas las pistas cuyos campos no contienen <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>Muestra todas las pistas cuyos campos no contienen <em>dave matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Para obtener más información sobre cómo realizar consultas de búsqueda más complejas, consulte la <link xref="adv-search"/></p>
+
</section>
-
+
</page>
diff --git a/help/es/sort.page b/help/es/sort.page
index 553e1dc..53afbcd 100644
--- a/help/es/sort.page
+++ b/help/es/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,19 +23,17 @@
<section id="addcolumn">
- <title>Añadir columnas</title>
-
+ <title>Añadir columnas</title>
+
<p>A medida que su colección crece, puede querer cambiar la vista de su colección para añadir información adicional sobre las canciones de su colección o cambiar la forma en que puede ver y ordenar sus canciones, artistas o álbumes.</p>
-
- <p>Puede añadir columnas adicionales a la vista de colección en <app>Banshee</app> para obtener más información sobre las canciones y también para permitirle ordenarlas. De manera predeterminada, <app>Banshee</app> muestra columnas para las canciones que incluyen <gui>Nombre</gui>, <gui>Artista</gui>, <gui>Álbum</gui> y <gui>Duración</gui>. Para añadir columnas adicionales, pulse con el botón derecho del ratón en cualquiera de las columnas y <app>Banshee</app> mostrará todas las column [...]
-
+
+ <p>Puede añadir más columnas a la vista de colección en <app>Banshee</app> para obtener más información sobre las canciones y para permitirle ordenarlas. De manera predeterminada, Banshee muestra columnas para las canciones que incluyen <gui>Nombre</gui>, <gui>Artista</gui>, <gui>Álbum</gui> y <gui>Duración</gui>. Para añadir columnas adicionales, pulse con el botón derecho del ratón en cualquiera de las columnas y Banshee mostrará todas las columnas disponibles para elegir. Pulse en l [...]
+
</section>
-
+
<section id="sorting">
<title>Ordenar columnas</title>
-
- <p>Puede ordenar su colección usando su ratón para pulsar en cualquiera de las columnas mostradas en la vista de colección. Si quiere ordenar su colección de música por artista, pulse en la cabecera de la columna <gui>Artista</gui> y <app>Banshee</app> ordenará automáticamente esa columna por orden alfabético. Pulsando otra vez en la columna <gui>Artista</gui>, la columna se ordenará en orden alfabético inverso.</p>
-
+ <p>Puede ordenar su colección usando su ratón para pulsar en cualquiera de las columnas mostradas en la vista de colección. Si quiere ordenar su colección de música por artista, pulse en la cabecera de la columna <gui>Artista</gui> y Banshee ordenará automáticamente esa columna por orden alfabético. Pulsando otra vez en la columna <gui>Artista</gui>, la columna se ordenará en orden alfabético inverso.</p>
</section>
-
+
</page>
diff --git a/help/es/sync.page b/help/es/sync.page
index 2cfde4a..3372b4c 100644
--- a/help/es/sync.page
+++ b/help/es/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Sincronizar su contenido multimedia con un reproductor portátil o un teléfono inteligente.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,79 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Sincronizar</title>
-
- <p><app>Banshee</app> soporta sincronizar su música con reproductores multimedia portátiles y teléfonos inteligentes. Puede añadir pistas de música específicas, álbumes o listas de reproducción, o permitir que <app>Banshee</app> mantenga su reproductor de música en sincronización con su colección entera. Al conectar su reproductor portátil al equipo también puede reproducir las canciones de su reproductor portátil en <app>Banshee</app>. Al sincronizar música en un formato sin pérdida c [...]
-
+ <title>Sincronizar</title>
+
+ <p>Banshee permite sincronizar su música con reproductores portátiles y teléfonos inteligentes. Puede añadir canciones, álbumes enteros o listas de reproducción, o hacer que Banshee sincronice automáticamente su reproductor portátil con toda su colección. Al conectar su reproductor portátil al ordenador también puede reproducir las canciones que se encuentran en él. Al sincronizar archivos que se encuentren en un formato de alta calidad como FLAC, Banshee los convertirá automáticamente [...]
+
<section id="devices">
- <title>Soporte de dispositivo</title>
-
- <p><app>Banshee</app> soporta casi todos los reproductores de música portátiles modernos y teléfonos inteligentes con la notable excepción del Apple iPhone, iPad e iPod Touch.</p>
-
- <p>Cuando conecte su dispositivo, <app>Banshee</app> lo mostrará en el menú de la izquierda. Al pulsar en el icono del dispositivo, lo llevará a la página principal del dispositivo en <app>Banshee</app>, mostrando sus preferencias de sincronización.</p>
-
+ <title>Soporte de dispositivos</title>
+ <p>Banshee cuenta con soporte para casi todos los reproductores multimedia portátiles y teléfonos inteligentes a excepción del iPhone, iPad y iPod Touch.</p>
+
+ <p>Cuando conecte su dispositivo, Banshee lo mostrará en el menú de la izquierda. Al pulsar en el icono del dispositivo, le llevará a la página principal del dispositivo en Banshee, mostrando sus preferencias de sincronización.</p>
+
</section>
-
- <section id="sync-settings">
+
+ <section id="sync-settings">
<title>Sincronizar su música</title>
-
- <p>Puede elegir gestionar el contenido multimedia de su música portátil haciendo que <app>Banshee</app> lo sincronice automáticamente, o puede gestionar su música y sus archivos multimedia manualmente.</p>
-
- <p>Elija su dispositivo desde el menú de <app>Banshee</app> y luego elija cómo quiere sincronizar sus archivos multimedia, incluyendo:</p>
-
- <list>
- <item><p>Música</p></item>
- <item><p>Audiolibros</p></item>
- <item><p>Vídeos</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>En el menú desplegable junto a cada uno de los archivos multimedia, seleccione una opción:</p>
-
- <list>
- <item><p>Gestionar de forma manual</p></item>
- <item><p>Sincronizar toda la colección</p></item>
- </list>
-
- <note style="warning">
- <p>Si elige sincronizar automáticamente su colección entera con su reproductor multimedia portátil, asegúrese de que su reproductor multimedia portátil tiene suficiente espacio de almacenamiento. Si su colección es más grande que el espacio de su reproductor multimedia portátil, <app>Banshee</app> sincronizará el contenido multimedia hasta que su reproductor esté lleno y luego se detenga.</p>
- </note>
-
- <p>si ha creado listas de reproducción o listas de reproducción inteligentes en su colección de música, también se mostrarán como una opción de sincronización de Música. Esto puede ser útil para crear listas de reproducción inteligentes, como listas de reproducción inteligentes que se actualizarán automáticamente a medida que se añade nuevo contenido basado en las reglas de la lista de reproducción, y <app>Banshee</app> sincronizará la nueva lista de reproducción con su dispositivo cad [...]
-
- <p><app>Banshee</app> mostrará el espacio total del disco duro de su reproductor de música portátil en un gráfico centrado en el centro inferior de <app>Banshee</app>. El gráfico mostrará cuánto espacio ocupan los archivos de sonido, vídeo, otros y el espacio libre. Justo debajo <app>Banshee</app> mostrará cuántos elementos en total hay almacenados en su reproductor de música portátil, a cuántas horas o días de reproducción equivalen y el espacio total usado.</p>
-
+ <p>Puede elegir gestionar el contenido multimedia de su reproductor de música portátil haciendo que Banshee lo sincronice automáticamente, o puede gestionar su música y sus archivos multimedia manualmente.</p>
+
+ <p>Seleccione su dispositivo desde el menú de Banshee y elija cómo quiere sincronizar sus archivos multimedia, incluyendo:</p>
+ <list>
+ <item><p>Música</p></item>
+ <item><p>Audiolibros</p></item>
+ <item><p>Vídeos</p></item>
+ <item><p>Podcasts</p></item>
+ </list>
+
+ <p>En el menú desplegable junto a cada uno de los archivos multimedia, seleccione una opción:</p>
+ <list>
+ <item><p>Gestionar de forma manual</p></item>
+ <item><p>Sincronizar toda la colección</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Si elige sincronizar automáticamente su colección completa con su dispositivo portátil, asegúrese de que su reproductor multimedia tiene espacio suficiente. Si su colección es más grande que el espacio de su reproductor multimedia, Banshee sincronizará el contenido hasta que el reproductor esté lleno.</p>
+ </note>
+
+ <p>si ha creado listas de reproducción o listas de reproducción inteligentes en su colección de música, también se mostrarán como una opción de sincronización de «Música». Esto puede ser útil para crear listas de reproducción inteligentes, ya que las listas de reproducción inteligentes se actualizarán automáticamente a medida que se añade contenido basado en las reglas de la lista de reproducción, y Banshee sincronizará automáticamente la nueva lista de reproducción con su dispositiv [...]
+
+ <p>Banshee mostrará el espacio total del disco de su reproductor multimedia portátil en un gráfico centrado en la parte inferior de Banshee. El gráfico mostrará cuánto espacio ocupan los archivos de sonido, vídeo, otros y el espacio libre. Justo debajo Banshee mostrará cuántos elementos en total hay almacenados en su reproductor portátil de música, a cuántas horas o días de reproducción equivalen y el espacio usado total.</p>
+
</section>
<section id="sync-manually">
- <title>Sincronizar su colección entera</title>
-
- <p>Puede arrastrar y soltar archivos multimedia a su reproductor de música portátil desde <app>Banshee</app>. Seleccione el archivo o los archivos que quiera copiar en su reproductor multimedia portátil y luego mantenga pulsado el botón derecho del ratón y arrastre los archivos al icono de su reproductor multimedia portátil en <app>Banshee</app>. Esto copiará los archivos a su dispositivo.</p>
-
- <p>Si su colección de música está codificada en un formato que su reproductor multimedia portátil no soporta, como OGG o FLAC, y tiene instalados los códecs necesarios, <app>Banshee</app> puede transcodificar automáticamente estos archivos a MP3 al transferirlos a su reproductor multimedia portátil. Compruebe que su distribución de Linux tiene los códecs necesarios, ya que esto está fuera del alcance de esta ayuda y varía según la distribución.</p>
-
- <note style="tip">
- <p>Puede necesitar expulsar su dispositivo para cargar los archivos correctamente en su reproductor de música portátil. Para expulsar su dispositivo en <app>Banshee</app>, pulse con el botón derecho del ratón sobre el dispositivo en el menú de <app>Banshee</app> y pulse <gui style="menuitem">Desconectar</gui>.</p>
- </note>
+ <title>Sincronizar su biblioteca completa</title>
+ <p>Puede arrastrar y soltar archivos multimedia en su reproductor de música portátil desde Banshee. Seleccione el archivo o los archivos que quiera copiar en su reproductor multimedia portátil y mantenga pulsado el botón del ratón mientras arrastra los archivos al icono de su reproductor multimedia portátil en Banshee. Esto copiará los archivos a su dispositivo.</p>
+
+ <p>Si su colección de música está codificada en un formato que su reproductor multimedia portátil no soporta, como OGG o FLAC, y tiene instalados los códecs necesarios, Banshee puede convertir automáticamente estos archivos a MP3 al transferirlos a su reproductor multimedia portátil. Compruebe que su distribución de Linux tiene los códecs necesarios, ya que esto está fuera del objetivo de esta ayuda y varía según la distribución.</p>
+
+ <note style="tip">
+ <p>Puede necesitar expulsar su dispositivo para cargar los archivos correctamente en su reproductor multimedia portátil. Para expulsar su dispositivo desde Banshee, pulse con el botón derecho del ratón sobre el dispositivo en el menú de Banshee y pulse <gui>Desconectar</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Reproducir música desde su reproductor de música portátil</title>
-
- <p>Puede reproducir música almacenada en su reproductor de música portátil directamente en <app>Banshee</app>. Elija su reproductor en el menú de <app>Banshee</app> en la parte izquierda y se mostrará la colección de su reproductor de música portátil. Entonces puede reproducir música en <app>Banshee</app> igual que lo haría desde su propia colección.</p>
-
+ <title>Reproducir música desde su reproductor portátil</title>
+ <p>Puede reproducir música almacenada en su reproductor de música portátil directamente en Banshee. Elija su reproductor en el menú de Banshee en la parte izquierda y se mostrará la colección de su reproductor de música portátil. Entonces puede reproducir la música en Banshee igual que lo haría desde su propia colección.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Quitar música de su reproductor de música portátil</title>
-
- <p>Para quitar canciones almacenadas en su reproductor de música portátil, elija su reproductor en <app>Banshee</app> para ver su colección. Elija las pistas que quiere quitar, pulse con el botón derecho la pista y elija <gui style="menuitem">Eliminar</gui>, o del menú elija <guiseq><gui style="menu">Editar</gui><gui style="menuitem">Eliminar</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Al eliminar archivos de su reproductor de música portátil se eliminarán de manera permanente, y no podrá recuperarlos.</p>
- </note>
-
+ <title>Quitar música de su reproductor portátil</title>
+ <p>Para quitar canciones almacenadas en su reproductor de música portátil, elija su reproductor en Banshee para ver su colección. Elija las pistas que quiere quitar, pulse con el botón derecho sobre las pistas y elija «Eliminar», o elija <guiseq><gui>Editar</gui><gui>Eliminar</gui></guiseq> en el menú.</p>
+
+ <note style="warning">
+ <p>Al eliminar archivos de su reproductor de música portátil se eliminarán de manera permanente, y no podrá recuperarlos.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/es/ui.page b/help/es/ui.page
index db1d6a7..7d33b33 100644
--- a/help/es/ui.page
+++ b/help/es/ui.page
@@ -4,17 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
<desc>Una vista general de la interfaz de usuario de <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -24,66 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Interfaz de usuario de <app>Banshee</app></title>
+ <title>Introducción a la interfaz de usuario de Banshee</title>
<figure>
<title>Ventana del <gui>Reproductor multimedia Banshee</gui></title>
<desc><app>Reproductor multimedia Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Interfaz de la colección de <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Fuentes</title>
+ <p>Su música y sus fuentes se muestran a la izquierda de Banshee. Las fuentes le dan acceso directo a la cola de reproducción, música, vídeos, Amazon, Last.fm, podcasts, etc.</p>
+
+ <note style="tip">
+ <p>Las opciones a elegir en el menú cambiarán según la fuente que se elija. Por ejemplo, para importar un podcast, tendrá que utilizar el menú en la fuente Podcast. Así, la opción de importar podcasts no aparecerá cuando esté viendo la colección de vídeos o música.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Examinador de colecciones</title>
+ <p>Cuando selecciona una canción o un vídeo desde «Fuentes», Banshee mostrará su contenido en el «Examinador de colecciones». Dependiendo de la fuente que elija, Banshee podrá mostrar su colección de música o de vídeo, subscripciones a Podcasts o incluso la tienda de música de Amazon para permitirle comprar música.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Vista «En reproducción»</title>
+ <p>Útil cuando se usa Banshee en modo a pantalla completa, el modo «En reproducción» oculta la colección para darle una vista más grande de la música o del vídeo que está viendo. Cuando escucha música, la vista «En reproducción» le mostrará el nombre del artista, el álbum y la portada, si está disponible. Si está viendo un vídeo, Banshee mostrará el vídeo.</p>
+
+ <p>Para cambiar la vista «En reproducción» para ocultar la interfaz de usuario de Banshee y usar el modo a pantalla completa, puede pulsar <key>F</key>, pulsar el botón <gui>Pantalla completa</gui> en la esquina superior derecha de Banshee o elegir <guiseq><gui>Ver</gui><gui>Pantalla completa</gui></guiseq> para iniciar el modo a pantalla completa.</p>
+
+</section>
+
+<section id="library">
+ <title>Colección</title>
+ <p>La vista «Colección» de Banshee cambiará dependiendo de la fuente que haya elegido. La «Colección de música» mostrará la carátula, los artistas en su colección y lista de canciones. La «Colección de podcast» mostrará sus subscripciones a podcast, los podcast que se han bajado y los que no, y todos los podcast, nuevos o antiguos. Consulte la página de ayuda de «Fuentes» para obtener información detallada sobre cómo gestionar una fuente.</p>
+</section>
- <section id="context">
- <title>Fuentes</title>
-
- <p>Su música y sus fuentes de video se muestran a la izquierda de <app>Banshee</app>. Las fuentes le dan acceso directo a la <app>cola de reproducción</app>, <gui>música</gui>, <gui>vídeos</gui>, <gui>Tienda MP3 de Amazon</gui>, <gui>Last.fm</gui>, <gui>Podcasts</gui> y más.</p>
-
- <note style="tip">
- <p>Las opciones a elegir en el menú cambiarán según la fuente que se elija. Por ejemplo, para importar un podcast, tendrá que utilizar la fuente <gui>Podcast</gui>. La opción del menú para importar un podcast no estará disponible cuando esté viendo la colección de video o música.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Navegador de colecciones</title>
-
- <p>Cuando selecciona una fuente de canción o vídeo desde Fuentes, <app>Banshee</app> mostrará su contenido en el navegador de colecciones. Dependiendo de la fuente que elija, <app>Banshee</app> podrá mostrar su colección de música o vídeo, subscripciones a podcasts o incluso la tienda de música de Amazon para permitirle comprar música.</p>
-
- </section>
-
- <section id="now-playing">
- <title>Vista <gui>En reproducción</gui></title>
-
- <p>Útil cuando se usa <app>Banshee</app> en modo de pantalla completa, el modo <gui>En reproducción</gui> oculta la colección para darle una vista más grande de la música o del vídeo que está viendo. Cuando escucha música, la vista <gui>En reproducción</gui> le mostrará el nombre del artista, el álbum y la portada, si está disponible. Si está viendo un vídeo, <app>Banshee</app> mostrará el vídeo.</p>
-
- <p>Para cambiar el modo <gui>En reproducción</gui> para esconder la interfaz de usuario de <app>Banshee</app> y ver el contenido multimedia en el modo de pantalla completa, puede hacer lo siguiente:</p>
-
- <list>
- <item>
- <p>Pulse dos veces en la vista con el ratón.</p>
- </item>
- <item>
- <p>Pulse <key>F</key>.</p>
- </item>
- <item>
- <p>Pulse <key>F11</key>.</p>
- </item>
- <item>
- <p>Pulse el botón <gui style="button">Pantalla completa</gui> en la esquina superior derecha de <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Seleccione <guiseq><gui style="menu">Vista</gui><gui style="menuitem">Pantalla completa</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Colecciones</title>
-
- <p>La vista <gui>Colecciones</gui> en <app>Banshee</app> cambiará dependiendo de la fuente que haya elegido. La «Colección de música» mostrará la carátula, los artistas en su colección y lista de canciones. Por ejemplo, la colección <gui>Música</gui> mostrtará la portada, artistas en su colección y la lista de canciones de la colección <gui>Podcasts</gui> mostrará sus subscripciones a podcast, los podcast que ha descargado y los que no, y todos los podcast, nuevos o antiguos. Consulte [...]
-
- </section>
</page>
diff --git a/help/fr/add-podcast.page b/help/fr/add-podcast.page
new file mode 100644
index 0000000..1560227
--- /dev/null
+++ b/help/fr/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="fr">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Ajout, suppression et écoute de podcasts avec Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>Un podcast, qu'est-ce que c'est ?</title>
+
+ <p>Les podcasts sont des programmes enregistrés, un peu comme ceux des radios, qui sont disponibles sur internet et auquels il est possible de s'abonner. Si vous souscrivez un abonnement avec Banshee, à chaque fois qu'un nouveau programme est rendu disponible, Banshee le télécharge automatiquement et vous permet de l'écouter.</p>
+
+ <p>Il y a des podcasts sur pratiquement tous les thèmes : musiques, films, Linux... Allez sur internet avec votre moteur de recherche favori et saisissez par exemple ces mots-clés « film podcast » et vous pourrez vous faire une idée du choix disponible.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Ajout d'un podcast</title>
+
+ <p>Pour ajouter un podcast à Banshee, vous devez d'abord aller sur la page internet de ce podcast avec votre navigateur. Tous les podcasts possèdent un bouton ou un lien pour s'abonner. Copiez le lien avec la souris. La plupart des navigateurs vous permettent de <gui>Copier le lien</gui> d'un clic droit.</p>
+
+ <p>Dans Banshee, appuyez sur le bouton <gui>Ajouter un podcast</gui> dans le coin supérieur droite de la fenêtre, ou allez dans le menu <guiseq><gui>Média</gui><gui>Ajouter un podcast</gui></guiseq> ou enfin appuyez sur le raccourci <keyseq><key>Maj</key><key>Ctrl</key><key>F</key></keyseq>.</p>
+
+ <p>Banshee ouvre une boîte de dialogue vous proposant un menu déroulant pour télécharger un nouveau podcast avec les choix suivants :</p>
+
+ <list>
+ <item><p>Télécharger l'épisode le plus récent (ce sera automatiquement le dernier épisode disponible).</p></item>
+ <item><p>Télécharger tous les épisodes (ceci téléchargera tous les épisodes).</p></item>
+ <item><p>Me laisser choisir quels épisodes télécharger (vous pourrez choisir les épisodes que vous voulez télécharger).</p></item>
+ </list>
+
+ <p>Une fois que vous avez ajouté une source de podcast, Banshee affiche :</p>
+
+ <list>
+ <item><p><gui>Nom</gui> : titre de cet épisode</p></item>
+ <item><p><gui>Podcast</gui> : nom du podcast</p></item>
+ <item><p><gui>Publié</gui> : date de publication ou de mise à disposition de l'épisode</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/fr/add-radio.page b/help/fr/add-radio.page
new file mode 100644
index 0000000..161d613
--- /dev/null
+++ b/help/fr/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="fr">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Ajout, suppression et écoute de stations de radio internet avec Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Radio internet</title>
+
+ <section id="radiodescription">
+ <title>Une radio internet, qu'est-ce que c'est ?</title>
+
+ <p>Les stations radio internet sont similaires aux autres stations historiques et permettent à un individu ou à un groupe d'écouter un flux musical en direct via l'internet. Elles peuvent tout à la fois diffuser un flux en provenance de stations historiques, de stations d'amateurs ou de stations commerciales y compris celles de DJs en direct ou d'autres commerces.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Ajout d'une station de radio</title>
+
+ <p>Pour ajouter une station de radio internet à Banshee, appuyez sur le bouton <gui>Ajouter une station</gui> au haut à droite, ou allez dans le menu <guiseq><gui>Média</gui><gui>Ajouter une station</gui></guiseq>.</p>
+
+ <p>Sur la page Web de la station de radio internet, recopiez l'URL du flux dans votre navigateur. Avec la plupart des navigateurs, un clic droit sur le lien vous propose de <gui>Copier le lien</gui>.</p>
+
+
+ <p>Banshee ouvre une boîte de dialogue avec plusieurs champs et vous demande d'entrer le genre, le titre et l'URL de flux de la station de radio que vous souhaitez ajouter. Choisissez le <gui>Type de station</gui> dans le menu déroulant. Saisissez le nom de votre station dans le champ adéquat. D'un clic droit dans le champ <gui>URL du flux</gui> choisissez <gui>copier</gui> ou appuyez sur <keyseq><key>Ctrl</key><key>V</key></keyseq>.</p>
+
+ <p>Vous pouvez aussi remplir les champs facultatifs <gui>Créateur de la station</gui>, <gui>Description</gui> et <gui>Note</gui>.</p>
+
+ <p>Pour terminer, n'oubliez pas d'<gui>Enregistrer</gui> votre nouvelle station dans Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/fr/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/fr/advanced.page
index 468ad23..362587e 100644
--- a/help/zh_CN/extensions.page
+++ b/help/fr/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="fr">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Obtention d'aide sur les options avancées.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Options avancées et aide</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Raccourcis claviers</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Raccourcis claviers</title>
</section>
-
+
</page>
diff --git a/help/fr/amazon.page b/help/fr/amazon.page
index cdc2145..2ee424c 100644
--- a/help/fr/amazon.page
+++ b/help/fr/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Synchronisation et achat de musique depuis la boutique MP3 Amazon.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Boutique MP3 Amazon</title>
+
+ <p>Avec Banshee, vous pouvez télécharger et importer de la musique depuis la boutique MP3 Amazon. Vous pouvez importer des fichiers de musique Amazon manuellement, les acheter dans votre navigateur internet, ou demander à Banshee de le faire. L'offre d'Amazon ne concerne que certains pays pour ce qui est des MP3, et selon votre pays, il se peut que vous ne puissiez pas acheter de musique en MP3 sur Amazon.</p>
+
+ <note style="important">
+ <p>Banshee utilise un code d'affiliation pour toute musique achetée sur Amazon. Toutes les sommes récoltées par le biais de ce code sont reversées à la fondation GNOME.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Achat de MP3 Amazon dans votre navigateur Web</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Achat de MP3 Amazon dans votre navigateur Web</title>
+
+ <p>La musique MP3 achetée sur le site Amazon peut être automatiquement téléchargée et importée dans Banshee. Banshee s'associe au fichier .amz qu'Amazon fournit pour les achats de MP3. Lors de votre achat sur Amazon, votre navigateur Web télécharge le fichier .amz, Banshee l'ouvre automatiquement, télécharge et importe la musique.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Achat de MP3 sur Amazon avec Banshee</title>
+
+ <p>Vous pouvez aussi chercher des titres sur Amazon avec Banshee. Sélectionnez boutique MP3 Amazon dans le volet de gauche. Ceci téléchargera la bibliothèque de la boutique MP3 Amazon comme si vous étiez dans votre navigateur. Une fois identifié dans Amazon, faites votre choix et achetez votre musique d'un seul clic. Banshee se charge de télécharger et d'importer votre musique dans la bibliothèque.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Importation manuelle de MP3 d'Amazon</title>
-
- <p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ <title>Importation manuelle de MP3 d'Amazon</title>
+
+ <p>Quand vous achetez de la musique d'Amazon dans votre navigateur internet, un fichier portant l'extension .amz est téléchargé et enregistré sur votre disque dur. Pour importer cette musique manuellement depuis Amazon, allez dans le menu de Banshee <guiseq><gui>Média</gui><gui>Importer des médias</gui></guiseq> et sélectionnez le fichier *.amz à importer. Banshee ouvre ce fichier et se connecte à Amazon MP3 store pour démarrer le téléchargement.</p>
+
<note style="warning">
<p>Les fichiers .amz d'Amazon ont une durée de vie limitée. Si vous ne téléchargez pas rapidement votre musique, le fichier devient périmé et vous ne pouvez plus obtenir votre musique. Amazon n'indique pas la durée de validité de ses fichiers mais nous vous recommandons de télécharger et d'importer n'importe quel achat sur le site d'Amazon dans l'heure qui suit.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/fr/emusic.page b/help/fr/emusic.page
new file mode 100644
index 0000000..24ef151
--- /dev/null
+++ b/help/fr/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="fr">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importation de musique achetée sur le site eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importation de vos titres eMusic</title>
+
+</page>
diff --git a/help/fr/extensions.page b/help/fr/extensions.page
index 8f4efb3..bbff180 100644
--- a/help/fr/extensions.page
+++ b/help/fr/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="fr">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="fr">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Ajout de nouvelles fonctionnalités à Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Extensions de Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Extensions officielles de Banshee</title>
</info>
+ <title>Gestion des extensions de Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Extensions de la communauté pour Banshee</title>
+ </info>
+ <title>Ajout d'extensions développées par la communauté pour Banshee</title>
</section>
+
</page>
diff --git a/help/fr/import.page b/help/fr/import.page
index 449ca39..df1fb87 100644
--- a/help/fr/import.page
+++ b/help/fr/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Transfert de musiques et vidéos de votre ordinateur vers la bibliothèque de Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Importation de musique et de vidéos</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>Vous pouvez importer de la musique et des vidéos de votre ordinateur vers Banshee. Les fichiers importés s'affichent dans vos ressources et peuvent être modifiés et gérés comme n'importe quel autre média dans Banshee.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>Pour importer des fichiers musicaux ou vidéos sur votre ordinateur, allez dans le menu <guiseq><gui>Média</gui><gui>Importer des médias</gui></guiseq>. Une boîte de dialogue s'affiche avec un certain nombre de choix.</p>
- <note style="tip">
+ <note>
<p>Des greffons additionnels autorisent des choix d'importation supplémentaires. Consultez le lien <link xref="#plugins"/> ci-dessous.</p>
</note>
@@ -53,27 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Vous pouvez importer une nouvelle fois à partir d'un dossier déjà importé sans vous soucier d'éventuels duplicatas dans votre bibliothèque.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Importation d'une liste de lecture</title>
+ <p>Vous pouvez importer de la musique à partir de listes de lecture déjà existantes sur votre ordinateur. La plupart des listes de lecture se terminent par l'extension <em>m3u</em>. Allez dans le menu <guiseq><gui>Média</gui><gui>Importer une liste de lecture</gui></guiseq>, recherchez votre liste parmi vos dossiers, sélectionnez-la et cliquez sur <gui>Importer</gui>.</p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Des greffons ajoutent des choix d'importation additionnels. Voici les ressources supplémentaires disponibles si les greffons adéquats sont activés :</p>
-
+ <title>Sources d'importation additionnelles</title>
+ <p>Des greffons ajoutent des choix d'importation additionnels. Voici les ressources supplémentaires disponibles si les greffons adéquats sont activés :</p>
</section>
-
+
</page>
diff --git a/help/fr/index.page b/help/fr/index.page
index c9229c3..b6d7dd0 100644
--- a/help/fr/index.page
+++ b/help/fr/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Lecteur multimédia Banshee</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Ajout, suppression et lecture</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Gestion et tri</title>
</section>
-
+
<section id="sync" style="2column">
<title>Synchronisation de vos médias avec un lecteur audio numérique</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Ajout de nouvelles fonctionnalités à Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Options avancées et aide</title>
+ <title>Options avancées et aide</title>
</section>
</page>
diff --git a/help/fr/introduction.page b/help/fr/introduction.page
index c5fc6c5..bde9300 100644
--- a/help/fr/introduction.page
+++ b/help/fr/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>Introduction au <app>Lecteur multimédia Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>Premiers pas</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p><app>Banshee</app> est un lecteur multimédia qui lit vos musiques, vidéos ou autres et qui peut se synchroniser avec vos appareils portables pour emporter vos médias avec vous.</p>
<p><app>Banshee</app> possède des fonctions pour importer vos médias, gérer leurs métadonnées et lire vos musiques et vidéos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>Banshee vous aide également à synchroniser vos musiques et vidéos avec la plupart des appareils portables comme les baladeurs numériques et les smartphones. Banshee prend en charge la plupart des lecteurs audio numériques comme beaucoup d'iPods, Sandisk, baladeurs MP3 Creative et téléphones Android.</p>
+<!--
<figure>
- <title>Fenêtre du <gui>Lecteur multimédia Banshee</gui></title>
- <desc><app>Lecteur multimédia Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Interface de la bibliothèque <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/fr/itunes-import.page b/help/fr/itunes-import.page
new file mode 100644
index 0000000..c35672a
--- /dev/null
+++ b/help/fr/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="fr">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importation de la musique et de sa classification à partir du lecteur multimédia <app>iTunes</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importation de votre bibliothèque <app>iTunes</app></title>
+
+</page>
diff --git a/help/fr/keyboard-shortcuts.page b/help/fr/keyboard-shortcuts.page
deleted file mode 100644
index 039f9e0..0000000
--- a/help/fr/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="fr">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Touche</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Lecture ou mise en pause du titre en cours</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Lecture du titre suivant</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Lecture du titre précédent</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Touche</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Déplacement du focus dans la boîte de la recherche</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
- <td><p>Ouverture de la boîte de dialogue d'importation de média</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Listes de lecture</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Touche</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td>
- <td><p>Création d'une nouvelle liste de lecture</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Touche</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Marquage des épisodes sélectionnés comme anciens</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interface</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Touche</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Passage en mode plein écran</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td>
- <td><p>Sélection de tous les titres de la liste de lecture</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Maj</key><key>A</key></keyseq></p>
- </td>
- <td><p>Désélection de tous les titres de la liste de lecture</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>bouton gauche de la souris</key></keyseq>
- </p></td>
- <td><p>Lecture du titre précédent (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>bouton droit de la souris</key></keyseq>
- </p></td>
- <td><p>Lecture du titre suivant (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>bouton central de la souris</key></keyseq>
- </p></td>
- <td><p>Passage du mode lecture au mode pause (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/fr/keyboardshortcuts.page b/help/fr/keyboardshortcuts.page
new file mode 100644
index 0000000..0a99d51
--- /dev/null
+++ b/help/fr/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="fr">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Raccourcis claviers</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Navigation dans Banshee avec les raccourcis clavier</title>
+
+ <section id="playbackcontrol">
+
+ <title>Contrôle de la lecture</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Espace</p></td> <td><p>Lecture ou mise en pause du titre en cours</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Lecture du titre suivant</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Lecture du titre précédent</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Interaction avec la bibliothèque</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Ctrl</key><key>I</key></keyseq></p></td> <td><p>Déplacement du focus dans la boîte de la recherche</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
+ <td><p>Ouverture de la boîte de dialogue d'importation de média</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Listes de lecture</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td> <td><p>Création d'une nouvelle liste de lecture</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Marquage des épisodes sélectionnés comme anciens</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interface</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Passage en mode plein écran</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td> <td><p>Sélection de tous les titres de la liste de lecture</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Maj</key><key>A</key></keyseq></p>
+ </td> <td><p>Désélection de tous les titres de la liste de lecture</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td> <td><p>Masquage de la fenêtre de Banshee (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>bouton gauche de la souris</key></keyseq>
+ </p></td> <td><p>Lecture du titre précédent (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>bouton droit de la souris</key></keyseq>
+ </p></td> <td><p>Lecture du titre suivant (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>bouton central de la souris</key></keyseq>
+ </p></td> <td><p>Passage du mode lecture au mode pause (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/fr/lastfm.page b/help/fr/lastfm.page
index dfc48ec..bd5626b 100644
--- a/help/fr/lastfm.page
+++ b/help/fr/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="fr">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Activation de Last.fm, informations sur les titres et la radio Last.fm.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,67 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>Last.fm est un service en ligne bien connu qui offre des versions gratuites ou payantes. Last.fm propose des informations sur des artistes ou des albums et si vous créez un profil Last.fm, vous pouvez surveiller gratuitement la musique que vous écoutez avec Banshee. Si vous ouvrez un compte payant en tant qu'adhérent, vous pouvez en plus écouter les diffusions musicales Last.fm en continu à partir de plusieurs clients dont Banshee. Last.fm vous propose de nombreux canaux de diffusio [...]
+
<section id="enable-lastfm">
- <title>Activation de Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Activation de Last.fm</title>
+ <p>Pour obtenir le meilleur de Last.fm, il vous faut créer votre profil Last.fm. Suivez ce lien <link href="http://www.last.fm/join">http://www.last.fm/join</link> pour ouvrir un compte ou bien ouvrez le menu de Banshee <guiseq><gui>Édition</gui><gui>Préférences</gui></guiseq>. Une fois dans les préférences, choisissez l'onglet <gui>Spécifique à la source</gui>, cliquez sur le menu déroulant <gui>Source</gui>, sélectionnez <gui>Last.fm</gui> et enfin cliquez sur le lien <em>S'inscrire [...]
+
+ <p>Pour permettre à Banshee de vous renseigner sur les morceaux diffusés sur votre ordinateur par Last.fm, vous devez vous inscrire sur Last.fm dans Banshee dans les préférences <gui>Spécifique à la source</gui>. Saisissez votre nom d'utilisateur et cliquez sur le bouton <gui>Se connecter à Last.fm</gui>. Vous êtes alors dirigé vers une page Web de Last.fm dans votre navigateur pour y autoriser l'accès de Banshee. Cliquez sur le lien <gui>Autoriser l'accès</gui> dans votre navigateur e [...]
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Écoute de la radio web Last.fm</title>
<p>La radio web Last.fm est gratuite pour les résidents des États-Unis, du Royaume-Uni et de l'Allemagne. Les habitants des autres pays doivent acquitter une redevance pour écouter cette radio. Les membres payants de tous pays auront aussi accès à certains privilèges comme écouter les listes de lecture et les radios musicales qu'ils ont aimées ou étiquetées.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+
+ <p>Dans le panneau des sources de Banshee, sur le côté gauche, est apparue une section Last.fm contenant vos stations radio Last.fm. Si vous disposez d'une connexion internet active, vous pouvez choisir une station et Banshee se connecte aux morceaux les plus populaires de celle-ci. Appuyez sur le bouton <gui>Lire</gui> ou sur la touche <key>Espace</key> pour démarrer l'écoute. Pour passer au morceau suivant dans la file d'attente de la radio, appuyez sur le bouton <gui>Suivant</gui> o [...]
+
</section>
-
+
</page>
diff --git a/help/fr/manage-coverart.page b/help/fr/manage-coverart.page
new file mode 100644
index 0000000..1a3b649
--- /dev/null
+++ b/help/fr/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="fr">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Gestion ou modification des pochettes de vos albums.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Pochette</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/fr/manage-playlists.page b/help/fr/manage-playlists.page
index b07ddc3..eb1ff55 100644
--- a/help/fr/manage-playlists.page
+++ b/help/fr/manage-playlists.page
@@ -1,144 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="fr">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="fr">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Création et gestion des listes de lecture.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Listes de lecture</title>
-
+ <title>Listes de lecture</title>
+
<p>Les listes de lecture vous permettent de créer et sauvegarder un ensemble de titres à écouter dans un certain ordre. Elles sont pratiques pour créer une liste de vos chansons favorites ou pour ranger votre bibliothèque en listes plus petites et plus faciles à consulter. Quelques marques de baladeurs acceptent même de lire ces listes de sorte que vous pouvez les emporter avec vous telles quelles.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>Banshee prend en charge les listes de lecture standards, celles où vous ajoutez vous-même vos titres mais aussi les listes de lecture intelligentes. Ces dernières sont générées automatiquement à partir de vos habitudes d'écoute, de vos favoris ou autres.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>Une liste de lecture standard est une suite de morceaux que vous ajoutez et que vous gérez vous-même. Vous pourriez par exemple créer une liste de titres de votre artiste favori en piochant dans différents albums, faire une liste de vos derniers favoris, ou encore créer une liste rythmée pour vous accompagner pendant vos exercices physiques.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>Vous pouvez modifier le classement de la liste en faisant glisser les titres avec la souris d'une ligne à une autre. Le classement ne peut être modifié que si aucune colonne n'a auparavant été triée. Pour annuler le tri dans une colonne, cliquez dans l'en-tête jusqu'à ce que la flèche haute ou basse disparaisse. Réorganisez ensuite la liste.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>Les listes de lecture intelligentes vous permettent de générer rapidement une liste dynamique basée sur un certain nombre de variables pré-déterminées. Vous pouvez très vite créer une liste de lecture basée sur un nom d'artiste, sur vos favoris ou autres.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Listes de lecture standards</title>
+
+ <p>Une liste de lecture standard est une suite de morceaux que vous ajoutez et que vous gérez vous-même. Vous pourriez par exemple créer une liste de titres de votre artiste favori en piochant dans différents albums, faire une liste de vos derniers favoris, ou encore créer une liste rythmée pour vous accompagner pendant vos exercices physiques.</p>
+
+ <p>Pour créer une nouvelle liste de lecture, vous pouvez soit presser la combinaison <keyseq><key>Control</key><key>N</key></keyseq>, soit choisir <guiseq><gui>Média</gui><gui>Nouvelle liste de lecture</gui></guiseq> dans le menu, ou encore sélectionner la ou les pistes que vous voulez ajouter et par un clic droit choisir <guiseq><gui>Ajouter à la liste de lecture</gui><gui>Nouvelle liste de lecture</gui></guiseq> dans le menu contextuel. Vous pouvez aussi faire glisser la ou les pis [...]
+
+ <p>Pour nommer votre liste de lecture, faites un clic droit dessus, choisissez <gui>Renommer</gui> et saisissez le nom que vous souhaitez lui donner.</p>
+
+ <p>Vous pouvez modifier le classement de la liste en faisant glisser les titres avec la souris d'une ligne à une autre. Le classement ne peut être modifié que si aucune colonne n'a auparavant été triée. Pour annuler le tri dans une colonne, cliquez dans l'en-tête jusqu'à ce que la flèche haute ou basse disparaisse. Réorganisez ensuite la liste.</p>
+
+ <p>Pour supprimer un titre de la liste, sélectionnez-le et appuyez sur la touche <key>Suppr</key>, ou faites <guiseq><gui>Édition</gui><gui>Enlever de la liste de lecture</gui></guiseq> dans le menu, ou encore par un clic droit choisissez <gui>Supprimer de la liste</gui> dans le menu contextuel.</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Liste de lecture intelligente</title>
+
+ <p>Les listes de lecture intelligentes vous permettent de générer rapidement une liste dynamique basée sur un certain nombre de variables pré-déterminées. Vous pouvez très vite créer une liste de lecture basée sur un nom d'artiste, sur vos favoris ou autres.</p>
+
+ <p>Pour créer une nouvelle liste de lecture intelligente, allez dans le menu <guiseq><gui>Média</gui><gui>Nouvelle liste de lecture intelligente</gui></guiseq>. Une boîte de dialogue s'affiche pour créer une nouvelle liste de lecture intelligente. Saisissez le nom de la liste et ensuite choisissez les critères sur lesquels elle sera construite. Vos critères peuvent provenir de n'importe quel champ, y compris des métadonnées comme le titre de l'album, le nom de l'artiste ou l'année. U [...]
+
<list>
<item><p>est</p></item>
- <item><p>n'est pas</p></item>
+ <item><p>n'est pas</p></item>
<item><p>moins de</p></item>
- <item><p>plus de</p></item>
+ <item><p>plus de</p></item>
<item><p>au plus</p></item>
- <item><p>au moins</p></item>
+ <item><p>au moins</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>Vous pouvez aussi appuyer sur le bouton <gui>+</gui> pour ajouter une condition supplémentaire à la liste : par exemple, créer une liste de lecture intelligente avec tous les morceaux de 2010 auxquels vous avez attribué une note de cinq étoiles. Pour générer cette liste, il faut saisir :</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Année</gui></p></td>
- <td><p><gui>est</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Année</gui></p></td> <td><p><gui>est</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Classement</gui></p></td>
- <td><p><gui>est</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Classement</gui></p></td> <td><p><gui>est</gui></p></td>
+ <td><p><gui/>5 étoiles</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>L'option supplémentaire <gui>Limiter à</gui> vous permet de choisir le nombre maximum de titres que vous voulez y mettre en cochant cette case.</p>
+
+ <p>Dans Banshee, vous avez aussi des listes de lectures intelligentes prédéfinies. Sélectionnez-en une et appuyez sur le bouton <gui>Ouvrir dans l'éditeur</gui> pour visionner comment elle se présente ou pour la modifier à votre goût. Quand vous cliquez sur le bouton <gui>Créer et enregistrer</gui> la liste est automatiquement générée et sauvegardée. Voici les liste disponibles :</p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Favoris (morceaux notés quatre ou cinq étoiles)</p>
- </item>
- <item>
- <p>Favoris récents (morceaux fréquemment écoutés cette semaine)</p>
- </item>
- <item>
- <p>Récemment ajoutés (morceaux importés cette semaine)</p>
- </item>
- <item>
- <p>Non écoutés (morceaux non écoutés ou ignorés)</p>
- </item>
- <item>
- <p>Favoris négligés (favoris non écoutés pendant les deux derniers mois)</p>
- </item>
- <item>
- <p>700 Mio de favoris (un CD de données rempli de vos morceaux préférés)</p>
- </item>
- <item>
- <p>80 minutes de favoris (un CD audio rempli de vos morceaux préférés)</p>
- </item>
- <item>
- <p>Non notés (morceaux qui n'ont pas été notés)</p>
- </item>
+ <title>Listes de lecture intelligentes Banshee</title>
+ <item><p>Favoris (morceaux notés quatre ou cinq étoiles)</p></item>
+ <item><p>Favoris récents (morceaux fréquemment écoutés cette semaine)</p></item>
+ <item><p>Récemment ajoutés (morceaux importés cette semaine)</p></item>
+ <item><p>Non écoutés (morceaux non écoutés ou ignorés)</p></item>
+ <item><p>Favoris négligés (favoris non écoutés pendant les deux derniers mois)</p></item>
+ <item><p>700 Mio de favoris (un CD de données rempli de vos morceaux préférés)</p></item>
+ <item><p>80 minutes de favoris (un CD audio rempli de vos morceaux préférés)</p></item>
+ <item><p>Non notés (morceaux qui n'ont pas été notés)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/fr/manage-tags.page b/help/fr/manage-tags.page
index 74f3965..5ae45fc 100644
--- a/help/fr/manage-tags.page
+++ b/help/fr/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="fr">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="fr">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Édition et modification des étiquettes et métadonnées d'un fichier musical.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,49 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Métadonnées d'un fichier musical</title>
+
+ <section id="metadata">
+
+ <title>Les métadonnées d'un fichier musical</title>
+
+ <p>La musique numérique contient des métadonnées qui stockent des informations dans le fichier musical comme le nom de l'artiste, le titre de l'album, l'année d'enregistrement, le genre musical et davantage encore. Pratiquement toute musique achetée par le biais d'Internet possède ces métadonnées déjà présentes dans le fichier et si vous importez de la musique à partir d'un CD, Banshee se charge d'y inclure les métadonnées qui s'y trouvent pendant l'extraction du CD. Pour de plus ampl [...]
+
+ <p>Les formats les plus usuels de métadonnées sont ID3v1 et ID3v2 pour les fichiers MP3 et les commentaires Vorbis pour les fichiers OGG Vorbis.</p>
+
+ <p>Si vous importez des titres qui ne contiennent pas de métadonnées, Banshee affiche <gui>Unconnu</gui> dans la plupart des champs de la bibliothèque.</p>
+
+ </section>
- <title>Les métadonnées d'un fichier musical</title>
-
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Les formats les plus usuels de métadonnées sont ID3v1 et ID3v2 pour les fichiers MP3 et les commentaires Vorbis pour les fichiers OGG Vorbis.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
-
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>La boîte de dialogue qui apparaît, affiche les métadonnées du titre et vous permet de les modifier ou de les mettre à jour. Les champs affichés par défaut sont :</p>
-
- <list>
- <item><p><gui>Titre du morceau</gui></p></item>
- <item><p><gui>Artiste du morceau</gui></p></item>
- <item><p><gui>Titre de l'album</gui></p></item>
- <item><p><gui>Genre</gui></p></item>
- <item><p><gui>Numéro de piste</gui></p></item>
- <item><p><gui>Numéro du disque</gui></p></item>
- <item><p><gui>Année</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
-
+ <section id="editmetadata">
+
+ <title>Correction de vos métadonnées</title>
+
+ <p>Vous pouvez corriger ou modifier les métadonnées de vos chansons. Sélectionnez le ou les titres que vous souhaitez mettre à jour et appuyez sur la touche <key>E</key> ou choisissez dans le menu <guiseq><gui>Édition</gui><gui>Modifier les informations du morceaux</gui></guiseq> ou encore faites un clic droit sur le titre et choisissez <gui>Modifier les informations du morceau</gui> dans le menu contextuel.</p>
+
+ <p>La boîte de dialogue qui apparaît, affiche les métadonnées du titre et vous permet de les modifier ou de les mettre à jour. Les champs affichés par défaut sont :</p>
+
+ <list>
+ <item><p><gui>Titre du morceau</gui></p></item>
+ <item><p><gui>Artiste du morceau</gui></p></item>
+ <item><p><gui>Titre de l'album</gui></p></item>
+ <item><p><gui>Genre</gui></p></item>
+ <item><p><gui>Numéro de piste</gui></p></item>
+ <item><p><gui>Numéro du disque</gui></p></item>
+ <item><p><gui>Année</gui></p></item>
+ </list>
+
+ <p>Mettez à jour les informations du morceau. Si vous avez sélectionné plusieurs titres à modifier, appuyez sur la flèche à droite du champ <gui>Titre du morceau</gui> ou appuyez sur le bouton <gui>Suivant</gui> au bas de la boîte de dialogue pour passer au suivant. Quand vous avez terminé de corriger toutes vos métadonnées, n'oubliez pas d'appuyer sur le bouton <gui>Enregistrer</gui>.</p>
+
</section>
</page>
diff --git a/help/fr/play-queue.page b/help/fr/play-queue.page
index 18c4b66..cf9c7f7 100644
--- a/help/fr/play-queue.page
+++ b/help/fr/play-queue.page
@@ -1,96 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="fr">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="fr">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Ajout de média à votre file d'attente de lecture.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
+ <title>File d'attente de lecture</title>
+
+ <p>La <gui>file d'attente de lecture</gui> vous permet d'ajouter des morceaux à lire dans un ordre séquentiel. Vous pouvez y ajouter beaucoup de pistes pour écouter des heures de musique sans interruption. Vous pouvez y ajouter des pistes seules ou des albums entiers et les trier ou les réorganiser.</p>
+
+<section id="addqueue">
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
+ <title>Ajout de musique à la file d'attente de lecture</title>
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
+ <p>Sélectionnez dans votre bibliothèque les pistes ou les albums à ajouter à la file d'attente de lecture.</p>
+
+ <p>Pour ajouter un album entier avec la souris, sélectionnez-le et glissez-le dans la <gui>File d'attente de lecture</gui> du volet de gauche.</p>
+
+ <p>Vous pouvez ajouter des morceaux à la file d'attente de lecture un à un ou par paquets. Pour ajouter un titre, faites un glisser-déposer avec la souris dans la <gui>File d'attente de lecture</gui> du volet de gauche ou faites un clic droit et choisissez <gui>Ajouter à la file d'attente de lecture</gui> dans le menu contextuel.</p>
+
+ <p>Vous pouvez ajouter plusieurs pistes en les sélectionnant une à une avec la souris tout en maintenant la touche <key>Ctrl</key> enfoncée, ou ajouter un intervalle de pistes en appuyant sur la touche <key>Maj</key> et en cliquant une deuxième fois pour sélectionner cet ensemble. Faites alors un glisser-déposer de la sélection avec la souris dans la <gui>File d'attente de lecture</gui> du volet de gauche ou faites un clic droit et choisissez <gui>Ajouter à la file d'attente de lecture [...]
+
+</section>
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
+<section id="reorderqueue">
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
+ <title>Organisation de votre file d'attente de lecture</title>
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+ <p>Votre file d'attente de lecture est classée dans l'ordre d'ajout des morceaux. Les premiers titres ou albums ajoutés à la liste sont les premiers lus. Vous pouvez modifier ce classement avec la souris en faisant un glisser-déposer d'un titre ou d'un ensemble de titres à l'intérieur de cette liste. Sélectionnez-le ou les titres que vous souhaitez déplacer et glissez-les avec la souris à la place ou au numéro de ligne choisi, puis relâchez la souris.</p>
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>Suppression de titres de la file d'attente de lecture</title>
+ <p>Vous pouvez supprimer une piste, un ensemble de pistes ou vider entièrement la file d'attente de lecture.</p>
+
+ <p>Pour supprimer une piste précise ou un ensemble de pistes de la liste, sélectionnez-les avec la souris, puis appuyez sur la touche <key>Suppr</key>.</p>
+
+ <p>Pour vider entièrement la file d'attente de lecture, appuyez sur le bouton <gui>Effacer</gui> dans le coin supérieur droite de la fenêtre.</p>
+
+</section>
+
</page>
diff --git a/help/fr/play.page b/help/fr/play.page
index 904c557..eb5c9de 100644
--- a/help/fr/play.page
+++ b/help/fr/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Lecture de vos vidéos et de vos fichiers musicaux.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Lecture de votre musique</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>Lecture d'une vidéo</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+
+ <title>Lecture de vos médias</title>
+
+ <section id="playmusic">
+ <title>Lecture de votre musique</title>
+
+ <p>Pour écouter de la musique avec Banshee, choisissez la ressource Musique. La bibliothèque musicale affiche tous les artistes qu'elle contient, la pochette de chaque album et la liste de toutes les chansons qu'elle contient.</p>
+
+ <p>Choisissez dans la liste d'artistes ou d'albums la chanson ou l'album que vous souhaitez écouter, ou faites une recherche dans le champ en haut à droite de Banshee.</p>
+
+ <p>Pour démarrer l'écoute d'une chanson, faites un double-clic sur son titre, appuyez sur la touche <key>Espace</key>, ou encore choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ <p>Vous pouvez aussi démarrer l'écoute d'un album en le sélectionnant dans l'explorateur et en double-cliquant sur le titre voulu ou en appuyant sur la touche <key>Espace</key>, ou encore en choisissant <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ <p>Pour écouter tous les titres d'un seul artiste, sélectionnez l'artiste dans le navigateur et appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ <p>Banshee affiche aussi vos albums favoris (ceux que vous écoutez le plus souvent), vos favoris récents, ceux non écoutés et ceux récemment ajoutés. Sélectionnez celui que vous voulez écouter et lisez les chansons de chacun d'eux.</p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>Lecture d'une vidéo</title>
+
+ <p>Vos vidéos importées sont listées dans l'ordre alphabétique. Pour en lancer une, sélectionnez-la dans la liste et appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ <p>Banshee affiche aussi vos vidéos favorites (celles que vous regardez le plus souvent) et celles non regardées. Choisissez une catégorie et vous pourrez lancer une vidéo de la liste.</p>
+
</section>
-
- <section id="play-radio">
- <title>Écoute d'une station de radio internet</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>Lecture d'un podcast</title>
+
+ <p>La ressource Podcasts affiche tous les podcasts auxquels vous êtes abonné, tous les podcasts disponibles et l'explorateur affiche la liste de tous les podcasts avec les plus récents en tête.</p>
+
+ <p>Pour lire un podcast, sélectionnez-le dans la liste et appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>Écoute d'une station de radio internet</title>
+
+ <p>La ressource Radio affiche dans l'ordre alphabétique toutes les stations radio internet que vous avez ajoutées à Banshee.</p>
+
+ <p>Pour écouter une station de radio internet, sélectionnez-la dans la liste et appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ </section>
+
</page>
diff --git a/help/fr/podcast.page b/help/fr/podcast.page
deleted file mode 100644
index 013569d..0000000
--- a/help/fr/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="fr">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/fr/radio.page b/help/fr/radio.page
deleted file mode 100644
index 3406977..0000000
--- a/help/fr/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="fr">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/fr/rb-import.page b/help/fr/rb-import.page
new file mode 100644
index 0000000..a80cb61
--- /dev/null
+++ b/help/fr/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="fr">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importation de la musique et de sa classification à partir du lecteur multimédia <app>Rhythmbox</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importation de votre bibliothèque <app>Rhythmbox</app></title>
+
+</page>
diff --git a/help/fr/search.page b/help/fr/search.page
index d5bcbd5..ec9b9d1 100644
--- a/help/fr/search.page
+++ b/help/fr/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,90 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Recherche dans votre bibliothèque Banshee</title>
+
+ <p>Banshee est doté d'un langage de recherche performant. Vous pouvez soit initier une recherche rapide et facile à partir de mots-clés simples, soit lancer une recherche approfondie avec la terminologie avancée de Banshee.</p>
+
+ <p>Pour effectuer une recherche de médias avec Banshee, appuyez sur la touche <key>S</key> ou cliquez dans la case <gui>Rechercher</gui> dans le coin supérieur droite de l'affichage de la bibliothèque.</p>
+
+ <p>Une recherche repose sur quelques mots-clés, par exemple <em>dave matthews</em>. En saisissant <em>dave matthews</em> dans le champ Rechercher, Banshee consulte toutes les métadonnées présentes comme le titre de la piste, le titre de l'album, le nom de l'artiste, l'année, etc. Chaque titre contenant les métadonnées <em>dave</em> et <em>matthews</em> est affiché. Les termes de recherche ne sont pas sensibles à la casse, et il est donc inutile de mettre des majuscules. Les termes <em> [...]
+
+<section id="operators">
+ <title>Opérateurs de base</title>
+ <p>Des opérateurs peuvent être placés entre deux mots-clés ou devant un mot-clé. L'opérateur par défaut est <gui>AND</gui> (ET) et est utilisé quand il n'y en a pas d'autre opérateur entre deux mots. Comme c'est l'opérateur par défaut, il n'y a pas d'opérateur AND explicit.</p>
+
<p>Les autres opérateurs de base sont <gui>OR</gui> et <gui>NOT</gui>. Utilisées conjointement, ces trois opérations permettent de faire des recherches très performantes pour vous aider à faire des recherches dans vos médias.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Opérateurs logiques et exemples</title>
<p>Voici une liste d'opérateurs logiques et des exemples de résultats de recherches effectués avec eux.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Opérateur</gui></p></td>
- <td><p><gui>Description</gui></p></td>
+ <td><p><gui>Opérateur</gui></p></td> <td><p><gui>Description</gui></p></td>
</tr>
<tr>
- <td><p><em>par défaut</em>, <em>espace</em></p></td>
- <td><p>Recherche les deux mots séparés par un espace entre les deux.</p></td>
+ <td><p><em>par défaut</em>, <em>espace</em></p></td> <td><p>Recherche les deux mots séparés par un espace entre les deux.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Les résultats de la recherche sont deux chansons avec l'un ou l'autre résultat dans n'importe quel champ.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Les résultats de la recherche sont deux chansons avec l'un ou l'autre résultat dans n'importe quel champ.</p></td>
</tr>
<tr>
- <td><p>NOT, not, <key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not, <key>-</key></p></td> <td><p>Ne pas afficher de résultats de recherche contenant un des termes de recherche qui suit NOT, not, <key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Voici des exemples d'opérations logiques :</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Recherche</gui></p></td>
- <td><p><gui>Description</gui></p></td>
+ <td><p><gui>Recherche</gui></p></td> <td><p><gui>Description</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Correspond à n'importe quel champ d'une piste contenant à la fois <em>dave</em> et <em>matthews</em>.</p></td>
+ <td><p>dave matthews</p></td> <td><p>Correspond à n'importe quel champ d'une piste contenant à la fois <em>dave</em> et <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
+ <td><p>dave, matthews</p></td> <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave or matthews</p></td> <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave | matthews</p></td> <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Affiche toutes les pistes dont les champs ne contiennent pas <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>Affiche toutes les pistes dont les champs ne contiennent pas <em>dave matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Pour de plus amples informations sur la façon d'effectuer des recherches plus complexes, consultez la page <link xref="adv-search"/>.</p>
+
</section>
-
+
</page>
diff --git a/help/fr/sort.page b/help/fr/sort.page
index 06ce35e..1859c73 100644
--- a/help/fr/sort.page
+++ b/help/fr/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Ajout de colonnes</title>
+
<p>Au fur et à mesure que votre bibliothèque s'étoffe, vous pourriez être amené à modifier la vue de la bibliothèque pour ajouter des informations supplémentaires sur les chansons de votre bibliothèque ou modifier la façon de retrouver ou visionner certains titres, artistes ou albums.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>Vous pouvez ajouter des colonnes à l'affichage standard de la bibliothèque <app>Banshee</app> pour avoir plus d'informations disponibles sur les titres et aussi pouvoir effectuer un tri sélectif. Par défaut, Banshee affiche pour les morceaux les colonnes <gui>Nom</gui>, <gui>Artiste</gui>, <gui>Album</gui> et <gui>Durée</gui>. Pour ajouter d'autres colonnes, faites un clic droit sur l'en-tête de l'une d'entre elles et Banshee affiche les autres colonnes disponibles que vous pouvez s [...]
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Tri par colonnes</title>
+ <p>Vous pouvez trier votre bibliothèque d'un clic de souris sur n'importe quelle colonne affichée. Si vous souhaitez trier votre musique par artiste, cliquez sur l'en-tête de la colonne <gui>Artiste</gui> et Banshee trie automatiquement cette colonne par ordre alphabétique. Un second clic sur la même colonne affiche un tri alphabétique inverse.</p>
</section>
-
+
</page>
diff --git a/help/fr/sync.page b/help/fr/sync.page
index 384863f..e8320dc 100644
--- a/help/fr/sync.page
+++ b/help/fr/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Synchronisation de votre média avec un lecteur multimédia portable ou un smartphone.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Synchronisation</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Synchronisation</title>
+
+ <p>Banshee prend en charge la synchronisation de votre musique avec des lecteurs multimédia portables et des smartphones. Vous pouvez soit y ajouter certaines pistes, albums ou listes de lectures, soit autoriser Banshee à synchroniser votre baladeur avec toute votre bibliothèque. Après avoir connecté votre baladeur à votre ordinateur, vous pouvez aussi écouter les morceaux qui y sont stockés. Lorsque vous synchronisez de la musique dans un format sans pertes comme FLAC, Banshee compres [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Compatibilité matérielle</title>
+ <p>Banshee est compatible avec la plupart des lecteurs multimédia portables et smartphones modernes à l'exception notable des iPhone, iPad et iPodTouch Apple.</p>
+
+ <p>Quand vous branchez votre matériel, Banshee affiche son icône dans la partie gauche du menu. Cliquez sur cette icône pour ouvrir la page d'accueil de ce matériel dans Banshee et afficher vos préférences de synchronisation.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>la musique</p></item>
- <item><p>les livres audio</p></item>
- <item><p>les vidéos</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>À partir du menu déroulant de chacun des médias, choisissez entre :</p>
-
- <list>
- <item><p>gérer manuellement</p></item>
- <item><p>synchroniser toute la bibliothèque</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Synchronisation de votre musique</title>
+ <p>Vous avez le choix entre laisser Banshee synchroniser automatiquement votre musique, ou le faire manuellement.</p>
+
+ <p>Choisissez votre matériel dans le menu de Banshee et ensuite la façon de synchroniser vos média, parmi :</p>
+ <list>
+ <item><p>la musique</p></item>
+ <item><p>les livres audio</p></item>
+ <item><p>les vidéos</p></item>
+ <item><p>les podcasts</p></item>
+ </list>
+
+ <p>À partir du menu déroulant de chacun des médias, choisissez entre :</p>
+ <list>
+ <item><p>gérer manuellement</p></item>
+ <item><p>synchroniser toute la bibliothèque</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Si vous décidez de synchroniser automatiquement toute votre bibliothèque avec votre baladeur, assurez vous au préalable que celui-ci dispose de suffisamment de mémoire. Au cas où votre bibliothèque serait plus grande que l'espace mémoire disponible de votre lecteur, Banshee le synchronise jusqu'à ce qu'il soit plein puis s'arrête.</p>
+ </note>
+
+ <p>Si vous avez créé des listes de lectures simples ou intelligentes dans votre bibliothèque musicale, elles sont aussi affichées comme options de synchronisation musicale. Ceci est très pratique lorsque vous créez des listes de lecture intelligentes car celles-ci se mettent automatiquement à jour, au fur et à mesure de vos ajouts, en fonction des règles de la liste de lecture. Banshee synchronise la nouvelle liste avec votre lecteur à chaque branchement.</p>
+
+ <p>Banshee affiche la totalité du contenu de la mémoire de votre baladeur sous forme d'un graphique situé au bas au centre. Ce graphique montre combien d'espace est actuellement utilisé respectivement par les fichiers audio, vidéo et le reste, ainsi que l'espace encore disponible. Juste en-dessous, Banshee vous indique le nombre total d'éléments actuellement stockés sur votre lecteur, le nombre de jours ou d'heures d'écoute que cela représente, ainsi que l'espace mémoire total utilisé.</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Synchronisation de toute votre bibliothèque</title>
+ <p>Avec Banshee, vous pouvez utiliser le glisser/copier vers votre baladeur. Sélectionnez le ou les fichiers que vous voulez copier sur votre baladeur et glissez-les avec la souris sur l'icône de votre lecteur de médias.</p>
+
+ <p>Si votre bibliothèque est encodée sous un format non compatible avec votre baladeur comme OGG ou FLAC et si vous avez installé les codecs adéquats, Banshee fait automatiquement la conversion en MP3 pendant le transfert de vos fichiers vers votre baladeur. Vérifiez la disponibilité des codecs nécessaires pour votre distribution, étant donné que ceci est en-dehors du contexte de ce guide et que cela dépend de la distribution utilisée.</p>
+
+ <note style="tip">
+ <p>Vous pourriez être amené à retirer le volume pour transférer correctement des fichiers sur votre baladeur. Pour retirer le volume dans Banshee avec la souris, faites un clic droit sur son icône et choisissez <gui>Déconnecter</gui> dans le menu contextuel.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Diffusion de musique à partir de votre baladeur</title>
+ <p>Vous pouvez directement diffuser de la musique stockée sur votre baladeur avec Banshee. Cliquez sur votre baladeur dans le volet gauche de Banshee et le contenu de celui-ci s'affiche. Vous pouvez alors diffuser ce contenu comme vous le feriez à partir de votre propre bibliothèque.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>La suppression de fichiers de votre baladeur est un acte irréversible et vous ne pourrez plus les récupérer.</p>
- </note>
-
+ <title>Suppression de pistes de votre baladeur</title>
+ <p>Pour supprimer des morceaux de votre baladeur, cliquez sur celui-ci pour afficher son contenu, sélectionnez les pistes à supprimer, faites un clic droit et choisissez <gui>Supprimer</gui>, ou à partir du menu, choisissez l'élément de menu <guiseq><gui>Édition</gui><gui>Supprimer</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>La suppression de fichiers de votre baladeur est un acte irréversible et vous ne pourrez plus les récupérer.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/fr/ui.page b/help/fr/ui.page
index fb32717..1486bb9 100644
--- a/help/fr/ui.page
+++ b/help/fr/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>Un aperçu de l'interface utilisateur de <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Introduction à l'interface utilisateur de Banshee</title>
<figure>
<title>Fenêtre du <gui>Lecteur multimédia Banshee</gui></title>
<desc><app>Lecteur multimédia Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Interface de la bibliothèque <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Ressources</title>
+ <p>Vos ressources musicales et vidéos apparaissent à gauche dans Banshee. Ces ressources permettent un accès rapide à vos files d'attente de lecture, musiques, vidéos, Amazon, Last.fm, podcasts et davantage encore.</p>
+
+ <note style="tip">
+ <p>Les options du menu sont différentes selon le choix de votre ressource. Par exemple, pour accéder au menu d'importation de podcast, vous devez sélectionner la ressource Podcast. Si vous êtes déjà en train de parcourir vos bibliothèques de vidéo ou de musique, cette option du menu est inaccessible.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>L'explorateur de bibliothèque</title>
+ <p>En sélectionnant une ressource de musique ou de vidéo parmi vos ressources, Banshee affiche le contenu correspondant dans l'explorateur de bibliothèque. En fonction du choix de la ressource, Banshee peut afficher vos bibliothèques musicales ou vidéos, vos abonnements à des podcasts et même la boutique de musique Amazon pour vous permettre d'acheter de la musique.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Affichage en mode Lecture en cours</title>
+ <p>Pratique lorsque vous utilisez Banshee en mode plein écran, le mode Lecture en cours masque la bibliothèque afin de vous offrir une vue optimale de la musique ou de la vidéo que vous regardez. Si vous écoutez de la musique, le mode Lecture en cours affiche le nom de l'artiste, de l'album et le graphisme de la pochette si disponible. Si vous regardez une vidéo, Banshee diffuse la vidéo.</p>
+
+ <p>Pour passer du mode Lecture en cours au mode plein écran et cacher l'interface utilisateur de Banshee, vous pouvez appuyer sur la touche <key>F</key>, cliquer sur le bouton <gui>Plein écran</gui> dans le coin supérieur droit ou sélectionner le menu <guiseq><gui>Affichage</gui><gui>Plein écran</gui></guiseq></p>
+
+</section>
+
+<section id="library">
+ <title>La bibliothèque</title>
+ <p>L'affichage de la bibliothèque dans Banshee est fonction de la ressource que vous avez sélectionnée. La bibliothèque musicale affiche les pochettes, les artistes et la liste des chansons disponibles. La bibliothèque des podcasts affiche vos abonnements en cours, les podcasts téléchargés ou non et tous les nouveaux ou anciens podcasts. Veuillez consulter chaque page d'aide correspondant à chacune des ressources possibles pour de plus amples informations sur chacune d'elle.</p>
+</section>
- <section id="context">
- <title>Ressources</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/gl/add-podcast.page b/help/gl/add-podcast.page
new file mode 100644
index 0000000..b9846ba
--- /dev/null
+++ b/help/gl/add-podcast.page
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="gl">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play podcasts in Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>What is a Podcast?</title>
+
+ <p>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.</p>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Add a Podcast</title>
+
+ <p>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 <gui>Copy link</gui>.
+ </p>
+
+ <p>In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the
+ upper right hand corner, from the menu choose <guiseq><gui>Media</gui><gui>
+ Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut <keyseq>
+ <key>Shift</key><key>Control</key><key>F</key></keyseq>.
+ </p>
+
+ <p>Banshee will then allow you to choose how you want to download new podcasts
+ from a drop down menu. Your choices include:</p>
+
+ <list>
+ <item><p>Download the Most Recent Episode (This will automatically
+ download the last episode that was released).</p></item>
+ <item><p>Download All Episodes (This will download all episodes).</p></item>
+ <item><p>Let Me Decide Which Episodes to Download (This will allow you
+ to choose which episodes you would like to download).</p></item>
+ </list>
+
+ <p>After you have added a Podcast feed, Banshee will display:</p>
+
+ <list>
+ <item><p><gui>Name</gui>: (Name of the specific episode)</p></item>
+ <item><p><gui>Podcast</gui>: (Name of the Podcast)</p></item>
+ <item><p><gui>Published</gui> (Date the episode was published or released)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/gl/add-radio.page b/help/gl/add-radio.page
new file mode 100644
index 0000000..c4f4cd5
--- /dev/null
+++ b/help/gl/add-radio.page
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="gl">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play internet radio stations in Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Radio en Internet</title>
+
+ <section id="radiodescription">
+ <title>What is Internet Radio?</title>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Add Radio Station</title>
+
+ <p>To add an internet radio station to Banshee, press <gui>Add Station</gui>
+ in the upper right hand corner of Banshee or, from the menu, choose <guiseq>
+ <gui>Media</gui><gui>Add Station</gui></guiseq>.
+ </p>
+
+ <p>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 <gui>Copy Link</gui>.
+ </p>
+
+
+ <p>Banshee will prompt you to enter the <gui>Station Genre</gui>.
+ Choose the kind of music the internet radio station plays from the available
+ drop down selections. You will then need to enter the <gui>Station Name</gui>.
+ Enter a name for the radio station. Then press tab or use your mouse to select
+ the <gui>Stream URL</gui> field to paste the URL of the radio station.
+ Using your mouse right click and choose <gui>Paste</gui> or press <keyseq>
+ <key>Control</key><key>V</key></keyseq>.</p>
+
+ <p>You can optionally also fill out the fields for
+ <gui>Station Creator</gui>, <gui>Description</gui>, and <gui>Rating</gui>.
+ </p>
+
+ <p>Then press <gui>Save</gui> to save the internet radio station in Banshee.
+ </p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/gl/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/gl/advanced.page
index 468ad23..c08d7ab 100644
--- a/help/zh_CN/extensions.page
+++ b/help/gl/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="gl">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Get help for advanced actions.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Advanced Options and Help</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Keyboard Shortcuts</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Keyboard Shortcuts</title>
</section>
-
+
</page>
diff --git a/help/gl/amazon.page b/help/gl/amazon.page
index b16102e..7e9c9a0 100644
--- a/help/gl/amazon.page
+++ b/help/gl/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Sync and purchase music from the Amazon MP3 Store.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,63 +19,63 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Tenda de MP3 de Amazon</title>
+
+ <p>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.
+ </p>
+
+ <note style="important">
+ <p>Banshee uses an Amazon affiliate code for all music purchases. All
+ money made via this affiliate code is donated to the GNOME Foundation.
+ </p>
+ </note>
+
<section id="amazon-browser">
- <title>Purchase Amazon MP3s in your web browser</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Purchase Amazon MP3s in your web browser</title>
+
+ <p>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.
+ </p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Buy Amazon MP3s in Banshee</title>
+
+ <p>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.
+ </p>
</section>
-
+
<section id="amazon-manual">
- <title>Import Amazon MP3s manually</title>
-
+ <title>Import Amazon MP3s manually</title>
+
<p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ extension .amz is downloaded and saved to your hard drive. To import
+ music purchased manually from Amazon, in Banshee choose
+ <guiseq><gui>Media</gui> <gui>Import Media</gui></guiseq> 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.
+ </p>
+
<note style="warning">
- <p>Amazon .amz files are only active for a short time. If you do not
+ <p>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.</p>
+ 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.
+ </p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/gl/emusic.page b/help/gl/emusic.page
new file mode 100644
index 0000000..0da93a6
--- /dev/null
+++ b/help/gl/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="gl">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music purchased from eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your eMusic tracks</title>
+
+</page>
diff --git a/help/gl/extensions.page b/help/gl/extensions.page
index f9c5981..7531a79 100644
--- a/help/gl/extensions.page
+++ b/help/gl/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="gl">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="gl">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Add additional functionality to Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Banshee Extensions</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Official Banshee Extensions</title>
</info>
+ <title>Manage extensions for Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Community Banshee Extensions</title>
+ </info>
+ <title>Add community built extensions for Banshee</title>
</section>
+
</page>
diff --git a/help/gl/import.page b/help/gl/import.page
index f710983..a9fdb62 100644
--- a/help/gl/import.page
+++ b/help/gl/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Add music and videos from your computer to your Banshee library.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,19 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Import music & videos</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>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.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>To import music or video files on your computer, choose <guiseq><gui>Media</gui>
+ <gui>Import Media</gui></guiseq>. A dialog will appear with a number of choices.</p>
- <note style="tip">
+ <note>
<p>Plugins may add additional import choices. See <link xref="#plugins"/>
below.</p>
</note>
@@ -62,29 +58,25 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>You can safely import from a folder you have already imported
from without worrying about duplicate entries in your library.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Import from a Playlist</title>
+ <p>You can also import music from playlists. Most playlist files end
+ in <em>m3u</em>. To import from a playlist, from the Banshee menu
+ choose <guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and
+ locate the playlist file in your folder, select it and press
+ <gui>Import</gui>.
+ </p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Plugins may add additional import choices. The following additional
- sources will be available if the appropriate plugins are enabled:</p>
-
+ <title>Additional Import Sources</title>
+ <p>Plugins may add additional import choices. The following additional
+ sources will be available if the appropriate plugins are enabled:</p>
</section>
-
+
</page>
diff --git a/help/gl/index.page b/help/gl/index.page
index c8275ab..7b58c11 100644
--- a/help/gl/index.page
+++ b/help/gl/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Reprodutor de música Banshee</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Add, Remove & Play</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Manage & Sort</title>
</section>
-
+
<section id="sync" style="2column">
<title>Sync your media with a portable music player</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Add additional functionality to Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Advanced options and help</title>
+ <title>Advanced options and help</title>
</section>
</page>
diff --git a/help/gl/introduction.page b/help/gl/introduction.page
index e5d4e9b..c72581e 100644
--- a/help/gl/introduction.page
+++ b/help/gl/introduction.page
@@ -4,15 +4,13 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>
+ Introduction to the <app>Banshee Media Player</app>.
+ </desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,24 +22,28 @@
<title>Introduction</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
- <p><app>Banshee</app> includes features to import your media, manage its
- metadata, and play your music and videos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>
+ <app>Banshee</app> 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.
+ </p>
+ <p>
+ <app>Banshee</app> includes features to import your media, manage its
+ metadata, and play your music and videos.
+ </p>
+ <p>
+ 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.
+ </p>
+<!--
<figure>
<title><gui>Banshee Media Player</gui> window</title>
- <desc><app>Reprodutor de música Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/gl/itunes-import.page b/help/gl/itunes-import.page
new file mode 100644
index 0000000..d1352d7
--- /dev/null
+++ b/help/gl/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="gl">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>iTunes</app> media player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>iTunes</app> library</title>
+
+</page>
diff --git a/help/gl/keyboard-shortcuts.page b/help/gl/keyboard-shortcuts.page
deleted file mode 100644
index eb482fa..0000000
--- a/help/gl/keyboard-shortcuts.page
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="gl">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Play or Pause the current song</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Play the next song</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Play the previous song</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Move the focus to the search box</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Open import media dialog</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Listas de reprodución</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Create New Playlist</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Mark the selected episodes as old</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interface</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Toggle full-screen mode</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Select all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Unselect all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Previous Song (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Next Song (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
- </p></td>
- <td><p>Toggle Play / Pause (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/gl/keyboardshortcuts.page b/help/gl/keyboardshortcuts.page
new file mode 100644
index 0000000..8dc1d20
--- /dev/null
+++ b/help/gl/keyboardshortcuts.page
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="gl">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Keyboard Shortcuts</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Control Banshee using Keyboard Shortcuts</title>
+
+ <section id="playbackcontrol">
+
+ <title>Playback Control</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Space Bar</p></td> <td><p>Play or Pause the current song</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Play the next song</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Play the previous song</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Library Interaction</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>
+ Move the focus to the search box</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Open import media dialog</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Listas de reprodución</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>
+ Create New Playlist</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>
+ Mark the selected episodes as old</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interface</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>
+ Toggle full-screen mode</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>
+ Select all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>
+ Unselect all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>
+ Hide Banshee Window (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Play Previous Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Play Next Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Toggle Play / Pause (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/gl/lastfm.page b/help/gl/lastfm.page
index 4f8241b..662adf9 100644
--- a/help/gl/lastfm.page
+++ b/help/gl/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="gl">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Enable Last.fm, song reporting and Last.fm radio.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,111 +19,102 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
+ <title>Last.fm</title>
+
<p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ 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.</p>
+
<section id="enable-lastfm">
- <title>Enable Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Enable Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>To enable Banshee to report the songs you play on your computer to Last.fm,
+ sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences.
+ Enter your username and press the <gui>Log in to Last.fm</gui> button. You
+ will be directed to a Last.fm webpage in your browser to grant Banshee access.
+ Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</gui> button
+ to complete the process.
+ </p>
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Listen to Last.fm Radio</title>
<p>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.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+ 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.
+ </p>
+
+ <p>In Banshee's sources pane 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 <gui>Play</gui> button
+ in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio
+ station. You can also press the <gui>Next</gui> button in Banshee,
+ <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq>
+ to play the next song in your radio station queue.
+ </p>
+
</section>
-
+
</page>
diff --git a/help/gl/manage-coverart.page b/help/gl/manage-coverart.page
new file mode 100644
index 0000000..9b41c2d
--- /dev/null
+++ b/help/gl/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="gl">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Manage or change your albums cover art.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Cover art</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/gl/manage-playlists.page b/help/gl/manage-playlists.page
index a3e5d94..badcfdc 100644
--- a/help/gl/manage-playlists.page
+++ b/help/gl/manage-playlists.page
@@ -1,157 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="gl">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="gl">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Create and manage playlists.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Listas de reprodución</title>
-
- <p>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.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+ <title>Listas de reprodución</title>
+
+ <p>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.
+ </p>
+
+ <p>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.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>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.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>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.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>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.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Normal Playlists</title>
+
+ <p>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.
+ </p>
+
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key>
+ <key>N</key></keyseq>, from the menu choosing <guiseq><gui>Media</gui>
+ <gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
+ to add to the playlist. Select the track(s), right click them, and choose
+ <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
+ 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 <gui>Music</gui>. As you drag it over <gui>Music</gui>,
+ a new option <gui><em>New Playlist</em></gui> will appear and you can drop
+ the track(s) over <gui><em>New Playlist</em></gui> to add them to the
+ playlist. You can repeat this process until you have added all the tracks
+ you want in the playlist.
+ </p>
+
+ <p>To give your playlist its own name, select the playlist and right click
+ on the playlist and press <gui>Rename Playlist</gui> and enter the name
+ of your playlist.
+ </p>
+
+ <p>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.
+ </p>
+
+ <p>To remove a track from the playlist, select the track(s) you wish to
+ remove. Press the <key>Delete</key>, from the menu choose
+ <guiseq><gui>Edit</gui><gui>Remove from Playlist</gui></guiseq> or right
+ click the track(s) with your mouse and press <gui>Remove from Playlist</gui>.
+ </p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Lista de reprodución intelixente</title>
+
+ <p>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.
+ </p>
+
+ <p>To create a new Smart Playlist, from the menu choose <guiseq>
+ <gui>Media</gui><gui>New Smart Playlist</gui></guiseq>. 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:
+ </p>
+
<list>
<item><p>é</p></item>
- <item><p>non é</p></item>
+ <item><p>non é</p></item>
<item><p>menos que</p></item>
- <item><p>máis que</p></item>
+ <item><p>máis que</p></item>
<item><p>como moito</p></item>
- <item><p>polo menos</p></item>
+ <item><p>polo menos</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>You can also press the <gui>+</gui> 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:
+ </p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Ano</gui></p></td>
- <td><p><gui>é</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Ano</gui></p></td> <td><p><gui>é</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Puntuación</gui></p></td>
- <td><p><gui>é</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Puntuación</gui></p></td> <td><p><gui>é</gui></p></td>
+ <td><p><gui/>5 stars</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>You can then optionally select how many songs are included by pressing
+ the <gui>Limit</gui> to checkbox and choosing the number of songs to be
+ included.
+ </p>
+
+ <p>Banshee also includes smart playlists already created for
+ you. Press the <gui>Open in editor</gui> button to view how the playlist
+ created was or to modify it. If you press <gui>Create and save</gui> the
+ playlist will be automatically generated and saved for you. The following
+ playlists are included:
+ </p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Favorites (Songs rated four and five stars)</p>
- </item>
- <item>
- <p>Recent Favorites (Songs listened to often in the past week)</p>
- </item>
- <item>
- <p>Recently Added (Songs imported within the last week)</p>
- </item>
- <item>
- <p>Unheard (Songs that have not been played or skipped)</p>
- </item>
- <item>
- <p>Neglected Favorites (Favorites not played in over two months)</p>
- </item>
- <item>
- <p>700 MB of Favorites (A data CD worth of favorite songs)</p>
- </item>
- <item>
- <p>80 Minutes of Favorites (An audio CD worth of favorite songs)</p>
- </item>
- <item>
- <p>Unrated (Songs that haven't been rated)</p>
- </item>
+ <title>Banshee Smart Playlists</title>
+ <item><p>Favorites (Songs rated four and five stars)</p></item>
+ <item><p>Recent Favorites (Songs listened to often in the past week)
+ </p></item>
+ <item><p>Recently Added (Songs imported within the last week)</p></item>
+ <item><p>Unheard (Songs that have not been played or skipped)</p></item>
+ <item><p>Neglected Favorites (Favorites not played in over two months)
+ </p></item>
+ <item><p>700 MB of Favorites (A data CD worth of favorite songs)</p></item>
+ <item><p>80 Minutes of Favorites (An audio CD worth of favorite songs)
+ </p></item>
+ <item><p>Unrated (Songs that haven't been rated)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/gl/manage-tags.page b/help/gl/manage-tags.page
index ccba033..d3e0944 100644
--- a/help/gl/manage-tags.page
+++ b/help/gl/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="gl">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="gl">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Edit and change music tags and metadata.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,51 +19,61 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Music Metadata</title>
- <title>Music metadata</title>
+ <section id="metadata">
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis
- comments for OGG Vorbis files.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
-
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>A dialog box will appear that shows the song's metadata and allow you to
- change or update it. The default fields displayed include:</p>
-
- <list>
- <item><p><gui>Track Title</gui></p></item>
- <item><p><gui>Artista da pista</gui></p></item>
- <item><p><gui>Título do álbum</gui></p></item>
- <item><p><gui>Xénero</gui></p></item>
- <item><p><gui>Número de pista</gui></p></item>
- <item><p><gui>Número de disco</gui></p></item>
- <item><p><gui>Ano</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>Music metadata</title>
+
+ <p>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
+ <link xref="import"/>.</p>
+
+ <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and
+ Vorbis comments for OGG Vorbis files.</p>
+
+ <p>If you have imported songs that do not contain metadata,
+ <app>Banshee</app> will display <gui>Unknown</gui> for most fields
+ in the library. </p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Edit Your Metadata</title>
+
+ <p>You can change and edit the metadata of your songs. Select the song or
+ songs you want to update and hit the <key>E</key>, choose
+ <guiseq><gui>Edit</gui><gui>Edit Track Information</gui></guiseq> from the menu, or use
+ your mouse and right click on the files and select
+ <gui>Edit Track Information</gui>.
+ </p>
+
+ <p>A dialog box will appear that shows the song's metadata and allow you to
+ change or update it. The default fields displayed include:</p>
+
+ <list>
+ <item><p><gui>Track Title</gui></p></item>
+ <item><p><gui>Artista da pista</gui></p></item>
+ <item><p><gui>Título do álbum</gui></p></item>
+ <item><p><gui>Xénero</gui></p></item>
+ <item><p><gui>Número de pista</gui></p></item>
+ <item><p><gui>Número de disco</gui></p></item>
+ <item><p><gui>Ano</gui></p></item>
+ </list>
+
+ <p>Update the song's information. If you have selected multiple songs to
+ edit press the right arrow icon to the right of the <gui>Track Title</gui>
+ field or press the <gui>Forward</gui> button at the bottom of the dialog
+ when finished with each song. When you have completed editing all metadata,
+ press <gui>Save</gui>.
+ </p>
+
</section>
</page>
diff --git a/help/gl/play-queue.page b/help/gl/play-queue.page
index db96bec..cd113cc 100644
--- a/help/gl/play-queue.page
+++ b/help/gl/play-queue.page
@@ -1,96 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="gl">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="gl">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Add media to your play queue.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
-
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
-
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
-
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
-
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
-
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
-
+ <title>Reproducir cola</title>
+
+ <p>The <gui>Play Queue</gui> 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.</p>
+
+<section id="addqueue">
+
+ <title>Add Music to the Play Queue</title>
+
+ <p>From your music library, you will need to select the music tracks or albums
+ you want to add to the play queue.
+ </p>
+
+ <p>To add an entire album to the Play Queue, using your mouse press and hold
+ the album and drag the album over <gui>Play Queue</gui> in the far left
+ window pane.
+ </p>
+
+ <p>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 <gui>Play Queue</gui>
+ in the far left window pane, or right click the track and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+ <p>You can select multiple files by using your mouse and pressing
+ <key>Control</key> and choosing each file with your mouse or
+ select a range of files by
+ pressing <key>Shift</key> and clicking twice to select that range of files. You can then
+ drag and drop it over the <gui>Play Queue</gui>
+ in the far left window pane or right click the tracks and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+</section>
+
+<section id="reorderqueue">
+
+ <title>Organize Your Play Queue</title>
+
+ <p>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.
+ </p>
+
+</section>
+
+<section id="removequeue">
+
+ <title>Removing Tracks from the Play Queue</title>
+
+ <p>You can remove an individual track, a group of tracks, or clear your entire
+ play queue.
+ </p>
+
+ <p>To remove an individual track or group of tracks, select the track
+ with your mouse and then press <key>Delete</key>.
+ </p>
+
+ <p>To clear your entire Play Queue, press the <gui>Clear</gui> button in the
+ upper right hand corner of the Play Queue.
+ </p>
+
+</section>
+
</page>
diff --git a/help/gl/play.page b/help/gl/play.page
index bed354f..4ac5be8 100644
--- a/help/gl/play.page
+++ b/help/gl/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Play your videos and music files.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,82 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Play your music</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <title>Play Your Media</title>
+
+ <section id="playmusic">
+ <title>Play your music</title>
+
+ <p>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.</p>
+
+ <p>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.
+ </p>
+
+ <p>To start playing a song, use your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
+ browser and using your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
+ and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
+ <p>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.
+ </p>
+
</section>
- <section id="play-video">
- <title>Play a video</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+ <section id="playvideo">
+ <title>Play a video</title>
+
+ <p>Your imported videos are listed alphabetically. To play a video,
+ choose the video you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>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.</p>
+
</section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
+
+ <section id="playpodcast">
+ <title>Play a Podcast</title>
+
+ <p>Podcasts shows you all Podcasts you're subscribed to, all Podcast
+ shows available, and the Podcast browser lists all Podcasts in order of
newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <p>To play a Podcast,
+ choose the Podcast you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
</section>
-
- <section id="play-radio">
- <title>Play an internet radio station</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- </section>
-
+
+ <section id="playradio">
+ <title>Play an internet radio station</title>
+
+ <p>The Radio source shows you all internet radio stations you have added
+ to Banshee alphabetically.
+ </p>
+
+ <p>To play an internet radio station,
+ choose the radio station you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ </section>
+
</page>
diff --git a/help/gl/podcast.page b/help/gl/podcast.page
deleted file mode 100644
index 45f9faa..0000000
--- a/help/gl/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="gl">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/gl/radio.page b/help/gl/radio.page
deleted file mode 100644
index 693e6d3..0000000
--- a/help/gl/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="gl">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/gl/rb-import.page b/help/gl/rb-import.page
new file mode 100644
index 0000000..2d08908
--- /dev/null
+++ b/help/gl/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="gl">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>Rhythmbox</app> music player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>Rhythmbox</app> library</title>
+
+</page>
diff --git a/help/gl/search.page b/help/gl/search.page
index 1033cbb..4eeb93b 100644
--- a/help/gl/search.page
+++ b/help/gl/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,100 +19,99 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
+ <title>Searching your Banshee Library</title>
+
+ <p>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.</p>
+
+ <p>To perform a search of your media in Banshee, press the <key>S</key> or
+ click the <gui>Search</gui> box in the upper right hand corner of the Library
+ view in Banshee.
+ </p>
+
+ <p>A search query consists of some basic terms, for example,
+ <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
+ Banshee will search all metadata fields including Track Title, Album Title,
+ Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
+ and <em>matthews</em> will be returned. Search terms are case insensitive, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ all mean the same thing when searching.</p>
+
+<section id="operators">
+ <title>Basic Operators</title>
+ <p>Operators can be placed between any two search words or placed before a
+ search word. The default operation is <gui>AND</gui> and is used when
+ no other operators are used between two search terms. Because it is the
default, there is no explicit AND operator.</p>
-
- <p>Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together,
+
+ <p>Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together,
these three operations can yield very powerful queries to help you search
your media.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Logical Operators and Examples</title>
<p>The following is a list of logical operators and examples of the search
results when searching using them.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operator</gui></p></td>
- <td><p><gui>Descrición</gui></p></td>
+ <td><p><gui>Operator</gui></p></td> <td><p><gui>Descrición</gui></p></td>
</tr>
<tr>
- <td><p><em>default</em>, <em>white space</em></p></td>
- <td><p>Search for two terms with a space between the two
- words or terms.</p></td>
+ <td><p><em>default</em>, <em>white space</em></p></td> <td><p>
+ Search for two terms with a space between the two words or terms.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Search results will be two songs with either result in any
- field.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>
+ Search results will be two songs with either result in any field.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>
+ Do not display search results with any search term that follows the
+ operator of NOT, not,<key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Examples of logical operations include:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Query</gui></p></td>
- <td><p><gui>Descrición</gui></p></td>
+ <td><p><gui>Query</gui></p></td> <td><p><gui>Descrición</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Matches any fields in a track containing both <em>dave</em> and
+ <td><p>dave matthews</p></td> <td><p>
+ Matches any fields in a track containing both <em>dave</em> and
<em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave, matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave or matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
- </tr>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave | matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
- </tr>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Displays all tracks whose fields do not contain
- <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>
+ Displays all tracks whose fields do not contain <em>dave
+ matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>For more information on performing more complex search queries,
+ see the <link xref="adv-search"/> page.</p>
+
</section>
-
+
</page>
diff --git a/help/gl/sort.page b/help/gl/sort.page
index cafcb75..bfd8e49 100644
--- a/help/gl/sort.page
+++ b/help/gl/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,32 +23,31 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Adding Columns</title>
+
<p>As your library grows, you may want to change your library view to add
- additional information about the songs in your library or change the way you
- can view and sort your songs, artists or albums.</p>
-
+ additional information about the songs in your library or change the way
+ you can view and sort your songs, artists or albums.</p>
+
<p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+ to give you more information about the songs and also allow you to sort
+ by. By default, Banshee displays columns for songs including
+ <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>.
+ 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.
+ </p>
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Sorting Columns</title>
+ <p>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 <gui>Artist</gui> column header and Banshee will
+ automatically sort that column alphabetically. Clicking the
+ <gui>Artist</gui> column again will sort the column in reverse alphabetical
+ order.</p>
</section>
-
+
</page>
diff --git a/help/gl/sync.page b/help/gl/sync.page
index e96bab0..3280650 100644
--- a/help/gl/sync.page
+++ b/help/gl/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Sync your media to a portable media player or smartphone.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,128 +19,130 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Sincronizar</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Sincronizar</title>
+
+ <p>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.
+ </p>
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Compatibilidade de dispositivos</title>
+ <p>Banshee supports almost all modern portable music players and
+ smartphones with the notable exception of the Apple iPhone, iPad and
+ iPod Touch.</p>
+
+ <p>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.
+ </p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Música</p></item>
- <item><p>Audiolibros</p></item>
- <item><p>Vídeos</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>From the dropdown menu next to each of the media, choose from:</p>
-
- <list>
- <item><p>Xestionar manualmente</p></item>
- <item><p>Sincronizar toda a fonoteca</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Sync Your Music</title>
+ <p>You can choose to manage the media on your portable music
+ by having Banshee automatically sync it or manage your music and media
+ manually.
+ </p>
+
+ <p>Choose your device from the Banshee menu and then choose how you want
+ to sync your media, including:
+ </p>
+ <list>
+ <item><p>Música</p></item>
+ <item><p>Audiolibros</p></item>
+ <item><p>Vídeos</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>From the dropdown menu next to each of the media, choose from:
+ </p>
+ <list>
+ <item><p>Xestionar manualmente</p></item>
+ <item><p>Sincronizar toda a fonoteca</p></item>
+ </list>
+
+ <note style="warning">
+ <p>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.
+ </p>
+ </note>
+
+ <p>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.
+ </p>
+
+ <p>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.
+ </p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Sync Your Entire Library</title>
+ <p>You can drag and drop media to your portable music player from 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.
+ </p>
+
+ <p>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.
+ </p>
+
+ <note style="tip">
+ <p>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 <gui>Disconnect</gui>.
+ </p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Play Music From Your Portable Music Player</title>
+ <p>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.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Deleting files from your portable music player will permanently remove
- the files and you will not be able to recover them.</p>
- </note>
-
+ <title>Remove Music From your Portable Music Player</title>
+ <p>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 <gui>Delete</gui> or from the
+ menu choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Deleting files from your portable music player will permanently remove
+ the files and you will not be able to recover them.
+ </p>
+ </note>
+
</section>
+
</page>
diff --git a/help/gl/ui.page b/help/gl/ui.page
index 2216d33..7e9dfd6 100644
--- a/help/gl/ui.page
+++ b/help/gl/ui.page
@@ -4,18 +4,13 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
+ <desc>
+ An overview of <app>Banshee's</app> user interface.
</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +20,65 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Introduction to the Banshee User Interface</title>
<figure>
<title><gui>Banshee Media Player</gui> window</title>
<desc><app>Reprodutor de música Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshee</app> library interface</p>
</media>
</figure>
-
- <section id="context">
- <title>Recursos</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
+
+<section id="context">
+ <title>Recursos</title>
+ <p>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.
+ </p>
+
+ <note style="tip">
+ <p>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.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Library Browser</title>
+ <p>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.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Now Playing View</title>
+ <p>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.</p>
+
+ <p>To change Now Playing to hide the Banshee user interface and use the full
+ screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui>
+ button in the upper right hand corner of Banshee, or choose
+ <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen
+ mode.</p>
+
+</section>
+
+<section id="library">
+ <title>Fonoteca</title>
+ <p>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.
+ </p>
+</section>
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/hu/add-podcast.page b/help/hu/add-podcast.page
new file mode 100644
index 0000000..58bf310
--- /dev/null
+++ b/help/hu/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="hu">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Podcastok hozzáadása, eltávolítása és lejátszása.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcastok</title>
+
+ <section id="podcastdescription">
+ <title>Mi az a podcast?</title>
+
+ <p>A podcastok a rádióműsorokhoz hasonló rögzített adások, amelyek az interneten érhetők el, és lehetővé teszik a feliratkozást. Ha feliratkozik egy podcastra a Bansheeban, az új adás megjelenésekor a Banshee automatikusan letölti a podcastot, és lehetővé teszi a meghallgatását.</p>
+
+ <p>Majdnem minden témában találhat podcastokat, beleértve a zenét, a filmeket, a Linuxot és sok mást. Indítson egy keresést kedvenc internetes keresőjével például a „filmes podcast” kifejezésre, és máris számos lehetőség közül válogathat.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Podcast hozzáadása</title>
+
+ <p>Egy podcastra feliratkozás első lépéseként fel kell keresnie a podcast honlapját az interneten. Majdnem minden podcast rendelkezik egy gombbal vagy hivatkozással a feliratkozáshoz. Másolja ki a podcastra való feliratkozásra szolgáló hivatkozást. Ezt a legtöbb böngészőben a hivatkozás helyi menüjének <gui>Hivatkozás másolása</gui> pontját kiválasztva teheti meg.</p>
+
+ <p>A Bansheeban nyomja meg a <gui>Feliratkozás új podcastra</gui> gombot a jobb felső sarokban, válassza a <guiseq><gui>Média</gui><gui>Podcast hozzáadása</gui></guiseq> menüpontot, vagy nyomja meg a <keyseq><key>Shift</key><key>Ctrl</key><key>F</key></keyseq> kombinációt.</p>
+
+ <p>A Banshee ezután lehetővé teszi az új podcastok letöltési módjának kiválasztását. A lehetőségei:</p>
+
+ <list>
+ <item><p>A legutóbbi epizód letöltése (az utoljára megjelent epizód automatikus letöltése).</p></item>
+ <item><p>Az összes epizód letöltése (az összes epizód letöltése).</p></item>
+ <item><p>Kiválasztom a letöltendő epizódokat (lehetővé teszi a letölteni kívánt epizódok kiválasztását).</p></item>
+ </list>
+
+ <p>A podcastforrás felvétele után a Banshee megjeleníti a következőket:</p>
+
+ <list>
+ <item><p><gui>Név</gui>: (az adott epizód neve)</p></item>
+ <item><p><gui>Podcast</gui>: (a podcast neve)</p></item>
+ <item><p><gui>Közzététel</gui> (az epizód közzétételének dátuma)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/hu/add-radio.page b/help/hu/add-radio.page
new file mode 100644
index 0000000..90be560
--- /dev/null
+++ b/help/hu/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="hu">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Internetes rádióállomások hozzáadása, eltávolítása és lejátszása a Bansheeban.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Internetes rádió</title>
+
+ <section id="radiodescription">
+ <title>Mi az az internetes rádió?</title>
+
+ <p>Az internetes rádióállomások hasonlóak a normál rádióállomásokhoz, amennyiben lehetővé teszik a zene élő továbbítását az interneten. Az internetes rádióállomásokat egyaránt működtetheti egy normál rádióállomás, egy saját adóját továbbító amatőr, vagy élő DJ-ket és akár reklámokat is sugárzó kereskedelmi rádióállomás.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Rádióállomás hozzáadása</title>
+
+ <p>Internetes rádióállomás hozzáadásához nyomja meg a Banshee jobb felső sarkában lévő <gui>Állomás hozzáadása</gui> gombot, vagy válassza a <guiseq><gui>Média</gui><gui>Állomás hozzáadása</gui></guiseq> menüpontot.</p>
+
+ <p>Az internetes rádióállomás weboldaláról másolja ki a műsorra mutató URL-címet a böngészőből. A legtöbb böngészőben a hivatkozás helyi menüjének <gui>Hivatkozás másolása</gui> pontját kell kiválasztani.</p>
+
+
+ <p>A Banshee bekéri az <gui>Állomás műfaját</gui>. Válassza ki az internetes rádióállomás által játszott zene fajtáját a legördülő menüből. Adja meg az <gui>Állomás nevét</gui>, ez tetszőleges név lehet. Ezután illessze be a <gui>Műsor URL-címe</gui> mezőbe a rádióállomás URL-címét. Végül válassza a helyi menü <gui>Beillesztés</gui> pontját, vagy nyomja meg a <keyseq><key>Ctrl</key><key>V</key></keyseq> kombinációt.</p>
+
+ <p>Kitöltheti az <gui>Állomás létrehozója</gui>, <gui>Leírás</gui> és az <gui>Értékelés</gui> mezőket is.</p>
+
+ <p>Ezután nyomja meg a <gui>Mentés</gui> gombot az internetes rádióállomás felvételéhez a Bansheeba.</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/hu/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/hu/advanced.page
index 468ad23..611e765 100644
--- a/help/zh_CN/extensions.page
+++ b/help/hu/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="hu">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Súgó további műveletekhez.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>További lehetőségek és súgó</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Gyorsbillentyűk</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Gyorsbillentyűk</title>
</section>
-
+
</page>
diff --git a/help/hu/amazon.page b/help/hu/amazon.page
index 4d075f2..f46dcfe 100644
--- a/help/hu/amazon.page
+++ b/help/hu/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Zene szinkronizálása és vásárlása az Amazon MP3-boltból</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Amazon MP3-bolt</title>
+
+ <p>A Banshee támogatja a zene letöltését és importálását az Amazon MP3-boltból. Az Amazon zenefájlokat importálhatja saját kezűleg, zenét vásárolhat böngészőjében vagy a Bansheeból. Az Amazon csak bizonyos országokban kínál MP3-formátumban megvásárolható zenét, és a földrajzi helytől függően lehet, hogy nem lesz képes MP3-fájlokat vásárolni.</p>
+
+ <note style="important">
+ <p>A Banshee minden zenevásárláshoz Amazon partnerkódot használ. A partnerkódon keresztül kapott minden bevételt a fejlesztők a GNOME Foundationnek ajánlanak fel.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Amazon MP3-fájlok vásárlása webböngészőből</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Amazon MP3-fájlok vásárlása webböngészőből</title>
+
+ <p>Az Amazon MP3-boltjából vásárolt zene automatikusan letölthető és importálható a Bansheeba. A Banshee társítja magát az Amazon által az MP3-vásárlásokhoz biztosított .amz fájlokhoz. Amikor az Amazontól zenét vásárol, a webböngészője letölti az .amz fájlt, a Banshee pedig automatikusan megnyitja, és megkezdi a letöltést és a zene importálását.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Amazon MP3-fájlok vásárlása a Bansheeban</title>
+
+ <p>Kereshet számokat az Amazonon a Bansheen belül is. Válassza az Amazon MP3-bolt elemet a Banshee bal oldali ablaktábláján. Ez betölti az Amazon MP3-boltot, mintha a webböngészőben nyitná meg. Megkeresheti a kívánt zenét az Amazon boltban, majd bejelentkezés után egy kattintással megvásárolhatja a zenét. A Banshee a megvásárolt zenét automatikusan letölti és importálja gyűjteményébe.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Amazon MP3-fájlok importálása saját kezűleg</title>
-
- <p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ <title>Amazon MP3-fájlok importálása saját kezűleg</title>
+
+ <p>Ha az Amazon boltjából webböngészőben vásárol zenét, egy .amz kiterjesztésű fájl kerül letöltésre. Az Amazontól vásárolt zenék saját kezűleg importálásához válassza a Banshee menüjének <guiseq><gui>Média</gui><gui>Média importálása</gui></guiseq> pontját, és válassza ki az importálandó *.amz fájlt. A Banshee megnyitja a fájlt, és csatlakozik az Amazon MP3-bolthoz a letöltés megkezdéséhez.</p>
+
<note style="warning">
<p>Az Amazon .amz fájljai csak rövid ideig aktívak. Ha nem tölti le gyorsan a zenét, a fájl lejár, és nem töltheti le a zenét az Amazonról. Az Amazon nem hozza nyilvánosságra, hogy meddig aktívak a fájlok. Javasoljuk, hogy egy órán belül töltse le és importálja az Amazonról vásárolt zenéket.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/hu/emusic.page b/help/hu/emusic.page
new file mode 100644
index 0000000..d262148
--- /dev/null
+++ b/help/hu/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="hu">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Az eMusicról vásárolt zene importálása.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>eMusic számok importálása</title>
+
+</page>
diff --git a/help/hu/extensions.page b/help/hu/extensions.page
index 655eac8..565796c 100644
--- a/help/hu/extensions.page
+++ b/help/hu/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="hu">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="hu">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>A Banshee bővítése további funkciókkal</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Banshee kiterjesztések</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Hivatalos Banshee kiterjesztések</title>
</info>
+ <title>A Banshee kiterjesztéseinek kezelése</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Közösségi Banshee kiterjesztések</title>
+ </info>
+ <title>Közösségi kiterjesztések a Bansheehoz</title>
</section>
+
</page>
diff --git a/help/hu/import.page b/help/hu/import.page
index a0b01ae..ae46cc5 100644
--- a/help/hu/import.page
+++ b/help/hu/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Zenék és videók hozzáadása számítógépéről a Banshee gyűjteményéhez.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Zenék és videók importálása</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>A számítógépén tárolt zenéket és videókat importálhatja a Bansheeba. Az importált fájlok megjelennek a forrásai közt, és a többi médiához hasonlóan szerkeszthetők és kezelhetők a Bansheeban.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>A számítógépén található zenei vagy videofájlok importálásához válassza a <guiseq><gui>Média</gui><gui>Média importálása</gui></guiseq> menüpontot. Megjelenik a lehetőségeket tartalmazó ablak.</p>
- <note style="tip">
+ <note>
<p>Bővítmények további importálási lehetőségeket biztosíthatnak. Lásd a <link xref="#plugins"/> részt lentebb.</p>
</note>
@@ -53,27 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Nyugodtan importálhat korábban már importált mappákból, a gyűjteményben ilyenkor nem jelennek meg többször ugyanazok az elemek.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Importálás lejátszólistából</title>
+ <p>Zenéit lejátszólistákból is importálhatja. A legtöbb lejátszólistafájl kiterjesztése <em>m3u</em>. Lejátszólistából való importáláshoz válassza a Banshee menüjének <guiseq><gui>Média </gui><gui>Lejátszólista importálása</gui></guiseq> pontját, keresse meg a lejátszólistafájlt, végül nyomja meg az <gui>Importálás</gui> gombot.</p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Bővítmények további importálási lehetőségeket biztosíthatnak. A megfelelő bővítmények engedélyezése esetén a következő további források válnak elérhetővé:</p>
-
+ <title>További importálási források</title>
+ <p>Bővítmények további importálási lehetőségeket biztosíthatnak. A megfelelő bővítmények engedélyezése esetén a következő további források válnak elérhetővé:</p>
</section>
-
+
</page>
diff --git a/help/hu/index.page b/help/hu/index.page
index 7fc643a..78677ad 100644
--- a/help/hu/index.page
+++ b/help/hu/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Banshee médialejátszó</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Hozzáadás, eltávolítás és lejátszás</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Kezelés és rendezés</title>
</section>
-
+
<section id="sync" style="2column">
<title>Média szinkronizálása hordozható zenelejátszóval</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>A Banshee bővítése további funkciókkal</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>További lehetőségek és súgó</title>
+ <title>További lehetőségek és súgó</title>
</section>
</page>
diff --git a/help/hu/introduction.page b/help/hu/introduction.page
index e7c62c5..fe3e8e8 100644
--- a/help/hu/introduction.page
+++ b/help/hu/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>A <app>Banshee médialejátszó</app> bemutatása.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>Bevezetés</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p>A <app>Banshee</app> médialejátszó segítségével zenéket és videókat játszhat le, valamint ezeket szinkronizálhatja hordozható eszközökkel.</p>
<p>A <app>Banshee</app> használatával importálhatja médiafájljait, kezelheti azok metaadatait, és lejátszhatja zenéit és videóit.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>A Banshee segíti zenéi és videói szinkronizálását népszerű hordozható eszközökre, mint a digitális zenelejátszók és okostelefonok. A Banshee támogatja a népszerű eszközöket, beleértve a legtöbb iPodot, Sandisk és Creative MP3-lejátszót, valamint az Android-alapú telefonokat.</p>
+<!--
<figure>
- <title><gui>Banshee médialejátszó</gui> ablak</title>
- <desc><app>Banshee médialejátszó</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>A <app>Banshee</app> gyűjtemény felület</p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/hu/itunes-import.page b/help/hu/itunes-import.page
new file mode 100644
index 0000000..0820e38
--- /dev/null
+++ b/help/hu/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="hu">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Zene és kategóriák importálása az <app>iTunes</app> médialejátszóból.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Az <app>iTunes</app> gyűjtemény importálása</title>
+
+</page>
diff --git a/help/hu/keyboard-shortcuts.page b/help/hu/keyboard-shortcuts.page
deleted file mode 100644
index c804857..0000000
--- a/help/hu/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="hu">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Billentyű</gui></p></td>
- <td><p><gui>Művelet</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Aktuális szám lejátszása vagy szüneteltetése</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Következő szám lejátszása</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Előző szám lejátszása</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Billentyű</gui></p></td>
- <td><p><gui>Művelet</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Fókusz keresődobozra mozgatása</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
- <td><p>Média importálása ablak megnyitása</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Lejátszólisták</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Billentyű</gui></p></td>
- <td><p><gui>Művelet</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td>
- <td><p>Új lejátszólista létrehozása</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcastok</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Billentyű</gui></p></td>
- <td><p><gui>Művelet</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Kijelölt epizód megjelölése régiként</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Felület</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Billentyű</gui></p></td>
- <td><p><gui>Művelet</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Teljes képernyős mód átváltása</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td>
- <td><p>A lejátszólista nézet összes számának kijelölése</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>A lejátszólista nézetben a számok kijelölésének törlése</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Bal egérgomb</key></keyseq>
- </p></td>
- <td><p>Előző szám lejátszása (az értesítésiterület-bővítmény szükséges)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Jobb egérgomb</key></keyseq>
- </p></td>
- <td><p>Következő szám lejátszása (az értesítésiterület-bővítmény szükséges)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Középső egérgomb</key></keyseq>
- </p></td>
- <td><p>Lejátszás/szünet átváltása (az értesítésiterület-bővítmény szükséges)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/hu/keyboardshortcuts.page b/help/hu/keyboardshortcuts.page
new file mode 100644
index 0000000..df773bb
--- /dev/null
+++ b/help/hu/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="hu">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Gyorsbillentyűk</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>A Banshee vezérlése gyorsbillentyűkkel</title>
+
+ <section id="playbackcontrol">
+
+ <title>Lejátszás vezérlése</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Billentyű</gui></p></td> <td><p><gui>Művelet</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Szóköz</p></td> <td><p>Aktuális szám lejátszása vagy szüneteltetése</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Következő szám lejátszása</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Előző szám lejátszása</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Gyűjtemény kezelése</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Billentyű</gui></p></td> <td><p><gui>Művelet</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Ctrl</key><key>F</key></keyseq></p></td> <td><p>Fókusz keresődobozra mozgatása</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
+ <td><p>Média importálása ablak megnyitása</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Lejátszólisták</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Billentyű</gui></p></td> <td><p><gui>Művelet</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td> <td><p>Új lejátszólista létrehozása</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcastok</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Billentyű</gui></p></td> <td><p><gui>Művelet</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Kijelölt epizód megjelölése régiként</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Felület</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Billentyű</gui></p></td> <td><p><gui>Művelet</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Teljes képernyős mód átváltása</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td> <td><p>A lejátszólista nézet összes számának kijelölése</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>A lejátszólista nézetben a számok kijelölésének törlése</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td> <td><p>A Banshee ablak elrejtése (az értesítésiterület-bővítmény szükséges)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Bal egérgomb</key></keyseq>
+ </p></td> <td><p>Előző szám lejátszása (az értesítésiterület-bővítmény szükséges)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Jobb egérgomb</key></keyseq>
+ </p></td> <td><p>Következő szám lejátszása (az értesítésiterület-bővítmény szükséges)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Középső egérgomb</key></keyseq>
+ </p></td> <td><p>Lejátszás/szünet átváltása (az értesítésiterület-bővítmény szükséges)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/hu/lastfm.page b/help/hu/lastfm.page
index 9a015b0..a26e934 100644
--- a/help/hu/lastfm.page
+++ b/help/hu/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="hu">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>A Last.fm, a számbeküldés és a Last.fm rádió engedélyezése.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,67 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>A Last.fm egy népszerű online szolgáltatás, amely ingyenes és fizetős változatban is elérhető. A Last.fm információkat kínál a zenei előadókról és albumokról, regisztráció után pedig a Last.fm ingyenesen lehetővé teszi a Bansheeban hallgatott zenék követését. Ha az előfizetéses szolgáltatást választja, akkor a Last.fm-ről sugárzott zenét is hallgathatja számos zenei kliensprogramban, például a Bansheeban. A Last.fm számos csatornát kínál, beleértve a hallgatási szokásai alapján java [...]
+
<section id="enable-lastfm">
- <title>A Last.fm engedélyezése</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>A Last.fm engedélyezése</title>
+ <p>A Last.fm teljes kihasználásához létre kell hoznia egy Last.fm profilt. Új fiók létrehozásához keresse fel a <link href="http://www.last.fm/join">http://www.last.fm/join</link> oldalt, vagy válassza a Banshee menüjének <guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui></guiseq> pontját. A beállítások között a <gui>Forrásspecifikus</gui> lapon válassza ki a <gui>Forrás</gui> legördülő menüből a <gui>Last.fm</gui> elemet, és kattintson a <em>Last.fm regisztráció</em> hivatkozásra.</p>
+
+ <p>Ahhoz, hogy a Banshee beküldje a számítógépén lejátszott számok információit a Last.fm-nek, jelentkezzen be a Last.fm-re a Bansheeból a <gui>Forrásspecifikus</gui> beállítások alatt. Adja meg felhasználónevét, és nyomja meg a <gui>Bejelentkezés a Last.fm-be</gui> gombot. A böngészőben megnyílik a Last.fm weboldala, és hozzáférést adhat a Banshee számára. Kattintson a <gui>Yes, allow access</gui> hivatkozásra a böngészőben, az ekkor megnyíló oldal közli, hogy a Banshee már hozzáfér a [...]
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>A Last.fm rádió hallgatása</title>
<p>A Last.fm rádió ingyenes az Egyesült Államok, az Egyesült Királyság és Németország lakói számára. Más országok lakóinak elő kell fizetniük a prémium hozzáférésre a rádió hallgatásához. A prémium előfizetők minden országban prémium rádiószolgáltatásokat kapnak: a kedvelt vagy megcímkézett zenék lejátszólistái és állomásai hallgathatók.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+
+ <p>A Banshee bal oldali Források ablaktábláján megjelenik egy Last.fm szakasz, beleértve az Ön Last.fm rádióállomásait is. A Last.fm rádió hallgatásához aktív internetkapcsolatra van szükség. Válassza ki a hallgatni kívánt rádióállomást, és a Banshee lekéri a Last.fm-től a rádióállomás feltöltéséhez szükséges számokat. Nyomja meg a Banshee <gui>Lejátszás</gui> gombját, vagy a <key>szóköz</key> billentyűt a Last.fm rádióállomás hallgatásához. A rádióállomás-sor következő számának lejáts [...]
+
</section>
-
+
</page>
diff --git a/help/hu/manage-coverart.page b/help/hu/manage-coverart.page
new file mode 100644
index 0000000..df10cd2
--- /dev/null
+++ b/help/hu/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="hu">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Albumok lemezborítóinak kezelése vagy módosítása.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Lemezborító</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/hu/manage-playlists.page b/help/hu/manage-playlists.page
index ec9bc34..1392c57 100644
--- a/help/hu/manage-playlists.page
+++ b/help/hu/manage-playlists.page
@@ -1,144 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="hu">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="hu">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Lejátszólisták létrehozása és kezelése.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Lejátszólisták</title>
-
+ <title>Lejátszólisták</title>
+
<p>A lejátszólisták lehetővé teszik adott sorrendben lejátszandó zeneszámok listájának létrehozását és mentését. A lejátszólistákkal kényelmesen létrehozhatja kedvenc számainak listáját, vagy gyűjteményét feloszthatja kisebb, egyszerűen tallózható listákra. Egyes hordozható médialejátszók lehetővé teszik a lejátszólista átvitelét is, így azt akár magával is viheti.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>A Banshee támogatja a normál lejátszólistákat, amelyek a hozzájuk adott számokat tartalmazzák, valamint az okos lejátszólistákat. Az okos lejátszólisták automatikusan kerülnek előállításra hallgatási szokásai, kedvenc zenéi és sok más szempont alapján.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>A normál lejátszólista az Ön által felvett és kezelt számok listája. Létrehozhat saját dallistát kedvenc előadója több albumából, kedvenc számaiból vagy egy vidám lejátszólistát az edzés közbeni hallgatáshoz.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>A lejátszólistát átrendezheti fogd és vidd módszerrel, a számokat az új helyükre húzva a lejátszólistában. A számok csak akkor rendezhetők át, ha a lista egyik oszlop szerint sincs rendezve. Az oszlop szerinti rendezés megszüntetéséhez kattintson az oszlopra addig, amíg az oszlop neve melletti fel vagy le nyíl el nem tűnik, ezután átrendezheti a lejátszólistát.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>Az okos lejátszólisták lehetővé teszik dinamikus lejátszólisták gyors létrehozását számos előre megadott változó alapján. Gyorsan létrehozhat egy új lejátszólistát adott előadó, kedvencek és sok más szempont alapján is.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Normál lejátszólisták</title>
+
+ <p>A normál lejátszólista az Ön által felvett és kezelt számok listája. Létrehozhat saját dallistát kedvenc előadója több albumából, kedvenc számaiból vagy egy vidám lejátszólistát az edzés közbeni hallgatáshoz.</p>
+
+ <p>Új lejátszólistát a <keyseq><key>Ctrl</key><key>N</key></keyseq> megnyomásával, a <guiseq><gui>Média</gui><gui>Új lejátszólista</gui></guiseq> menüpont kiválasztásával, vagy a hozzáadni kívánt számok kijelölésével hozhat létre. Válassza ki a számokat, kattintson rájuk a jobb egérgombbal, és válassza a <guiseq><gui>Hozzáadás a lejátszólistához</gui><gui>Új lejátszólista</gui></guiseq> menüpontot. A kijelölt számokat fogd és vidd módszerrel is áthúzhatja a bal oldali ablaktábla <gui [...]
+
+ <p>A lejátszólista elnevezéséhez válassza azt ki, kattintson rá a jobb egérgombbal, és válassza a helyi menü <gui>Lejátszólista átnevezése</gui> pontját a lejátszólista nevének beírásához.</p>
+
+ <p>A lejátszólistát átrendezheti fogd és vidd módszerrel, a számokat az új helyükre húzva a lejátszólistában. A számok csak akkor rendezhetők át, ha a lista egyik oszlop szerint sincs rendezve. Az oszlop szerinti rendezés megszüntetéséhez kattintson az oszlopra addig, amíg az oszlop neve melletti fel vagy le nyíl el nem tűnik, ezután átrendezheti a lejátszólistát.</p>
+
+ <p>A lejátszólista egy számának eltávolításához válassza ki azt a lejátszólistából. Nyomja meg a <key>Delete</key> billentyűt, válassza a <guiseq><gui>Szerkesztés</gui><gui>Eltávolítás a lejátszólistáról</gui></guiseq> menüpontot, vagy kattintson a jobb egérgombbal a számra, és válassza az <gui>Eltávolítás a lejátszólistáról</gui> menüpontot.</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Okos lejátszólista</title>
+
+ <p>Az okos lejátszólisták lehetővé teszik dinamikus lejátszólisták gyors létrehozását számos előre megadott változó alapján. Gyorsan létrehozhat egy új lejátszólistát adott előadó, kedvencek és sok más szempont alapján is.</p>
+
+ <p>Új okos lejátszólista létrehozásához válassza a <guiseq><gui>Média</gui><gui>Új okos lejátszólista</gui></guiseq> menüpontot. Megjelenik egy párbeszédablak az új okos lejátszólista létrehozásához. Adja meg a lejátszólista nevét, majd válassza ki a lejátszólista feltöltéséhez használandó feltételeket. A számok metaadatai közt megtalálható bármely mező közül választhat, például album, előadó vagy év. Válassza ki a feltételt, majd válassza ki a következők egyikét:</p>
+
<list>
<item><p>=</p></item>
- <item><p>nem</p></item>
+ <item><p>nem</p></item>
<item><p>kevesebb, mint</p></item>
- <item><p>több, mint</p></item>
+ <item><p>több, mint</p></item>
<item><p>legfeljebb</p></item>
- <item><p>legalább</p></item>
+ <item><p>legalább</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>A <gui>+</gui> gombot megnyomva további feltételt adhat az okos lejátszólistához. Létrehozhat például egy olyan okos lejátszólistát, amely tartalmazza az összes 5 csillagra értékelt 2010-es számot. Ennek a létrehozásához a következőket kell választania:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Év</gui></p></td>
- <td><p><gui>=</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Év</gui></p></td> <td><p><gui>=</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Értékelés</gui></p></td>
- <td><p><gui>=</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Értékelés</gui></p></td> <td><p><gui>=</gui></p></td>
+ <td><p><gui/>5 csillag</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>Ezután kiválaszthatja, hogy hány számot szeretne felvenni. Jelölje be a <gui>Korlátozás</gui> négyzetet, és adja meg a felvenni kívánt számok mennyiségét.</p>
+
+ <p>A Banshee tartalmaz előre elkészített okos lejátszólistákat. Nyomja meg a <gui>Megnyitás szerkesztőben</gui> gombot a lejátszólista feltételeinek megjelenítéséhez, vagy azok módosításához. A <gui>Létrehozás és mentés</gui> gomb megnyomásával a lejátszólista mentésre kerül. A program a következő lejátszólistákat tartalmazza:</p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Kedvencek (Négy és öt csillagra értékelt számok)</p>
- </item>
- <item>
- <p>Legutóbbi kedvencek (A múlt héten gyakran hallgatott számok)</p>
- </item>
- <item>
- <p>Legutóbb hozzáadott (Az elmúlt héten importált számok)</p>
- </item>
- <item>
- <p>Nem hallgatott (Le nem játszott vagy kihagyott számok)</p>
- </item>
- <item>
- <p>Mellőzött kedvencek (Több mint két hónapja le nem játszott kedvencek)</p>
- </item>
- <item>
- <p>700 MB kedvenc (Egy adat CD-nyi kedvenc szám)</p>
- </item>
- <item>
- <p>80 percnyi kedvenc (Egy hang CD-nyi kedvenc szám)</p>
- </item>
- <item>
- <p>Nem értékelt (Még nem értékelt számok)</p>
- </item>
+ <title>A Banshee okos lejátszólistái</title>
+ <item><p>Kedvencek (Négy és öt csillagra értékelt számok)</p></item>
+ <item><p>Legutóbbi kedvencek (A múlt héten gyakran hallgatott számok)</p></item>
+ <item><p>Legutóbb hozzáadott (Az elmúlt héten importált számok)</p></item>
+ <item><p>Nem hallgatott (Le nem játszott vagy kihagyott számok)</p></item>
+ <item><p>Mellőzött kedvencek (Több mint két hónapja le nem játszott kedvencek)</p></item>
+ <item><p>700 MB kedvenc (Egy adat CD-nyi kedvenc szám)</p></item>
+ <item><p>80 percnyi kedvenc (Egy hang CD-nyi kedvenc szám)</p></item>
+ <item><p>Nem értékelt (Még nem értékelt számok)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/hu/manage-tags.page b/help/hu/manage-tags.page
index 701e18d..fb446d9 100644
--- a/help/hu/manage-tags.page
+++ b/help/hu/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="hu">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="hu">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Zenecímkék és metaadatok szerkesztése.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,49 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Zene metadatai</title>
+
+ <section id="metadata">
+
+ <title>Zene metaadatai</title>
+
+ <p>A digitalizált zene metaadatokat tartalmazhat, ezek az adatok információkat tárolnak a zenei fájlban, például az előadót, az albumot, a felvétel évét, a műfajt és sok mást. Majdnem minden, az internetről vásárolt zene már tartalmazza a metaadatokat, és ha zenéit CD-ről importálja, a Banshee a CD beolvasásakor fel fogja venni a metaadatokat, ha azok elérhetők. A CD-k beolvasásával és a metaadatok felvételével kapcsolatos további információkért nézze meg a <link xref="import"/> részt.</p>
+
+ <p>A népszerű metaadat-formátumok az ID3v1 és ID3v2 az MP3 fájlokhoz, és a Vorbis megjegyzések OGG Vorbis fájlokhoz.</p>
+
+ <p>Ha metaadatokat nem tartalmazó számokat importált, a <app>Banshee</app> az <gui>Ismeretlen</gui> szót fogja megjeleníteni a gyűjtemény legtöbb mezőjében.</p>
+
+ </section>
- <title>Zene metaadatai</title>
-
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>A népszerű metaadat-formátumok az ID3v1 és ID3v2 az MP3 fájlokhoz, és a Vorbis megjegyzések OGG Vorbis fájlokhoz.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
-
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>Megjelenik egy párbeszédablak, amely megjeleníti a szám metaadatait, és lehetővé teszi azok módosítását. Az alapesetben megjelenített mezők:</p>
-
- <list>
- <item><p><gui>Szám címe</gui></p></item>
- <item><p><gui>Szám előadója</gui></p></item>
- <item><p><gui>Album címe</gui></p></item>
- <item><p><gui>Műfaj</gui></p></item>
- <item><p><gui>Szám sorszáma</gui></p></item>
- <item><p><gui>Lemezszám</gui></p></item>
- <item><p><gui>Év</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
-
+ <section id="editmetadata">
+
+ <title>Metaadatok szerkesztése</title>
+
+ <p>A számok metaadatait szerkesztheti. Válassza ki a frissíteni kívánt számokat, és nyomja meg az <key>E</key> billentyűt, vagy válassza a <guiseq><gui>Szerkesztés</gui><gui>Száminformációk szerkesztése</gui></guiseq> menüpontot, vagy kattintson a jobb egérgombbal a fájlokra, és válassza a <gui>Száminformációk szerkesztése</gui> menüpontot.</p>
+
+ <p>Megjelenik egy párbeszédablak, amely megjeleníti a szám metaadatait, és lehetővé teszi azok módosítását. Az alapesetben megjelenített mezők:</p>
+
+ <list>
+ <item><p><gui>Szám címe</gui></p></item>
+ <item><p><gui>Szám előadója</gui></p></item>
+ <item><p><gui>Album címe</gui></p></item>
+ <item><p><gui>Műfaj</gui></p></item>
+ <item><p><gui>Szám sorszáma</gui></p></item>
+ <item><p><gui>Lemezszám</gui></p></item>
+ <item><p><gui>Év</gui></p></item>
+ </list>
+
+ <p>Frissítse a szám információit. Ha több számot választott ki a szerkesztéshez, és végzett egy szám szerkesztésével, akkor nyomja meg a jobbra nyíl ikont a <gui>Szám címe</gui> mezőtől jobbra, vagy nyomja meg a <gui>Tovább</gui> gombot az ablak alján a következő számra lépéshez. Ha befejezte a metaadatok szerkesztését, akkor nyomja meg a <gui>Mentés</gui> gombot.</p>
+
</section>
</page>
diff --git a/help/hu/play-queue.page b/help/hu/play-queue.page
index 4bd7f83..3974c56 100644
--- a/help/hu/play-queue.page
+++ b/help/hu/play-queue.page
@@ -1,96 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="hu">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="hu">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Médiafájlok hozzáadása a lejátszási sorhoz.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
+ <title>Lejátszási sor</title>
+
+ <p>A <gui>Lejátszási sor</gui> lehetővé teszi a zenék megadott sorrendben való lejátszását. Sok számot hozzáadva órákon át folyamatosan hallgathatja zenéit. Egyedi számokat vagy teljes albumokat is hozzáadhat, valamint rendezheti vagy át is rendezheti azokat.</p>
+
+<section id="addqueue">
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
+ <title>Zene hozzáadása a lejátszási sorhoz</title>
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
+ <p>Zenegyűjteményéből válassza ki a lejátszási sorhoz adandó számokat vagy albumokat.</p>
+
+ <p>Teljes album lejátszási sorhoz adásához az egérrel húzza az albumot a bal oldali ablaktábla <gui>Lejátszási sor</gui> elemére.</p>
+
+ <p>Zeneszámokat a lejátszási sorhoz egyenként vagy csoportosan adhat. Egy fájl hozzáadásához húzza át azt a bal oldali ablaktábla <gui>Lejátszási sor</gui> elemére, vagy kattintson rá a jobb egérgombbal, és válassza a <gui>Hozzáadás a lejátszási sorhoz</gui> menüpontot.</p>
+
+ <p>Több fájlt is kiválaszthat a <key>Ctrl</key> nyomva tartásával, és az egyes fájlok egérkattintással való kijelölésével, vagy fájlok csoportját is kiválaszthatja a <key>Shift</key> lenyomva tartásával és két kattintással a csoport első és utolsó elemén. Ezután fogd és vidd módszerrel átviheti a fájlokat a bal oldali ablaktábla <gui>Lejátszási sor</gui> elemére, vagy kattintson a számokra a jobb egérgombbal, és válassza a <gui>Hozzáadás a lejátszási sorhoz</gui> elemet.</p>
+
+</section>
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
+<section id="reorderqueue">
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
+ <title>Rendszerezze lejátszási sorát</title>
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+ <p>Lejátszási sorában a számok hozzáadásuk sorrendjében szerepelnek. Az elsőként a sorhoz adott számok vagy albumok kerülnek elsőként lejátszásra. Lejátszási sorát fogd és vidd módszerrel átrendezheti. Válassza ki az átrendezni kívánt számokat, és húzza azokat a sor kívánt pozíciójára.</p>
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>Számok eltávolítása a lejátszási sorból</title>
+ <p>Eltávolíthat egy számot, számok csoportját, vagy minden számot.</p>
+
+ <p>Egy szám vagy számok csoportjának eltávolításához válassza ki a számokat az egérrel, és nyomja meg a <key>Delete</key> billentyűt.</p>
+
+ <p>A teljes lejátszási sor törléséhez nyomja meg a <gui>Törlés</gui> gombot a Lejátszási sor nézet jobb felső sarkában.</p>
+
+</section>
+
</page>
diff --git a/help/hu/play.page b/help/hu/play.page
index f699869..ffc2430 100644
--- a/help/hu/play.page
+++ b/help/hu/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Videók és zenefájlok lejátszása.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Zenék lejátszása</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>Videó lejátszása</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+
+ <title>Médiafájlok lejátszása</title>
+
+ <section id="playmusic">
+ <title>Zenék lejátszása</title>
+
+ <p>Zenék lejátszásához válassza a Zene forrást. A zenegyűjtemény megjeleníti a gyűjtemény összes előadóját, az egyes albumok lemezborítóját, és a gyűjtemény összes számának listáját.</p>
+
+ <p>Válassza ki a lejátszandó albumot vagy számot az előadók vagy albumok listájáról, vagy használja a keresősávot a Banshee jobb felső sarkában.</p>
+
+ <p>Egy szám lejátszásának megkezdéséhez kattintson duplán az egérrel a szám címére, nyomja meg a <key>szóközt</key>, vagy válassza a Banshee menüjének <guiseq><gui>Lejátszás</gui><gui>Lejátszás</gui></guiseq> pontját.</p>
+
+ <p>Egy album lejátszása elindítható az album kiválasztásával az albumböngészőben, és a szám címén való dupla kattintással, a <key>szóköz</key> megnyomásával, vagy a Banshee menüjéből a <guiseq><gui>Lejátszás</gui><gui>Lejátszás</gui></guiseq> pont kiválasztásával.</p>
+
+ <p>Egy előadó összes számának lejátszásához válassza ki az előadót az előadó-böngészőben, és nyomja meg a <key>szóközt</key>, vagy válassza a Banshee menüjéből a <guiseq><gui>Lejátszás</gui><gui>Lejátszás</gui></guiseq> pontot.</p>
+
+ <p>A Banshee megjeleníti kedvenc albumait (amiket a legtöbbször hallgatott), legutóbbi kedvenceket, legutóbb hozzáadott és nem hallgatott zenéket. Válassza ki a meghallgatni kívánt kategóriát az ahhoz tartozó dalok lejátszásához.</p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>Videó lejátszása</title>
+
+ <p>Az importált videók ábécérendben jelennek meg. Videó lejátszásához válassza ki azt a listából, és nyomja meg a <key>szóközt</key>, vagy válassza a Banshee menüjéből a <guiseq><gui>Lejátszás</gui><gui>Lejátszás</gui></guiseq> pontot.</p>
+
+ <p>A Banshee megjeleníti kedvenc videóit (amiket a legtöbbet nézett) és nem nézett videóit. Válassza ki az egyiket, és a listából lejátszhatja a videókat.</p>
+
</section>
-
- <section id="play-radio">
- <title>Internetes rádióállomás lejátszása</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>Podcast lejátszása</title>
+
+ <p>A Podcastok megjeleníti az összes podcastot, amelyre fel van iratkozva, az összes elérhető podcast adást. A podcastböngésző a podcastok felsorolását a legújabbal kezdi.</p>
+
+ <p>Podcast lejátszásához válassza ki azt a listából, és nyomja meg a <key>szóközt</key>, vagy válassza a Banshee menüjéből a <guiseq><gui>Lejátszás</gui><gui>Lejátszás</gui></guiseq> pontot.</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>Internetes rádióállomás lejátszása</title>
+
+ <p>A Rádió forrás ábécérendben megjeleníti a Bansheeba felvett összes internetes rádióállomást.</p>
+
+ <p>Internetes rádióállomás lejátszásához válassza ki azt a listából, és nyomja meg a <key>szóközt</key>, vagy válassza a Banshee menüjéből a <guiseq><gui>Lejátszás</gui><gui>Lejátszás</gui></guiseq> pontot.</p>
+
+ </section>
+
</page>
diff --git a/help/hu/podcast.page b/help/hu/podcast.page
deleted file mode 100644
index 1d1682a..0000000
--- a/help/hu/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="hu">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcastok</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/hu/radio.page b/help/hu/radio.page
deleted file mode 100644
index ab717d0..0000000
--- a/help/hu/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="hu">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/hu/rb-import.page b/help/hu/rb-import.page
new file mode 100644
index 0000000..7188676
--- /dev/null
+++ b/help/hu/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="hu">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Zene és kategóriák importálása a <app>Rhythmbox</app> zenelejátszóból.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>A <app>Rhythmbox</app> gyűjtemény importálása</title>
+
+</page>
diff --git a/help/hu/search.page b/help/hu/search.page
index bf0cdf3..5b81b9d 100644
--- a/help/hu/search.page
+++ b/help/hu/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,90 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Keresés a Banshee gyűjteményben</title>
+
+ <p>A Banshee tartalmaz egy hatékony keresőnyelvet. Egyszerű keresőkifejezések segítségével gyorsan és egyszerűen kereshet gyűjteményében, vagy részletes kereséseket hajthat végre a Banshee fejlett keresőtechnológiájával.</p>
+
+ <p>Médiafájlok kereséséhez nyomja meg az <key>S</key> billentyűt, vagy kattintson a <gui>Keresés</gui> dobozra a Gyűjtemény nézet jobb felső sarkában.</p>
+
+ <p>A keresőkifejezés egyszerű kifejezésekből áll, például: <em>dave matthews</em>. A <em>dave matthews</em> kifejezés beírásakor a keresődobozba a Banshee minden metaadat-mezőben keresni fog, beleértve a szám címe, album címe, album előadója, év stb. mezőket. Minden szám megjelenik, amelynek metadatai közt szerepel a <em>dave</em> és <em>matthews</em> név. A keresőkifejezések nem különböztetik meg a kis- és a nagybetűket. Így a <em>dave</em>, <em>Dave</em> és <em>DAVE</em> kereséskor m [...]
+
+<section id="operators">
+ <title>Alapvető műveletek</title>
+ <p>Bármely két keresőkifejezés közé vagy keresőszó elé elhelyezhetők műveletek. Az alapművelet az <gui>ÉS</gui>, és ha a két keresőkifejezés közt nincs megadva más művelet, akkor ez kerül felhasználásra. Mivel ez az alap, így nincs külön ÉS művelet.</p>
+
<p>További alapvető műveletek az <gui>OR</gui> és a <gui>NOT</gui>. Együtt ez a három művelet nagyon hatékony lekérdezéseket eredményezhet, amelyek segítenek médiafájljai megtalálásában.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Logikai műveletek és példák</title>
<p>Az alábbi lista a logikai műveleteket tartalmazza, és az azokkal kapható találatokra ad példákat.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Művelet</gui></p></td>
- <td><p><gui>Leírás</gui></p></td>
+ <td><p><gui>Művelet</gui></p></td> <td><p><gui>Leírás</gui></p></td>
</tr>
<tr>
- <td><p><em>alap</em>, <em>szóköz</em></p></td>
- <td><p>Két kifejezés keresése, szóközzel a két szó vagy kifejezés között.</p></td>
+ <td><p><em>alap</em>, <em>szóköz</em></p></td> <td><p>Két kifejezés keresése, szóközzel a két szó vagy kifejezés között.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>A találatok a két számot tartalmazzák, amelyek egyike megtalálható valamely mezőben.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>A találatok a két számot tartalmazzák, amelyek egyike megtalálható valamely mezőben.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>Ne jelenítse meg a NOT, not,<key>-</key> műveletet követő keresőkifejezést tartalmazó találatokat.</p></td>
+ </tr>
+
+</table>
<p>Példák logikai műveletekre:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Lekérdezés</gui></p></td>
- <td><p><gui>Leírás</gui></p></td>
+ <td><p><gui>Lekérdezés</gui></p></td> <td><p><gui>Leírás</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Egy szám bármely mezőjére illeszkedik, amely tartalmazza a <em>dave</em> és <em>matthews</em> neveket is.</p></td>
+ <td><p>dave matthews</p></td> <td><p>Egy szám bármely mezőjére illeszkedik, amely tartalmazza a <em>dave</em> és <em>matthews</em> neveket is.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Egy szám bármely mezőjére illeszkedik, amely tartalmazza a <em>dave</em> vagy <em>matthews</em> nevet.</p></td>
+ <td><p>dave, matthews</p></td> <td><p>Egy szám bármely mezőjére illeszkedik, amely tartalmazza a <em>dave</em> vagy <em>matthews</em> nevet.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Egy szám bármely mezőjére illeszkedik, amely tartalmazza a <em>dave</em> vagy <em>matthews</em> nevet.</p></td>
- </tr>
+ <td><p>dave or matthews</p></td> <td><p>Egy szám bármely mezőjére illeszkedik, amely tartalmazza a <em>dave</em> vagy <em>matthews</em> nevet.</p></td>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Egy szám bármely mezőjére illeszkedik, amely tartalmazza a <em>dave</em> vagy <em>matthews</em> nevet.</p></td>
- </tr>
+ <td><p>dave | matthews</p></td> <td><p>Egy szám bármely mezőjére illeszkedik, amely tartalmazza a <em>dave</em> vagy <em>matthews</em> nevet.</p></td>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Megjeleníti az összes számot, amelyek egyik mezője sem tartalmazza a <em>dave matthews</em> nevet.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>Megjeleníti az összes számot, amelyek egyik mezője sem tartalmazza a <em>dave matthews</em> nevet.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Összetett lekérdezések végrehajtásával kapcsolatos további információkért lásd a <link xref="adv-search"/> oldalt.</p>
+
</section>
-
+
</page>
diff --git a/help/hu/sort.page b/help/hu/sort.page
index c0aac22..c34fe58 100644
--- a/help/hu/sort.page
+++ b/help/hu/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Oszlopok hozzáadása</title>
+
<p>Ahogyan gyűjteménye növekszik, szükség lehet a gyűjteménynézet módosítására a számokkal kapcsolatos további információk felvételéhez, vagy a számok, előadók vagy albumok megjelenítési és rendezési módjának módosításához.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>A <app>Banshee</app> gyűjteménynézetéhez további oszlopokat adhat a számokkal kapcsolatos további információk eléréséhez, valamint ezek alapján rendezhet is. Alapbeállítás szerint a Banshee a számokhoz tartozó <gui>Név</gui>, <gui>Előadó</gui>, <gui>Album</gui> és <gui>Idő</gui> oszlopát jeleníti meg. További oszlopok hozzáadásához kattintson a jobb egérgombbal az oszlopokra, és a Banshee megjeleníti az összes elérhető oszlopot. Kattintson a gyűjteményhez felvenni kívánt oszlop neve [...]
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Oszlopok rendezése</title>
+ <p>Gyűjteményét rendezheti a gyűjteménynézetben megjelenő bármely oszlop alapján, az egérrel a kívánt oszlopra kattintva. Ha zenéit előadó alapján szeretné rendezni, kattintson az <gui>Előadó</gui> oszlopnévre, és a Banshee automatikusan ábécérendbe rendezi az adott oszlopot. Az <gui>Előadó</gui> oszlopra való ismételt kattintás fordított ábécérendbe rendezi az oszlopot.</p>
</section>
-
+
</page>
diff --git a/help/hu/sync.page b/help/hu/sync.page
index 91a2b3d..a65ff47 100644
--- a/help/hu/sync.page
+++ b/help/hu/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Szinkronizálja médiafájljait hordozható zenelejátszóra vagy okostelefonra.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Szinkronizálás</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Szinkronizálás</title>
+
+ <p>A Banshee támogatja zenéinek szinkronizálását hordozható médialejátszókra és okostelefonokra. Szinkronizálhat egyes zeneszámokat, albumokat vagy lejátszólistákat, vagy beállíthatja a Bansheet a zenelejátszó szinkronban tartására a teljes gyűjteménnyel. A lejátszója számítógéphez csatlakoztatása után lejátszhatja az azon tárolt zenéit a Bansheeban. Ha veszteségmentes, például FLAC formátumban tárolt zenéit szinkronizálja, a Banshee automatikusan átkódolja veszteséges, például Ogg Vor [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Eszköztámogatás</title>
+ <p>A Banshee majdnem minden modern hordozható zenelejátszót és okostelefont támogat, kivéve az Apple iPhone, iPad és iPod Touch eszközöket.</p>
+
+ <p>Amikor csatlakoztatja az eszközt, a Banshee megjeleníti azt a bal oldali menüben. Az eszközikon megnyomása eljuttatja az eszköz kezdőoldalára a Bansheeban, amely a szinkronizálási beállításokat jeleníti meg.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Zene</p></item>
- <item><p>Hangoskönyvek</p></item>
- <item><p>Videók</p></item>
- <item><p>Podcastok</p></item>
- </list>
-
- <p>Az egyes médiatípusok melletti legördülő menüből válasszon a következőkből:</p>
-
- <list>
- <item><p>Kezelés saját kezűleg</p></item>
- <item><p>Teljes gyűjtemény szinkronizálása</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Zenéinek szinkronizálása</title>
+ <p>Hagyhatja, hogy a hordozható zenelejátszón lévő médiafájlokat a Banshee automatikusan szinkronizálja, vagy saját kezűleg is kezelheti zenéit és médiafájljait.</p>
+
+ <p>Válassza ki az eszközt a Banshee menüjéből, és válassza ki, hogyan szeretné szinkronizálni médiafájljait, beleértve a következőket:</p>
+ <list>
+ <item><p>Zene</p></item>
+ <item><p>Hangoskönyvek</p></item>
+ <item><p>Videók</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>Az egyes médiatípusok melletti legördülő menüből válasszon a következőkből:</p>
+ <list>
+ <item><p>Kezelés saját kezűleg</p></item>
+ <item><p>Teljes gyűjtemény szinkronizálása</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Ha a teljes gyűjtemény automatikus szinkronizálását választja a hordozható médialejátszóval, akkor győződjön meg róla, hogy a médialejátszón elegendő szabad hely van. Ha a gyűjteménye nagyobb, mint a hordozható médialejátszón elérhető szabad hely, akkor a Banshee addig szinkronizál, amíg a lejátszó meg nem telik, majd abbahagyja.</p>
+ </note>
+
+ <p>Ha zenegyűjteményében létrehozott lejátszólistákat vagy okos lejátszólistákat, akkor ezek is megjelennek zeneszinkronizálási lehetőségként. Ez okos lejátszólisták létrehozásakor lehet hasznos, mivel az okos lejátszólisták automatikusan frissülnek a lejátszólista szabályainak megfelelő új tartalom felvételekor, és a Banshee az új lejátszólistát szinkronizálni fogja az eszközre annak minden egyes csatlakoztatásakor.</p>
+
+ <p>A Banshee ablak közepén alul egy grafikonon megjelenik a hordozható zenelejátszó teljes merevlemez-területe. A grafikon megjeleníti, hogy mennyi helyet foglalnak a hangfájlok, a videók, az egyéb fájlok, és a szabad helyet. Ez alatt közvetlenül megjelenik, hogy összesen hány fájlt tárol a hordozható zenelejátszó, ez hány óra vagy nap alatt hallgatható végig, és az összesen felhasznált hely.</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Teljes gyűjtemény szinkronizálása</title>
+ <p>A Bansheeból fogd és vidd módszerrel is másolhat fájlokat hordozható zenelejátszójára. Válassza ki az átmásolni kívánt fájlokat, nyomja le és tartsa lenyomva a jobb egérgombot, és húzza a fájlokat a hordozható zenelejátszó ikonjára a Bansheeban. Ez átmásolja a fájlokat az eszközre.</p>
+
+ <p>Ha zenegyűjteménye olyan, például OGG vagy FLAC formátumban van kódolva, amit a hordozható zenelejátszó nem támogat, és a szükséges kodekek telepítve vannak, akkor a Banshee automatikusan át tudja kódolni ezeket a fájlokat MP3-ba azok átvitelekor a hordozható zenelejátszóra. A szükséges kodekekkel kapcsolatban nézze meg Linux disztribúciója dokumentációját, mivel ezek telepítésének módja disztribúciónként eltér.</p>
+
+ <note style="tip">
+ <p>A hordozható zenelejátszón lévő fájlok megfelelő betöltéséhez szükség lehet az eszköz kiadására. Az eszköz Bansheeból való kiadásához kattintson a jobb egérgombbal az eszközre a Banshee menüben, és válassza a <gui>Leválasztás</gui> menüpontot.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Zene lejátszása hordozható zenelejátszóról</title>
+ <p>A hordozható zenelejátszón tárolt zenéket közvetlenül lejátszhatja a Bansheeban. Válassza ki lejátszóját a Banshee bal oldali menüjéből, és megjelenik a hordozható zenelejátszó gyűjteménye. Ekkor ugyanúgy lejátszhatja a zenét a Bansheeban, mintha az a saját gyűjteményében lenne.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>A fájlok törlése a hordozható zenelejátszóról végleges, a törölt fájlok nem állíthatók helyre.</p>
- </note>
-
+ <title>Zene eltávolítása hordozható zenelejátszóról</title>
+ <p>A hordozható zenelejátszón tárolt dalok eltávolításához válassza ki a lejátszót a Bansheeban a gyűjteményének megjelenítéséhez. Válassza ki az eltávolítani kívánt számokat, kattintson a jobb egérgombbal a számokra, és válassza a <gui>Törlés</gui> menüpontot, vagy a menü <guiseq><gui>Szerkesztés</gui><gui>Törlés</gui></guiseq> menüpontját.</p>
+
+ <note style="warning">
+ <p>A fájlok törlése a hordozható zenelejátszóról végleges, a törölt fájlok nem állíthatók helyre.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/hu/ui.page b/help/hu/ui.page
index b712092..4f61025 100644
--- a/help/hu/ui.page
+++ b/help/hu/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>A <app>Banshee</app> felhasználói felületének bemutatása.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>A Banshee felhasználói felületének ismertetése</title>
<figure>
<title><gui>Banshee médialejátszó</gui> ablak</title>
<desc><app>Banshee médialejátszó</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>A <app>Banshee</app> gyűjtemény felület</p>
</media>
</figure>
+
+<section id="context">
+ <title>Források</title>
+ <p>Zene- és videoforrásai a Banshee bal oldalán láthatók. A források segítségével gyorsan elérheti a lejátszási sort, a zenéit, videóit, az Amazont, a Last.fm fiókját, podcastjait és sok mást.</p>
+
+ <note style="tip">
+ <p>A menüpontok a kiválasztott forrástól függően változnak. A menüből Podcast importálásához például a Podcast forrást kell kiválasztania. A Podcast importálására szolgáló menüpont nem érhető el videonézés vagy a zenegyűjtemény böngészése közben.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Gyűjteményböngésző</title>
+ <p>Ha a Források alatt zenei vagy videoforrást választ, a Banshee megjeleníti a tartalmat a Gyűjteményböngészőben. A választott forrástól függően a Banshee megjelenítheti a zenei vagy videogyűjteményét, Podcast-feliratkozásait vagy akár az Amazon zeneboltot, ahonnan zenét vásárolhat.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Most játszott nézet</title>
+ <p>A Banshee teljes képernyős módban való használatakor igen hasznos a Most játszott nézet, amely elrejti a gyűjteményt, ezzel nagyobb területet biztosít a zene vagy a videó számára. Zene hallgatásakor a Most játszott nézet megjeleníti az előadó nevét, az albumot és a lemezborítót, ha az elérhető. Videó lejátszásakor a Banshee a videót jeleníti meg.</p>
+
+ <p>A Banshee felhasználói felületét elrejtő és a teljes képernyős módot használó Most játszott nézetre váltáshoz megnyomhatja az <key>F</key> billentyűt vagy a Banshee jobb felső sarkában lévő <gui>Teljes képernyő</gui> gombot, illetve kiválaszthatja a <guiseq><gui>Nézet</gui><gui>Teljes képernyő</gui></guiseq> menüpontot is.</p>
+
+</section>
+
+<section id="library">
+ <title>Gyűjtemény</title>
+ <p>A Gyűjtemény nézet a kiválasztott Forrástól függően változik. A Zenegyűjtemény a lemezborítót, a gyűjteményben található előadókat és a számok listáját jeleníti meg. A Podcast gyűjtemény megjeleníti a Podcast feliratkozásait, a letöltött vagy le nem töltött podcastokat, és minden új vagy régi podcastot. A források kezelésével kapcsolatos részletekért nézze meg az egyes forrásokhoz tartozó súgóoldalakat.</p>
+</section>
- <section id="context">
- <title>Források</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/ja/add-podcast.page b/help/ja/add-podcast.page
new file mode 100644
index 0000000..96fad93
--- /dev/null
+++ b/help/ja/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="ja">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Bansheeでポッドキャストを追加、削除および再生</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>ポッドキャスト</title>
+
+ <section id="podcastdescription">
+ <title>ポッドキャストとは？</title>
+
+ <p>ポッドキャストは、インターネット上で購読できるようにラジオ番組を録画ようなものです。Bansheeでポッドキャストは購読することで、Bansheeは自動的にポッドキャストをダウンロードし、新しい番組を聞くことができます。</p>
+
+ <p>世の中には、音楽、映画、Linuxなど、いろいろなジャンルの多くのポッドキャストがあります。お好みの検索エンジンで"映画 ポッドキャスト"などとインターネットから検索すると多くのポッドキャストが見つかるでしょう。</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>ポッドキャストの追加</title>
+
+ <p>ポッドキャストをBansheeに追加するには、まず最初にインターネットからポッドキャストを提供しているホームページをウェブブラウザーでアクセスする必要があります。ほぼすべてのポッドキャストはポッドキャストを購読するボタンまたはリンクが提供されています。ウェブブラウザーでポッドキャスト購読用のリンクを右クリックして<gui>リンクのURLをコピー</gui>を選びます。</p>
+
+ <p>Bansheeのウィンドウの右上にある<gui>新しいポッドキャストで購読</gui>ボタンを押すか、もしくはBansheeのメニューから<guiseq><gui>メディア</gui><gui>ポッドキャストで購読</gui></guiseq>、それかキーボードのショートカットで<keyseq><key>Shift</key><key>Ctrl</key><key>F</key></keyseq>を押します。</p>
+
+ <p>Bansheeではドロップダウンメニューから新しいポッドキャストをダウンロードする方法を選択することできます。次のような選択肢があります：</p>
+
+ <list>
+ <item><p>最新のエピソードをダウンロードする（これは最後の公開されたエピソードが自動的にダウンロードされます）</p></item>
+ <item><p>すべてのエピソードをダウンロード（これはすべてのエピソードがダウンロードされます）</p></item>
+ <item><p>どのエピソードをダウンロードするか確認する（これはダウンロードを希望するエピソードを選択できるようになります）</p></item>
+ </list>
+
+ <p>ポッドキャストのフィードを追加した後、Bansheeが表示されます：</p>
+
+ <list>
+ <item><p><gui>名前</gui>: （特定のエピソードの名前）</p></item>
+ <item><p><gui>ポッドキャスト</gui>: （ポッドキャストの名前）</p></item>
+ <item><p><gui>公開日</gui>（エピソードが発行された日、もしくはリリースされた日）</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/ja/add-radio.page b/help/ja/add-radio.page
new file mode 100644
index 0000000..507b9d4
--- /dev/null
+++ b/help/ja/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="ja">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Banshee上でインターネットラジオステーションを再生、追加、削除します。</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>インターネットラジオ</title>
+
+ <section id="radiodescription">
+ <title>インターネットラジオとは？</title>
+
+ <p>インターネットラジオステーションは、組織や個人がインターネット上で音楽のライブストリームを可能にします。これは通常のラジオステーションに似ています。インターネットラジオ局は、通常のラジオステーションの同時ストリーム、アマチュア放送独自のストリーム、またはライブDJやコマーシャルを含む商用インターネットラジオステーションを行うことができます。</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>ラジオステーションを追加する</title>
+
+ <p>インターネットラジオステーションをBansheeへ追加するためには、Bansheeの右上にある<gui>ステーションを追加</gui>をクリックするか、もしくは<guiseq><gui>メディア</gui><gui>ステーションを追加</gui></guiseq>を選びます。</p>
+
+ <p>Webブラウザーを使いインターネットラジオステーションのWebページからストリームのURLへのリンクをコピーしてください。ほとんどのブラウザーでは、リンクの上で右クリックしてメニューから<gui>リンクのURLをコピー</gui>を選びます。</p>
+
+
+ <p>Bansheeは、<gui>ステーションジャンル</gui>を入力するプロンプトを表示します。インターネットラジオステーションで聞ける音楽の種類をドロップダウンリストから選択してください。ラジオステーションに対する<gui>ステーション名</gui>を入力する必要があります。<gui>ストリームURL</gui>にはラジオステーションのURLをウェブブラウザーなどから貼り付けてください。マウスで右クリックして<gui>貼り付け</gui>を選ぶか、<keyseq><key>Ctrl</key><key>V</key></keyseq>で貼り付けられます。</p>
+
+ <p>必要に応じて、また、<gui>ステーションの作者</gui>、<gui>説明</gui>と<gui>評価</gui>のフィールドに任意で記入することができます。</p>
+
+ <p>次に<gui>保存</gui>ボタンを押して、Bansheeのインターネットラジオステーションを保存を押してください。</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/ja/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/ja/advanced.page
index 468ad23..ae52a44 100644
--- a/help/zh_CN/extensions.page
+++ b/help/ja/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="ja">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>詳細な使い方についてのヘルプ</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>詳細なオプションとヘルプ</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">キーボードショートカット</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>キーボードショートカット</title>
</section>
-
+
</page>
diff --git a/help/ja/amazon.page b/help/ja/amazon.page
index 69f65ee..8c859a7 100644
--- a/help/ja/amazon.page
+++ b/help/ja/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Amazon MP3ストアで購入した楽曲を同期する</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Amazon MP3ストア</title>
+
+ <p>BansheeはAmazon MP3ストアから音楽のダウンロードとインポートをサポートしています。ウェブブラウザーもしくはBansheeの中でAmazonから購入した音楽ファイルは手動でインポートすることができます。Amazonは一部の国ではMP3形式による音楽の販売を提供していますが、場所によってはAmazonからMP3ファイルを購入することができない場合もあります。</p>
+
+ <note style="important">
+ <p>Bansheeは、すべての楽曲の購入に対してAmazonアフィリエイトコードを使います。このアフィリエイトコードで得たすべての利益はGNOME Foundationに寄付されます。</p>
+ </note>
+
<section id="amazon-browser">
- <title>ウェブブラウザーからAmazon MP3を購入する</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>ウェブブラウザーからAmazon MP3を購入する</title>
+
+ <p>楽曲をAmazon MP3ストアから購入した場合、自動的にダウンロードされてBansheeにインポートされます。 Bansheeは、Amazonと連携して.amzファイルからMP3をダウンロードするための仕組みを提供しています。 Amazonで音楽を購入する場合、Webブラウザーは.amzファイルをダウンロードすると自動的にBansheeを開き、ダウンロードを開始して楽曲をインポートします。</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Banshee内でAmazon MP3を購入する</title>
+
+ <p>Banshee内でAmazonで曲を検索することができます。Bansheeの左側のソースからAmazon MP3ストアを選択してください。これはウェブブラウザーだった場合と同じく、Amazon MP3ストアが読み込まれます。Amazonにログインした後、購入したい音楽を検索することができ、ワンクリックで購入できます。購入した後、Bansheeは自動的にダウンロードし、ライブラリにインポートします。</p>
</section>
-
+
<section id="amazon-manual">
- <title>Amazon MP3を手動でインポートする</title>
-
- <p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ <title>Amazon MP3を手動でインポートする</title>
+
+ <p>ウェブブラウザーからAmazon MP3ストアで音楽を購入した時、.amz形式の拡張を持ったファイルがハードディスクにダウンロードされます。Amazonから購入した音楽を手動でBansheeへインポートする場合、Bansheeのメニューから<guiseq><gui>メディア</gui><gui>メディアをインポート</gui></guiseq>を選び、.amzファイルを選択してインポートを行います。Bansheeは指定されたファイルを開き、Amazon MP3ストアに接続し、ダウンロードが始まります。</p>
+
<note style="warning">
<p>Amazonの.amzファイルには短時間だけ有効なファイルです。購入した音楽をすぐにダウンロードしないでファイルが有効期限切れになるとAmazonから音楽をダウンロードすることはできません。Amazonは.amzファイルがどのぐらいの期間有効なのか確認する方法を公開していません。そのため、ダウンロード購入したらすぐにAmazonからインポートすることをお勧めします。</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/ja/emusic.page b/help/ja/emusic.page
new file mode 100644
index 0000000..30251e6
--- /dev/null
+++ b/help/ja/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="ja">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>eMusicで購入した楽曲をインポートする</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>eMusicのトラックをインポートする</title>
+
+</page>
diff --git a/help/ja/extensions.page b/help/ja/extensions.page
index 49163aa..ddf3e8f 100644
--- a/help/ja/extensions.page
+++ b/help/ja/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="ja">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="ja">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Bansheeに追加機能を加える</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Bansheeの拡張機能</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">公式のBanshee機能拡張</title>
</info>
+ <title>Banshee機能拡張を管理する</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">コミュニティのBanshee機能拡張</title>
+ </info>
+ <title>コミュニティビルドのBanshee機能拡張を管理する</title>
</section>
+
</page>
diff --git a/help/ja/import.page b/help/ja/import.page
index f80ce0c..edd5aa1 100644
--- a/help/ja/import.page
+++ b/help/ja/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>コンピューター上の音楽ファイルやビデオファイルをBansheeのライブラリへ追加します。</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>楽曲とビデオのインポート</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>お使いのコンピューター上に保存された音楽やビデオをBansheeにインポートすることができます。インポートされたファイルはソースに存在する既存のファイルと同じく編集や管理ができます。</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>コンピューター上の音楽ファイルやビデオファイルをインポートするには、<guiseq><gui>メディア</gui><gui>メディアのインポート</gui></guiseq>を選びます。ダイアログには選択肢がいくつか表示されます。</p>
- <note style="tip">
+ <note>
<p>プラグインによりインポート元の選択肢を追加することができます。 詳しくは<link xref="#plugins"/>をご覧ください。</p>
</note>
@@ -53,27 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>ライブラリ内のすでにインポートした重複したエントリを心配することなく、フォルダーから安全にインポートすることができます。</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>プレイリストからのインポート</title>
+ <p>プレイリストから楽曲をインポートすることができます。<em>m3u</em>形式の拡張子のほとんどのプレイリストファイルに対応しています。プレイリストからインポートするには、Bansheeのメニューから<guiseq><gui>メディア</gui><gui>プレイリストのインポート</gui></guiseq>を選び、プレイリストを含むフォルダーを選択した後に<gui>インポート</gui>をクリックします。</p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>プラグインにてインポート元の選択肢を追加することができます。また、適切なプラグインが有効になっている場合、次の追加のソースが利用できるようになります：</p>
-
+ <title>追加のインポートソース</title>
+ <p>プラグインにてインポート元の選択肢を追加することができます。また、適切なプラグインが有効になっている場合、次の追加のソースが利用できるようになります：</p>
</section>
-
+
</page>
diff --git a/help/ja/index.page b/help/ja/index.page
index a674fd6..6e72dad 100644
--- a/help/ja/index.page
+++ b/help/ja/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Bansheeメディアプレイヤー</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>追加と削除、再生</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>管理と並び替え</title>
</section>
-
+
<section id="sync" style="2column">
<title>ポータブルミュージックプレイヤーと楽曲を同期します</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Bansheeに追加機能を加える</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>詳細な設定とヘルプ</title>
+ <title>詳細な設定とヘルプ</title>
</section>
</page>
diff --git a/help/ja/introduction.page b/help/ja/introduction.page
index ac5b65c..96a85c1 100644
--- a/help/ja/introduction.page
+++ b/help/ja/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc><app>Bansheeメディアプレイヤー</app>について</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>はじめに</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p><app>Banshee</app>はメディアプレイヤーです。音楽、ビデオ、その他のメディアを再生することができます。また、ポータブルデバイスと同期して、外出先でも音楽やビデオを楽しめます。</p>
<p><app>Banshee</app>にはメディアをインポート、メタデータの管理、音楽とビデオを再生する機能があります。</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>Bansheeはポータブルミュージックプレーヤーやスマートフォンなどの一般的な携帯機器に対して音楽やビデオを同期することができます。BansheeはほとんどのiPod、SanDisk、CreativeのMP3プレーヤーなどの一般的なデバイス、また、Androidを搭載した携帯電話をサポートしています。</p>
+<!--
<figure>
- <title><gui>Bansheeメディアプレイヤー</gui> のウィンドウ</title>
- <desc><app>Bansheeメディアプレイヤー</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p><app>Banshee</app>ライブラリのインターフェース</p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/ja/itunes-import.page b/help/ja/itunes-import.page
new file mode 100644
index 0000000..e95c18b
--- /dev/null
+++ b/help/ja/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="ja">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc><app>iTunes</app>メディアプレイヤーから楽曲とカテゴリ分けをインポートする</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title><app>iTunes</app>ライブラリからインポートする</title>
+
+</page>
diff --git a/help/ja/keyboard-shortcuts.page b/help/ja/keyboard-shortcuts.page
deleted file mode 100644
index f64bb12..0000000
--- a/help/ja/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="ja">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>キー</gui></p></td>
- <td><p><gui>アクション</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>現在の楽曲を再生または停止します</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>次の楽曲を再生します</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>前の楽曲を再生します</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>キー</gui></p></td>
- <td><p><gui>アクション</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>検索ボックスにフォーカスを移動します</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
- <td><p>メディアのインポートダイアログを開きます</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>プレイリスト</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>キー</gui></p></td>
- <td><p><gui>アクション</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td>
- <td><p>新しいプレイリストを作成する</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>ポッドキャスト</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>キー</gui></p></td>
- <td><p><gui>アクション</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>マークを付けたエピソードは古いものです。</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>インターフェース</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>キー</gui></p></td>
- <td><p><gui>アクション</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>フルスクリーンを有効にする</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td>
- <td><p>プレイリストにあるすべての楽曲を選択します</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>プレイリストビューから、すべての楽曲の選択を外す</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>左クリック</key></keyseq>
- </p></td>
- <td><p>前の楽曲を再生します（通知領域アイコンのプラグインが有効化されている必要があります）</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>右クリック</key></keyseq>
- </p></td>
- <td><p>次の楽曲を再生します（通知領域アイコンのプラグインが有効化されている必要があります）</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Ctrl</key><key>中クリック</key></keyseq>
- </p></td>
- <td><p>再生と停止を切り替える（通知領域アイコンのプラグインが有効化されている必要があります）</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/ja/keyboardshortcuts.page b/help/ja/keyboardshortcuts.page
new file mode 100644
index 0000000..080ec2a
--- /dev/null
+++ b/help/ja/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="ja">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>キーボードショートカット</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>キーボードショートカットでBansheeを操作する</title>
+
+ <section id="playbackcontrol">
+
+ <title>再生操作</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>キー</gui></p></td> <td><p><gui>アクション</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Space</p></td> <td><p>現在の楽曲を再生または停止します</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>次の楽曲を再生します</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>前の楽曲を再生します</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>ライブラリの相互作用</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>キー</gui></p></td> <td><p><gui>アクション</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Ctrl</key><key>F</key></keyseq></p></td> <td><p>検索ボックスにフォーカスを移動します</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
+ <td><p>メディアのインポートダイアログを開きます</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>プレイリスト</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>キー</gui></p></td> <td><p><gui>アクション</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td> <td><p>新しいプレイリストを作成する</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>ポッドキャスト</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>キー</gui></p></td> <td><p><gui>アクション</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>マークを付けたエピソードは古いものです。</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>インターフェース</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>キー</gui></p></td> <td><p><gui>アクション</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>フルスクリーンを有効にする</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td> <td><p>プレイリストにあるすべての楽曲を選択します</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>プレイリストビューから、すべての楽曲の選択を外す</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td> <td><p>Bansheeウィンドウを隠す（通知領域アイコンのプラグインが有効化されている必要があります）</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>左クリック</key></keyseq>
+ </p></td> <td><p>前の楽曲を再生します（通知領域アイコンのプラグインが有効化されている必要があります）</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>右クリック</key></keyseq>
+ </p></td> <td><p>次の楽曲を再生します（通知領域アイコンのプラグインが有効化されている必要があります）</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>中クリック</key></keyseq>
+ </p></td> <td><p>再生と停止を切り替える（通知領域アイコンのプラグインが有効化されている必要があります）</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/ja/lastfm.page b/help/ja/lastfm.page
index 4da6acc..c1c61b3 100644
--- a/help/ja/lastfm.page
+++ b/help/ja/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="ja">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Last.fmを有効にすれば、曲の情報送信とLast.fmラジオが利用できます</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,74 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>Last.fmは人気のあるオンラインサービスです。無料と有料のバージョンが提供されています。Last.fmを使うことによってLast.fmはユーザープロファイルを作成することにより、音楽アーティストやアルバムに関する情報を提供しています。Last.fmから自由に音楽を追跡することができます。費用を支払ってLast.fmのプレミアムメンバーに加入した際には、Bansheeを含む多くのミュージックプレイヤーで、Last.fmから音楽をストリーミングで聴くことができます。Last.fmはあなたの視聴傾向、あなたの好みなどに基づいて、お勧めする音楽を含む複数のチャネルをストリーミングとして提供します。</p>
+
<section id="enable-lastfm">
- <title>Last.fmを有効化</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Last.fmを有効化</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>Bansheeで再生中の曲をレポートにするには、まず、Bansheeの設定の<gui>情報個別の項目</gui>からLast.fmにログインします。ユーザー名を入力し、<gui>Last.fmへログイン</gui>を押すとBansheeからウェブブラウザーが自動的に起動し、直接Last.fmのウェブページにアクセスします。ウェブブラウザーで<gui>Yes, allow access</gui>のリンクをクリックすると、BansheeがLast.fmのアクセス権を与えたという画面になります。Bansheeの画面に戻り、<gui>ログインを完了</gui>ボタンを押すと処理が完了します。</p>
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Last.fmラジオを聴けます</title>
<p>Last.fmラジオは、アメリカ、イギリス、ドイツの居住者向けの無料のサービスです。その他の国の居住者はラジオを聞く際にLast.fmのプレミアムアカウントの支払いが必要となります。プレミアムメンバーは、すべての国で自由にLast.fmラジオを聴くことができます。また、プレイリスト機能や音楽放送局を聴くこと、あなたが気に入ったラジオ曲にタグ付けすることもできます。</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+
+ <p>Bansheeの左側のソースの中で、Last.fmのソースを選ぶと、あなたが視聴できるLast.fmのラジオステーションが表示されます。Last.fmのラジオを聴く際にはインターネット接続が必要になります。あなたが聴きたいラジオステーションを選択して、BansheeがLast.fmのラジオステーションと通信してくれるのを待ってください。Bansheeの<gui>再生</gui>ボタンを押すか、<key>Space</key>を押すとLast.fmのラジオステーションからストリーミングが始まります。Bansheeの<gui>次へ</gui>ボタンを押すか、<key>N</key>を押す、もしくはBansheeのメニューから<guiseq><gui>再生</gui><gui>次へ</gui></guiseq>を選ぶとラジオステーションのキューの中で次の曲が再生されます。</p>
+
</section>
-
+
</page>
diff --git a/help/ja/manage-coverart.page b/help/ja/manage-coverart.page
new file mode 100644
index 0000000..83a5d6d
--- /dev/null
+++ b/help/ja/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="ja">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>アルバムのカバーアートの管理と変更</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>カバーアート</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/ja/manage-playlists.page b/help/ja/manage-playlists.page
index 1fb281a..c59685e 100644
--- a/help/ja/manage-playlists.page
+++ b/help/ja/manage-playlists.page
@@ -1,144 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="ja">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="ja">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>プレイリストの作成と管理</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>プレイリスト</title>
-
+ <title>プレイリスト</title>
+
<p>プレイリストは作成して、音楽トラックを任意の順番で再生するリストを保存することができます。プレイリストはあなたのお気に入りの曲のリストを作成したり、ライブラリの中を分割して簡単に見渡すことができ便利です。一部のポータブルミュージックプレーヤーは、外出先でもプレイリスト通りに聴くことができるようにプレイリストを転送することができます。</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>Bansheeは、ノーマルなプレイリストをサポートします。あなたが追加した楽曲がプレイリストに含まれています。スマートプレイリストはあなたの再生頻度、音楽の好みなどの情報を元に自動的に生成されるプレイリストのことです。</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>通常のプレイリストは曲の追加および管理を行うリストです。あなたの好きなアーティストの曲の独自のリストを複数のアルバムから作成することができます。たとえば、最新の好きな曲のプレイリストや、運動中に聴くためアップビートのプレイリストなどといった感じです。</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>プレイリストからトラックをドラッグアンドドロップすることによって、順番を新しい位置に変更することができます。列のいずれかがソートされている場合、トラックだけプレイリストで並び替えることができます。ソートされていない列にて列のヘッダーの上向き矢印または下向き矢印をクリックするとソートされます。</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>スマートプレイリストを作ることにより、あらかじめ設定されたルールに基づいて迅速に動的なプレイリストを作成することができます。特定のアーティスト、お気に入り、その他のルールに基づいて新しいプレイリストを作成することができます。</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>通常のプレイリスト</title>
+
+ <p>通常のプレイリストは曲の追加および管理を行うリストです。あなたの好きなアーティストの曲の独自のリストを複数のアルバムから作成することができます。たとえば、最新の好きな曲のプレイリストや、運動中に聴くためアップビートのプレイリストなどといった感じです。</p>
+
+ <p>プレイリストを作成するには、トラックを選択した状態で<keyseq><key>Ctrl</key><key>N</key></keyseq>を押すか、Bansheeのメニューから<guiseq><gui>メディア</gui><gui>新しいプレイリスト</gui></guiseq>を選びます。選択されたトラックの上で右クリックを行いメニューから<guiseq><gui>プレイリストへ追加</gui><gui>新しいプレイリスト</gui></guiseq>を選択しても構いません。新しいプレイリストに追加したいトラックを選択して、左側の<gui>音楽</gui>のアイコンに対してドラッグして<gui><em>新しいプレイリスト</em></gui>を選んでも構いません。<gui><em>新しいプレイリスト</em></gui>の中にトラックが追加されます。プレイリストに必要なトラックが追加され終わるまで、この作業を繰り返し行います</p>
+
+ <p>プレイリストに独自の名前を付けるには、プレイリストを右クリックして<gui>名前の変更</gui>を選びます。そして、プレイリスト名を入力した後にEnterキーを押します。</p>
+
+ <p>プレイリストからトラックをドラッグアンドドロップすることによって、順番を新しい位置に変更することができます。列のいずれかがソートされている場合、トラックだけプレイリストで並び替えることができます。ソートされていない列にて列のヘッダーの上向き矢印または下向き矢印をクリックするとソートされます。</p>
+
+ <p>プレイリストからトラックを削除する場合、削除したいトラックを選択して<key>Delete</key>を押します。またはBansheeのメニューから<guiseq><gui>編集</gui><gui>プレイリストから削除</gui></guiseq>を選びます。もしくは選択したトラックで右クリックし、<gui>プレイリストから削除</gui>を選びます。</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>スマートプレイリスト</title>
+
+ <p>スマートプレイリストを作ることにより、あらかじめ設定されたルールに基づいて迅速に動的なプレイリストを作成することができます。特定のアーティスト、お気に入り、その他のルールに基づいて新しいプレイリストを作成することができます。</p>
+
+ <p>新しいスマートプレイリストを作成するには、Bansheeのメニューから<guiseq><gui>メディア</gui><gui>新しいスマートプレイリストを作成</gui></guiseq>を選択してください。新しいスマートプレイリストを作成するためのダイアログが表示されます。プレイリストの名前を入力し、プレイリストが基準とすべき項目を選択してください。トラックの情報のいずれかの項目がアルバム、アーティスト、発売された年など次の情報から基準を選択します。</p>
+
<list>
<item><p>等しい</p></item>
- <item><p>等しくない</p></item>
+ <item><p>等しくない</p></item>
<item><p>以後</p></item>
- <item><p>以前</p></item>
+ <item><p>以前</p></item>
<item><p>多くて</p></item>
- <item><p>少なくて</p></item>
+ <item><p>少なくて</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p><gui>+</gui>ボタンを押すことによって、スマートプレイリストに追加する項目を増やせます。たとえば、2010年に発売されたすべての曲で評価が5つ星であるものというスマートプレイリストを作成することができます。このプレイリストを作成するには次の項目を選びます。</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>年</gui></p></td>
- <td><p><gui>等しい</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>年</gui></p></td> <td><p><gui>等しい</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>評価</gui></p></td>
- <td><p><gui>等しい</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>評価</gui></p></td> <td><p><gui>等しい</gui></p></td>
+ <td><p><gui/>5つ星</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>選択する曲の数が多すぎる場合、必要に応じて<gui>制限する</gui>のチェックボックスを押すと、曲の数を絞り込むことができます。</p>
+
+ <p>Bansheeには、あらかじめ作成されているスマートプレイリストがいくつかあります。<gui>編集</gui>ボタンを押すことで、そのスマートプレイリストがどのように作られたのかを見ることができます。また、それを変更することができます。<gui>作成と保存</gui>を押すとスマートプレイリストが作成され保存されます。あらかじめ用意されているスマートプレイリストには次のものがあります。</p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>お気に入り（評価が4つ星か5つ星の楽曲）</p>
- </item>
- <item>
- <p>最近のお気に入り（最近１週間でよく再生された楽曲）</p>
- </item>
- <item>
- <p>最近追加した項目 (先週インポートされた楽曲)</p>
- </item>
- <item>
- <p>再生されていない曲（再生されていないかスキップされた楽曲）</p>
- </item>
- <item>
- <p>注目されていない（お気に入りだが2ヶ月間再生されていない）</p>
- </item>
- <item>
- <p>お気に入り中の700MB（お気に入りの楽曲から選ばれたデータCD）</p>
- </item>
- <item>
- <p>お気に入り中の80分（お気に入りの楽曲から選ばれた音楽CD）</p>
- </item>
- <item>
- <p>未評価（評価がなされていない楽曲）</p>
- </item>
+ <title>Bansheeスマートプレイリスト</title>
+ <item><p>お気に入り（評価が4つ星か5つ星の楽曲）</p></item>
+ <item><p>最近のお気に入り（最近１週間でよく再生された楽曲）</p></item>
+ <item><p>最近追加した項目 (先週インポートされた楽曲)</p></item>
+ <item><p>再生されていない曲（再生されていないかスキップされた楽曲）</p></item>
+ <item><p>注目されていない（お気に入りだが2ヶ月間再生されていない）</p></item>
+ <item><p>お気に入り中の700MB（お気に入りの楽曲から選ばれたデータCD）</p></item>
+ <item><p>お気に入り中の80分（お気に入りの楽曲から選ばれた音楽CD）</p></item>
+ <item><p>未評価（評価がなされていない楽曲）</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/ja/manage-tags.page b/help/ja/manage-tags.page
index 2cce279..40cc702 100644
--- a/help/ja/manage-tags.page
+++ b/help/ja/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="ja">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="ja">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>楽曲タグとメタデータの編集および変更</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,49 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>楽曲のメタデータ</title>
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>一般的によく使われるメタデータ形式としては、MP3ファイルではID3v1とID3v2、OGG VorbisファイルではVorbis commentsがあります。</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
+ <section id="metadata">
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>ダイアログボックスにはトラックのメタデータ情報が表示されます。この情報は変更および更新することができます。デフォルトで表示される項目には次のものがあります。</p>
-
- <list>
- <item><p><gui>トラックタイトル</gui></p></item>
- <item><p><gui>アーティスト</gui></p></item>
- <item><p><gui>アルバム</gui></p></item>
- <item><p><gui>ジャンル</gui></p></item>
- <item><p><gui>トラック番号</gui></p></item>
- <item><p><gui>ディスク番号</gui></p></item>
- <item><p><gui>年</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>楽曲のメタデータ</title>
+
+ <p>音楽ファイルの中の情報にはアーティスト、アルバム名、録音した年、ジャンルなどがメタデータが含まれています。インターネット上で購入したほぼすべての音楽ファイルは、メタデータがすでに埋め込まれており、BansheeでCDからリッピングする場合は可能な限りメタデータを含んでリッピングします。メタデータを含んでCDをリッピングする方法の詳細については<link xref="import"/>を参照してください。</p>
+
+ <p>一般的によく使われるメタデータ形式としては、MP3ファイルではID3v1とID3v2、OGG VorbisファイルではVorbis commentsがあります。</p>
+
+ <p>もし、メタデータが含まれていない楽曲をインポートした場合、<app>Banshee</app>のライブラリ内の多くの項目に<gui>不明</gui>と表示されます。</p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>メタデータを編集する</title>
+
+ <p>トラックの情報を変更できます。情報を変更したいトラックを選択し<key>E</key>を押すか、Bansheeのメニューから<guiseq><gui>編集</gui><gui>トラック情報を編集</gui></guiseq>を選びます。もしくは選択したトラックの上で右クリックして<gui>トラック情報を編集</gui>を選びます。</p>
+
+ <p>ダイアログボックスにはトラックのメタデータ情報が表示されます。この情報は変更および更新することができます。デフォルトで表示される項目には次のものがあります。</p>
+
+ <list>
+ <item><p><gui>トラックタイトル</gui></p></item>
+ <item><p><gui>アーティスト</gui></p></item>
+ <item><p><gui>アルバム</gui></p></item>
+ <item><p><gui>ジャンル</gui></p></item>
+ <item><p><gui>トラック番号</gui></p></item>
+ <item><p><gui>ディスク番号</gui></p></item>
+ <item><p><gui>年</gui></p></item>
+ </list>
+
+ <p>トラックの情報を編集する時、もし複数のトラックを選択した場合には個々のトラックの情報を入力した後に、<gui>タイトル</gui>の項目の右下の<gui>進む</gui>ボタンを押して、すべてのメタデータの編集がおわった後に<gui>保存</gui>をクリックします。</p>
+
</section>
</page>
diff --git a/help/ja/play-queue.page b/help/ja/play-queue.page
index b9ff333..6492554 100644
--- a/help/ja/play-queue.page
+++ b/help/ja/play-queue.page
@@ -1,96 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="ja">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="ja">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>メディアを再生キューに追加する</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
+ <title>再生キュー</title>
+
+ <p><gui>再生キュー</gui>に音楽を追加すると順番に再生されます。音楽をノンストップで聞き続けられるぐらい多くのトラックを追加することができます。また、個々のトラックまたはアルバム全体を追加することができます。それらをソートしたり、再生順を並び替えることができます。</p>
+
+<section id="addqueue">
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
+ <title>楽曲を再生キューに追加する</title>
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
+ <p>音楽ライブラリから、トラックやアルバムを選択して再生キューに追加する必要があります。</p>
+
+ <p>再生キューにアルバム全体を追加するには、アルバムをマウスでドラッグし、ウィンドウで左側の<gui>再生キュー</gui>の上にアルバムをドロップします。</p>
+
+ <p>個別のファイルまたはグループのファイルを再生キューに追加することができます。個々のファイルを追加するにはファイルをドラッグして、ウィンドウの一番左の<gui>再生キュー</gui>の上にドロップするか、トラックで右クリックして<gui>再生キューへ追加</gui>を選びます。</p>
+
+ <p>複数のファイルを選択するには、マウスを使用して<key>Ctrl</key>を押しながら各ファイルの選択を繰り返すか、<key>Shift</key>を押しながら始点と終点を決めて、その範囲のファイルを選択します。そうして、<gui>再生キュー</gui>に選択したファイルをドラッグアンドドロップするか、選択したファイルの上で右クリックし<gui>再生キューへ追加</gui>を選びます。</p>
+
+</section>
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
+<section id="reorderqueue">
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
+ <title>プレイリストを整理する</title>
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+ <p>再生キューはトラックを追加した順番で構成されています。再生キューに最初に登録したトラック、またはアルバムから再生されていきます。マウスを使って並べ替えしたいトラックをリスト内でドラッグアンドドロップすることで再生順を変更できます。</p>
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>プレイリストからトラックを削除中</title>
+ <p>個々のトラック、トラックのグループを再生キューから削除したり、再生キュー全体をクリアできます。</p>
+
+ <p>削除するには個々のトラックまたはグループのトラックをマウスで選択し、<key>Delete</key>を押します。</p>
+
+ <p>再生キューの全体をクリアするには、再生キューのウィンドウの右上の<gui>クリア</gui>ボタンをクリックします。</p>
+
+</section>
+
</page>
diff --git a/help/ja/play.page b/help/ja/play.page
index 4a3ab2d..ac392a5 100644
--- a/help/ja/play.page
+++ b/help/ja/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>動画と楽曲を再生する</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>楽曲を再生する</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>動画を再生する</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+
+ <title>メディアを再生する</title>
+
+ <section id="playmusic">
+ <title>楽曲を再生する</title>
+
+ <p>Bansheeで音楽を再生するには音楽ソースを選択します。音楽ライブラリには音楽ライブラリ内のすべてのアーティスト、各アルバム用のカバーアート、およびライブラリ内のすべての曲のリストが表示されます。</p>
+
+ <p>アルバムや曲、アーティスト、アルバムのリストから選択して再生したり、Bansheeの右上隅にある検索ボックスを使用します。</p>
+
+ <p>曲の再生を開始するには、トラック名をダブルクリックを押しての<key>Space</key>、またはBansheeのメニューから<guiseq><gui>再生</gui><gui>再生</gui></guiseq>を選びます。</p>
+
+ <p>アルバム一覧からアルバムを選択し、曲の名前をマウスでダブルクリックするか、 <key>Space</key>を押す、もしくはBansheeのメニューから<guiseq><gui>再生</gui><gui>再生</gui></guiseq>を選ぶことでアルバムを再生することができます。</p>
+
+ <p>１人のアーティストに関するすべての曲を再生するには、アーティストのブラウザーで好きなアーティストを選択して、<key>Space</key>を押すか、Bansheeのメニューから<guiseq><gui>再生</gui><gui>再生</gui>を選びます。</guiseq></p>
+
+ <p>Bansheeには、お気に入り（頻繁に再生された）、最近のお気に入り、最近追加した項目、再生されていない曲が表示されます。あなたが聞きたいものを選んでください。</p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>動画を再生する</title>
+
+ <p>インポートしたビデオはアルファベット順に表示されます。ビデオを再生するには、リストから再生したいビデオを選んだ後に、<key>Space</key>を押すか、またはBansheeのメニューから<guiseq><gui>再生</gui><gui>再生</gui></guiseq>を選びます。</p>
+
+ <p>また、Bansheeはお気に入りのビデオ（あなたが頻繁に再生するビデオ）、注目されていないビデオを表示します。いずれかを選択するとリストからビデオを再生することができます。</p>
+
</section>
-
- <section id="play-radio">
- <title>インターネットラジオステーションを再生する</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>ポッドキャストを再生する</title>
+
+ <p>ポッドキャストのソースは、購読しているすべてのポッドキャストを表示します。ポッドキャストのブラウザーでは、購読しているすべてのポッドキャストが新しいものから順にリスト表示されます。</p>
+
+ <p>ポッドキャストを再生する場合、再生したいポッドキャストを選択した後にエピソードを選び、<key>Space</key>を押すか、もしくはBansheeのメニューから<guiseq><gui>再生</gui><gui>再生</gui></guiseq>を選びます。</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>インターネットラジオステーションを再生する</title>
+
+ <p>ラジオのソースはBansheeに追加したすべてのインターネットラジオステーションをアルファベット順に表示します。</p>
+
+ <p>インターネットラジオステーションを再生するには、再生したいラジオステーションをリストから選択し、<key>Space</key>を押すか、Bansheeのメニューから<guiseq><gui>再生</gui><gui>再生</gui></guiseq>を選びます。</p>
+
+ </section>
+
</page>
diff --git a/help/ja/podcast.page b/help/ja/podcast.page
deleted file mode 100644
index 157785a..0000000
--- a/help/ja/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="ja">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>ポッドキャスト</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/ja/radio.page b/help/ja/radio.page
deleted file mode 100644
index 331ce46..0000000
--- a/help/ja/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="ja">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/ja/rb-import.page b/help/ja/rb-import.page
new file mode 100644
index 0000000..0572277
--- /dev/null
+++ b/help/ja/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="ja">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc><app>Rhythmbox</app>ミュージックプレイヤーから音楽と分類をインポートします。</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title><app>Rhythmbox</app>のライブラリからインポートする</title>
+
+</page>
diff --git a/help/ja/search.page b/help/ja/search.page
index 0bd2beb..ad74d92 100644
--- a/help/ja/search.page
+++ b/help/ja/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,90 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Bansheeのライブラリを検索</title>
+
+ <p>Bansheeは強力な検索式を備えています。基本的な検索キーワードでもライブラリをすばやく簡単に検索できます。また、Bansheeの高度な検索式によって詳細な検索も行えます。</p>
+
+ <p>Bansheeでアイテムの検索を実行するには、<key>S</key>を押すか、Bansheeのライブラリビューの右上にある<gui>検索ボックス</gui>をクリックします。</p>
+
+ <p>検索問い合わせは、いくつかの基本的なキーワードで構成されています。たとえば、<em>dave matthews</em>。検索ボックスに<em>dave matthews</em>と入力した場合、Bansheeは、すべてのトラックの情報のすべての項目（トラックのタイトル、アルバムのタイトル、アルバムのアーティスト、発売された年など）から<em>dave</em>と<em>matthews</em>が含まれる結果を返します。検索キーワードの中では<em>dave</em>や<em>Dave</em>、<em>DAVE</em>といった大文字小文字の区別は行わず、同様に扱われます。</p>
+
+<section id="operators">
+ <title>基本的な演算子</title>
+ <p>検索条件の演算子は任意の2つの検索キーワードの間に記述、もしくは検索キーワードの前に記述します。既定の演算は<gui>AND</gui>であり、2つの検索キーワードの間に他の演算子がない場合に使用されます。既定でANDになるため、明示的なAND演算子はありません。</p>
+
<p>その他の基本的な演算子は、<gui>OR</gui>と<gui>NOT</gui>があります。また、これらの3つの演算を使うことにより、メディアを検索するため非常に強力な検索問い合わせを行うことができます。</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>論理演算子と検索式の例</title>
<p>以下は、論理演算子の一覧、および論理演算子を使用した検索結果の例です。</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>演算子</gui></p></td>
- <td><p><gui>説明</gui></p></td>
+ <td><p><gui>演算子</gui></p></td> <td><p><gui>説明</gui></p></td>
</tr>
<tr>
- <td><p><em>default</em>, <em>white space</em></p></td>
- <td><p>２個のキーワードから検索したい場合、２個のキーワードの間に半角スペースを入れてください。</p></td>
+ <td><p><em>default</em>, <em>white space</em></p></td> <td><p>２個のキーワードから検索したい場合、２個のキーワードの間に半角スペースを入れてください。</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>検索結果は、任意のフィールドのいずれかの結果を持つ2つの楽曲になります。</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>検索結果は、任意のフィールドのいずれかの結果を持つ2つの楽曲になります。</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>NOT、not、<key>-</key>の演算子を記述することにより、検索キーワードを含む検索結果を表示しません。</p></td>
+ </tr>
+
+</table>
<p>論理演算を使用した例:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>問い合わせ</gui></p></td>
- <td><p><gui>説明</gui></p></td>
+ <td><p><gui>問い合わせ</gui></p></td> <td><p><gui>説明</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>いずれかの項目に<em>dave</em>と<em>matthews</em>を含んでいるトラックが該当します。</p></td>
+ <td><p>dave matthews</p></td> <td><p>いずれかの項目に<em>dave</em>と<em>matthews</em>を含んでいるトラックが該当します。</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>いずれかの項目に<em>dave</em>か<em>matthews</em>を含んでいるトラックが該当します。</p></td>
+ <td><p>dave, matthews</p></td> <td><p>いずれかの項目に<em>dave</em>か<em>matthews</em>を含んでいるトラックが該当します。</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>いずれかの項目に<em>dave</em>か<em>matthews</em>を含んでいるトラックが該当します。</p></td>
- </tr>
+ <td><p>dave or matthews</p></td> <td><p>いずれかの項目に<em>dave</em>か<em>matthews</em>を含んでいるトラックが該当します。</p></td>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>いずれかの項目に<em>dave</em>か<em>matthews</em>を含んでいるトラックが該当します。</p></td>
- </tr>
+ <td><p>dave | matthews</p></td> <td><p>いずれかの項目に<em>dave</em>か<em>matthews</em>を含んでいるトラックが該当します。</p></td>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>項目に<em>dave matthews</em>を含んでいないすべてのトラックが表示されます。</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>項目に<em>dave matthews</em>を含んでいないすべてのトラックが表示されます。</p></td>
+ </tr>
+
+ </table>
+
+ <p>より複雑な検索を行いたい場合、詳しくは、<link xref="adv-search"/>ページを参照してください。</p>
+
</section>
-
+
</page>
diff --git a/help/ja/sort.page b/help/ja/sort.page
index f479be4..60c8adb 100644
--- a/help/ja/sort.page
+++ b/help/ja/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>列の追加</title>
+
<p>ライブラリが大きくなるにつれて、ライブラリ内のトラックに追加情報を表示したり、曲のタイトル、アーティストやアルバムでソートする方法を変更するなど、ライブラリビューを変更したくなることでしょう。</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p><app>Banshee</app>のライブラリビューに追加の列を加えることができます。そのトラックの詳細な情報を一覧表示することができ、また追加した列を元にソートできるようになります。Bansheeのデフォルトでは<gui>タイトル</gui>、<gui>アーティスト</gui>、<gui>アルバム</gui>、<gui>再生時間</gui>が表示されています。追加の列を追加するには、Bansheeのいずれかの列の上でマウスの右クリックを使用すると、利用可能な列の一覧が表示されるので追加したい列のチェックボックスをオンにしてください。</p>
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>列をソート</title>
+ <p>Bansheeのライブラリビューに表示される列のいずれかをマウスでクリックして、ライブラリをソートすることができます。音楽ライブラリをアーティストのアルファベット順にソートしたい場合、<gui>アーティスト</gui>列のヘッダーをクリックすると自動的にソートされます。<gui>アーティスト</gui>列のヘッダーをもう一度クリックするとアルファベットの順逆にソートされます。</p>
</section>
-
+
</page>
diff --git a/help/ja/sync.page b/help/ja/sync.page
index dd1d514..73d0d5d 100644
--- a/help/ja/sync.page
+++ b/help/ja/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>音楽をポータブルメディアプレイヤーもしくはスマートフォンに同期します。</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>同期</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>同期</title>
+
+ <p>Bansheeはポータブルミュージックプレイヤーやスマートフォンへの音楽の同期をサポートしています。特定の音楽トラック、アルバム、プレイリストのみを追加することもできます。また、Bansheeはライブラリ全体を同期して、お手持ちのポータブルミュージックプレイヤーを常に同一の状態に保つことができます。Bansheeにポータブルメディアプレイヤーが接続されている時も、直接ポータブルミュージックプレイヤー上の音楽をBansheeで直接再生することができます。同期する音楽がFLACなどのロスレスフォーマットの場合、BansheeがサポートするOgg VorbisやMP3などの非可逆フォーマットに自動的にフォーマットを変換してくれます。これにはあらかじめ対応するコーデックがインストールされている必要があります。</p>
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>デバイスサポート</title>
+ <p>Bansheeは、ほとんどの音楽プレイヤーとスマートフォン（Apple iPhone、iPad、iPod touchは著しく例外的なので非対応）に対応しています。</p>
+
+ <p>もし、デバイスを接続した時、Bansheeは左側のメニューに表示します。デバイスのアイコンをクリックすると同期の設定を表示するページに移ります。</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>音楽</p></item>
- <item><p>オーディオブック</p></item>
- <item><p>ビデオ</p></item>
- <item><p>ポッドキャスト</p></item>
- </list>
-
- <p>ドロップダウンメニューから次のメディアを選択できます。</p>
-
- <list>
- <item><p>手動で管理する</p></item>
- <item><p>すべてのライブラリと同期</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>音楽を同期する</title>
+ <p>Bansheeで選択することにより、お手持ちのポータブルミュージックプレイヤー上の音楽とビデオを自動的に同期するか手動で管理することができます。</p>
+
+ <p>Bansheeのメニューからメディアを同期したいデバイスを選択してください。</p>
+ <list>
+ <item><p>音楽</p></item>
+ <item><p>オーディオブック</p></item>
+ <item><p>ビデオ</p></item>
+ <item><p>ポッドキャスト</p></item>
+ </list>
+
+ <p>ドロップダウンメニューから次のメディアを選択できます。</p>
+ <list>
+ <item><p>手動で管理する</p></item>
+ <item><p>すべてのライブラリと同期</p></item>
+ </list>
+
+ <note style="warning">
+ <p>すべてのライブラリをポータブルメディアプレーヤーに自動的に同期する場合は、ポータブルメディアプレーヤーに十分な記憶領域を確保してください。同期対象のライブラリのデータ容量が接続されているポータブルミュージックプレイヤーの容量よりも上回る場合、Bansheeは容量が一杯になるまでメディアの同期を行います。</p>
+ </note>
+
+ <p>もし、音楽ライブラリの中にプレイリストやスマートプレイリストを作成している場合、音楽の同期をする際にオプションとして表示されます。スマートプレイリストは新しいコンテンツが追加された場合、ルールに従いプレイリストへ追加してくれるのを支援する仕組みです。Bansheeにて音楽を同期する際に、ポータブルミュージックプレイヤー上に新しいプレイリストを作成する場合、すでに作成してあるスマートプレイリストを参考にすることができます。</p>
+
+ <p>Bansheeの下部中央のグラフには接続されているポータブルミュージックプレーヤー内のストレージの容量が表示されます。グラフ中の情報には、ポータブルミュージックプレーヤーの容量を音楽、ビデオ、その他と空き容量がどのぐらいの割合を占めているのか、また、アイテムの合計数、再生時間の総合計、使用領域の合計が表示されます。</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>ライブラリ全部を同期する</title>
+ <p>Bansheeからメディアをポータブルミュージックプレイヤーへドラッグアンドドロップすることができます。まず転送したいファイルを選択して右クリックし、Banshee上のポータブルミュージックプレイヤーのアイコンへドラッグアンドドロップするとお手持ちのポータブルミュージックプレイヤーへコピーされます。</p>
+
+ <p>もし、音楽ライブラリの中の音楽ファイルがOGGファイルまたはFLACなど、サポートされていない形式でエンコードされている場合、ポータブルメディアプレイヤーに転送する際にBansheeはMP3形式に自動的に変換することができます。（必要なコーデックがインストールされている必要があります）コーデックについてはディストリビューションによって異なりますのでヘルプには記述しません。必要なコーデックについてお使いのLinuxディストリビューションをご確認ください。</p>
+
+ <note style="tip">
+ <p>お手持ちのポータブルメディアプレイヤーから正しくファイルを読み込むためには、Bansheeでマウント中のポータブルメディアプレイヤーを安全に取り外す必要があります。Banshee中から安全に取り外したい時、任意のポータブルメディアプレイヤーを右クリックしてBansheeのメニューから<gui>切断</gui>をクリックしてください。</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>ポータブルミュージックプレイヤー内の楽曲を再生する</title>
+ <p>ポータブルミュージックプレイヤーに保存された音楽をBansheeで直接再生することができます。左側のメニューにポータブルミュージックプレイヤーのライブラリが表示されます。Bansheeのメニューからお使いのプレーヤーを選択してください。その後、自身のライブラリ内の音楽と同じようにBansheeで音楽を再生することができます。</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>お手持ちのミュージックメディアプレーヤーからファイルを削除すると完全に削除されます。削除したファイルは復元することはできません。</p>
- </note>
-
+ <title>ポータブルミュージックプレイヤー内から楽曲を削除する</title>
+ <p>ポータブルミュージックプレイヤーに保存した楽曲を削除したい場合、任意のポータブルミュージックプレイヤーを選択し、Bansheeのライブラリを表示します。次に削除したいトラックを選択し、右クリックしてメニューから<gui>削除</gui>を選びます。もしくはBansheeのメニューから<guiseq><gui>編集</gui><gui>削除</gui></guiseq>を選びます。</p>
+
+ <note style="warning">
+ <p>お手持ちのミュージックメディアプレーヤーからファイルを削除すると完全に削除されます。削除したファイルは復元することはできません。</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/ja/ui.page b/help/ja/ui.page
index 037fe38..8bf2576 100644
--- a/help/ja/ui.page
+++ b/help/ja/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc><app>Banshee</app>のユーザーインターフェースの概要</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Bansheeのユーザーインターフェースについて</title>
<figure>
<title><gui>Bansheeメディアプレイヤー</gui> のウィンドウ</title>
<desc><app>Bansheeメディアプレイヤー</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshee</app>ライブラリのインターフェース</p>
</media>
</figure>
+
+<section id="context">
+ <title>ソース</title>
+ <p>Bansheeの左側には、音楽、ビデオなどのソースが表示されます。これにより再生キュー、音楽、ビデオ、Amazon、Last.fm、ポッドキャストなどに素早くアクセスすることができます。</p>
+
+ <note style="tip">
+ <p>メニューの項目は、選択したソースに応じて変わります。たとえば、ポッドキャストを購読するためのメニューを出したい場合、ポッドキャストのソースを選択する必要があります。ポッドキャストを操作するためのメニューの項目が表示されている時には音楽ライブラリやビデオライブラリは利用できません。</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>ライブラリブラウザー</title>
+ <p>Bansheeのウィンドウの左側のソースから音楽やビデオのソースを選択すると、ライブラリのブラウザーにコンテンツが表示されます。Bansheeのウィンドウの右側はソースに応じて音楽のライブラリ、ビデオのライブラリ、ポッドキャストの購読、Amazon MP3ストアから音楽を購入ができる画面に変わります。</p>
+</section>
+
+<section id="nowplaying">
+ <title>再生中のビュー</title>
+ <p>Bansheeでフルスクリーンモードで使うと、再生中モードを隠して音楽のライブラリを大きく表示、もしくは再生中のビデオを大きく表示することができます。音楽を再生中の時、アーティスト名とアルバムのカバーアートが表示されます。もしビデオを鑑賞している時であれば、フルスクリーンでビデオを楽しめます。</p>
+
+ <p>再生中にBansheeのユーザーインターフェースを隠して、フルスクリーンモードに変更したい場合、<key>F</key>を押すか、Bansheeのウィンドウの右上にある<gui>フルスクリーン</gui>ボタンを押します。もしくはBansheeのメニューから<guiseq><gui>表示</gui><gui>フルスクリーン</gui></guiseq>を選ぶとフルスクリーンモードに移行します。</p>
+
+</section>
+
+<section id="library">
+ <title>ライブラリ</title>
+ <p>Bansheeのライブラリビューは、選択したソースに応じて変わります。音楽のライブラリはライブラリ内のアーティスト、曲のリスト、カバーアートが表示されます。ポッドキャストのライブラリはポッドキャストの購読をダウンロード／ダウンロードされていない。もしくはすべての新しい／古いポッドキャストが表示されます。ソースの管理方法の詳細については各ソースのヘルプページを参照してください。</p>
+</section>
- <section id="context">
- <title>ソース</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/pt_BR/add-podcast.page b/help/pt_BR/add-podcast.page
new file mode 100644
index 0000000..0b61ecd
--- /dev/null
+++ b/help/pt_BR/add-podcast.page
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="pt_BR">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play podcasts in Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>What is a Podcast?</title>
+
+ <p>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.</p>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Add a Podcast</title>
+
+ <p>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 <gui>Copy link</gui>.
+ </p>
+
+ <p>In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the
+ upper right hand corner, from the menu choose <guiseq><gui>Media</gui><gui>
+ Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut <keyseq>
+ <key>Shift</key><key>Control</key><key>F</key></keyseq>.
+ </p>
+
+ <p>Banshee will then allow you to choose how you want to download new podcasts
+ from a drop down menu. Your choices include:</p>
+
+ <list>
+ <item><p>Download the Most Recent Episode (This will automatically
+ download the last episode that was released).</p></item>
+ <item><p>Download All Episodes (This will download all episodes).</p></item>
+ <item><p>Let Me Decide Which Episodes to Download (This will allow you
+ to choose which episodes you would like to download).</p></item>
+ </list>
+
+ <p>After you have added a Podcast feed, Banshee will display:</p>
+
+ <list>
+ <item><p><gui>Name</gui>: (Name of the specific episode)</p></item>
+ <item><p><gui>Podcast</gui>: (Name of the Podcast)</p></item>
+ <item><p><gui>Published</gui> (Date the episode was published or released)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/pt_BR/add-radio.page b/help/pt_BR/add-radio.page
new file mode 100644
index 0000000..780e203
--- /dev/null
+++ b/help/pt_BR/add-radio.page
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="pt_BR">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play internet radio stations in Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Internet Radio</title>
+
+ <section id="radiodescription">
+ <title>What is Internet Radio?</title>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Add Radio Station</title>
+
+ <p>To add an internet radio station to Banshee, press <gui>Add Station</gui>
+ in the upper right hand corner of Banshee or, from the menu, choose <guiseq>
+ <gui>Media</gui><gui>Add Station</gui></guiseq>.
+ </p>
+
+ <p>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 <gui>Copy Link</gui>.
+ </p>
+
+
+ <p>Banshee will prompt you to enter the <gui>Station Genre</gui>.
+ Choose the kind of music the internet radio station plays from the available
+ drop down selections. You will then need to enter the <gui>Station Name</gui>.
+ Enter a name for the radio station. Then press tab or use your mouse to select
+ the <gui>Stream URL</gui> field to paste the URL of the radio station.
+ Using your mouse right click and choose <gui>Paste</gui> or press <keyseq>
+ <key>Control</key><key>V</key></keyseq>.</p>
+
+ <p>You can optionally also fill out the fields for
+ <gui>Station Creator</gui>, <gui>Description</gui>, and <gui>Rating</gui>.
+ </p>
+
+ <p>Then press <gui>Save</gui> to save the internet radio station in Banshee.
+ </p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/pt_BR/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/pt_BR/advanced.page
index 468ad23..ccf29d6 100644
--- a/help/zh_CN/extensions.page
+++ b/help/pt_BR/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="pt_BR">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Get help for advanced actions.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Advanced Options and Help</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Atalhos de teclado</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Atalhos de teclado</title>
</section>
-
+
</page>
diff --git a/help/pt_BR/amazon.page b/help/pt_BR/amazon.page
index fe7ca44..e274731 100644
--- a/help/pt_BR/amazon.page
+++ b/help/pt_BR/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Sincronize e compre músicas do Loja de MP3 da Amazon.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,40 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Loja de MP3 da Amazon</title>
+
+ <p>O Banshee tem suporta ao download e à importação de músicas da loja de MP3 da Amazon. Você pode importar arquivos de música da Amazon, comprar música no seu navegador manualmente ou comprar música diretamente do Banshee. A Amazon fornece para download apenas em MP3 em alguns países, e dependendo de sua localização, pode ser que você não seja capaz de comprar MP3s da Amazon.</p>
+
+ <note style="important">
+ <p>O Banshee utiliza um código de afiliação Amazon para todas as comprar de músicas. Todo o dinheiro gerado por esse código de afiliação é doado para a Fundação GNOME.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Compre MP3s da Amazon no seu navegador</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Compre MP3s da Amazon no seu navegador</title>
+
+ <p>Musicas baixadas da loja de MP3 da Amazon podem ser baixadas e importadas automaticamente para o Banshee. O Banshee automaticamente relaciona o arquivo .amz da Amazon para compras MP3. Quando você compra música na Amazon, seu navegador irá baixar o arquivo .amz e o Banshee irá automaticamente abri-lo e inciar o download e a importação da música.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Compre MP3s da Amazon no Banshee</title>
+
+ <p>Você também pode buscar músicas no Amazon com o Banshee. Escolha Amazon MP3 Store no menu Banshee da esquerda. Isso irá carregar o loja de MP3 da Amazon, exatamente como se você estivesse em um navegador. Você pode procurar no Amazon pela música que deseja comprar depois de logar no Amazon, compre músicas com um clique. O Banshee irá automaticamente baixar e importar suas músicas compradas para sua biblioteca.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Importar MP3s da Amazon manualmente</title>
-
+ <title>Importar MP3s da Amazon manualmente</title>
+
<p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ extension .amz is downloaded and saved to your hard drive. To import
+ music purchased manually from Amazon, in Banshee choose
+ <guiseq><gui>Media</gui> <gui>Import Media</gui></guiseq> 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.
+ </p>
+
<note style="warning">
<p>Um arquivo .amz da Amazon são válidos apenas por um curto período de tempo. Se você não baixar a sua música rapidamente o arquivo irá expirar e você não poderá baixar a música do Amazon. A Amazon não informa por quanto tempo os arquivos são válidos. É recomendado que você baixe e importe qualquer compra da Amazon em no máximo uma hora após a compra.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/pt_BR/emusic.page b/help/pt_BR/emusic.page
new file mode 100644
index 0000000..3822b5b
--- /dev/null
+++ b/help/pt_BR/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="pt_BR">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music purchased from eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your eMusic tracks</title>
+
+</page>
diff --git a/help/pt_BR/extensions.page b/help/pt_BR/extensions.page
index c0c196c..1bd21cf 100644
--- a/help/pt_BR/extensions.page
+++ b/help/pt_BR/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="pt_BR">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="pt_BR">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Adicione funcionalidade adicional ao Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Extensões do Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Extensões oficiais do Banshee</title>
</info>
+ <title>Gerencie extensões do Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Community Banshee Extensions</title>
+ </info>
+ <title>Add community built extensions for Banshee</title>
</section>
+
</page>
diff --git a/help/pt_BR/import.page b/help/pt_BR/import.page
index d7e8ac3..105384e 100644
--- a/help/pt_BR/import.page
+++ b/help/pt_BR/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Adicione músicas e vídeos do seu computador para a sua biblioteca Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,22 +14,17 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Importar músicas & vídeos</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>Você pode importar músicas e vídeos armazenados no seu computador para o Banshee. Arquivos importados aparecerão dentro de suas fontes e podem ser editados e gerenciados como qualquer outra mídia no Banshee.</p>
- <p>Para importar arquivos de música ou vídeo do seu computador, escolha <guiseq><gui style="menu">Mídia</gui><gui style="menuitem">Importar mídia</gui></guiseq>. Um janela vai aparecer com um número de opções.</p>
+ <p>To import music or video files on your computer, choose <guiseq><gui>Media</gui>
+ <gui>Import Media</gui></guiseq>. A dialog will appear with a number of choices.</p>
- <note style="tip">
+ <note>
<p>Plug-ins podem adicionar opções importantes. Veja <link xref="#plugins"/> abaixo.</p>
</note>
@@ -52,27 +47,23 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Você pode importar com segurança arquivos de uma pasta da que você já importou sem preocupar-se em duplicar as entradas na sua biblioteca.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Importar de uma lista de reprodução</title>
+ <p>You can also import music from playlists. Most playlist files end
+ in <em>m3u</em>. To import from a playlist, from the Banshee menu
+ choose <guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and
+ locate the playlist file in your folder, select it and press
+ <gui>Import</gui>.
+ </p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Plug-ins podem adicionar opções importantes adicionais. As fontes adicionais abaixo estarão disponíveis se os plug-ins apropriados estiverem habilitados:</p>
-
+ <title>Fontes de importação adicionais</title>
+ <p>Plug-ins podem adicionar opções importantes adicionais. As fontes adicionais abaixo estarão disponíveis se os plug-ins apropriados estiverem habilitados:</p>
</section>
-
+
</page>
diff --git a/help/pt_BR/index.page b/help/pt_BR/index.page
index b01eecc..8e806cf 100644
--- a/help/pt_BR/index.page
+++ b/help/pt_BR/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Reprodutor de mídia Banshee</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Adicionar, remover & reproduzir</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Gerenciar & ordenar</title>
</section>
-
+
<section id="sync" style="2column">
<title>Sincronizar suas mídias com um reprodutor portátil</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Adicionar funcionalidade adicional ao Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Opções avançadas e ajuda</title>
+ <title>Opções avançadas e ajuda</title>
</section>
</page>
diff --git a/help/pt_BR/introduction.page b/help/pt_BR/introduction.page
index 37b460a..cc44d77 100644
--- a/help/pt_BR/introduction.page
+++ b/help/pt_BR/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>Introdução ao <app>Reprodutor de mídia Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>Introdução</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p>O <app>Banshee</app> é um reprodutor de mídia que permite a você reproduzir músicas, ver vídeos e outras mídias, bem como sincronizar-los com dispositivos portáteis para ter suas mídias fora de casa.</p>
<p>O <app>Banshee</app> inclui recursos para importar suas mídias, gerenciar os metadados delas e reproduzir suas músicas e vídeos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>O Banshee também ajuda você a sincronizar suas músicas e vídeos para os dispositivos portáteis mais populares como, reprodutores de áudio digital e smartphones, o Banshee suporta dispositivos populares como a maioria dos iPods, reprodutores MP3 Sandisk e Creative, e telefones baseados em Android.</p>
+<!--
<figure>
- <title>Janela do <gui>Reprodutor de mídia Banshee</gui></title>
- <desc><app>Reprodutor de mídia Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Interface da biblioteca do <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/pt_BR/itunes-import.page b/help/pt_BR/itunes-import.page
new file mode 100644
index 0000000..c8150f2
--- /dev/null
+++ b/help/pt_BR/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="pt_BR">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>iTunes</app> media player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>iTunes</app> library</title>
+
+</page>
diff --git a/help/pt_BR/keyboard-shortcuts.page b/help/pt_BR/keyboard-shortcuts.page
deleted file mode 100644
index 2013585..0000000
--- a/help/pt_BR/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="pt_BR">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Ação</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Reproduz ou pausa a música atual</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Reproduz a próxima música</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Reproduz a música anterior</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Ação</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Move o foco para a caixa de busca</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Abre a janela de importação de mídia</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Listas de reprodução</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Ação</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Cria nova lista de reprodução</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasts</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Ação</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Marca os episódios selecionados como velhos</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interface</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Tecla</gui></p></td>
- <td><p><gui>Ação</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Alterna o modo de tela cheia</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Seleciona todas as músicas na visão de lista de reprodução</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Desfaz a seleção de todas as músicas nas visão de lista de reprodução</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Botão esquerdo do mouse</key></keyseq>
- </p></td>
- <td><p>Reproduz a música anterior (Necessita que o plug-in da área de notificação esteja habilitado)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Botão direito do mouse</key></keyseq>
- </p></td>
- <td><p>Reproduz a próxima música (Necessita que o plug-in da área de notificação esteja habilitado)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Botão do meio do mouse</key></keyseq>
- </p></td>
- <td><p>Alterna reproduzir/pausar (Necessita que o plug-in da área de notificação esteja habilitado)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/pt_BR/keyboardshortcuts.page b/help/pt_BR/keyboardshortcuts.page
new file mode 100644
index 0000000..3bec62c
--- /dev/null
+++ b/help/pt_BR/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="pt_BR">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Atalhos de teclado</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Controlar o Banshee usando atalhos de teclado</title>
+
+ <section id="playbackcontrol">
+
+ <title>Controle de reprodução</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Ação</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Barra de espaço</p></td> <td><p>Reproduz ou pausa a música atual</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Reproduz a próxima música</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Reproduz a música anterior</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Interação com a biblioteca</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Ação</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>Move o foco para a caixa de busca</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Abre a janela de importação de mídia</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Listas de reprodução</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Ação</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>Cria nova lista de reprodução</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Ação</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Marca os episódios selecionados como velhos</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interface</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Ação</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Alterna o modo de tela cheia</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>Seleciona todas as músicas na visão de lista de reprodução</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>Desfaz a seleção de todas as músicas nas visão de lista de reprodução</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>Oculta a janela do Banshee (Necessita que o plug-in da área de notificação esteja habilitado)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Botão esquerdo do mouse</key></keyseq>
+ </p></td> <td><p>Reproduz a música anterior (Necessita que o plug-in da área de notificação esteja habilitado)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Botão direito do mouse</key></keyseq>
+ </p></td> <td><p>Reproduz a próxima música (Necessita que o plug-in da área de notificação esteja habilitado)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Botão do meio do mouse</key></keyseq>
+ </p></td> <td><p>Alterna reproduzir/pausar (Necessita que o plug-in da área de notificação esteja habilitado)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/pt_BR/lastfm.page b/help/pt_BR/lastfm.page
index 555715d..04b4eb8 100644
--- a/help/pt_BR/lastfm.page
+++ b/help/pt_BR/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="pt_BR">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Habilite Last.fm, relatório de músicas e rádio Last.fm.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,82 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>Last.fm é um serviço online popular que oferece duas versões, gratuita e paga. O Last.fm oferece informações sobre artistas da música e álbuns, e se você criar um perfil de usuário Last.fm que permite que você acompanhe a música que você ouve no Banshee gratuitamente. Se você inscrever-se como membro pagante, você pode também ouvir à transmissões de músicas do Last.fm em vários clientes, incluindo Banshee. O Last.fm oferece múltiplos canais para transmissão, incluindo músicas recome [...]
+
<section id="enable-lastfm">
- <title>Habilitar Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Habilitar Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>To enable Banshee to report the songs you play on your computer to Last.fm,
+ sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences.
+ Enter your username and press the <gui>Log in to Last.fm</gui> button. You
+ will be directed to a Last.fm webpage in your browser to grant Banshee access.
+ Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</gui> button
+ to complete the process.
+ </p>
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Habilitar relatório de músicas do Banshee no Last.fm</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
+ <section id="devicesongreporting">
+ <title>Habilitar relatório de músicas do seu dispositivo</title>
+ <p>Após vincular com sucesso o Banshee ao seu perfil do Last.fm e habilitar o Banshee para relatar músicas para o Last.fm, você também pode habilitar scrobble de um dispositivo conectado. O Banshee vai, com a conexão do seu dispositivo, tentar fazer scrobble das músicas que você ouviu a partir da última conexão e enviá-las para o Last.fm.</p>
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
+ <p>Da mesma forma que as submissões normais de "scrobbling" do Banshee, Last.fm vai atualizar automaticamente os metadados de suas músicas se alguma informação de artista, título ou álbum estiver incorreta (apesar de que nós, novamente, recomendamos que você use a extensão Reparador de metadados para corrigir seus arquivos).</p>
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <p>Por favor, note que atualmente o Banshee tem suporte a este recurso apenas em produtos da Apple que têm suporte na extensão AppleDevice.</p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Ouvir a rádio Last.fm</title>
<p>A rádio Last. fm é gratuita para os moradores dos Estados Unidos, Reino Unido e Alemanha. Moradores de outros países terão que pagar por contas no Last.fm para ouvir a rádio. Membros registrados, em todos os países também ganham funcionalidades adicionais como ouvir as lista de reprodução e estações de música que você amou ou marcou.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+
+ <p>In Banshee's sources pane 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 <gui>Play</gui> button
+ in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio
+ station. You can also press the <gui>Next</gui> button in Banshee,
+ <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq>
+ to play the next song in your radio station queue.
+ </p>
+
</section>
-
+
</page>
diff --git a/help/pt_BR/manage-coverart.page b/help/pt_BR/manage-coverart.page
new file mode 100644
index 0000000..a40645c
--- /dev/null
+++ b/help/pt_BR/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="pt_BR">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Manage or change your albums cover art.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Cover art</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/pt_BR/manage-playlists.page b/help/pt_BR/manage-playlists.page
index c96bac2..a7a0225 100644
--- a/help/pt_BR/manage-playlists.page
+++ b/help/pt_BR/manage-playlists.page
@@ -1,110 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="pt_BR">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="pt_BR">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Crie e gerencie listas de reprodução.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Listas de reprodução</title>
-
+ <title>Listas de reprodução</title>
+
<p>Listas de reprodução permitem a você criar e salvar uma lista de músicas que são reproduzidas em uma ordem específica. As listas de reprodução são muito convenientes para criar uma lista com suas músicas favoritas ou para condensar sua biblioteca em listas menores que são mais fáceis de navegar. Alguns reprodutores portáteis permitem que você transfira a lista de reprodução, então você pode tê-la com você fora de casa.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>O Banshee suporta as playlists normais que incuem as música que você adiciona à playlist, bem como listas de reprodução inteligentes. Estas são listas geradas automaticamente baseado nos seus hábitos, músicas favoritas, e mais.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>Uma lista de reprodução normal é uma lista de músicas que você que você adiciona e gerencia. Você pode querer cirar sua própria lista de músicas do seu artista favorito de vários álbums diferentes, suas mais recentes músicas favoritas, ou uma lista de reprodução com músicas agitadas, para ouvir enquanto se exercita.</p>
-
- <p>Você pode criar uma nova lista de reprodução pressionando <keyseq><key>Control</key><key>N</key></keyseq>, ou pelo menu escolhendo <guiseq><gui style="menu">Mídia</gui><gui style="menuitem">Nova lista de reprodução</gui></guiseq> ou selecionando as faixas que você deseja adicionar à lista de reprodução. Selecione a(s) faixa(s), clique com botão direito do mouse nela(s) e escolha <guiseq><gui style="menuitem">Adicionar à lista de reprodução</gui><gui style="menuitem">Nova lista de re [...]
-
- <p>Para dar à suas listas de reprodução seu próprio nome, selecione a lista de reprodução e clique com botão direito do mouse nela e pressione <gui style="menuitem">Renomear lista de reprodução</gui> e digite o nome da sua lista de reprodução.</p>
-
- <p>Você pode alterar a ordem da lista de reprodução arrastando e soltando as músicas para a nova posição. Músicas só podem ser reordenadas quando nenhuma das colunas estiverem ordenadas. Para retirar ordem de uma coluna, clique-a até que as setas para baixo e para cima não estejam sendo mais mostradas e, então, reordene a lista de reprodução.</p>
-
- <p>Para remover uma faixa da lista de reprodução, selecione a(s) faixa(s) que deseja remover. Pressione a tecla <key>Delete</key>, no menu escolha <guiseq><gui style="menu">Editar</gui><gui style="menuitem">Remover da lista de reprodução</gui></guiseq> ou clique com o botão direito do mouse na(s) faixa(s) que deseja remover e clique em <gui style="menuitem">Remover da lista de reprodução</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>Listas de reprodução inteligentes permitem que você gere rapidamente uma ista de reprodução dinâmica baseada em um número de variáveis pré-configuradas. Você pode criar rapidamente uma lista de reprodução baseada em um artista específico, favoritos e mais.</p>
-
- <p>Para criar uma nova lista de reprodução inteligente, no menu escolha: <guiseq><gui style="menu">Mídia</gui><gui style="menuitem">Nova lista de reprodução inteligente</gui></guiseq>. Será exibida uma janela para criar uma nova lista de reprodução inteligente. Digite um nome para sua lista de reprodução e depois escolha o critério no qual sua lista de reprodução irá basear-se. Você pode escolher qualquer campo, incluindo os metadados das músicas, como álbum, artista ou ano. Escolha o [...]
-
+
+ <title>Listas de reprodução normais</title>
+
+ <p>Uma lista de reprodução normal é uma lista de músicas que você que você adiciona e gerencia. Você pode querer cirar sua própria lista de músicas do seu artista favorito de vários álbums diferentes, suas mais recentes músicas favoritas, ou uma lista de reprodução com músicas agitadas, para ouvir enquanto se exercita.</p>
+
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key>
+ <key>N</key></keyseq>, from the menu choosing <guiseq><gui>Media</gui>
+ <gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
+ to add to the playlist. Select the track(s), right click them, and choose
+ <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
+ 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 <gui>Music</gui>. As you drag it over <gui>Music</gui>,
+ a new option <gui><em>New Playlist</em></gui> will appear and you can drop
+ the track(s) over <gui><em>New Playlist</em></gui> to add them to the
+ playlist. You can repeat this process until you have added all the tracks
+ you want in the playlist.
+ </p>
+
+ <p>To give your playlist its own name, select the playlist and right click
+ on the playlist and press <gui>Rename Playlist</gui> and enter the name
+ of your playlist.
+ </p>
+
+ <p>Você pode alterar a ordem da lista de reprodução arrastando e soltando as músicas para a nova posição. Músicas só podem ser reordenadas quando nenhuma das colunas estiverem ordenadas. Para retirar ordem de uma coluna, clique-a até que as setas para baixo e para cima não estejam sendo mais mostradas e, então, reordene a lista de reprodução.</p>
+
+ <p>To remove a track from the playlist, select the track(s) you wish to
+ remove. Press the <key>Delete</key>, from the menu choose
+ <guiseq><gui>Edit</gui><gui>Remove from Playlist</gui></guiseq> or right
+ click the track(s) with your mouse and press <gui>Remove from Playlist</gui>.
+ </p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Lista de reprodução inteligentes</title>
+
+ <p>Listas de reprodução inteligentes permitem que você gere rapidamente uma ista de reprodução dinâmica baseada em um número de variáveis pré-configuradas. Você pode criar rapidamente uma lista de reprodução baseada em um artista específico, favoritos e mais.</p>
+
+ <p>To create a new Smart Playlist, from the menu choose <guiseq>
+ <gui>Media</gui><gui>New Smart Playlist</gui></guiseq>. 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:
+ </p>
+
<list>
<item><p>é</p></item>
- <item><p>não é</p></item>
+ <item><p>não é</p></item>
<item><p>menos que</p></item>
- <item><p>mais que</p></item>
+ <item><p>mais que</p></item>
<item><p>no máximo</p></item>
- <item><p>no mínimo</p></item>
+ <item><p>no mínimo</p></item>
</list>
-
- <p>Você pode também pressionar o botão <gui style="button">+</gui> para adicionar uma consulta à lista de reprodução inteligente. Por exemplo, você pode criar uma lista de reprodução inteligente incluindo todas as músicas de 2010 que você avaliou com 5 estrelas. Para criar essa lista de reprodução você deve escolher:</p>
-
+
+ <p>You can also press the <gui>+</gui> 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:
+ </p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Ano</gui></p></td>
- <td><p><gui>é</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Ano</gui></p></td> <td><p><gui>é</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Avaliação</gui></p></td>
- <td><p><gui>é</gui></p></td>
- <td><p>5 estrelas</p></td>
+ <td><p><gui>Avaliação</gui></p></td> <td><p><gui>é</gui></p></td>
+ <td><p><gui/>5 stars</p></td>
</tr>
</table>
-
- <p>Você poderá, então, optar por escolher quantas músicas serão incluídas marcando a caixa de seleção <gui style="checkbox">Limitado a</gui> e escolhendo o número de músicas a serem incluídas.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>You can then optionally select how many songs are included by pressing
+ the <gui>Limit</gui> to checkbox and choosing the number of songs to be
+ included.
+ </p>
+
+ <p>Banshee also includes smart playlists already created for
+ you. Press the <gui>Open in editor</gui> button to view how the playlist
+ created was or to modify it. If you press <gui>Create and save</gui> the
+ playlist will be automatically generated and saved for you. The following
+ playlists are included:
+ </p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Favoritos (músicas avaliadas em quatro ou cindo estrelas)</p>
- </item>
- <item>
- <p>Favoritos recentes (músicas ouvidas muitas vezes na semana passada)</p>
- </item>
- <item>
- <p>Adicionadas recentemente (músicas importadas na última semana)</p>
- </item>
- <item>
- <p>Não ouvidas (músicas que não foram reproduzidas ou foram puladas)</p>
- </item>
- <item>
- <p>Favoritos esquecidos (favoritos que não foram reproduzidos por mais de 2 meses)</p>
- </item>
- <item>
- <p>700 MB de favoritos (um CD de dados digno de músicas favoritas)</p>
- </item>
- <item>
- <p>80 minutos de favoritos (um CD de áudio digno de músicas favoritas)</p>
- </item>
- <item>
- <p>Sem avaliação (músicas que não foram classificadas)</p>
- </item>
+ <title>Listas de reprodução inteligentes do Banshee</title>
+ <item><p>Favoritos (músicas avaliadas em quatro ou cindo estrelas)</p></item>
+ <item><p>Favoritos recentes (músicas ouvidas muitas vezes na semana passada)</p></item>
+ <item><p>Adicionadas recentemente (músicas importadas na última semana)</p></item>
+ <item><p>Não ouvidas (músicas que não foram reproduzidas ou foram puladas)</p></item>
+ <item><p>Favoritos esquecidos (favoritos que não foram reproduzidos por mais de 2 meses)</p></item>
+ <item><p>700 MB de favoritos (um CD de dados digno de músicas favoritas)</p></item>
+ <item><p>80 minutos de favoritos (um CD de áudio digno de músicas favoritas)</p></item>
+ <item><p>Sem avaliação (músicas que não foram classificadas)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/pt_BR/manage-tags.page b/help/pt_BR/manage-tags.page
index d822c9c..506bbfb 100644
--- a/help/pt_BR/manage-tags.page
+++ b/help/pt_BR/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="pt_BR">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="pt_BR">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Edite e modifique marcações e metadados das músicas.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,39 +19,53 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Metadados de músicas</title>
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Formatos populares de metadados são ID3v1 e ID3v2 para arquivos MP3 e Vorbis comments para arquivos OGG Vorbis.</p>
-
- <p>Se você importou alguma música que não contenha metadados, o <app>Banshee</app> vai exibir <gui>Desconhecido</gui> para a maioria dos campos na biblioteca.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
+ <section id="metadata">
- <p>Você pode alterar e editar os metadados de suas músicas. Selecione a música ou as músicas que você deseja atualizar e pressione a tecla <key>E</key>, selecione <guiseq><gui style="menu">Editar</gui><gui style="menuitem">Editar informação de faixas</gui></guiseq> no menu ou clique com o botão direito do mouse nos arquivos e selecione <gui style="menuitem">Editar informações de faixas</gui>.</p>
-
- <p>Uma caixa de diálogo aparecerá, ela exibe os metadados das músicas e permite que você altere e atualize-os. Os campos mostrados por padrão são:</p>
-
- <list>
- <item><p><gui>Título da faixa</gui></p></item>
- <item><p><gui>Artista da faixa</gui></p></item>
- <item><p><gui>Título do álbum</gui></p></item>
- <item><p><gui>Gênero</gui></p></item>
- <item><p><gui>Número da faixa</gui></p></item>
- <item><p><gui>Número do disco</gui></p></item>
- <item><p><gui>Ano</gui></p></item>
- </list>
-
- <p>Atualize as informações da música. Se você selecionou múltiplas músicas para editar, pressione a seta para a direita no campo <gui>Título da faixa</gui> ou pressione o botão <gui style="button">Avançar</gui> na parte inferior da janela quando finalizar cada música. Quando concluir a edição de todos os metadados, pressione <gui style="button">Salvar</gui>.</p>
+ <title>Metadados de músicas</title>
+
+ <p>Música digital contém metadados que armazenam informações sobre a música, incluindo artista, álbum, ano de gravação, gênero, e mais. Quase todas as músicas compradas na internet já terão seus metadados inclusos, e se você importar música de CDs o Banshee irá incluir os metadados quando copiando o CD se estes estiverem disponíveis. Para mais informações sobre a cópia de CDs e inclusão de metadados veja o link: <link xref="import"/>.</p>
+
+ <p>Formatos populares de metadados são ID3v1 e ID3v2 para arquivos MP3 e Vorbis comments para arquivos OGG Vorbis.</p>
+
+ <p>If you have imported songs that do not contain metadata,
+ <app>Banshee</app> will display <gui>Unknown</gui> for most fields
+ in the library. </p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Edite seus metadados</title>
+
+ <p>You can change and edit the metadata of your songs. Select the song or
+ songs you want to update and hit the <key>E</key>, choose
+ <guiseq><gui>Edit</gui><gui>Edit Track Information</gui></guiseq> from the menu, or use
+ your mouse and right click on the files and select
+ <gui>Edit Track Information</gui>.
+ </p>
+
+ <p>Uma caixa de diálogo aparecerá, ela exibe os metadados das músicas e permite que você altere e atualize-os. Os campos mostrados por padrão são:</p>
+
+ <list>
+ <item><p><gui>Título da faixa</gui></p></item>
+ <item><p><gui>Artista da faixa</gui></p></item>
+ <item><p><gui>Título do álbum</gui></p></item>
+ <item><p><gui>Gênero</gui></p></item>
+ <item><p><gui>Número da faixa</gui></p></item>
+ <item><p><gui>Número do disco</gui></p></item>
+ <item><p><gui>Ano</gui></p></item>
+ </list>
+
+ <p>Update the song's information. If you have selected multiple songs to
+ edit press the right arrow icon to the right of the <gui>Track Title</gui>
+ field or press the <gui>Forward</gui> button at the bottom of the dialog
+ when finished with each song. When you have completed editing all metadata,
+ press <gui>Save</gui>.
+ </p>
+
</section>
</page>
diff --git a/help/pt_BR/play-queue.page b/help/pt_BR/play-queue.page
index e383e7d..d25e675 100644
--- a/help/pt_BR/play-queue.page
+++ b/help/pt_BR/play-queue.page
@@ -1,96 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="pt_BR">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="pt_BR">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Adicione mídias para sua fila de reprodução.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
-
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
-
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
-
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
-
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
-
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
-
+ <title>Fila de reprodução</title>
+
+ <p>A <gui>Fila de reprodução</gui> permite que você adicione músicas a serem reproduzidas em uma ordem sequencial. Você pode adicionar algumas faixas que permitem a você ouvir horas de música sem interrupções. Você pode adicionar faixas individuais ou álbuns inteiros, e ordenar ou reorganizá-los.</p>
+
+<section id="addqueue">
+
+ <title>Adicione música à fila de reprodução</title>
+
+ <p>Da biblioteca de música você precisará selecionar as faixas ou álbums que deseja adicionar à fila de reprodução.</p>
+
+ <p>Para adiconar um álbum inteiro à fila de reprodução, usando seu mouse clique e segure o álbum e arraste para a <gui>Fila de reprodução</gui> na lado esquerda da janela.</p>
+
+ <p>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 <gui>Play Queue</gui>
+ in the far left window pane, or right click the track and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+ <p>You can select multiple files by using your mouse and pressing
+ <key>Control</key> and choosing each file with your mouse or
+ select a range of files by
+ pressing <key>Shift</key> and clicking twice to select that range of files. You can then
+ drag and drop it over the <gui>Play Queue</gui>
+ in the far left window pane or right click the tracks and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+</section>
+
+<section id="reorderqueue">
+
+ <title>Organize sua fila de reprodução</title>
+
+ <p>Sua fila de reprodução está organizada na ordem em que você adiciona as faixas. As primeiras faixas ou álbuns que você adicionar na lista serão reproduzidas primeiro. Você pode reordenar sua lista de reprodução usando seu mouse, arrastando e soltando uma faixa ou grupo de faixas na lista. Selecione a(s) faixa(s) que deseja reordenar, arraste-as e solte-as na posição que desejar na sua lista de reprodução.</p>
+
+</section>
+
+<section id="removequeue">
+
+ <title>Removendo faixas da lista de reprodução</title>
+
+ <p>Você pode remover uma faixa individualmente, um grupo de faixas, ou limpar toda a lista de reprodução.</p>
+
+ <p>Para remover uma faixa individualmente ou um grupo de faixas, selecione a faixa com o mouse e então pressione <key>Delete</key>.</p>
+
+ <p>To clear your entire Play Queue, press the <gui>Clear</gui> button in the
+ upper right hand corner of the Play Queue.
+ </p>
+
+</section>
+
</page>
diff --git a/help/pt_BR/play.page b/help/pt_BR/play.page
index 04a6de8..6ce3e66 100644
--- a/help/pt_BR/play.page
+++ b/help/pt_BR/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Reproduza seus arquivos de vídeo e música.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,118 +18,70 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Reproduza suas músicas</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <title>Reproduzir suas mídias</title>
+
+ <section id="playmusic">
+ <title>Reproduza suas músicas</title>
+
+ <p>Para reproduzir música no Banshee, escolha a fonte da música. A biblioteca de música irá exibir todos os artista na sua biblioteca, capa de cada álbum e uma lista com todas as músicas de sua biblioteca.</p>
+
+ <p>Escolha o albúm ou música que você deseja reproduzir na lista de artistas e albúms ou use a barra de pesquisa na parte superior direita do Banshee.</p>
+
+ <p>To start playing a song, use your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
+ browser and using your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">Por música</gui></title>
- <p>Reproduz as faixas em ordem aleatória.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Por artista</gui></title>
- <p>Reproduz as faixas de artistas diferentes toda vez.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Por álbum</gui></title>
- <p>Reproduz as faixas de álbuns diferentes toda vez.</p>
- </item>
- <item>
- <title><gui style="radiobutton">Por avaliação</gui></title>
- <p>Reproduz as faixas com melhor avaliação com mais frequência do que os sem avaliação.</p>
- <note style="info">
- <p>Se não houver faixas avaliadas, as faixas são reproduzidas em uma ordem aleatória.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">Por pontuação</gui></title>
- <p>Faixas que você reproduz frequentemente possuem maior pontuação e são reproduzidas com mais frequência.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>Reproduza um vídeo</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+ and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
+ <p>O Banshee também mostra seus álbuns favoritos (aqueles que você mais ouve), favoritos rececentes, recentemente adicionados e músicas não ouvidas. Escolha quele que você deseja ouvir para que possa reproduzi-los.</p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>Reproduza um vídeo</title>
+
+ <p>Your imported videos are listed alphabetically. To play a video,
+ choose the video you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>O Banshee também exibe seus vídeos favoritos (aqueles que você mais assiste), e vídeos não assistidos. Escolha um e você pode reproduzir um vídeo da lista.</p>
+
</section>
-
- <section id="play-radio">
- <title>Reproduza uma estação de rádio na internet</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>Reproduza um podcast</title>
+
+ <p>Podcasts exibe todos os podcasts que você assina, todos os shows de podcast disponíveis, e o navegador de podcast lista todos os podcasts colocando os mais novos primeiro.</p>
+
+ <p>To play a Podcast,
+ choose the Podcast you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>Reproduza uma estação de rádio na internet</title>
+
+ <p>A fonte de rádio mostra todas as suas estações de rádio na internet que você adicionou ao Banshee listadas em ordem alfabética.</p>
+
+ <p>To play an internet radio station,
+ choose the radio station you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ </section>
+
</page>
diff --git a/help/pt_BR/podcast.page b/help/pt_BR/podcast.page
deleted file mode 100644
index 5621829..0000000
--- a/help/pt_BR/podcast.page
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="pt_BR">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Adicione, remova e ouça podcasts no <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasts</title>
-
- <section id="podcast-description">
- <title>O que é um podcast?</title>
-
- <p>Podcasts são programas gravados, parecidos com os programas de rádio, que estão disponíveis na internet e permitem que você assine-os. Quando você assina um podcast no <app>Banshee</app>, toda vez que um novo programa é lançado o <app>Banshee</app> irá automaticamente baixá-lo e permitir que você posso ouvi-lo.</p>
-
- <p>Existem podcasts sobre quase todos os assuntos incluindo músicas, filmes, Linux e mais. Busque na Internet utilizando seu sistema de busca favorito com termos como "Linux Podcast" e você será apresentado a várias opções para escolher.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Adicionar um podcast</title>
-
- <p>Para adicionar um podcast ao <app>Banshee</app>, primeiro você precisa visitar a página web do seu podcast na Internet através do seu navegador. Quase todos os podcasts vão ter um botão ou link disponível para que possam assiná-lo. Copie o link de assinatura do podcast. Na maioria do navegadores, você pode clicar com o botão direito e escolher <gui style="menuitem">Copiar link</gui>.</p>
-
- <p>No <app>Banshee</app>, clique em <gui style="menuitem">Podcast</gui> no menu à esquerda da janela. Então, clique em <gui style="menuitem">Assinar podcast</gui> na parte direita da barra de ferramentas, do menu escolha <guiseq><gui style="menu">Mídia</gui><gui style="menuitem">Assinar podcast</gui></guiseq> ou use o atalho de teclado <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>Por padrão, os podcasts não serão baixados, de forma que você apenas será capaz de ouvi-los enquanto estiver conectado à Internet. Quando você assina a um novo podcast, você tem as seguintes opções:</p>
-
- <list>
- <item>
- <p>Selecionar <gui style="checkbox">Baixar novos episódios</gui> para baixar automaticamente qualquer episódio novo para seu computador, de forma que você possa acessá-los quando você não tiver conexão com a Internet.</p>
- </item>
- <item>
- <p>Selecionar <gui style="menuitem">Arquivar todos os episódios, exceto o mais recente</gui> para ter apenas o episódio mais novo exibido.</p>
- </item>
- </list>
-
- <p>Após ter adicionar um podcast, o <app>Banshee</app> vai exibir o nome do podcast, o título de cada episódio e a data em que ele foi publicado.</p>
-
- <p>Assim que um podcast for arquivado, ele será removido da lista de <gui>Itens novos</gui>, mas ainda vai aparecer na lista de <gui>Todos os itens</gui>.</p>
-
- <note style="tip">
- <p>Você pode editar as opções de assinatura das <gui style="menuitem">Propriedades do podcast</gui>, o que ser acessado clicando com o botão direito do mouse no nome do podcast correspondente na lista de podcasts ou clicando com botão direito do mouse em qualquer episódio daquele podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remover um podcast</title>
-
- <p>Para remover um podcast, clique com o botão direito no podcast na lista de podcasts e selecione <gui style="menuitem">Cancelar assinatura e excluir</gui>. Isso vai cancelar a assinatura, evitando que você receba atualizações do podcast, e vai excluir todos os episódios do podcast da sua biblioteca.</p>
-
- </section>
-
-</page>
diff --git a/help/pt_BR/radio.page b/help/pt_BR/radio.page
deleted file mode 100644
index 57011f1..0000000
--- a/help/pt_BR/radio.page
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="pt_BR">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Adicione, remova e ouça estações de rádio da internet no <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Rádio na Internet</title>
-
- <section id="radio-description">
- <title>O que é rádio na Internet?</title>
-
- <p>Estações de rádio na internet são similares a estações normais de rádio, permitindo a indivíduos ou organizações a transmissão de músicas na internet. Estações de rádio na Internet podem ser transmissões simultâneas de uma estação normal, um amador difundindo sua própria estação ou estações comerciais na internet, que incluem DJs ao vivo e até comerciais.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Adicionar estação de rádio</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>Você vai precisar digitar alguns detalhes sobre a estação de rádio que você gostaria de adicionar. Os primeiros três campos são obrigatórios:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>No campo <gui style="input">URL do fluxo</gui>, digite ou cole a URL do fluxo clicando com o botão direito ou selecionando <gui style="menuitem">Colar</gui> ou pressionando <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>Você também pode preencher os campos para <gui style="input">Criador da estação</gui>, <gui style="input">Descrição</gui> e <gui style="input">Avaliação</gui>.</p>
- </item>
- <item>
- <p>Finalmente, clique em <gui style="button">Salvar</gui> para salvar a estação de rádio no <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Reproduzir uma estação de rádio</title>
-
- <p>Para <link xref="play">reproduzir</link> uma estação de rádio, clique duas vezes sobre a estação de rádio. Alternativamente, clique com o botão direito na estação e selecione <gui style="menuitem">Reproduzir</gui> ou selecione a estação de rádio e escolha <guiseq><gui style="menu">Reproduzir</gui><gui style="menuitem">Reproduzir</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>Você também pode clicar com o botão direito na estação e selecionar <gui style="menuitem">Reproduzir após a faixa atual</gui> para adicionar a estação de rádio à fila após a faixa que está sendo reproduzida no momento.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Reproduzir após a faixa atual</gui> pode não funcionar em algumas instalações do <app>Banshee</app>.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/pt_BR/rb-import.page b/help/pt_BR/rb-import.page
new file mode 100644
index 0000000..533c6c7
--- /dev/null
+++ b/help/pt_BR/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="pt_BR">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>Rhythmbox</app> music player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>Rhythmbox</app> library</title>
+
+</page>
diff --git a/help/pt_BR/search.page b/help/pt_BR/search.page
index 3092d55..f2ef0d7 100644
--- a/help/pt_BR/search.page
+++ b/help/pt_BR/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,89 +19,70 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Pesquisando na sua biblioteca do Banshee</title>
+
+ <p>O Banshee dispõe de uma poderosa linguagem de busca. Você pode rapidamente e com muita facilidade buscar na sua biblioteca com termos básicos de pesquisa ou executar pesquisas detalhadas com a terminologia de busca avançada do Banshee.</p>
+
+ <p>Para executar uma busca de suas mídias no Banshee, pressione a tecla <key>S</key>, ou clique caixa <gui>Pesquisar</gui> na parte superior direita da visualização de bibliteca no Banshee.</p>
+
+ <p>Uma consulta consistem em alguns termos básicos, pro exemplo <em>dave matthews</em>. Digitando <em>dave matthews</em> na caixa de busca, o Banshee irá procurar em todos os campos de metadados, incluindo Título da faixa, Título do álbum, Artista, Ano, etc. Qualquer faixa que tenha nos seus metadados <em>dave</em> e <em>matthews</em> será retornada. Os termos de busca não diferanciam maiúsculas de minúsculas, o que seignifica que você não precisa colocar letras maiúsculas. <em>dave</e [...]
+
+<section id="operators">
+ <title>Operadores básicos</title>
+ <p>Operadores podem ser colocados entre quaisquer dois termos de busca ou antes de um. A operação padrão é <gui>E</gui>, e é usado quando nenhum outro operador for usado entre dois termos de busca. Graças a este padrão não há explicitamente o operador E.</p>
+
<p>Outros peradores básicos incluem <gui>OU</gui> e <gui>NÃO</gui>. Juntos esses três operadores podem formar consultas muito poderosas para te ajudar a pesquisar suas mídias.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Operadores lógicos e exemplos</title>
<p>Abaixo está uma lista de operadores lógicos e exemplos dos resultados das buscas usando-os.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operador</gui></p></td>
- <td><p><gui>Descrição</gui></p></td>
+ <td><p><gui>Operador</gui></p></td> <td><p><gui>Descrição</gui></p></td>
</tr>
<tr>
- <td><p><em>padrão</em>, <em>espaço em branco</em></p></td>
- <td><p>Busca por dois termos com um espaço entre as duas palavras ou os dois termos.</p></td>
+ <td><p><em>padrão</em>, <em>espaço em branco</em></p></td> <td><p>Busca por dois termos com um espaço entre as duas palavras ou os dois termos.</p></td>
</tr>
<tr>
- <td><p>OU, ou, <key>|</key>, <key>,</key></p></td>
- <td><p>O resultado da busca será duas músicas com um resultado em qualquer campo.</p></td>
+ <td><p>OU, ou, <key>|</key>, <key>,</key></p></td> <td><p>O resultado da busca será duas músicas com um resultado em qualquer campo.</p></td>
</tr>
<tr>
- <td><p>NÃO, não,<key>-</key></p></td>
- <td><p>Não exibe nenhum resultado de pesquisa com qualquer termo de pesquisa precedido do operador NÃO, não,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NÃO, não,<key>-</key></p></td> <td><p>
+ Do not display search results with any search term that follows the
+ operator of NOT, not,<key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Exemplo de operações lógicas incluem:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Consulta</gui></p></td>
- <td><p><gui>Descrição</gui></p></td>
+ <td><p><gui>Consulta</gui></p></td> <td><p><gui>Descrição</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Retorna quaisquer campos de uma faixa contendo ambos, <em>dave</em> e <em>matthews</em>.</p></td>
+ <td><p>dave matthews</p></td> <td><p>Retorna quaisquer campos de uma faixa contendo ambos, <em>dave</em> e <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Retorna quaisquer campos em uma faixa contendo <em>dave</em> ou <em>matthews</em>.</p></td>
+ <td><p>dave, matthews</p></td> <td><p>Retorna quaisquer campos em uma faixa contendo <em>dave</em> ou <em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave ou matthews</p></td>
- <td><p>Retorna quaisquer campos em uma faixa contendo <em>dave</em> ou <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave ou matthews</p></td> <td><p>Retorna quaisquer campos em uma faixa contendo <em>dave</em> ou <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Retorna quaisquer campos em uma faixa contendo <em>dave</em> ou <em>matthews</em>.</p></td>
- </tr>
+ <td><p>dave | matthews</p></td> <td><p>Retorna quaisquer campos em uma faixa contendo <em>dave</em> ou <em>matthews</em>.</p></td>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Exibe todas as faixas cujos campos não contenham <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>Exibe todas as faixas cujos campos não contenham <em>dave matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Para mais informações sobre a execução de consultas mais complexas, veja a <link xref="adv-search"/> página.</p>
+
</section>
-
+
</page>
diff --git a/help/pt_BR/sort.page b/help/pt_BR/sort.page
index 2bad979..e81d0a1 100644
--- a/help/pt_BR/sort.page
+++ b/help/pt_BR/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Adicionando colunas</title>
+
<p>Conforme sua biblioteca cresce, você pode desejar alterar sua visualização da biblioteca para adicionar informações complementares sobre as músicas à sua biblioteca ou alterar a forma de ver e ordenar suas músicas, artistas ou álbums.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>Você pode adicionar colunas extras para a visualização de biblioteca no <app>Banshee</app> para ter maiores informações sobre as músicas e também permitir ordenar de maneira diferente, por padrão o Banshee mostra as seguintes colunas para músicas <gui>Nome</gui>, <gui>Artista</gui>, <gui>Álbum</gui>, e <gui>Duração</gui>. Para adicionar colunas extra clique com o botão direito do mouse em qualquer uma das colunas, o Banshee irá mostrar todas as colunas disponíveis, para escolhar uma [...]
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Ordenando colunas</title>
+ <p>Você pode ordenar sua biblioteca clicando com o mouse em qualquer uma das colunas mostradas na visualização de biblioteca, se você deseja ordenar por Artista, clique no topo da coluna <gui>Artista</gui>, e o Banshee automaticamente irá ordenar esta coluna alfabeticamente, clicando novamente na coluna <gui>Artista</gui> o Banshee irá ordenar a coluna na ordem alfabética inversa.</p>
</section>
-
+
</page>
diff --git a/help/pt_BR/sync.page b/help/pt_BR/sync.page
index 2ee3fd8..1addea3 100644
--- a/help/pt_BR/sync.page
+++ b/help/pt_BR/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Sincronize suas mídias com um reprodutor de mídia portátil ou smartphone.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,79 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Sincronização</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Sincronização</title>
+
+ <p>O Banshee tem suporta a sincronização de suas músicas com reprodutores de mída portáteis e smartphones. Você pode adicionar faixas de músicas específicas, álbuns ou listas de reprodução ou permitir que o Banshee mantenha seu reprodutor portátil sincronizado com toda a sua biblioteca. Depois que seu reprodutor estiver conectado ao computador você pode também ouvir as músicas do seu reprodutor portátil no Banshee. Quando se está sincronizando música em um formato sem perda ("lossless" [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Suporte a dispositivos</title>
+ <p>O Banshee tem suporte a quase todos os reprodutores portáteis de música e smartphones, com a notável excessão dos dispositivos: Apple iPhone, iPad e iPod Touch.</p>
+
+ <p>Quando você conectar seu dispositivo o Banshee irá mostrá-lo no menu esquerdo. Clicando no ícone do dispositivo o Banshee exibirá a página do dispositivo, exibindo suas preferências de sincronização.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Música</p></item>
- <item><p>Livros de áudio</p></item>
- <item><p>Vídeos</p></item>
- <item><p>Podcasts</p></item>
- </list>
-
- <p>No menu de contexto próximo de cada mídia, escolha:</p>
-
- <list>
- <item><p>Gerenciamento manual</p></item>
- <item><p>Sincronizar toda a biblioteca</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Sincronize suas músicas</title>
+ <p>Você pode escolher entre a sincronização automática do Banshee ou gerenciando suas músicas e mídias manualmente.</p>
+
+ <p>Escolha seu dispositivo no menu do Banshee e então selecione como você deseja sincronizar suas mídias, incluindo:</p>
+ <list>
+ <item><p>Música</p></item>
+ <item><p>Livros de áudio</p></item>
+ <item><p>Vídeos</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>No menu de contexto próximo de cada mídia, escolha:</p>
+ <list>
+ <item><p>Gerenciamento manual</p></item>
+ <item><p>Sincronizar toda a biblioteca</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Se você optar por sincronizar toda a sua biblioteca com seu reprodutor portátil automaticamente certifique-se de que seu reprodutor portátil dipõe de capacidade de armazenamento suficiente. Se sua biblioteca for maior que o espaço disponível em seu dispositivo o Banshee irá sincronizar até que o dispositivo esteja cheio, e então vai parar.</p>
+ </note>
+
+ <p>Se você criou playlists ou playlists inteligentes na sua biblioteca de música, elas também serão mostradas como opções de sincronização para música. Isso pode ser útil quando criar playlists inteligentes, como elas são atulizadas automaticamente toda vez que um arquivo dentro das suas regras é adicionado, e o Banshee sincronizará a nova playlist com seu dispositivo sempre que ele for conectado.</p>
+
+ <p>O Banhsee vai exibir a capacidade total do seu dispositivo em um gráfico na parte central inferior do Banshee. O gráfico vai mostrar quanto espaço está ocupado por arquivos de áudio, vídeos, e outros bem como o espaço livre. Logo abaixo o Banshee vai exibe quantos itens estão armazenados no seu dispositivo, qual a equivalência em dias e horas de execução e o total de espaço usado.</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Sincronize toda a sua biblioteca</title>
+ <p>Você pode arrastar e soltar arquivos de mídia no seu dispositivo pelo Banshee. Selecione o arquivo ou os arquivos que deseja copiar para seu reprodutor portátil e então pressione e segure o botão direito do mouse e arraste o(s) arquivo(s) para o ícone do seu dispositivo no Banshee. Esse procedimento copiará os arquivos para o seu dispositivo.</p>
+
+ <p>Se sua biblioteca de músicas estvier codificada em um formato que seu reprodutor portátil não suporta, como OGG ou FLAC, e você tem os codecs necessários instalados, o Banshe pode converter automaticamente esses arquivos em MP3 quando estiver os transferindo para seu reprodutor portátil. Verifique com sua distribuição Linux pelos codecs necessários já que isso está fora do escopo desse manual e variam de distribuição para distribuição.</p>
+
+ <note style="tip">
+ <p>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 <gui>Disconnect</gui>.
+ </p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Reproduza músicas do seu reprodutor portátil</title>
+ <p>Você pode reproduzir músicas armazenadas no seu reprodutor portátil diretamente no Banshee, escolha seu dispositivo no menu da esquerda e a biblioteca do seu reprodutor portátil será exibida. Então você poderá reproduzir a música no Banshee da mesma maneira que faz na sua própria biblioteca.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Excluir arquivos do seu reprodutor portátil vai excluir permanentemente os arquivos, e você não poderá recuperá-los.</p>
- </note>
-
+ <title>Remova músicas do seu reprodutor portátil</title>
+ <p>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 <gui>Delete</gui> or from the
+ menu choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Excluir arquivos do seu reprodutor portátil vai excluir permanentemente os arquivos, e você não poderá recuperá-los.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/pt_BR/ui.page b/help/pt_BR/ui.page
index 571bb3d..b7b00e9 100644
--- a/help/pt_BR/ui.page
+++ b/help/pt_BR/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>Uma visão geral da interface gráfica do <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,46 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Introdução à interface gráfica do Banshee</title>
<figure>
<title>Janela do <gui>Reprodutor de mídia Banshee</gui></title>
<desc><app>Reprodutor de mídia Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Interface da biblioteca do <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Fontes</title>
+ <p>Suas fontes de músicas e vídeos são mostradas no lado esquerdo do Banshee. As fontes dão a você acesso rápido a suas filas de reprodução, músicas, vídeos, Last.fm, podcasts e mais.</p>
+
+ <note style="tip">
+ <p>As opções do menu mudam de acordo com a fonte que você escolher. Por exemplo, para usar o menu para importar um podcast, você precisa selecionar a fonte do podcast. A opção de menu para importar um podcast não está disponível quando você está visualizando a biblioteca de vídeos ou a biblioteca de músicas.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Navegador de biblioteca</title>
+ <p>Quando você seleciona uma fonte música ou vídeo das fontes, o Banshee irá mostrar seu conteúdo no navegador da biblioteca. Dependendo da fonte que você selecionou o Banshee pode mostrar suas bibliotecas de música ou vídeo, assinaturas de podcast ou mesmo a loja de músicas da Amazon para que você possa comprar músicas.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Visão de reproduzindo agora</title>
+ <p>De grande ajuda quando se está usando o Banshee no modo tela cheia, o modo "Reproduzindo agora" oculta a biblioteca para proporcionar uma maior visão da música ou vídeo a que você está assistindo. Quando se está ouvindo músicas, a visão "Reproduzindo agora" vai exibir o nome do artista, do álbum e a capa, se disponível. Se você estiver assistindo a um vídeo o Banshee mostrará o vídeo.</p>
+
+ <p>To change Now Playing to hide the Banshee user interface and use the full
+ screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui>
+ button in the upper right hand corner of Banshee, or choose
+ <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen
+ mode.</p>
+
+</section>
+
+<section id="library">
+ <title>Biblioteca</title>
+ <p>A visualização de biblioteca no Banshee irá mudar dependendo da fonte que houver escolhido. A biblioteca de música irá mostrar arte da capa, artistas em sua biblioteca e lista de músicas. A biblioteca de podcast irá exibir suas assinaturas de podcast, podcasts que são e que não são baixados, e todos os podcasts, novos e velhos. Por favor veja a página de ajuda de cada tipo fonte para informações detalhadas sobre o gerenciamento das fontes.</p>
+</section>
- <section id="context">
- <title>Fontes</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/sl/add-podcast.page b/help/sl/add-podcast.page
new file mode 100644
index 0000000..10de023
--- /dev/null
+++ b/help/sl/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="sl">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Dodajte, odstranite in predvajajte podcaste v Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasti</title>
+
+ <section id="podcastdescription">
+ <title>Kaj je podcast?</title>
+
+ <p>Podcasti so posneti programi podobni radijskim programom, ki so na voljo na internetu in vam omogočajo naročnino. Ko se v Banshee naročite na podcast, bo ob novem izidu programa Banshee samodejno prejel podcast in vam omogočil njegovo poslušanje.</p>
+
+ <p>Obstajajo podcasti o skoraj vseh temah vključno z glasbo, filmi, Linuxom in več. Iščite po internetu z uporabo svojega priljubljenega iskalnika z iskalnim nizom kot je "film podcast" in predstavljenih vam bo veliko možnosti za izbiro.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Dodajanje podcasta</title>
+
+ <p>Za dodajanje podcasta v Banshee boste morali najprej obiskati domačo stran podcasta v svojem spletnem brskalniku. Skoraj vsi podcasti bodo imeli prikazan gumb ali povezavo za naročilo nanj. Kopirajte povezavo na naročilo podcasta. V večini brskalnikov lahko desno kliknete na povezavo in izberete <gui>Kopiraj povezavo</gui>. </p>
+
+ <p>V zgornjem desnem kotu Banshee izberite <gui>Naroči se na podcaste</gui>, v meniju izberite choose <guiseq><gui>Večpredstavnost</gui><gui> Naroči se na podcast</gui></guiseq> ali uporabite tipkovno bližnjico <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
+
+ <p>Banshee vam bo nato v spustnem meniju omogočal izbiro kako želite prejeti nove podcaste. Vaše izbire vključujejo: </p>
+
+ <list>
+ <item><p>Prejemi najnovejšo epizodo (to bo samodejno prejelo zadnjo izdano epizodo).</p></item>
+ <item><p>Prejmi vse epizode (To bo prejelo vse epizode).</p></item>
+ <item><p>Naj sam/a odločim katere epizode naj prejmem (to vam bo omogočilo izbiro epizod, ki jih želite prejeti).</p></item>
+ </list>
+
+ <p>Po dodajanju vira podcasta bo Banshee prikazal:</p>
+
+ <list>
+ <item><p><gui>Ime</gui>: (Ime določene epizode)</p></item>
+ <item><p><gui>Podcast</gui>: (Ime podcasta)</p></item>
+ <item><p><gui>Objavljeno</gui> (Datum objave ali izida epizode)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/sl/add-radio.page b/help/sl/add-radio.page
new file mode 100644
index 0000000..87dc5c3
--- /dev/null
+++ b/help/sl/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="sl">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Dodajte, odstranite in predvajajte internetne radijske postaje v Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Internetni radio</title>
+
+ <section id="radiodescription">
+ <title>Kaj je internetni radio?</title>
+
+ <p>Internetne radijske postaje so podobne običajnim radijskim postajam. Posamezniku ali organizaciji omogočajo živo pretakanje glasbe preko interneta. Internetne radijske postaje so lahko hkraten pretok običajne radijske postaje, amaterji, ki razpršeno oddajajo svojo lastno postajo ali komercialne internetne radijske postaje, ki vključujejo DJ-je in celo reklame.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Dodajanje radijske postaje</title>
+
+ <p>Za dodajanje internetne radijske postaje v Banshee v zgornjem desnem kotu Banshee pritisnite <gui>Dodaj postajo</gui> ali pa v meniju izberite <guiseq><gui>Večpredstavnost</gui><gui>Dodaj postajo</gui></guiseq>.</p>
+
+ <p>S spletne strani internetne radijske postaje v svojem brskalniku kopirajte povezavo do URL-ja njihovega pretoka. V večini brskalnikom lahko desno kliknete na povezavo in pritisnete <gui>Kopiraj povezavo</gui>.</p>
+
+
+ <p>Banshee vas bo pozval k vnosu <gui>Zvrsti postaje</gui>. Iz razpoložljivih možnosti spustnega menija izberite vrsto glasbe, ki jo internetna radijska postaja predvaja. Vnesti boste morali <gui>Ime postaje</gui>. Nato pritisnite tabulator ali uporabite svojo miško za izbiro pogovornega okna <gui>URL pretoka:</gui> v katerega prilepite URL radijske postaje. Z miško desno kliknite in izberite <gui>Prilepi</gui> ali pritisnite <keyseq><key>Control</key>+<key>V</key></keyseq>.</p>
+
+ <p>Če želite, lahko izpolnite tudi polja <gui>Ustvarjalec postaje</gui>, <gui>Opis</gui> in <gui>Ocena</gui>.</p>
+
+ <p>Nato pritisnite <gui>Shrani</gui> za shranjevanje internetne radijske postaje v Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/sl/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/sl/advanced.page
index 468ad23..2c6bdf3 100644
--- a/help/zh_CN/extensions.page
+++ b/help/sl/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="sl">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Dobite pomoč za napredne možnosti.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Napredne možnosti in pomoč.</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Tipkovne bližnjice</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Tipkovne bližnjice</title>
</section>
-
+
</page>
diff --git a/help/sl/amazon.page b/help/sl/amazon.page
index 8d1fc35..fb38a75 100644
--- a/help/sl/amazon.page
+++ b/help/sl/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Usklajujte in nakupujte glasbo v trgovini Amazon MP3.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Trgovina Amazon MP3</title>
+
+ <p>Banshee podpira prejemanje in uvažanje glasbe iz trgovine Amazon MP3. Glasbene datoteke Amazon lahko ročno uvozite, kupite glasbo v svojem spletnem brskalniku ali kupite glasbo v Banshee. Amazon ponuja glasbo le v vrsti MP3 v določenih državah in morda glede na vaše mesto ne boste mogli kupiti Amazon MP3-jev.</p>
+
+ <note style="important">
+ <p>Banshee uporablja pridružitveno kodo Amazon za vse nakupe glasbe. Ves denar zbran s to pridružitveno kodo je doniran fundaciji GNOME.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Kupite Amazon MP3-je v svojem spletnem brskalniku</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Kupite Amazon MP3-je v svojem spletnem brskalniku</title>
+
+ <p>Glasbo kupljeno v trgovini Amazon MP3 je mogoče samodejno prejeti in uvoziti v Banshee. Banshee se poveže z datoteko .amz, ki jo Amazon zagotavlja za nakupe MP3. Ko kupite glasbo na Amazonu, bo vaš spletni brskalnik prejel datoteko .amz, Banshee jo bo samodejno odprl in začel prejem in uvoz glasbe.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Kupite Amazon MP3-je v Banshee</title>
+
+ <p>Skladbe lahko na Amazonu iščete znotraj Banshee. V meniju Banshee na levi izberite trgovino Amazon MP3. To bo naložilo trgovino Amazon MP3 tako, kot če bi bili v spletnem brskalniku. Po Amazonu lahko iščete glasbo, ki jo želite kupiti. Po prijavi v Amazon lahko glasbo kupite z enim klikom. Banshee bo samodejno prejel in uvozil vaš nakup v knjižnico.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Ročen uvoz Amazon MP3-je</title>
-
- <p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ <title>Ročen uvoz Amazon MP3-je</title>
+
+ <p>Ko glasbo kupite z Amazona v spletnem brskalniku, bo datoteka z razširitvijo .amz prejeta in shranjena na vaš trdi disk. Za uvoz glasbe ročno kupljene z Amazona v Banshee izberite <guiseq><gui>Večpredstavnost</gui><gui>Uvozi večpredstavnost</gui></guiseq> in izberite datoteko *.amz za uvoz. Banshee bo nato odprl to datoteko in se povezal v trgovino Amazon MP3 za začetek prejema.</p>
+
<note style="warning">
<p>Datoteke Amazon .amz so dejavne le za kratek čas. V primeru da svoje glasbe ne boste hitro prejeli, bo datoteka potekla in ne boste mogli prejeti svoje glasbe z Amazona. Amazon ne objavlja kako dolgo so datoteke dejavne. Priporočamo vam, da svoje nakupe z Amazona prejmete in uvozite v eni urni od nakupa.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/sl/emusic.page b/help/sl/emusic.page
new file mode 100644
index 0000000..1ae28db
--- /dev/null
+++ b/help/sl/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="sl">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Uvažanje glasbe kupljene na eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Uvozite svoje skladbe eMusic</title>
+
+</page>
diff --git a/help/sl/extensions.page b/help/sl/extensions.page
index 84e52a3..05f0a2e 100644
--- a/help/sl/extensions.page
+++ b/help/sl/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="sl">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="sl">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Dodajte dodatne zmožnosti v Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Razširitve Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Uradne razširitve Banshee</title>
</info>
+ <title>Upravljajte razširitve Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Razširitve Banshee, ki jih je razvila skupnost</title>
+ </info>
+ <title>Dodajte razširitve za Banshee, ki jih je izgradila skupnost</title>
</section>
+
</page>
diff --git a/help/sl/import.page b/help/sl/import.page
index f504a8d..e9fc9cd 100644
--- a/help/sl/import.page
+++ b/help/sl/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Dodajte glasbo in videoposnetke s svojega računalnika v vašo knjižnico Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Uvozite glasbo in video</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>V Banshee lahko uvozite glasbo in videoposnetke shranjene na svojem računalniku. Uvožene datoteke se pojavijo v vaših virih in jih je mogoče urejati in upravljati kot katerekoli druge večpredstavnostne datoteke v Banshee.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>Za uvoz glasbenih ali video datotek s svojega računalnika izberite <guiseq><gui>Večpredstavnost</gui><gui>Uvozi večpredstavnost</gui></guiseq>. Pojavilo se bo pogovorno okno s številnimi izbirami.</p>
- <note style="tip">
+ <note>
<p>Vstavki lahko dodajo dodatne možnosti uvoza. Oglejte si <link xref="#plugins"/> spodaj.</p>
</note>
@@ -53,27 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Mapo lahko varno znova uvozite brez skrbi o podvojenih vnosih v svoji knjižnici. </p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Uvozi s seznama predvajanja</title>
+ <p>Glasbo lahko uvozite tudi s seznamov predvajanja. Večina datotek seznamov predvajanja se konča z <em>m3u</em>. Za uvoz s seznama prevajanja v meniju Banshee izberite <guiseq><gui>Večpredstavnost</gui><gui>Uvozi seznam predvajanja</gui></guiseq> in v svoji mapi najdite datoteko seznama predvajanja, jo izberite in pritisnite <gui>Uvozi</gui>.</p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Vstavki lahko dodajo dodatne možnosti uvoza. Če so primerni vstavki omogočeni, bodo na voljo naslednji dodatni viri:</p>
-
+ <title>Dodatni viri uvoza</title>
+ <p>Vstavki lahko dodajo dodatne možnosti uvoza. Če so primerni vstavki omogočeni, bodo na voljo naslednji dodatni viri:</p>
</section>
-
+
</page>
diff --git a/help/sl/index.page b/help/sl/index.page
index f08e155..5708fec 100644
--- a/help/sl/index.page
+++ b/help/sl/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Banshee predvajalnik večpredstavnostnih datotek</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Dodaj, odstrani in predvajaj</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Upravljaj in razvrsti</title>
</section>
-
+
<section id="sync" style="2column">
<title>Uskladite svoje večpredstavnostne datoteke s prenosljivim predvajalnikom glasbe</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Dodajte dodatne zmožnosti Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Napredne možnosti in pomoč</title>
+ <title>Napredne možnosti in pomoč</title>
</section>
</page>
diff --git a/help/sl/introduction.page b/help/sl/introduction.page
index 87fb3cb..acdfcdc 100644
--- a/help/sl/introduction.page
+++ b/help/sl/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>Uvod v <app>Banshee predvajalnik večpredstavnosti</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>Uvod</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p><app>Banshee</app> je večpredstavnostni predvajalnik, ki vam omogoča predvajanja vaše glasbe, videov in drugih večpredstavnostnih datotek kot tudi njihovo usklajevanje s prenosnimi napravami.</p>
<p><app>Banshee</app> vključuje zmožnosti za uvoz vaših večpredstavnostih datotek, uvoz njihovih metapodatkov in predvajanje vaše glasbe in videov.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>Banshee vam pomaga tudi uskladiti svojo glasbo in videoposnetke s priljubljenimi prenosnimi napravami kot so digitalni zvočni predvajalniki in pametni telefoni. Banshee podpira priljubljene naprave vključno z večino iPodi, MP3 predvajalniki Sandisk in Creative ter Android telefoni.</p>
+<!--
<figure>
- <title>Okno <gui>Banshee predvajalnik večpredstavnostnih datotek</gui></title>
- <desc><app>Banshee predvajalnik večpredstavnostnih datotek</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Vmesnik knjižnice <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/sl/itunes-import.page b/help/sl/itunes-import.page
new file mode 100644
index 0000000..f2a5058
--- /dev/null
+++ b/help/sl/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="sl">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Uvozite glasbo in kategorizacije iz predvajalnika <app>iTunes</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Uvozite svojo knjižnico <app>iTunes</app></title>
+
+</page>
diff --git a/help/sl/keyboard-shortcuts.page b/help/sl/keyboard-shortcuts.page
deleted file mode 100644
index 6d3049b..0000000
--- a/help/sl/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="sl">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Ključ</gui></p></td>
- <td><p><gui>Dejanje</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Predvajanje ali premor predvajanja trenutne pesmi</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Predvajaj naslednjo skladbo</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Predvajaj predhodno skladbo</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Ključ</gui></p></td>
- <td><p><gui>Dejanje</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Premakni žarišče v iskalno polje</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Odpri pogovorno okno uvažanja</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Seznami predvajanja</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Ključ</gui></p></td>
- <td><p><gui>Dejanje</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Ustvari nov seznam predvajanja</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Podcasti</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Ključ</gui></p></td>
- <td><p><gui>Dejanje</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Označi izbrane epizode kot stare</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Vmesnik</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Ključ</gui></p></td>
- <td><p><gui>Dejanje</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Preklopi celozaslonski način</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Izberi vse skladbe v pogledu seznama predvajanja</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Odstrani izbiro vseh skladb v pogledu seznama predvajanja</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Levi miškin gumb</key></keyseq>
- </p></td>
- <td><p>Predvajaj predhodno skladbo (zahteva omogočen vstavek obvestilnega področja</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Desni miškin gumb</key></keyseq>
- </p></td>
- <td><p>Predvajaj naslednjo skladbo (zahteva omogočen vstavek obvestilnega področja</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Srednji miškin gumb</key></keyseq>
- </p></td>
- <td><p>Preklopi predvajanje / premor (zahteva omogočen vstavek obvestilnega področja</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/sl/keyboardshortcuts.page b/help/sl/keyboardshortcuts.page
new file mode 100644
index 0000000..426fabc
--- /dev/null
+++ b/help/sl/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="sl">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Tipkovne bližnjice</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Nadzor Banshee s tipkovnimi bližnjicami</title>
+
+ <section id="playbackcontrol">
+
+ <title>Nadzor predvajanja</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Ključ</gui></p></td> <td><p><gui>Dejanje</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Preslednica</p></td> <td><p>Predvajanje ali premor predvajanja trenutne pesmi</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Predvajaj naslednjo skladbo</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Predvajaj predhodno skladbo</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Interakcija s knjižnico</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Ključ</gui></p></td> <td><p><gui>Dejanje</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Pritisnite <keyseq><key>Control</key><key>H</key></keyseq>.</p></td> <td><p>Premakni žarišče v iskalno polje</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Odpri pogovorno okno uvažanja</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Seznami predvajanja</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Ključ</gui></p></td> <td><p><gui>Dejanje</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>Ustvari nov seznam predvajanja</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasti</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Ključ</gui></p></td> <td><p><gui>Dejanje</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Označi izbrane epizode kot stare</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Vmesnik</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Ključ</gui></p></td> <td><p><gui>Dejanje</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Preklopi celozaslonski način</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>Izberi vse skladbe v pogledu seznama predvajanja</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>Odstrani izbiro vseh skladb v pogledu seznama predvajanja</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>Skrij okno Banshee (zahteva omogočen vstavek obvestilnega področja</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Levi miškin gumb</key></keyseq>
+ </p></td> <td><p>Predvajaj predhodno skladbo (zahteva omogočen vstavek obvestilnega področja</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Desni miškin gumb</key></keyseq>
+ </p></td> <td><p>Predvajaj naslednjo skladbo (zahteva omogočen vstavek obvestilnega področja</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Srednji miškin gumb</key></keyseq>
+ </p></td> <td><p>Preklopi predvajanje / premor (zahteva omogočen vstavek obvestilnega področja</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/sl/lastfm.page b/help/sl/lastfm.page
index 086ed87..801b5c0 100644
--- a/help/sl/lastfm.page
+++ b/help/sl/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="sl">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Omogočite Last.fm, poročanje skladb in radio Last.fm.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,67 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>Last.fm je priljubljena spletna storitev, ki ponuja tako brezplačno in plačano različico. Last.fm ponuja podatke o glasbenih izvajalci in albumih in če ustvarite uporabniški profil, vam Last.fm omogoča brezplačno sledenje glasbe, ki jo poslušate v Banshee. Če se naročite kot plačujoči član, lahko poslušate tudi pretakajočo glasbo z Last.fm v različnih glasbenih odjemalcih vklučno z Banshee. Last.fm ponuja več kanalov za pretok vključno s priporočeno glasbo za vas na osnovi vaših nav [...]
+
<section id="enable-lastfm">
- <title>Omogoči Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Omogoči Last.fm</title>
+ <p>Da bi dobili največ iz Last.fm, boste morali ustvariti profil Last.fm. Za ustvarjanje računa obiščite <link href="http://www.last.fm/join">http://www.last.fm/join</link> ali v meniju Banshee izberite <guiseq><gui>Uredi</gui><gui>Možnosti</gui></guiseq>. Nato pritisnite zavihek <gui>Lastno viru</gui> in pritisnite spustni meni <gui>Vir</gui> in izberite <gui>Last.fm</gui> in izberite povezavo <em>Vpis v Last.fm</em></p>
+
+ <p>Za omogočenje poročanja skladb v Banshee, ki se predvajajo na vašem računalniku, se v možnostih <gui>Lastno viru</gui> Banshee vpišite na Last.fm. Vnesite svoje uporabniško ime in pritisnite gumb <gui>Prijavi se v Last.fm</gui>. V svojem brskalniku boste usmerjeni na spletno stran Last.fm za dodeljevanje pravic Banshee. V svojem brskalniku kliknite na povezavo <gui>Da, dovoli dostop</gui> in preusmerjeni boste na spletno stran, ki bo prikazala sporočilo, da ima Banshee sedaj dostop [...]
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Poslušanje radia Last.fm</title>
<p>Radio Last.fm je brezplačen za prebivalce Združenih držav Amerike, Združenega Kraljestva in Nemčije. Prebivalci drugih držav morajo plačati za premijski račun z Last.fm za poslušanje radia. Premijski člani v vseh državah prejmejo tudi zmožnosti premijskega radia: poslušanje seznamov predvajanja in postaj glasbe, ki vam je všeč ali ste jo označili.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+
+ <p>V vsebinskem meniju na levi strani Banshee boste imeli sedaj odsek Last.fm, vključno s svojimi radijskimi postajami Last.fm. Za poslušanje radia Last.fm boste potrebovali dejavno internetno povezavo. Izberite radijsko postajo, ki jo želite poslušati. Banshee bo komuniciral z Last.fm za dodajanje skladb za to radijsko postajo. V Banshee pritisnite gumb <gui>Predvajaj</gui> ali <key>Preslednico</key> za začetek pretakanja radijske postaje Last.fm. Za predvajanje naslednje skladbe v [...]
+
</section>
-
+
</page>
diff --git a/help/sl/manage-coverart.page b/help/sl/manage-coverart.page
new file mode 100644
index 0000000..fb908b6
--- /dev/null
+++ b/help/sl/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="sl">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Upravljajte ali spremenite ovojnice svojih albumov.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Ovitki</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/sl/manage-playlists.page b/help/sl/manage-playlists.page
index 8cf8df6..19839c6 100644
--- a/help/sl/manage-playlists.page
+++ b/help/sl/manage-playlists.page
@@ -1,144 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="sl">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="sl">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Ustvarjanje in upravljanje s seznami predvajanja.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Seznami predvajanja</title>
-
+ <title>Seznami predvajanja</title>
+
<p>Seznami predvajanja vam omogočajo ustvarjanje in shranjevanje seznama skladb za predvajanjem v določenem vrstnem redu. Seznami predvajanja so priročni za ustvarjanje seznama vaših najljubših skladb ali za razdelitev knjižnice v manjše sezname skozi katere je lažje brskati. Nekateri prenosni predvajalniki večpredstavnosti vam omogočajo prenos seznama predvajanja, zato ga lahko vzamete s sabo.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>Banshee podpira običajne sezname predvajanja, ki vključujejo skladbe, ki jih dodate na seznam predvajanja in pametne sezname predvajanja na osnovi vaših navad poslušanja, priljubljene glasbe in več.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>Običajen seznam predvajanja je seznam skladb, ki jih dodajate in upravljate. Morda želite ustvariti svoj lasten seznam skladb svojega priljubljenega izvajalca iz več albumov, svojih zadnjih priljubljenih skladb ali poskočen seznam predvajanja za poslušanje med telesno vadbo. </p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>Vrsti red seznama predvajanja lahko spremeniti z vlečenjem in spuščanjem skladb na nov položaj v seznamu predvajanja. Skladbe je mogoče v seznamu predvajanja preurejati le, če ni razvrščen noben od stolpcev. Za odstranitev razvrstitve stolpca, pritisnite stolpec tolikokrat, da puščica navzgor ali navzdol ni več prikazana in preuredite seznam predvajanja. </p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>Pametni seznami predvajanja vam omogočajo hitro ustvarjanje dinamičnih seznamov predvajanja na osnovni številnih pred-nastavljenih spremenljivk. Nov seznam predvajanja lahko ustvarite na osnovi določenega izvajalca, priljubljenih in več.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Običajni seznami predvajanja</title>
+
+ <p>Običajen seznam predvajanja je seznam skladb, ki jih dodajate in upravljate. Morda želite ustvariti svoj lasten seznam skladb svojega priljubljenega izvajalca iz več albumov, svojih zadnjih priljubljenih skladb ali poskočen seznam predvajanja za poslušanje med telesno vadbo. </p>
+
+ <p>Nov seznam predvajanja lahko ustvarite s pritiskom <keyseq><key>Control</key><key>N</key></keyseq>, z izbiro <guiseq><gui>Večpredstavnost</gui><gui>Nov seznam predvajanja</gui></guiseq> ali z izbiro skladb, ki jih želite dodati na seznam predvajanja. Izberite skladb-o/e, desno kliknite na njih in izberite <guiseq><gui>Dodaj na seznam predvajanja</gui><gui>Nov seznam predvajanja</gui></guiseq>. Skladbe lahko na nov seznam predvajanja tudi povlečete in spustite tako, da skladbe izbe [...]
+
+ <p>Če želite seznamu predvajanja dati ime, ga izberite, nanj desno kliknite in pritisnite <gui>Preimenuj seznam predvajanja</gui> in vnesite ime svojega seznama predvajanja.</p>
+
+ <p>Vrsti red seznama predvajanja lahko spremeniti z vlečenjem in spuščanjem skladb na nov položaj v seznamu predvajanja. Skladbe je mogoče v seznamu predvajanja preurejati le, če ni razvrščen noben od stolpcev. Za odstranitev razvrstitve stolpca, pritisnite stolpec tolikokrat, da puščica navzgor ali navzdol ni več prikazana in preuredite seznam predvajanja. </p>
+
+ <p>Za odstranitev skladbe s seznama predvajanja izberite skladb-o/e, ki jih želite odstraniti. Pritisnite <key>Izbriši</key>, v meniju izberite <guiseq><gui>Uredi</gui><gui>Odstrani s seznama predvajanja</gui></guiseq> ali pa desno kliknite s svojo miško in pritisnite <gui>Odstrani s seznama predvajanja</gui>.</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Pameten seznam predvajanja</title>
+
+ <p>Pametni seznami predvajanja vam omogočajo hitro ustvarjanje dinamičnih seznamov predvajanja na osnovni številnih pred-nastavljenih spremenljivk. Nov seznam predvajanja lahko ustvarite na osnovi določenega izvajalca, priljubljenih in več.</p>
+
+ <p>Za ustvarjanje novega pametnega seznama predvajanj izberite <guiseq><gui>Večpredstavnost</gui><gui>Nov pameten seznam predvajanj</gui></guiseq>. Predstavljeno vam bo pogovorno okno za ustvarjanje novega pametnega seznama predvajanja. Vnesite ime svojega seznama predvajanja in izberite kriterije na katerih naj bo osnovan vaš seznam predvajanja. Izbirate lahko med katerimikoli polji vključenimi v metapodatke skladbe kot so album, izvajalec ali leto. Izberite kriterije na nato stori [...]
+
<list>
<item><p>je</p></item>
- <item><p>ni</p></item>
+ <item><p>ni</p></item>
<item><p>manj kot</p></item>
- <item><p>več kot</p></item>
+ <item><p>več kot</p></item>
<item><p>največ</p></item>
- <item><p>najmanj</p></item>
+ <item><p>najmanj</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>Pritisnete lahko tudi gumb <gui>+</gui> za dodajanje poizvedbe dodajanja v pameten seznam. Na primer ustvarite lahko pameten seznam predvajanja, ki vključuje vse skladbe iz leta 2010, ocenjene s 5 zvezdicami. Za ustvarjanje tega seznama predvajanja bi izbrali:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Leto</gui></p></td>
- <td><p><gui>je</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Leto</gui></p></td> <td><p><gui>je</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Ocena</gui></p></td>
- <td><p><gui>je</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Ocena</gui></p></td> <td><p><gui>je</gui></p></td>
+ <td><p><gui/>5 zvezdic</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>Izbirno lahko izberete koliko skladb je vključenih tako, da pritisnete izbirno polje <gui>Omeji</gui> in izberete število skladb, ki naj bodo vključene.</p>
+
+ <p>Banshee vključuje tudi pametne sezname predvajanja že ustvarjene za vas. Pritisnite gumb <gui>Odpri v urejevalniku</gui> za ogled kako je bil seznam predvajanja ustvarjen ali za njegovo spreminjanje. Če pritisnete <gui>Ustvari in shrani</gui>, bo seznam predvajanja samodejno ustvarjen in shranjen za vas. Vključeni so naslednji seznami predvajanja:</p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Priljubljene (skladbe, ocenjene s štirimi in petimi zvezdicami)</p>
- </item>
- <item>
- <p>Nedavno priljubljene (skladbe pogosto poslušane v predhodnem tednu)</p>
- </item>
- <item>
- <p>Nedavno dodano (skladbe uvožene v zadnjem tednu)</p>
- </item>
- <item>
- <p>Ne slišano (skladbe, ki niso bile predvajane ali preskočene)</p>
- </item>
- <item>
- <p>Zapostavljene priljubljene (priljubljene, ki niso bile predvajanje v dveh mesecih)</p>
- </item>
- <item>
- <p>700 MB priljubljenih (podatkovni CD priljubljenih skladb)</p>
- </item>
- <item>
- <p>80 minut priljubljenih (zvočni CD priljubljenih skladb)</p>
- </item>
- <item>
- <p>Neocenjeno (Skladbe, ki še niso bile ocenjene)</p>
- </item>
+ <title>Pametni seznami prevajanja Banshee</title>
+ <item><p>Priljubljene (skladbe, ocenjene s štirimi in petimi zvezdicami)</p></item>
+ <item><p>Nedavno priljubljene (skladbe pogosto poslušane v predhodnem tednu)</p></item>
+ <item><p>Nedavno dodano (skladbe uvožene v zadnjem tednu)</p></item>
+ <item><p>Ne slišano (skladbe, ki niso bile predvajane ali preskočene)</p></item>
+ <item><p>Zapostavljene priljubljene (priljubljene, ki niso bile predvajanje v dveh mesecih)</p></item>
+ <item><p>700 MB priljubljenih (podatkovni CD priljubljenih skladb)</p></item>
+ <item><p>80 minut priljubljenih (zvočni CD priljubljenih skladb)</p></item>
+ <item><p>Neocenjeno (Skladbe, ki še niso bile ocenjene)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/sl/manage-tags.page b/help/sl/manage-tags.page
index 7262152..9a9901f 100644
--- a/help/sl/manage-tags.page
+++ b/help/sl/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="sl">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="sl">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Uredite in spremenite oznake in metapodatke glasbe.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,49 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Metapodatki glasbe</title>
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Priljubljene vrste metapodatkov sta ID3v1 in ID3v2 za datoteke MP3 in opombe Vorbis za datoteke OGG Vorbis.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
+ <section id="metadata">
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>Pojavilo se bo polje pogovornega okna, ki prikazuje metapodatke skladbe in vam omgoča njihovo spremembo ali posodobitev. Privzeto prikazana polja vključujejo:</p>
-
- <list>
- <item><p><gui>Naslov skladbe</gui></p></item>
- <item><p><gui>Izvajalec skladbe</gui></p></item>
- <item><p><gui>Naslov albuma</gui></p></item>
- <item><p><gui>Zvrst</gui></p></item>
- <item><p><gui>Številka skladbe</gui></p></item>
- <item><p><gui>Številka diska</gui></p></item>
- <item><p><gui>Leto</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>Metapodatki glasbe</title>
+
+ <p>Digitalna glasba vsebuje metapodatke, ki v glasbeni datoteki shranjujejo podrobnosti vključno z izvajalcem, albumom, letom snemanja, zvrstjo in več. Skoraj vsa glasba kupljena preko interneta bo imela metapodatke že vstavljene. Med uvažanjem glasbe s CD-jev, bo Banshee pri zajemanju CD-ja vključil metapodatke, če so na voljo. Za več podrobnosti o zajemanju CD-jev in vključevanju metapodatkov si oglejte <link xref="import"/>.</p>
+
+ <p>Priljubljene vrste metapodatkov sta ID3v1 in ID3v2 za datoteke MP3 in opombe Vorbis za datoteke OGG Vorbis.</p>
+
+ <p>Če ste uvozili skladbe brez metapodatkov, bo <app>Banshee</app> prikazal <gui>Neznano</gui> za večino polj v knjižnici.</p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Urejajte svoje metapodatke</title>
+
+ <p>Metapodatke svojih skladb lahko spremenite in uredite. Izberite skladbo ali skladbe, ki jih želite posodobiti in pritisnite <key>E</key>, v meniju izberite <guiseq><gui>Uredi</gui><gui>Uredi podatke o skladbi</gui></guiseq> ali z miško desno kliknite na datoteke in izberite <gui>Uredi podatke o skladbi</gui></p>
+
+ <p>Pojavilo se bo polje pogovornega okna, ki prikazuje metapodatke skladbe in vam omgoča njihovo spremembo ali posodobitev. Privzeto prikazana polja vključujejo:</p>
+
+ <list>
+ <item><p><gui>Naslov skladbe</gui></p></item>
+ <item><p><gui>Izvajalec skladbe</gui></p></item>
+ <item><p><gui>Naslov albuma</gui></p></item>
+ <item><p><gui>Zvrst</gui></p></item>
+ <item><p><gui>Številka skladbe</gui></p></item>
+ <item><p><gui>Številka diska</gui></p></item>
+ <item><p><gui>Leto</gui></p></item>
+ </list>
+
+ <p>Posodobite podrobnosti o skladbi. Če ste izbrali več skladb za urejanje, pritisnite ikono desne puščice desno od polja <gui>Naslov skladbe</gui> ali pritisnite gumb <gui>Naprej</gui> na dnu pogovornega okna, ko boste končali z urejanjem skladbe. Ko boste dokončali urejanje vseh metapodatkov, pritisnite <gui>Shrani</gui>.</p>
+
</section>
</page>
diff --git a/help/sl/play-queue.page b/help/sl/play-queue.page
index b4f5f9b..06d027a 100644
--- a/help/sl/play-queue.page
+++ b/help/sl/play-queue.page
@@ -1,96 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="sl">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="sl">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Dodajanje večpredstavnostnih datotek v čakalno vrsto predvajanja.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
+ <title>Vrsta predvajanja</title>
+
+ <p><gui>Čakalna vrsta predvajanja</gui> vam omogoča dodajanje skladb za predvajanje v zaporednem vrstnem redu. Dodate lahko skladbe za ure neprekinjenega poslušanja skladb. Dodate lahko posamezne skladbe ali celotne albume in jih razvrstite ali preuredite.</p>
+
+<section id="addqueue">
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
+ <title>Dodajanje glasbe v čakalno vrsto predvajanja</title>
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
+ <p>V svoji glasbeni knjižnici boste morali izbrati skladbe ali albume, ki jih želite dodati v čakalno vrsto predvajanja.</p>
+
+ <p>Za dodajanje celotnega albuma v čakalno vrsto predvajanja s svojo miško pritisnite in držite album in ga povlecite nad <gui>Čakalna vrsta predvajanja</gui> v levem pladnju okna.</p>
+
+ <p>Skladbe lahko v čakalno vrsto predvajanja dodate posamezno ali kot skupino. Za dodajanje posamezne datoteke jo povlecite in spustite nad <gui>Čakalno vrsto predvajanja</gui> v najbolj levem pladnju okna ali z desnim klikom na skladbo in izbiro <gui>Dodaj v čakalno vrsto predvajanja</gui>.</p>
+
+ <p>Več datotek lahko izberete tako, da jih klikate z miško medtem ko držite tipko <key>Control</key> in s tem izberete posamezne datoteke ali pa izberete obseg datotek tako, da dvakrat pritisnete tipko <key>Shift</key>. Nato lahko datoteke povlečete in spustite nad <gui>Čakalno vrsto predvajanja</gui> v daljnem levem pladnju okna ali z desnim klikom na skladbe in izbiro <gui>Dodaj v čakalno vrsto predvajanja</gui>. </p>
+
+</section>
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
+<section id="reorderqueue">
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
+ <title>Organizacija vaše čakalne vrste predvajanja.</title>
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+ <p>Vaša čakalna vrsta predvajanja je organizirana v redu dodanih skladb. Prve skladbe ali albume, ki ste jih dodali v čakalno vrsto, bodo prvi predvajani. Svojo čakalno vrsto predvajanja lahko preuredite z vlečenjem in spuščanjem skladbe ali skupine skladb v seznamu predvajanja. Z miško izberite skladb-o/e, ki jih želite preurediti in svojo miško spustite nad številko ali mestom, kjer naj bodo te datoteke v čakalni vrsti predvajanja.</p>
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>Odstranjevanje skladb s čakalne vrste predvajanja</title>
+ <p>Odstranite lahko posamezno skladbo, skupino skladb ali počistite svojo celotno čakalno vrsto predvajanja.</p>
+
+ <p>Za odstranitev posamezne skladbe ali skupine skladb, skladbo izberite z miško in nato pritisnite <key>Izbriši</key>.</p>
+
+ <p>Za čiščenje svoje celotne čakalne vrste predvajanja pritisnite gumb <gui>Počisti</gui> v zgodnjem desnem kotu čakalne vrste predvajanja.</p>
+
+</section>
+
</page>
diff --git a/help/sl/play.page b/help/sl/play.page
index 34f3223..ff41694 100644
--- a/help/sl/play.page
+++ b/help/sl/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Predvajajte svoje video in glasbene datoteke.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Predvajajte svojo glasbo</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>Predvajajte videoposnetke</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+
+ <title>Predvajajte svoje datoteke večpredstavnosti</title>
+
+ <section id="playmusic">
+ <title>Predvajajte svojo glasbo</title>
+
+ <p>Za predvajanje glasbe v Banshee izberite vir glasba. Glasbena knjižnica vam bo prikazala vse izvajalce v vaši glasbeni knjižnici, ovojnice za vsak album in seznam vseh skladb v vaši knjižnici.</p>
+
+ <p>S seznama izvajalcev izberite album ali skladbo, ki jo želite predvajati ali pa uporabite iskalno vrstico v zgornjem desnem kotu Banshee.</p>
+
+ <p>Za začetek predvajanja skladbe dvokliknite na ime skladbe, pritisnite <key>Preslednico</key> ali v meniju Banshee izberite <guiseq><gui>Predvajanje</gui><gui>Predvajaj</gui></guiseq>.</p>
+
+ <p>Album lahko začnete predvajati z izbiro albuma v brskalniku albumov in dvoklikom na ime skladbe, pritiskom <key>Preslednice</key> ali izbiro <guiseq><gui>Predvajanje</gui><gui>Predvajaj</gui></guiseq> v meniju Banshee.</p>
+
+ <p>Za predvajanje vseh skladb enega izvajalca izberite izvajalca v brskalniku izvajalcev in pritisnite <key>Preslednico</key> ali pa v meniju Banshee izberite <guiseq><gui>Predvajanje</gui><gui>Predvajaj</gui></guiseq>.</p>
+
+ <p>Banshee prikazuje tudi vaše priljubljene albume (tiste, ki jih največ predvajate), nedavno priljubljeno, nedavno dodano in ne slišano glasbo. Izberite seznam, ki ga želite poslušati in lahko boste predvajali skladbe z njega. </p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>Predvajajte videoposnetke</title>
+
+ <p>Vaši uvoženi videi so razvrščeni po abecedi. Za predvajanje videa ga izberite na seznamu in pritisnite <key>Preslednico</key> ali pa v meniju Banshee izberite <guiseq><gui>Predvajanje</gui><gui>Predvajaj</gui></guiseq>.</p>
+
+ <p>Banshee prikazuje tudi vaše najljubše videoposnetke (tiste, ki jih največ gledate) in ne gledane videoposnetke. Izberite enega in lahko boste predvajali video s seznama. </p>
+
</section>
-
- <section id="play-radio">
- <title>Predvajajte internetno radijsko postajo</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>Predvajajte podcaste</title>
+
+ <p>Vir podcasti vam prikaže vse podcaste na katere ste naročeni, vse razpoložljive oddaje podcastov in vse podcaste v vrstnem redu od novejšega proti starejšemu.</p>
+
+ <p>Za predvajanja podcasta s seznama izberite podcast, ki ga želite predvajati, ter pritisnite <key>Preslednico</key> ali pa v meniju Banshee izberite <guiseq><gui>Predvajanje</gui><gui>Predvajaj</gui></guiseq>.</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>Predvajajte internetno radijsko postajo</title>
+
+ <p>Vir radio vam prikaže vse internetne radijske postaje, ki ste jih dodali v Banshee v abecednem vrstnem redu.</p>
+
+ <p>Za predvajanje internetne radijske postaje s seznama izberite radijsko postajo, ki jo želite predvajati, ter pritisnite <key>Preslednico</key> ali v meniju Banshee izberite <guiseq><gui>Predvajanje</gui><gui>Predvajaj</gui></guiseq>.</p>
+
+ </section>
+
</page>
diff --git a/help/sl/podcast.page b/help/sl/podcast.page
deleted file mode 100644
index bfbfec2..0000000
--- a/help/sl/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="sl">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Podcasti</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/sl/radio.page b/help/sl/radio.page
deleted file mode 100644
index 9a1bb37..0000000
--- a/help/sl/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="sl">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/sl/rb-import.page b/help/sl/rb-import.page
new file mode 100644
index 0000000..6670221
--- /dev/null
+++ b/help/sl/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="sl">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Uvozite glasbo in kategorizacije iz predvajalnika glasbe <app>Rhythmbox</app>. </desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Uvozite svojo knjižnico <app>Rhythmbox</app></title>
+
+</page>
diff --git a/help/sl/search.page b/help/sl/search.page
index bdb56e5..b9b1f20 100644
--- a/help/sl/search.page
+++ b/help/sl/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,90 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Iskanje po vaši knjižnici Banshee</title>
+
+ <p>Banshee vsebuje zmogljiv iskalni jezik. Po svoji knjižnici lahko iščete hitro in enostavno z osnovnimi iskalnimi izrazi ali izvedete podrobna iskanja z napredno iskalno terminologijo Banshee. </p>
+
+ <p>Za izvedbo iskanja vaše večpredstavnosti v Banshee pritisnite <key>S</key> ali kliknite na polje <gui>Iskanje</gui> v zgornjem desnem kotu pogleda knjižnica v Banshee</p>
+
+ <p>Iskalna poizvedba je sestavljena iz nekaj osnovnih nizov na primer <em>janez novak</em>. Če v iskalno polje vnesete <em>janez novak</em>, bo Banshee preiskal vsa polja metapodatkov, vključno z naslovom skladbe, naslovom albuma, izvajalcem albuma, letom, itd. Vsaka skladba katere metapodatki vsebujejo <em>janez</em> in <em>novak</em> bo vrnjena kot rezultat. Iskalni izrazi so neodvisni od velikosti črk. <em>janez</em>, <em>Janez</em> in <em>JANEZ</em> med iskanjem pomenijo enako stvar.</p>
+
+<section id="operators">
+ <title>Osnovni operatorji</title>
+ <p>Med katerekoli dve iskalni besedi ali pred iskalno besedo je mogoče postaviti operatorje. Privzeti operator je <gui>IN</gui>, ki se uporablja, ko se ne uporablja noben drug operator med dvema iskalnima nizoma. Ker IN je privzeti operator, izreci operator IN ne obstaja.</p>
+
<p>Druga osnovna operatorja sta <gui>ALI</gui> in <gui>NE</gui>. Skupaj lahko ti trije operatorji tvorijo zmogljive poizvedbe, ki vam pomagajo iskati vaše večpredstavnostne datoteke.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Logični operatorji in primeri</title>
<p>Sledi seznam logičnih operatorjev in iskalnih rezultatov pri njihovi uporabi.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Operator</gui></p></td>
- <td><p><gui>Opis</gui></p></td>
+ <td><p><gui>Operator</gui></p></td> <td><p><gui>Opis</gui></p></td>
</tr>
<tr>
- <td><p><em>privzeto</em>, <em>presledek</em></p></td>
- <td><p>Iščite za dva izraza s presledkom med dvema besedama ali izrazoma.</p></td>
+ <td><p><em>privzeto</em>, <em>presledek</em></p></td> <td><p>Iščite za dva izraza s presledkom med dvema besedama ali izrazoma.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Rezultat iskanja bosta bila dva izraza s katerimkoli rezultatom v kateremukoli polju.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Rezultat iskanja bosta bila dva izraza s katerimkoli rezultatom v kateremukoli polju.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>Ne prikaži rezultatov iskanja s katerimkoli iskalnim izrazom, ki sledi operatorju NE, ne, <key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Primeri logičnih operacij vključujejo:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Poizvedba</gui></p></td>
- <td><p><gui>Opis</gui></p></td>
+ <td><p><gui>Poizvedba</gui></p></td> <td><p><gui>Opis</gui></p></td>
</tr>
<tr>
- <td><p>janez novak</p></td>
- <td><p>Ujema se z vsemi polji v skladbi, ki vsebujejo tako <em>janez</em> kot <em>novak</em>.</p></td>
+ <td><p>janez novak</p></td> <td><p>Ujema se z vsemi polji v skladbi, ki vsebujejo tako <em>janez</em> kot <em>novak</em>.</p></td>
</tr>
<tr>
- <td><p>janez, novak</p></td>
- <td><p>Ujema se s polji v skladbi, ki vsebujejo <em>janez</em> ali <em>novak</em>.</p></td>
+ <td><p>janez, novak</p></td> <td><p>Ujema se s polji v skladbi, ki vsebujejo <em>janez</em> ali <em>novak</em>.</p></td>
</tr>
<tr>
- <td><p>janez ali novak</p></td>
- <td><p>Ujema se s polji v skladbi, ki vsebujejo <em>janez</em> ali <em>novak</em>.</p></td>
- </tr>
+ <td><p>janez ali novak</p></td> <td><p>Ujema se s polji v skladbi, ki vsebujejo <em>janez</em> ali <em>novak</em>.</p></td>
+ </tr>
<tr>
- <td><p>janez | novak</p></td>
- <td><p>Ujema se s polji v skladbi, ki vsebujejo <em>janez</em> ali <em>novak</em>.</p></td>
- </tr>
+ <td><p>janez | novak</p></td> <td><p>Ujema se s polji v skladbi, ki vsebujejo <em>janez</em> ali <em>novak</em>.</p></td>
+ </tr>
<tr>
- <td><p>- "janez novak"</p></td>
- <td><p>Prikaže vse skladbe, katerih polja ne vsebujejo <em>janez novak</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>- "janez novak"</p></td> <td><p>Prikaže vse skladbe, katerih polja ne vsebujejo <em>janez novak</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Za več podrobnosti o izvajanju bolj zapletenih poizvedb iskanja si oglejte stran <link xref="adv-search"/>.</p>
+
</section>
-
+
</page>
diff --git a/help/sl/sort.page b/help/sl/sort.page
index 7cdb20d..f3e908d 100644
--- a/help/sl/sort.page
+++ b/help/sl/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Dodajanje stolpcev</title>
+
<p>Medtem ko vaša knjižnica raste, boste morda svoj pogled knjižnice želeli spremeniti za dodajanje dodatnih podatkov o skladbah v vaši knjižnici predvajanje ali spremembo načina ogleda in razvrščanja skladb, izvajalcev ali albumov.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>Pogledu knjižnice v <app>Banshee</app> lahko dodatne dodatne stolpce, ki vam dajo več podrobnosti o skladbah in vam dovolijo razvrščanje. Privzeto Banshee prikazuje stolpce skladb <gui>Ime</gui>, <gui>Izvajalec</gui>, <gui>Album</gui> in <gui>Čas</gui>. Za dodajanje dodatnih stolpcev z miško desno kliknite na katerikoli stolpec in Banshee bo prikazal vse razpoložljive stolpce. Kliknite izbirno polje poleg imena stolpca, ki ga želite dodati v pogled knjižnice.</p>
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Razvrščanje stolpcev</title>
+ <p>Svojo knjižnico lahko razvrstite tako, da z miško kliknete na enega od stolpcev prikazanih v pogledu knjižnice. Če glasbeno knjižnico razvrstiti po izvajalcu, kliknite na glavo stolpca <gui>Izvajalec</gui> in Banshee bo stolpec samodejno razvrstil po abecedi. Ponoven klik na <gui>Izvajalec</gui> bo stolpec razvrstil v nasprotnem abecednem redu.</p>
</section>
-
+
</page>
diff --git a/help/sl/sync.page b/help/sl/sync.page
index 8c14849..e27357c 100644
--- a/help/sl/sync.page
+++ b/help/sl/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Uskladite svoje večpredstavnostne datoteke s prenosnim večpredstavnostnim predvajalnikom ali pametnim telefonom.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Usklajevanje</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Usklajevanje</title>
+
+ <p>Banshee podpira usklajevanje vaše glasbe s prenosnimi večpredstavnostnimi predvajalniki in pametnimi telefoni. Dodate lahko določene skladbe, albume ali seznam predvajanja ali pa Banshee dovolite usklajevanje celotne knjižnice s svojim glasbenim predvajalnikom. Ko je vaš predvajalnik povezan na računalnik lahko skladbe na prenosnem predvajalniku predvajate v Banshee. Med usklajevanjem glasbe vrste brez izgub kot je FLAC, bo Banshee vašo glasbo samodejno prekodiral v vrsto z izgubai [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Podpora naprav</title>
+ <p>Banshee podpira skoraj vse nove prenosne predvajalnike glasbe z izjemo Apple iPhone, iPad in iPod Touch.</p>
+
+ <p>Ko vklopite svojo napravo, jo bo Banshee prikazal v levem meniju. Pritisk na ikono naprave vas bo odpeljal na domačo stran naprave v Banshee, ki bo prikazala vaše možnosti usklajevanja.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Glasba</p></item>
- <item><p>Zvočne knjige</p></item>
- <item><p>Videi</p></item>
- <item><p>Podcasti</p></item>
- </list>
-
- <p>V spustnem meniju poleg vsakega medija izberite iz:</p>
-
- <list>
- <item><p>Upravljajte ročno</p></item>
- <item><p>Uskladi celotno knjižnico</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Uskladite svojo glasbo</title>
+ <p>Večpredstavnostne datoteke na svojem prenosnem predvajalniku glasbe lahko upravljate s samodejnim usklajevanjem Banshee ali pa s svojo glasbo in večpredstavnostne datoteke upravljate ročno.</p>
+
+ <p>Izberite svojo napravo iz menija Banshee in nato izberite kako želite uskladiti svoje večpredstavnostne datoteke, vključno z:</p>
+ <list>
+ <item><p>Glasba</p></item>
+ <item><p>Zvočne knjige</p></item>
+ <item><p>Videi</p></item>
+ <item><p>Podcast</p></item>
+ </list>
+
+ <p>V spustnem meniju poleg vsakega medija izberite iz:</p>
+ <list>
+ <item><p>Upravljajte ročno</p></item>
+ <item><p>Uskladi celotno knjižnico</p></item>
+ </list>
+
+ <note style="warning">
+ <p>V primeru, da izberete samodejno usklajevanje vaše celotne knjižnice s svojim prenosnim predvajalnikom glasbe, se prepričajte da ima prenosni predvajalnik na voljo dovolj prostora. V primeru, da je vaša knjižnica večja od prostora na vašem prenosnem predvajalniku glasbe, bo Banshee usklajeval večpredstavnostne datoteke dokler vaš predvajalnik in poln in se nato zaustavil.</p>
+ </note>
+
+ <p>V primeru, da ste v svoji glasbeni knjižnici ustvarili sezname predvajanja , bodo bili prikazani tudi kot možnost usklajevanja za glasbo. To je lahko uporabno pri ustvarjanju pametnih seznamov, saj se bodo pametni seznami ob dodajanju nove vsebine na osnovi pravil seznama predvajanja samodejno posodabljali . Banshee bo nov seznam predvajanja uskladil z napravo vsakič, ko jo priklopite. </p>
+
+ <p>Banshee bo prikazal celoten prostor na trdem disku vašega prenosnega predvajalnika glasbe v grafu na spodnjem delu Banshee. Graf bo prikazal koliko prostora zasedajo zvočne, video in druge datoteke, ter koliko prostora je še praznega. Neposredno pod tem vam bo Banshee prikazal koliko je vseh predmetov shranjenih na vašem prenosnem predvajalniku glasbe, koliko uram ali dnem predvajanja to ustreza in koliko prostora je porabljenega.</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Uskladite svojo celotno knjižnico</title>
+ <p>Večpredstavnostne datoteke lahko iz Banshee spustite na svoj prenosni predvajalnik glasbe. Izberite datoteko ali datoteke, ki jih želite prekopirati na svoj prenosni predvajalnik glasbe. Nato pritisnite in držite desni miškin gumb in povlecite datotek-o/e na ikono svojega prenosnega predvajalnika v Banshee. To bo datoteke skopiralo na vašo napravo. </p>
+
+ <p>V primeru da je vaša glasbena knjižnica vrste, ki je vaš prenosni večpredstavnostni prevajalnik ne podpira (na primer OGG ali FLAC) in imate nameščene zahtevane kodeke, lahko Banshee te datoteke samodejno med prenašanjem na veš prenosni predvajalnik večpredstavnosti prekodira v MP3. Za pomoč pri namestitvi kodekov si oglejte dokumentacijo distribucije, saj je izven obsega te pomoči in se med distribucijami razlikuje.</p>
+
+ <note style="tip">
+ <p>Morda boste morali svojo napravo izvreči za pravilno nalaganje datotek na svoj prenosni predvajalnik glasbe. Za izvrz svoje naprave v Banshee z miško v meniju Banshee desno kliknite na napravo in pritisnite <gui>Odklopi</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Predvajajte glasbo s svojega prenosnega predvajalnika glasbe</title>
+ <p>Glasbo shranjeno na prenosnem predvajalniku glasbe lahko predvajate neposredno v Banshee. Izberite svoj predvajalnik v meniju Banshee na levi in prikazana bo knjižnica vašega predvajalnika glasbe. Nato lahko v Banshee predvajate glasbo kot bi jo predvajali v svoji lastni knjižnici.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Izbris datotek z vašega prenosnega glasbenega predvajalnika bo datoteke trajno izbrisal in ne boste jih mogli obnoviti.</p>
- </note>
-
+ <title>Odstranite glasbo iz svojega prenosnega predvajalnika glasbe</title>
+ <p>Za odstranitev skladb shranjenih na prenosnem predvajalniku glasbe v Banshee izberite svoj predvajalnik za ogled njegove knjižnice. Nato izberite skladbe, ki jih želite izbrisati in izberite "Izbriši" ali v meniju izberite <guiseq><gui>Uredi</gui><gui>Izbriši</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Izbris datotek z vašega prenosnega glasbenega predvajalnika bo datoteke trajno izbrisal in ne boste jih mogli obnoviti.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/sl/ui.page b/help/sl/ui.page
index d8a0349..5dc266c 100644
--- a/help/sl/ui.page
+++ b/help/sl/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>Pregled uporabniškega vmesnika <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Uvod v uporabniški vmesnik Banshee</title>
<figure>
<title>Okno <gui>Banshee predvajalnik večpredstavnostnih datotek</gui></title>
<desc><app>Banshee predvajalnik večpredstavnostnih datotek</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Vmesnik knjižnice <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Viri</title>
+ <p>Viri vaše glasbe in videov so v Banshee prikazani na levi. Viri vam omogočajo hiter dostop do vaše predvajalne vrste, Glasbe, Videov, Amazona, Last.fm, Podcastov in več. </p>
+
+ <note style="tip">
+ <p>Izbire menija se bodo spremenile glede na izbrani vir. Na primer, če hočete videti meni za uvoz podcasta, boste morali izbrati vir Podcast. Možnost menija za uvažanje podcasta ni na voljo pri ogledovanju video ali glasbene knjižnice.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Brskalnik knjižnice</title>
+ <p>Ko iz virov izberete vir glasbe ali videa, bo Banshee vašo vsebino prikazal v brskalniku knjižnice. Glede na izbrani vir lahko Banshee prikaže vašo glasbeno ali video knjižnico, naročila podcastov ali celo glasbeno trgovino Amazon, ki vam omogoča nakup slabe.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Pogled sedaj se predvaja</title>
+ <p>V načinu predvajanja se knjižnica skrije in je zato več prostora za prikaz videa. Zato je uporaben v celozaslonskem načinu. Med poslušanjem glasbe bo prikazano ime izvajalca, album in ovitek, če je na voljo. Če gledate video, bo Banshee prikazal video.</p>
+
+ <p>Za skritje uporabniškega vmesnika Banshee in uporabo celozaslonskega načina lahko pritisnete <key>F</key>, pritisnete gumb <gui>Celozaslonski način</gui> v zgornjem desnem kotu programa ali izberete <guiseq><gui>Pogled</gui><gui>Celozaslonski način</gui></guiseq>.</p>
+
+</section>
+
+<section id="library">
+ <title>Knjižnica</title>
+ <p>Pogled knjižnice se bo v Banshee spremenil glede na vaš izbrani vir. Glasbena knjižnica bo prikazala ovitke, izvajalce v vaši knjižnici in seznam skladb. Knjižnica podcastov bo prikazala vaša naročila podcastov, prejete in ne prejete podcaste in vse, nove in stare podcaste. Oglejte si stran pomoči vsakega vira za podrobnosti o upravljanju virov. </p>
+</section>
- <section id="context">
- <title>Viri</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/uk/add-podcast.page b/help/uk/add-podcast.page
new file mode 100644
index 0000000..b6760e7
--- /dev/null
+++ b/help/uk/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="uk">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Додавання, вилучення та відтворення подкастів в Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Подкасти</title>
+
+ <section id="podcastdescription">
+ <title>Що це таке — подкаст?</title>
+
+ <p>Подкасти — це доступні в інтернеті, заздалегідь записані програми, подібні до радіо програм, які можна передплатити. Якщо ви підписались до подкасту в Banshee, щоразу, під час виходу нового випуску, Banshee автоматично звантажуватиме його для вас.</p>
+
+ <p>В мережі є подкасти практично на всі теми,зокрема з музикою, фільмами, Linux тощо. Шукайте в інтернеті через ваш улюблений пошуковий рушій, наприклад введіть «фільм-подкаст» і ви отримаєте багато варіантів для вибору.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Додавання подкасту</title>
+
+ <p>Щоб додати подкаст в Banshee, потрібно спочатку відвідати домашню сторінку подкасту в інтернеті через переглядач. Майже всі подкасти мають кнопку або посилання для підписання подкасту, скопіюйте це посилання. У більшості переглядачів, можете натиснути праву кнопку миші і в контекстному меню виберіть <gui>Скопіювати посилання</gui>.</p>
+
+ <p>В Banshee, натисніть кнопку <gui>Підписатись до подкасту</gui> у верхньому правому куті, або виберіть в меню <guiseq><gui>Файл</gui><gui> Підписатись до подкасту</gui></guiseq> чи натисніть комбінацію клавіш <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
+
+ <p>Виберіть з спадного меню в Banshee спосіб звантаження нових подкастів. Наявні такі варіанти:</p>
+
+ <list>
+ <item><p>Звантажити найсвіжіший епізод (автоматично звантажуватиметься останній епізод)</p></item>
+ <item><p>Звантажити всі епізоди (автоматично звантажуватимуться всі епізоди)</p></item>
+ <item><p>Дозволити мені самому вирішувати, який епізод звантажувати (дасть вам змогу самому вибрати, що звантажувати)</p></item>
+ </list>
+
+ <p>Після додавання стрічки подкасту, Banshee покаже:</p>
+
+ <list>
+ <item><p><gui>Назва</gui>: (назва окремого епізоду)</p></item>
+ <item><p><gui>Подкаст</gui>: (назва подкасту)</p></item>
+ <item><p><gui>Опублікований</gui> (дата опублікування або випуску)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/uk/add-radio.page b/help/uk/add-radio.page
new file mode 100644
index 0000000..8e84d6f
--- /dev/null
+++ b/help/uk/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="uk">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Додавання, вилучення та прослуховування радіостанцій в Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Інтернет-радіо</title>
+
+ <section id="radiodescription">
+ <title>Що це таке — інтернет-радіо?</title>
+
+ <p>Інтернет-радіостанції подібні до звичайних радіостанцій. Вони дають змогу окремим особам або організаціям передавати музику мовлення в прямому ефірі через інтернет. Інтернет-радіостанції можуть використовувати для трансляції, як звичайні радіостанції, так і радіостанції аматорського мовлення або навіть комерційні інтернет-радіостанції з дикторами в прямому ефірі та рекламними роликами.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Додавання радіостанції</title>
+
+ <p>Щоб додати інтернет-радіостанцію до Banshee, натисніть кнопку <gui>Додати радіостанцію</gui> у верхньому правому куті Banshee або виберіть в меню <guiseq><gui>Файл</gui><gui>Додати радіостанцію</gui></guiseq>.</p>
+
+ <p>На сторінці радіостанції скопіюйте посилання на їхній потік. В більшості переглядачів, можна натиснути праву кнопку миші з вказівником на потрібному посиланні та вибрати <gui>Скопіювати посилання</gui>.</p>
+
+
+ <p>Banshee запропонує вам ввести <gui>Жанр радіостанції</gui>. В спадному списку виберіть з доступних жанр музики, яку передає ця станція, потім в поле <gui>Назва станції</gui> введіть її назву. Натисніть клавішу «tab» або вказівником миші перейдіть у поле <gui>Адреса потоку</gui>, натисніть праву кнопку миші і в контекстному меню виберіть <gui>Вставити</gui> або натисніть <keyseq><key>Control</key><key>V</key></keyseq>, щоб вставити адресу.</p>
+
+ <p>За бажанням, можете заповнити поля <gui>Автор станції</gui>, <gui>Опис</gui> та <gui>Оцінка</gui>.</p>
+
+ <p>Потім натисніть кнопку <gui>Зберегти</gui>, щоб зберегти цю радіостанцію в Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/de/extensions.page b/help/uk/advanced.page
similarity index 51%
copy from help/de/extensions.page
copy to help/uk/advanced.page
index 3cbec18..f1373af 100644
--- a/help/de/extensions.page
+++ b/help/uk/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="de">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="uk">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Отримання довідки з додаткових дій</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Додаткові параметри та довідка</title>
- <title><app>Banshee</app> extensions</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Клавіатурні скорочення</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Клавіатурні скорочення</title>
</section>
-
+
</page>
diff --git a/help/uk/amazon.page b/help/uk/amazon.page
index 0c05baa..36a7812 100644
--- a/help/uk/amazon.page
+++ b/help/uk/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Синхронізація та придбання музики в магазині Amazon MP3.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,59 +19,34 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Магазин Amazon MP3</title>
+
+ <p>Banshee підтримує звантаження та імпортування музики з магазину Amazon MP3. Можете вручну імпортувати музичні файли Amazon, купити їх через ваш переглядач або через Banshee. Amazon пропонує музику лише у форматі MP3 і в певних країнах. Можливо, ви не зможете купити музику в магазині Amazon MP3, якщо ви живете в іншій країні.</p>
+
+ <note style="important">
+ <p>Banshee використовує код членства в Amazon для всіх музичних покупок. Всі гроші, зароблені через цей код вносяться як пожертва до фундації GNOME.</p>
+ </note>
+
<section id="amazon-browser">
- <title>Придбання в Amazon MP3 через переглядач</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Придбання в Amazon MP3 через переглядач</title>
+
+ <p>Музика, придбана в магазині Amazon MP3 може автоматично звантажуватись та імпортуватись в Banshee. Banshee асоціює себе з файлами Amazon .amz, що надаються як прибдання MP3. Якщо ви купуєте музику в Amazon, ваш переглядач звантажуватиме файли .amz, а Banshee автоматично відкриватиме такі файли і розпочинатиме їхнє звантаження та імпортування музики.</p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Придбання в Amazon MP3 через Banshee</title>
+
+ <p>Також можна виконувати пошук музики в Amazon в межах Banshee. Виберіть джерело «Amazon MP3» в меню Banshee ліворуч і завантажиться магазин Amazon MP3 так само, як і в переглядачі. Знайдіть музику, яку хочете придбати, увійдіть в свій обліковий запис Amazon та купіть її, виконавши всього лише одне клацання. Banshee автоматично звантажить та імпортує вашу купівлю до фонотеки.</p>
</section>
-
+
<section id="amazon-manual">
- <title>Імпортування з Amazon MP3 вручну</title>
-
- <p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ <title>Імпортування з Amazon MP3 вручну</title>
+
+ <p>Під час купівлі в Amazon через переглядач, файл з розширенням .amz буде звантажено і збережено на жорсткий диск. Щоб імпортувати його вручну, натисніть в меню Banshee <guiseq><gui>Файл</gui><gui>Імпортувати матеріал</gui></guiseq>, виберіть для імпортування файл *.amz. Banshee відкриє цей файл, з'єднається з магазином Amazon MP3 і розпочне звантаження.</p>
+
<note style="warning">
<p>Файли Amazon з роширенням .amz активні лише короткий час. Якщо ви швидко не звантажите їх, вони застаріють і ви не зможете забрати свою купівлю. Amazon не повідомляє, як довго такі файли залишаються активними. Рекомендується звантажувати та імпортувати купівлю в межах години.</p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/uk/emusic.page b/help/uk/emusic.page
new file mode 100644
index 0000000..bcc4e9f
--- /dev/null
+++ b/help/uk/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="uk">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Імпортування музики, придбаної в eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Імпортування доріжок з eMusic</title>
+
+</page>
diff --git a/help/uk/extensions.page b/help/uk/extensions.page
index 26fc926..85031a5 100644
--- a/help/uk/extensions.page
+++ b/help/uk/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="uk">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="uk">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Додаткові можливості для Banshee</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> extensions</title>
+ <title>Розширення Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Офіційні розширення Banshee</title>
</info>
+ <title>Керування розширеннями Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Розширення спільноти для Banshee</title>
+ </info>
+ <title>Додавання до Banshee розширень, створених спільнотою</title>
</section>
+
</page>
diff --git a/help/uk/import.page b/help/uk/import.page
index 0ef2009..9d09b2d 100644
--- a/help/uk/import.page
+++ b/help/uk/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Додавання музики та відео з комп'ютера до фонотеки Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,16 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Імпортування музики та відео</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>Ви можете імпортувати відео та музику зі свого комп'ютера в Banshee. Імпортовані файли з'являться в джерелах і ви зможете керувати ними та змінювати їх як і інші матеріали в Banshee.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>Щоб імпортувати музичні або відео файли, виберіть в меню <guiseq><gui>Файл</gui><gui>Імпортувати матеріали</gui></guiseq>. З'явиться вікно з варіантами вибору.</p>
- <note style="tip">
+ <note>
<p>Модулі надають додаткову варіанти імпортування. Детальніше, дивіться розділ нижче <link xref="#plugins"/>.</p>
</note>
@@ -53,27 +46,18 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>Ви можете спокійно імпортувати з теки, з якої ви вже імпортували, не турбуючись про дублювання записів у фонотеці.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Імпортування зі списку відтворення</title>
+ <p>Також можна імпортувати музику зі списків відтворення. Більшість файлів у списку відтворення закінчуються на <em>m3u</em>. Щоб імпортувати зі списку, виберіть в меню Banshee <guiseq><gui>Файл</gui><gui>Імпортувати список відтворення</gui></guiseq>, знайдіть в теці файл списку, виберіть його та натисніть <gui>Імпортувати</gui>.</p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Модулі надають додаткові варіанти імпортування. Такі додаткові джерела будуть доступні, якщо увімкнути відповідні модулі:</p>
-
+ <title>Додаткові джерела імпортування</title>
+ <p>Модулі надають додаткові варіанти імпортування. Такі додаткові джерела будуть доступні, якщо увімкнути відповідні модулі:</p>
</section>
-
+
</page>
diff --git a/help/uk/index.page b/help/uk/index.page
index 77dfa77..e532853 100644
--- a/help/uk/index.page
+++ b/help/uk/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> media player</title>
+ <title>Мультимедійний програвач Banshee</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Додавання, вилучення та відтворення</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Керування та сортування</title>
</section>
-
+
<section id="sync" style="2column">
<title>Синхронізація фонотеки з портативними програвачами</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Додавання функційних можливостей до Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Додаткові параметри та довідка</title>
+ <title>Додаткові параметри та довідка</title>
</section>
</page>
diff --git a/help/uk/introduction.page b/help/uk/introduction.page
index fcc9b10..ba3e8c8 100644
--- a/help/uk/introduction.page
+++ b/help/uk/introduction.page
@@ -4,15 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Introduction to the <app>Banshee</app> media player.</desc>
+ <desc>Знайомство з <app>медіапрогравачем Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,23 +20,16 @@
<title>Передмова</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
+ <p><app>Banshee</app> — це мультимедійний програвач, що дає змогу відтворювати музику, відео та інші матеріали, а також синхронізувати їх з портативними пристроями.</p>
<p><app>Banshee</app> дає вам змогу імпортувати матеріали, керувати їх метаданими та відтворювати музику та відео.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>Також Banshee допоможе вам синхронізувати музику з такими популярними портативними пристроями, як цифрові аудіо програвачі та смартфони. Banshee підтримує більшість популярних пристроїв, включаючи iPods, Sandisk, програвачі Creative MP3 та телефони під керуванням Android.</p>
+<!--
<figure>
- <title>Вікно <gui>Мультимедійного програвача Banshee</gui></title>
- <desc><app>Мультимедійний програвач Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p>Інтерфейс фонотеки <app>Banshee</app></p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/uk/itunes-import.page b/help/uk/itunes-import.page
new file mode 100644
index 0000000..a87ec52
--- /dev/null
+++ b/help/uk/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="uk">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Імпорт музики та категоризація з мультимедійного програвача <app>iTunes</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Імпортування фонотеку <app>iTunes</app></title>
+
+</page>
diff --git a/help/uk/keyboard-shortcuts.page b/help/uk/keyboard-shortcuts.page
deleted file mode 100644
index 289083b..0000000
--- a/help/uk/keyboard-shortcuts.page
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="uk">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Клавіша</gui></p></td>
- <td><p><gui>Дія</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Відтворення поточної доріжки або пауза</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Відтворити наступну композицію</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Відтворити попередню композицію</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Клавіша</gui></p></td>
- <td><p><gui>Дія</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Перемістити фокус до пошукового поля</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Відкрити діалог імпортування</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Списки відтворення</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Клавіша</gui></p></td>
- <td><p><gui>Дія</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Створити новий список відтворення</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>Подкасти</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Клавіша</gui></p></td>
- <td><p><gui>Дія</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Позначити вибрані епізоди як старі</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Інтерфейс</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Клавіша</gui></p></td>
- <td><p><gui>Дія</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Перемкнути повноекранний режим</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Вибрати всі твори у списку</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Зняти виділення з усіх творів у списку</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Ліва кнопка миші</key></keyseq>
- </p></td>
- <td><p>Попередня доріжка (Потребує увімкненого модуля «Область сповіщення»)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Права кнопка миші</key></keyseq>
- </p></td>
- <td><p>Наступна доріжка (Потребує увімкненого модуля «Область сповіщення»)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Середня кнопка миші</key></keyseq>
- </p></td>
- <td><p>Відтворити / Павза (Потребує увімкненого модуля «Область сповіщення»)</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/uk/keyboardshortcuts.page b/help/uk/keyboardshortcuts.page
new file mode 100644
index 0000000..e4883dd
--- /dev/null
+++ b/help/uk/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="uk">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Клавіатурні скорочення</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Керування Banshee через клавіатуру</title>
+
+ <section id="playbackcontrol">
+
+ <title>Керування відтворенням</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Клавіша</gui></p></td> <td><p><gui>Дія</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Пробіл</p></td> <td><p>Відтворення поточної доріжки або пауза</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Відтворити наступну композицію</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Відтворити попередню композицію</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Взаємодія з фонотекою</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Клавіша</gui></p></td> <td><p><gui>Дія</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>Перемістити фокус до пошукового поля</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Відкрити діалог імпортування</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Списки відтворення</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Клавіша</gui></p></td> <td><p><gui>Дія</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>Створити новий список відтворення</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Подкасти</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Клавіша</gui></p></td> <td><p><gui>Дія</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Позначити вибрані епізоди як старі</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Інтерфейс</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Клавіша</gui></p></td> <td><p><gui>Дія</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Перемкнути повноекранний режим</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>Вибрати всі твори у списку</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>Зняти виділення з усіх творів у списку</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>Згорнути вікно Banshee (Потребує увімкненого модуля «Область сповіщення»)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Ліва кнопка миші</key></keyseq>
+ </p></td> <td><p>Попередня доріжка (Потребує увімкненого модуля «Область сповіщення»)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Права кнопка миші</key></keyseq>
+ </p></td> <td><p>Наступна доріжка (Потребує увімкненого модуля «Область сповіщення»)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Середня кнопка миші</key></keyseq>
+ </p></td> <td><p>Відтворити / Павза (Потребує увімкненого модуля «Область сповіщення»)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/uk/lastfm.page b/help/uk/lastfm.page
index 7c66d9a..3684dce 100644
--- a/help/uk/lastfm.page
+++ b/help/uk/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="uk">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Увімкнення Last.fm, звітування про пісні та радіо Last.fm.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,107 +19,74 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
- <p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ <title>Last.fm</title>
+
+ <p>Last.fm — популярна онлайнова радіослужба, що пропонує безплатні та платні послуги. На Last.fm ви знайдете інформацію про виконавців та альбоми, а якщо створите обліковий запис, Last.fm дасть вам змогу безкоштовно відслідковувати музику, яку ви слухаєте в Banshee. Платні передплатники, можуть також прослуховувати потокову музику з Last.fm в різноманітних музичних клієнтах, в тому числі і в Banshee. Last.fm пропонує багато потокових каналів, зокрема з рекомендаціями музики на основі [...]
+
<section id="enable-lastfm">
- <title>Увімкнути Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Увімкнути Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>Щоб увімкнути звітування на Last.fm про прослухані вами пісні в Banshee, потрібно зареєструватись в Last.fm на вкладці <gui>Особливості джерела</gui> в налаштуваннях Banshee. Введіть користувача та натисніть кнопку <gui>Увійти до Last.fm</gui>. Відкриється домашня сторінка Last.fm в веб-переглядачі із запитом на доступ до Banshee. Натисніть посилання <gui>Так, дозволити доступ</gui>, відкриється сторінка з повідомленням, що Banshee зараз має доступ до Last.fm. Поверніться до Banshee [...]
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Прослуховування радіо Last.fm</title>
<p>Радіо Last.fm безплатне для резидентів зі Сполучених Штатів, Об'єднаного Королівства та Німеччини. Резидентам з інших країн, потрібно купити обліковий запис «Преміум», щоб слухати радіо Last.fm. Резиденти «Преміум», з усіх країн, також отримують додаткові можливості: прослуховування списків відтворення та станцій з улюбленою музикою та мітки.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+
+ <p>В панелі джерел Banshee ліворуч, ви знайдете секцію Last.fm, зокрема радіостанції. Щоб слухати радіо Last.fm, потрібне увімкнуте з'єднання з інтернетом. Виберіть бажану радіостанцію і Banshee зв'яжеться з Last.fm, щоб звантажити пісні цієї станції. Натисніть кнопку <gui>Відтворити</gui> в Banshee або <key>Пробіл</key>, щоб увімкнути радіостанцію з Last.fm. Також можете натиснути кнопку <gui>Наступна</gui> в Banshee, клавішу <key>N</key> або в меню <guiseq><gui>Відтворити</gui><gui>Н [...]
+
</section>
-
+
</page>
diff --git a/help/uk/manage-coverart.page b/help/uk/manage-coverart.page
new file mode 100644
index 0000000..298d4a0
--- /dev/null
+++ b/help/uk/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="uk">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Керування та заміна обкладинки альбому.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Обкладинка</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/uk/manage-playlists.page b/help/uk/manage-playlists.page
index 58f5210..08753fd 100644
--- a/help/uk/manage-playlists.page
+++ b/help/uk/manage-playlists.page
@@ -1,144 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="uk">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="uk">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Створення та керування списками відтворення.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Списки відтворення</title>
-
+ <title>Списки відтворення</title>
+
<p>Списки відтворення дають змогу створювати і зберігати списки доріжок для відтворення у вказаному порядку. Доволі зручно таким чином створювати списки улюблених пісень або поділити фонотеку на менші списки, які легше переглядати. Деякі портативні програвачі можуть навіть завантажувати такі списки, щоб ви могли взяти їх з собою в дорогу.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+
+ <p>Banshee підтримує звичайні списки відтворення, що містять композиції, які ви додаєте самостійно, а також «розумні» списки відтворення. Останні, автоматично створюються на основі ваших музичних уподобань, улюбленої музики тощо.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>Звичайний список відтворення містить список доріжок, які ви додаєте та керуєте ними. Можливо, ви захочете створити список з пісень улюбленого виконавця з різних альбомів, або список ваших останніх улюблених композицій чи список життєрадісної музики для прослуховування під час ранкової зарядки.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>Упорядкувати список відтворення можна за допомогою перетягування доріжок на нове місце у списку. Доріжки можна перевпорядковувати лише, якщо в жодному зі стовпчиків не виконувалось сортування. Щоб скасувати сортування, натискайте на заголовок стовпчика поки не зникне стрілка направлена вгору або вниз, потім виконуйте перевпорядкування списку.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>«Розумні» списки відтворення дають змогу швидко створювати динамічні списки на основі заданих змінних. Такий новий список буде базуватись на творах окремого виконавця, на улюблених творах тощо.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Звичайні списки відтворення</title>
+
+ <p>Звичайний список відтворення містить список доріжок, які ви додаєте та керуєте ними. Можливо, ви захочете створити список з пісень улюбленого виконавця з різних альбомів, або список ваших останніх улюблених композицій чи список життєрадісної музики для прослуховування під час ранкової зарядки.</p>
+
+ <p>Створити новий список відтворення можна натиснувши <keyseq><key>Control</key><key>N</key></keyseq> або через меню <guiseq><gui>Файл</gui><gui>Новий список відтворення</gui></guiseq> чи просто можна вибрати доріжки, які хочете додати до списку. Натисніть праву кнопку миші з вказівником на вибраних доріжках та виберіть в контекстному меню <guiseq><gui>Додати до списку відтворення</gui><gui>Новий список відтворення</gui></guiseq>. Також можна перетягнути вибрані доріжки на джерело <g [...]
+
+ <p>Щоб дати назву новому списку, натисніть праву кнопку миші з вказівником на ньому і натисніть <gui>Перейменувати список відтворення</gui> та введіть нову назву.</p>
+
+ <p>Упорядкувати список відтворення можна за допомогою перетягування доріжок на нове місце у списку. Доріжки можна перевпорядковувати лише, якщо в жодному зі стовпчиків не виконувалось сортування. Щоб скасувати сортування, натискайте на заголовок стовпчика поки не зникне стрілка направлена вгору або вниз, потім виконуйте перевпорядкування списку.</p>
+
+ <p>Щоб вилучити доріжку(и) зі списку відтворення, виберіть бажані та натисніть клавішу <key>Delete</key> або виберіть в меню <guiseq><gui>Зміни</gui><gui>Вилучити зі списку</gui></guiseq> чи виберіть в контекстному меню <gui>Вилучити зі списку</gui>.</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>«Розумний» список відтворення</title>
+
+ <p>«Розумні» списки відтворення дають змогу швидко створювати динамічні списки на основі заданих змінних. Такий новий список буде базуватись на творах окремого виконавця, на улюблених творах тощо.</p>
+
+ <p>Щоб створити новий «розумний» список відтворення, виберіть в меню <guiseq><gui>Файл</gui><gui>Новий «розумний» список</gui></guiseq>. З'явиться вікно, введіть назву списку та виберіть критерії на яких базуватиметься цей список. Змінюйте поля на ваш розсуд, зокрема з такими метаданими твору, як «Виконавець», «Альбом» або «Рік». Після вибору критерію, виберіть одне з:</p>
+
<list>
<item><p>є</p></item>
- <item><p>немає</p></item>
+ <item><p>немає</p></item>
<item><p>менше за</p></item>
- <item><p>понад</p></item>
+ <item><p>понад</p></item>
<item><p>щонайбільше</p></item>
- <item><p>щонайменше</p></item>
+ <item><p>щонайменше</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>Також можете натиснути кнопку <gui>+</gui>, щоб задати додаткові критерії для цього списку. Наприклад, ви можете створити «розумний» список, який враховуватиме всі твори 2010 року, що позначені 5 зірками. Щоб створити такий список, потрібно вибрати:</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Рік</gui></p></td>
- <td><p><gui>є</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Рік</gui></p></td> <td><p><gui>є</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Оцінка</gui></p></td>
- <td><p><gui>є</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Оцінка</gui></p></td> <td><p><gui>є</gui></p></td>
+ <td><p><gui/>5 зірок</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>Кількість творів у списку можна обмежити встановивши галочку <gui>Обмежити до</gui>, а у полі поруч, виберіть число творів, що будуть у списку.</p>
+
+ <p>Banshee також містить вже створені для вас «розумні» списки відтворення. Натисніть кнопку <gui>Відкрити в редакторі</gui>, щоб побачити такі списки або змінити їх. Після натискання кнопки <gui>Створити і зберегти</gui>, список буде автоматично згенерований і збережений. Banshee містить такі списки:</p>
+
<list>
- <title><app>Banshee</app> smart playlists</title>
- <item>
- <p>Улюблені (позначені чотирма або п'ятьма зірками)</p>
- </item>
- <item>
- <p>Недавні улюблені (найчастіше слухані останнього тижня)</p>
- </item>
- <item>
- <p>Додані недавно (імпортовані останнього тижня)</p>
- </item>
- <item>
- <p>Не прослухані (ніколи не відтворювались або пропущені)</p>
- </item>
- <item>
- <p>Знехтувані улюблені (улюблені, що не відтворювались понад два місяці)</p>
- </item>
- <item>
- <p>700 Mб улюблених (CD з даними, вартими стати улюбленими)</p>
- </item>
- <item>
- <p>80 хвилин улюблених (звуковий CD з вартими стати улюбленими)</p>
- </item>
- <item>
- <p>Без оцінки (композиції, які не були оцінені)</p>
- </item>
+ <title>«Розумні» списки відтворення Banshee</title>
+ <item><p>Улюблені (позначені чотирма або п'ятьма зірками)</p></item>
+ <item><p>Недавні улюблені (найчастіше слухані останнього тижня)</p></item>
+ <item><p>Додані недавно (імпортовані останнього тижня)</p></item>
+ <item><p>Не прослухані (ніколи не відтворювались або пропущені)</p></item>
+ <item><p>Знехтувані улюблені (улюблені, що не відтворювались понад два місяці)</p></item>
+ <item><p>700 Mб улюблених (CD з даними, вартими стати улюбленими)</p></item>
+ <item><p>80 хвилин улюблених (звуковий CD з вартими стати улюбленими)</p></item>
+ <item><p>Без оцінки (композиції, які не були оцінені)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/uk/manage-tags.page b/help/uk/manage-tags.page
index 8c8c9a9..2b68f31 100644
--- a/help/uk/manage-tags.page
+++ b/help/uk/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="uk">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="uk">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Редагування або зміна міток та метаданих.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,49 +19,41 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
+
<title>Музичні метадані</title>
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Популярні формати метаданих: ID3v1 і ID3v2 для файлів MP3 та коментарі Vorbis для файлів OGG Vorbis.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>Edit your metadata</title>
+ <section id="metadata">
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>З'явиться вікно з метаданими доріжки, що дасть вам змогу змінити або відновити їх. В цьому вікні будуть показані такі поля:</p>
-
- <list>
- <item><p><gui>Назва доріжки</gui></p></item>
- <item><p><gui>Виконавець доріжки</gui></p></item>
- <item><p><gui>Назва альбому</gui></p></item>
- <item><p><gui>Жанр</gui></p></item>
- <item><p><gui>Номер доріжки</gui></p></item>
- <item><p><gui>Номер диску</gui></p></item>
- <item><p><gui>Рік</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>Музичні метадані</title>
+
+ <p>Цифрова музика містить деякі метадані, що зберігаються в музичному файлі, наприклад: виконавець, альбом, рік запису, жанр тощо. Майже у всі музичні твори, придбані через інтернет, такі метадані вже закладено. Під час імпортування музики з компактого диска, Banshee знайде такі метадані, якщо вони є і додасть їх до музичних файлів. Докладніше про копіювання компактних дисків разом з метаданими, дивіться розділ <link xref="import"/>.</p>
+
+ <p>Популярні формати метаданих: ID3v1 і ID3v2 для файлів MP3 та коментарі Vorbis для файлів OGG Vorbis.</p>
+
+ <p>Якщо імпортовані музичні файли не містять метаданих, <app>Banshee</app> показуватиме слово <gui>Невідомо</gui> майже у всіх полях фонотеки.</p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Редагування метаданих</title>
+
+ <p>Метадані доріжок можна редагувати або змінювати. Виберіть одну або кілька доріжок і натисніть клавішу <key>E</key>, або виберіть в меню <guiseq><gui>Зміни</gui><gui>Змінити дані доріжки</gui></guiseq> чи натисніть праву кнопку миші з вказівником на доріжці і в контекстному меню виберіть <gui>Змінити дані доріжки</gui>.</p>
+
+ <p>З'явиться вікно з метаданими доріжки, що дасть вам змогу змінити або відновити їх. В цьому вікні будуть показані такі поля:</p>
+
+ <list>
+ <item><p><gui>Назва доріжки</gui></p></item>
+ <item><p><gui>Виконавець доріжки</gui></p></item>
+ <item><p><gui>Назва альбому</gui></p></item>
+ <item><p><gui>Жанр</gui></p></item>
+ <item><p><gui>Номер доріжки</gui></p></item>
+ <item><p><gui>Номер диску</gui></p></item>
+ <item><p><gui>Рік</gui></p></item>
+ </list>
+
+ <p>Відредагуйте дані доріжки. Якщо ви вибрали кілька доріжок, натискайте піктограму у вигляді стрілки поряд з полем <gui>Назва доріжки</gui> або кнопку <gui>Вперед</gui> у нижній частині вікна, щоб відредагувати дані кожної доріжки. Після завершення редагування, натисніть кнопку <gui>Зберегти</gui>.</p>
+
</section>
</page>
diff --git a/help/uk/play-queue.page b/help/uk/play-queue.page
index 8ca757b..92172af 100644
--- a/help/uk/play-queue.page
+++ b/help/uk/play-queue.page
@@ -1,96 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="uk">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="uk">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Додавання матеріалів до черги.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
+ <title>Відтворення черги</title>
+
+ <p>Джерело <gui>Відтворити чергу</gui> дає змогу додавати музичні файли для відтворення у послідовному порядку. Додавайте окремі доріжки або цілі альбоми, сортуйте їх та перевпорядковуйте. Можете додати до черги багато доріжок, щоб слухати музику годинами без зупинки.</p>
+
+<section id="addqueue">
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
+ <title>Додавання музики до черги</title>
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
+ <p>Потрібно вибрати з фонотеки бажані доріжки або альбоми, щоб додати їх до черги відтворення.</p>
+
+ <p>Щоб додати весь альбом до черги відтворення, натисніть та утримуйте кнопку миші з вказівником на альбомі та перетягніть його на джерело <gui>Відтворити чергу</gui> в ліву дальню панель вікна.</p>
+
+ <p>Додавайте до черги, як окремі доріжки так і доріжки в складі групи. Щоб додати окремий файл, перетягніть його на джерело <gui>Черга відтворення</gui> або натисніть праву кнопку миші з вказівником на доріжці і в контекстному меню виберіть <gui>Додати до черги відтворення</gui>.</p>
+
+ <p>Ви можете вибрати відразу кілька файлів, натискаючи клавішу <key>Ctrl</key>, або за допомогою миші вибирайте кожний файл окремо, або цілий список файлів, клацнувши мишею в двох місцях, на початку списку і в кінці бажаного списку, потім натисніть клавішу <key>Shift</key>. Перетягніть весь список на джерело <gui>Черга відтворення</gui>, або натисніть праву кнопку миші з вказівником на ньому і в контекстному меню виберіть <gui>Додати до черги відтворення</gui>.</p>
+
+</section>
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
+<section id="reorderqueue">
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
+ <title>Упорядкування черги відтворення</title>
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+ <p>Джерело «Відтворити чергу» упорядковане в порядку додавання вами доріжок. Перші додані вами доріжки та альбоми будуть відтворюватись першими, але ви можете перевпорядкувати чергу відтворення перетягуючи мишею доріжки або групи доріжок в списку. Виберіть вказівником миші доріжку(и), перетягніть її у списку і відпустіть кнопку миші над бажаним номером або місцем в черзі.</p>
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
+</section>
+
+<section id="removequeue">
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
+ <title>Вилучення доріжок з черги відтворення</title>
+ <p>Можете вилучати з черги як окремі доріжки так і групи доріжок або очистити всю чергу відтворення.</p>
+
+ <p>Щоб вилучити окрему доріжку або групу доріжок, виберіть потрібне за допомогою миші та натисніть клавішу <key>Delete</key>.</p>
+
+ <p>Щоб очистити всю чергу, натисніть кнопку <gui>Очистити</gui> у верхньому правому куті «Черги відтворення».</p>
+
+</section>
+
</page>
diff --git a/help/uk/play.page b/help/uk/play.page
index d2417ac..c978918 100644
--- a/help/uk/play.page
+++ b/help/uk/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Відтворення відео та музичних файлів.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,51 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>Play your media</title>
-
- <section id="play-music">
- <title>Відтворення музики</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
- </section>
-
- <section id="play-video">
- <title>Відтворення відео</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+
+ <title>Відтворення матеріалів</title>
+
+ <section id="playmusic">
+ <title>Відтворення музики</title>
+
+ <p>Щоб відтворити музику в Banshee, виберіть джерело «Музика». В переглядачі фонотеки, ви побачите всіх виконавців, обкладинки для кожного альбому та перелік всіх творів.</p>
+
+ <p>Виберіть бажаний альбом або пісню зі списку виконавців або скористайтесь пошуковим полем у верхньому правому куті Banshee.</p>
+
+ <p>Щоб розпочати відтворення, двічі клацніть на назві композиції або натисніть <key>Пробіл</key> чи виберіть в рядку меню Banshee <guiseq><gui>Відтворення</gui><gui>Відтворити</gui></guiseq>.</p>
+
+ <p>Так само можна відтворити альбом. Виберіть бажаний в переглядачі альбомів, двічі клацніть на назві композиції або натисніть <key>Пробіл</key> чи виберіть в рядку меню Banshee <guiseq><gui>Відтворення</gui><gui>Відтворити</gui></guiseq>.</p>
+
+ <p>Щоб відтворити всі композиції одного виконавця, виберіть його в переглядачі виконавців та натисніть <key>Пробіл</key> або виберіть в рядку меню Banshee <guiseq><gui>Відтворення</gui><gui>Відтворити</gui></guiseq>.</p>
+
+ <p>Banshee також показує альбоми з джерел «Улюблені» (найчастіше відтворювані), «Недавні улюблені», «Недавно додані» та «Не прослухані». Виберіть одне з них і зможете відтворити всі композиції з нього.</p>
+
</section>
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
- newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+ <section id="playvideo">
+ <title>Відтворення відео</title>
+
+ <p>Всі імпортовані відеофайли перелічені в алфавітному порядку. Щоб відтворити відео, виберіть бажане зі списку та натисніть <key>Пробіл</key> або виберіть в рядку меню Banshee <guiseq><gui>Відтворення</gui><gui>Відтворити</gui></guiseq>.</p>
+
+ <p>Banshee також показує відео з джерел «Улюблені» (найчастіше відтворювані) та «Не переглянуті». Виберіть одне з них і зможете відтворити будь-яке відео зі списку.</p>
+
</section>
-
- <section id="play-radio">
- <title>Відтворення інтернет-радіостанції</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <section id="playpodcast">
+ <title>Відтворення подкасту</title>
+
+ <p>Джерело «Подкасти» показує всі підписані вами подкасти та всі доступні. В переглядачі подкастів перелічені всі подкасти в порядку «спершу найновіші».</p>
+
+ <p>Щоб відтворити подкаст, виберіть бажаний зі списку та натисніть <key>Пробіл</key> або виберіть в рядку меню Banshee <guiseq><gui>Відтворення</gui><gui>Відтворити</gui></guiseq>.</p>
+
</section>
-
+
+ <section id="playradio">
+ <title>Відтворення інтернет-радіостанції</title>
+
+ <p>Джерело «Радіо» покаже в алфавітному порядку всі радіостанції, які ви додали до Banshee.</p>
+
+ <p>Щоб відтворити радіостанцію, виберіть бажану зі списку та натисніть <key>Пробіл</key> або виберіть в рядку меню Banshee <guiseq><gui>Відтворення</gui><gui>Відтворити</gui></guiseq>.</p>
+
+ </section>
+
</page>
diff --git a/help/uk/podcast.page b/help/uk/podcast.page
deleted file mode 100644
index a28e9c8..0000000
--- a/help/uk/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="uk">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Подкасти</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>Add a podcast</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>Play a podcast</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/uk/radio.page b/help/uk/radio.page
deleted file mode 100644
index dd4e683..0000000
--- a/help/uk/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="uk">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/uk/rb-import.page b/help/uk/rb-import.page
new file mode 100644
index 0000000..5f70aac
--- /dev/null
+++ b/help/uk/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="uk">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Імпортування та категоризація музики з музичного програвача <app>Rhythmbox</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Імпортування фонотеки <app>Rhythmbox</app></title>
+
+</page>
diff --git a/help/uk/search.page b/help/uk/search.page
index 9faca34..94ae9b5 100644
--- a/help/uk/search.page
+++ b/help/uk/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,90 +19,68 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Searching your <app>Banshee</app> library</title>
-
- <p><app>Banshee</app> features a powerful search language. You can search
- your library quickly and easily with basic search terms or perform detailed
- searches with the <app>Banshee</app> advanced search terminology.</p>
-
- <p>To perform a search of your media in <app>Banshee</app>, press the
- <key>S</key> or click the <gui>Search</gui> box in the upper right hand
- corner of the Library view in <app>Banshee</app>.</p>
-
- <p>A search query consists of some basic terms, for example,
- <em>dave matthews</em>. By entering <em>dave matthews</em> in the search
- box, <app>Banshee</app> will search all metadata fields including
- Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata
- includes <em>dave</em> and <em>matthews</em> will be returned. Search terms
- are case insensitive, meaning you do not have to capitalize. <em>dave</em>,
- <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching.</p>
-
- <section id="operators">
- <title>Basic operators</title>
-
- <p>Operators can be placed between any two search words or placed before a
- search word. The default operation is <gui>AND</gui> and is used when
- no other operators are used between two search terms. Since it is the
- default, there is no explicit AND operator.</p>
-
+ <title>Пошук у фонотеці Banshee</title>
+
+ <p>Особливість Banshee — потужна пошукова мова. Ви можете швидко і легко вести пошук у фонотеці використовуючи основні терміни пошуку, або виконати детальний пошук через розширену пошукову термінологію Banshee.</p>
+
+ <p>Щоб виконати пошук матеріалу в Banshee, натисніть клавішу <key>S</key> або клацніть у полі <gui>Пошук</gui> у верхньому правому куті переглядача фонотеки Banshee.</p>
+
+ <p>Пошуковий запит складається з певних базових термінів, наприклад, <em>тарас чубай</em>. Введіть <em>тарас чубай</em> у пошукове поле і Banshee шукатиме цей запит у всіх полях метаданих, зорема: «Назва доріжки», «Назва альбому», «Виконавець альбому», «Рік» тощо. Будуть показані всі доріжки, в чиїх метаданих є слова <em>тарас</em> та <em>чубай</em>. Слова пошуку нечутливі до регістру, тобто непотрібно їх писати з великої букви. Під час пошуку всі введені слова, наприклад, <em>тарас</e [...]
+
+<section id="operators">
+ <title>Базові оператори</title>
+ <p>Оператори можна розташовувати між будь-якими пошуковими словами або перед ними. Типовим оператором є <gui>AND</gui> він використовується, якщо між пошуковими словами немає ніяких операторів. AND вважається неявним оператором, тому що він типовий.</p>
+
<p>Інші базові оператори — <gui>OR</gui> та <gui>NOT</gui>. Разом, ці три оператори дають вам дуже потужний інструмент пошуку матеріалів у вашій фонотеці.</p>
+
+</section>
- </section>
-
- <section id="logical">
- <title>Logical operators and examples</title>
-
+<section id="logical">
+ <title>Логічні оператори та приклади</title>
<p>Нижче наведено список логічних операторів та приклади отримання результатів пошуку.</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Оператор</gui></p></td>
- <td><p><gui>Опис</gui></p></td>
+ <td><p><gui>Оператор</gui></p></td> <td><p><gui>Опис</gui></p></td>
</tr>
<tr>
- <td><p><em>типово</em>, <em>вільне місце</em></p></td>
- <td><p>Показати результат за двома словами з пробілом між ними.</p></td>
+ <td><p><em>типово</em>, <em>вільне місце</em></p></td> <td><p>Показати результат за двома словами з пробілом між ними.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Показати доріжки, що містять будь-яке із слів пошуку.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Показати доріжки, що містять будь-яке із слів пошуку.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>Не показувати результати для слів, що містяться після оператора NOT, not,<key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Приклади дії логічних операторів:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Запит</gui></p></td>
- <td><p><gui>Опис</gui></p></td>
+ <td><p><gui>Запит</gui></p></td> <td><p><gui>Опис</gui></p></td>
</tr>
<tr>
- <td><p>тарас чубай</p></td>
- <td><p>Збіг в полях доріжки, що містять обидва слова <em>тарас</em> та <em>чубай</em>.</p></td>
+ <td><p>тарас чубай</p></td> <td><p>Збіг в полях доріжки, що містять обидва слова <em>тарас</em> та <em>чубай</em>.</p></td>
</tr>
<tr>
- <td><p>тарас, чубай</p></td>
- <td><p>Збіг в полях доріжки, що містять або <em>тарас</em> або <em>чубай</em>.</p></td>
+ <td><p>тарас, чубай</p></td> <td><p>Збіг в полях доріжки, що містять або <em>тарас</em> або <em>чубай</em>.</p></td>
</tr>
<tr>
- <td><p>тарас або чубай</p></td>
- <td><p>Збіг в полях доріжки, що містять або <em>тарас</em> або <em>чубай</em>.</p></td>
- </tr>
+ <td><p>тарас або чубай</p></td> <td><p>Збіг в полях доріжки, що містять або <em>тарас</em> або <em>чубай</em>.</p></td>
+ </tr>
<tr>
- <td><p>тарас | чубай</p></td>
- <td><p>Збіг в полях доріжки, що містять або <em>тарас</em> або <em>чубай</em>.</p></td>
- </tr>
+ <td><p>тарас | чубай</p></td> <td><p>Збіг в полях доріжки, що містять або <em>тарас</em> або <em>чубай</em>.</p></td>
+ </tr>
<tr>
- <td><p>-"тарас чубай"</p></td>
- <td><p>Показує всі доріжки, чиї поля не містять <em>тарас чубай</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"тарас чубай"</p></td> <td><p>Показує всі доріжки, чиї поля не містять <em>тарас чубай</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Докладніше про виконання складніших пошукових запитів, дивіться сторінку <link xref="adv-search"/>.</p>
+
</section>
-
+
</page>
diff --git a/help/uk/sort.page b/help/uk/sort.page
index 7a63c54..a2e7fcf 100644
--- a/help/uk/sort.page
+++ b/help/uk/sort.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,30 +23,17 @@
<section id="addcolumn">
- <title>Adding columns</title>
-
+ <title>Додавання стовпців</title>
+
<p>Якщо ваша фонотека постійно наповнюється, можливо ви захочете змінити її перегляд, щоб отримувати додаткову інформацію про композиції або змінити спосіб перегляду та сортування композицій, виконавців та альбомів.</p>
-
- <p>You can add additional columns to the library view in <app>Banshee</app>
- to give you more information about the songs and also allow you to sort by.
- By default, <app>Banshee</app> displays columns for songs including
- <gui>Name</gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To
- add additional columns, using your mouse right click on any of the columns
- and <app>Banshee</app> 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.</p>
-
+
+ <p>Можете додавати стовпчики до переглядача доріжок в <app>Banshee</app>, щоб отримати більше інформації про композиції та нові можливості сортування. Типово, Banshee показує такі стовпчики: <gui>Назва</gui>, <gui>Виконавець</gui>, <gui>Альбом</gui> та <gui>Час</gui>. Щоб додати стовпчики, натисніть праву кнопку миші з вказівником на будь-якому стовпчику і Banshee покаже можливі варіанти додаткових стовпчиків. Поставте галочку поруч із назвою стовпчика, який хочете додати.</p>
+
</section>
-
+
<section id="sorting">
- <title>Sorting columns</title>
-
- <p>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 <gui>Artist</gui> column header and <app>Banshee</app> will
- automatically sort that column alphabetically. Clicking the <gui>Artist</gui>
- column again will sort the column in reverse alphabetical order.</p>
-
+ <title>Сортування стовпців</title>
+ <p>Сортувати фонотеку можна клацнувши на будь-якому стовпчику в переглядачі фонотеки. Якщо хочете відсортувати за виконавцем, клацніть на заголовку стовпчика <gui>Виконавець</gui> і Banshee автоматично відсортує вміст у алфавітному порядку. Повторне клацання на тому ж стовпчику відсортує вміст стовпчика в зворотньому алфавітному порядку.</p>
</section>
-
+
</page>
diff --git a/help/uk/sync.page b/help/uk/sync.page
index 102148d..86af1c1 100644
--- a/help/uk/sync.page
+++ b/help/uk/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>Синхронізація матеріалів з портативним програвачем або зі смартфоном.</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,127 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Синхронізація</title>
-
- <p><app>Banshee</app> supports syncing your music to portable media players
- and smartphones. You can add specific music tracks, albums or playlist or
- allow <app>Banshee</app> 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 <app>Banshee</app>. When syncing
- music in a lossless format, such as FLAC, <app>Banshee</app> will
- automatically transcode your music for you to a lossy format such as Ogg
- Vorbis or MP3, if you have the correct codecs installed.</p>
-
+ <title>Синхронізація</title>
+
+ <p>Banshee підтримує синхронізацію музики з портативними програвачами та смартфонами. Ви можете вказати окремі доріжки, альбоми чи списки відтворення або дозволити Banshee синхронізувати всю фонотеку. Після під'єднання портативного програвача до комп'ютера, ви також можете відтворити в Banshee музику з нього. Якщо музичні файли для синхронізації у форматі без втрат «lossless», наприклад FLAC, Banshee автоматично перекодує їх у формат з втратами «lossy», наприклад, Ogg Vorbis або MP3, з [...]
+
<section id="devices">
- <title>Device support</title>
-
- <p><app>Banshee</app> supports almost all modern portable music players and
- smartphones with the notable exception of the Apple iPhone, iPad and
- iPod Touch.</p>
-
- <p>When you plug your device in, <app>Banshee</app> will display it in the
- left menu. Pressing the device icon will take you to your device home page
- in <app>Banshee</app> displaying your sync preferences.</p>
-
+ <title>Підтримка пристроїв</title>
+ <p>Banshee підтримує практично всі сучасні портативні музичні програвачі та смартфони за винятком хіба що Apple iPhone, iPad та iPod Touch.</p>
+
+ <p>Під час під'єднання пристрою, Banshee покаже його ліворуч в меню. Натискання на піктограму пристрою відкриває домашню сторінку пристрою в Banshee з параметрами синхронізації.</p>
+
</section>
-
- <section id="sync-settings">
- <title>Sync your music</title>
-
- <p>You can choose to manage the media on your portable music by having
- <app>Banshee</app> automatically sync it or manage your music and media
- manually.</p>
-
- <p>Choose your device from the <app>Banshee</app> menu and then choose how
- you want to sync your media, including:</p>
-
- <list>
- <item><p>Музика</p></item>
- <item><p>Аудіокниги</p></item>
- <item><p>Відео</p></item>
- <item><p>Подкасти</p></item>
- </list>
-
- <p>В розкривному меню, поряд з кожним пунктом, виберіть:</p>
-
- <list>
- <item><p>Керувати вручну</p></item>
- <item><p>Синхронізувати всю фонотеку</p></item>
- </list>
-
- <note style="warning">
- <p>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, <app>Banshee</app> will sync media until your player is full
- and then stop.</p>
- </note>
-
- <p>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 <app>Banshee</app>
- will sync the new playlist to your device every time you plug it in.</p>
-
- <p><app>Banshee</app> will display the total hard drive space of your
- portable music player in a graph in the bottom center of <app>Banshee</app>.
- The graph will show you how much space is taken by audio files, video, other
- and free space. Directly below that <app>Banshee</app> 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.</p>
-
+
+ <section id="sync-settings">
+ <title>Синхронізація музики</title>
+ <p>Ви можете вибрати, щоб Banshee автоматично синхронізував фонотеку портативного програвача або можете керувати синхронізацією вручну.</p>
+
+ <p>Виберіть пристрій з меню Banshee, а потім вкажіть що ви хочете синхронізувати, в тому числі:</p>
+ <list>
+ <item><p>Музика</p></item>
+ <item><p>Аудіокниги</p></item>
+ <item><p>Відео</p></item>
+ <item><p>Подкасти</p></item>
+ </list>
+
+ <p>В розкривному меню, поряд з кожним пунктом, виберіть:</p>
+ <list>
+ <item><p>Керувати вручну</p></item>
+ <item><p>Синхронізувати всю фонотеку</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Якщо ви синхронізуєте всю фонотеку, переконайтесь, що на портативному програвачі достатньо вільного місця. В іншому випадку, якщо ваша фонотека більша ніж місце на ньому, Banshee синхронізуватиме файли поки програвач не заповниться повністю, потім зупиниться.</p>
+ </note>
+
+ <p>Звичайні чи «розумні» списки відтворення у фонотеці, також можна буде побачити в джерелі «Музика», як варіант синхронізації. Корисно додавати «розумні» списки відтворення до портативного пристрою тому, що їхній вміст постійно оновлюється за правилами створення таких списків і Banshee синхронізуватиме їх під час кожного під'єднання пристрою.</p>
+
+ <p>Графік в нижній, центральній частині Banshee показує загальну місткість накопичувача портативного пристрою, а також місце, яке займають матеріали та вільне місце. Нижче Banshee показує загальну кількість матеріалів, що зберігаються на портативному програвачі, приблизну кількість годин або днів прослуховування та загалом використане місце.</p>
+
</section>
<section id="sync-manually">
- <title>Sync your entire library</title>
-
- <p>You can drag and drop media to your portable music player from
- <app>Banshee</app>. 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 <app>Banshee</app>.
- This will copy the files to your device.</p>
-
- <p>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, <app>Banshee</app> 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.</p>
-
- <note style="tip">
- <p>You may need to eject your device to load the files correctly on your
- portable music player. To eject your device in <app>Banshee</app>, using
- your mouse right click the device in the <app>Banshee</app> menu and press
- <gui style="menuitem">Disconnect</gui>.</p>
- </note>
+ <title>Синхронізування всієї фонотеки</title>
+ <p>Матеріали можна перетягувати до портативного програвача прямо з Banshee. Виберіть один або кілька файлів, які хочете скопіювати до пристрою, потім натисніть та утримуйте праву кнопку миші і перетягуйте їх на піктограму портативного програвача. Ця дія скопіює вибрані файли до пристрою.</p>
+
+ <p>Якщо ваша фонотека закодована у формат, що не підтримується портативним програвачем, наприклад, OGG або FLAC, а в системі встановлені потрібні кодеки, Banshee може автоматично перекодувати такі файли у формат MP3 під час перенесення їх до портативного пристрою. Наявність таких кодеків залежить від марки дистрибутиву і виходить за рамки цієї довідки.</p>
+
+ <note style="tip">
+ <p>Може виникнути потреба витягти пристрій, щоб коректно завантажити файли до нього. Натисніть праву кнопку миші з вказівником на значку пристрою в меню Banshee і виберіть пункт <gui>Від'єднати</gui>.</p>
+ </note>
</section>
-
+
<section id="pmp-play">
- <title>Play music from your portable music player</title>
-
- <p>You can play music stored on your portable music player directly in
- <app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the
- left and your portable music player's library will be displayed. You can then
- play music in <app>Banshee</app> just as you would music in your own
- library.</p>
-
+ <title>Відтворення музики з портативного програвача</title>
+ <p>Відтворити музику з портативного пристрою ви можете прямо з Banshee. Виберіть в меню Banshee, ліворуч, портативний програвач і його фонотека буде показана в переглядачі. Відтворювати музику з пристрою можна так само, як і музику з фонотеки Banshee.</p>
</section>
-
+
<section id="pmp-delete">
- <title>Remove music from your portable music player</title>
-
- <p>To remove songs stored on your portable music player, choose your player
- in <app>Banshee</app> to view its library. Then choose the tracks you would
- like to remove and right click the tracks and choose
- <gui style="menuitem">Delete</gui> or from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Delete</gui></guiseq>.</p>
-
- <note style="warning">
- <p>Вилучення файлів з портативного програвача назавжди знищить їх і ви ніколи не зможете відновити їх.</p>
- </note>
-
+ <title>Вилучення музики з портативного програвача</title>
+ <p>Для вилучення доріжок з портативного пристрою, виберіть його в меню Banshee, щоб побачити його фонотеку, потім виберіть доріжки, які хочете вилучити, натисніть праву кнопку миші з вказівником на них і виберіть в контекстному меню <gui>Вилучити</gui>, або через рядок меню <guiseq><gui>Правка</gui><gui>Вилучити</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>Вилучення файлів з портативного програвача назавжди знищить їх і ви ніколи не зможете відновити їх.</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/uk/ui.page b/help/uk/ui.page
index ded7a88..1a80313 100644
--- a/help/uk/ui.page
+++ b/help/uk/ui.page
@@ -4,18 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc>An overview of the <app>Banshee</app> user interface.
- </desc>
+ <desc>Огляд інтерфейсу користувача <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -25,90 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>The <app>Banshee</app> user interface</title>
+ <title>Вступ до інтерфейсу користувача Banshee</title>
<figure>
<title>Вікно <gui>Мультимедійного програвача Banshee</gui></title>
<desc><app>Мультимедійний програвач Banshee</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p>Інтерфейс фонотеки <app>Banshee</app></p>
</media>
</figure>
+
+<section id="context">
+ <title>Джерела</title>
+ <p>Джерела музики та відео показані як меню, у лівій частині Banshee. Вони надають швидкий доступ до відтворення черги, музики, відео, подкастів, Amazon, Last.fm тощо.</p>
+
+ <note style="tip">
+ <p>Пункти меню змінюються залежно від джерел, які ви вибрали. Наприклад, щоб використовувати меню для імпортування подкастів, потрібно вибрати джерело «Подкасти». Цей пункт меню буде недоступний під час перегляду відео чи фонотеки.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>Переглядач фонотеки</title>
+ <p>Якщо ви виберете музику або відео з «Джерел», Banshee покаже її в переглядачі фонотеки. Залежно від вашого вибору, Banshee покаже, або збірку музики та відео, або підписку на подкасти чи магазин музики Amazon, у якому ви зможете придбати бажану музику тощо.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Режим «Відтворюється зараз»</title>
+ <p>Корисно під час використання Banshee на повний екран. У цьому режимі, панель фонотеки приховується, щоб надати більше місця для перегляду музичних та відео файлів. Під час прослуховування музики, на панелі «Зараз відтворюється» буде показане виконавця, назва альбому та обкладинка. Якщо ви переглядаєте відео, на цій панелі Banshee буде показувати відео.</p>
+
+ <p>Щоб у режимі «Відтворюється зараз» приховати інтерфейс користувача Banshee і увімкнути повноекранний режим, натисніть, або клавішу <key>F</key>, або кнопку <gui>На весь екран</gui> у правому верхньому куті Banshee, або виберіть в меню <guiseq><gui>Перегляд</gui><gui>На весь екран</gui></guiseq>.</p>
+
+</section>
+
+<section id="library">
+ <title>Фонотека</title>
+ <p>Перегляд панелі «Фонотека» в Banshee залежить від вибраного джерела. Якщо ви виберете джерело «Музика», будуть показані виконавці, перелік композицій та обкладинки альбомів. В джерелі «Подкасти», ви побачите свою підписку на подкасти, звантажені і не звантажені подкасти та всі, нові і старі подкасти. Перегляньте сторінку з довідкою для кожного джерела, щоб отримати детальну інформацію про керування ним.</p>
+</section>
- <section id="context">
- <title>Джерела</title>
-
- <p>Your music and video sources are shown on the left in <app>Banshee</app>.
- The sources give you quick access to your <gui>Play Queue</gui>,
- <gui>Music</gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>,
- <gui>Last.fm</gui>, <gui>Podcasts</gui> and more.</p>
-
- <note style="tip">
- <p>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 <gui>Podcasts</gui> source. The menu option for importing a podcast is
- not available when viewing the video or music library.</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>Library browser</title>
-
- <p>When you select a music or video source from Sources, <app>Banshee</app>
- will display your content in the library browser. Depending on the source you
- choose, <app>Banshee</app> can display your music or video library, podcast
- subscriptions or even the Amazon Music Store to allow you to buy music.</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>Now Playing</gui> view</title>
-
- <p>Helpful when using <app>Banshee</app> in full screen mode, the
- <gui>Now Playing</gui> mode hides the library to give you a larger view of
- the music or video you are watching. When listening to music, the
- <gui>Now Playing</gui> view will show you the artist name, album and cover
- art if available. If you are watching a video, <app>Banshee</app> will
- display the video.</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>Libraries</title>
-
- <p>The <gui>Libraries</gui> view in <app>Banshee</app> will change depending
- on the Source you have chosen. For example, the <gui>Music</gui> library will
- display cover art, artists in your library, and list of songs and the
- <gui>Podcasts</gui> library will display your podcast subscriptions, podcasts
- that are downloaded or not downloaded, and all, new or old podcasts. Please
- see the help page of each source for detailed information on managing a
- source.</p>
-
- </section>
</page>
diff --git a/help/zh_CN/add-podcast.page b/help/zh_CN/add-podcast.page
new file mode 100644
index 0000000..6ed10d1
--- /dev/null
+++ b/help/zh_CN/add-podcast.page
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast" xml:lang="zh_CN">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play podcasts in Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>What is a Podcast?</title>
+
+ <p>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.</p>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Add a Podcast</title>
+
+ <p>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 <gui>Copy link</gui>.
+ </p>
+
+ <p>In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the
+ upper right hand corner, from the menu choose <guiseq><gui>Media</gui><gui>
+ Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut <keyseq>
+ <key>Shift</key><key>Control</key><key>F</key></keyseq>.
+ </p>
+
+ <p>Banshee will then allow you to choose how you want to download new podcasts
+ from a drop down menu. Your choices include:</p>
+
+ <list>
+ <item><p>Download the Most Recent Episode (This will automatically
+ download the last episode that was released).</p></item>
+ <item><p>Download All Episodes (This will download all episodes).</p></item>
+ <item><p>Let Me Decide Which Episodes to Download (This will allow you
+ to choose which episodes you would like to download).</p></item>
+ </list>
+
+ <p>After you have added a Podcast feed, Banshee will display:</p>
+
+ <list>
+ <item><p><gui>Name</gui>: (Name of the specific episode)</p></item>
+ <item><p><gui>Podcast</gui>: (Name of the Podcast)</p></item>
+ <item><p><gui>Published</gui> (Date the episode was published or released)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/add-radio.page b/help/zh_CN/add-radio.page
new file mode 100644
index 0000000..9b6ba40
--- /dev/null
+++ b/help/zh_CN/add-radio.page
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio" xml:lang="zh_CN">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Add, remove and play internet radio stations in Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Internet Radio</title>
+
+ <section id="radiodescription">
+ <title>What is Internet Radio?</title>
+
+ <p>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.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Add Radio Station</title>
+
+ <p>To add an internet radio station to Banshee, press <gui>Add Station</gui>
+ in the upper right hand corner of Banshee or, from the menu, choose <guiseq>
+ <gui>Media</gui><gui>Add Station</gui></guiseq>.
+ </p>
+
+ <p>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 <gui>Copy Link</gui>.
+ </p>
+
+
+ <p>Banshee will prompt you to enter the <gui>Station Genre</gui>.
+ Choose the kind of music the internet radio station plays from the available
+ drop down selections. You will then need to enter the <gui>Station Name</gui>.
+ Enter a name for the radio station. Then press tab or use your mouse to select
+ the <gui>Stream URL</gui> field to paste the URL of the radio station.
+ Using your mouse right click and choose <gui>Paste</gui> or press <keyseq>
+ <key>Control</key><key>V</key></keyseq>.</p>
+
+ <p>You can optionally also fill out the fields for
+ <gui>Station Creator</gui>, <gui>Description</gui>, and <gui>Rating</gui>.
+ </p>
+
+ <p>Then press <gui>Save</gui> to save the internet radio station in Banshee.
+ </p>
+
+ </section>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/zh_CN/advanced.page
similarity index 54%
copy from help/zh_CN/extensions.page
copy to help/zh_CN/advanced.page
index 468ad23..6f2b7df 100644
--- a/help/zh_CN/extensions.page
+++ b/help/zh_CN/advanced.page
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced" xml:lang="zh_CN">
<info>
- <link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Get help for advanced actions.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -17,16 +17,14 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Advanced Options and Help</title>
- <title><app>Banshee</app> 扩展</title>
-
- <section id="official" style="2column">
+ <section id="keyboard" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Keyboard Shortcuts</title>
</info>
-
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <title>Keyboard Shortcuts</title>
</section>
-
+
</page>
diff --git a/help/zh_CN/amazon.page b/help/zh_CN/amazon.page
index 74a5fb4..2839ac3 100644
--- a/help/zh_CN/amazon.page
+++ b/help/zh_CN/amazon.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
<desc>Sync and purchase music from the Amazon MP3 Store.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,63 +19,63 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 store</title>
-
- <p><app>Banshee</app> 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 <app>Banshee</app>. 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.</p>
-
- <note style="important">
- <p><app>Banshee</app> uses an Amazon affiliate code for all music
- purchases. All money made via this affiliate code is donated to the GNOME
- Foundation.</p>
- </note>
-
+ <title>Amazon MP3 Store</title>
+
+ <p>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.
+ </p>
+
+ <note style="important">
+ <p>Banshee uses an Amazon affiliate code for all music purchases. All
+ money made via this affiliate code is donated to the GNOME Foundation.
+ </p>
+ </note>
+
<section id="amazon-browser">
- <title>Purchase Amazon MP3s in your web browser</title>
-
- <p>Music purchased from the Amazon MP3 store can be automatically downloaded
- and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app>
- will automatically open it and begin the download and import the music.</p>
-
+ <title>Purchase Amazon MP3s in your web browser</title>
+
+ <p>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.
+ </p>
</section>
-
+
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in <app>Banshee</app></title>
-
- <p>You can also search for songs on Amazon within <app>Banshee</app>. Choose
- the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and
- import your purchase into the library. </p>
-
+ <title>Buy Amazon MP3s in Banshee</title>
+
+ <p>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.
+ </p>
</section>
-
+
<section id="amazon-manual">
- <title>Import Amazon MP3s manually</title>
-
+ <title>Import Amazon MP3s manually</title>
+
<p>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 <app>Banshee</app> choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Media</gui></guiseq>
- from the menu and select the *.amz file to be imported. <app>Banshee</app>
- will then open this file and connect to the Amazon MP3 store to begin the
- download.</p>
-
+ extension .amz is downloaded and saved to your hard drive. To import
+ music purchased manually from Amazon, in Banshee choose
+ <guiseq><gui>Media</gui> <gui>Import Media</gui></guiseq> 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.
+ </p>
+
<note style="warning">
- <p>Amazon .amz files are only active for a short time. If you do not
+ <p>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.</p>
+ 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.
+ </p>
</note>
-
- </section>
-
+ </section>
+
</page>
diff --git a/help/zh_CN/emusic.page b/help/zh_CN/emusic.page
new file mode 100644
index 0000000..436e2d8
--- /dev/null
+++ b/help/zh_CN/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import" xml:lang="zh_CN">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music purchased from eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your eMusic tracks</title>
+
+</page>
diff --git a/help/zh_CN/extensions.page b/help/zh_CN/extensions.page
index 468ad23..1f5dff0 100644
--- a/help/zh_CN/extensions.page
+++ b/help/zh_CN/extensions.page
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extensions" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend" xml:lang="zh_CN">
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to <app>Banshee</app>.</desc>
+ <desc>Add additional functionality to Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> 扩展</title>
+ <title>Banshee Extensions</title>
<section id="official" style="2column">
<info>
- <title type="link">Official <app>Banshee</app> extensions</title>
+ <title type="link">Official Banshee Extensions</title>
</info>
+ <title>Manage extensions for Banshee</title>
+ </section>
- <title>Manage extensions for <app>Banshee</app></title>
-
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Community Banshee Extensions</title>
+ </info>
+ <title>Add community built extensions for Banshee</title>
</section>
+
</page>
diff --git a/help/zh_CN/import.page b/help/zh_CN/import.page
index ee3e799..b34e8af 100644
--- a/help/zh_CN/import.page
+++ b/help/zh_CN/import.page
@@ -3,8 +3,8 @@
<info>
<link type="guide" xref="index#media"/>
- <desc>Add music and videos from your computer to your <app>Banshee</app>
- library.</desc>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Add music and videos from your computer to your Banshee library.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,23 +14,19 @@
<name>Shaun McCance</name>
<email>shaunm at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
<title>Import music & videos</title>
- <p>You can import music and videos stored on your computer into
- <app>Banshee</app>. Imported files appear in your sources and can be edited
- and managed like any other media in <app>Banshee</app>.</p>
+ <p>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.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Import Media</gui></guiseq>. A
- dialog wil appear with a number of choices.</p>
+ <p>To import music or video files on your computer, choose <guiseq><gui>Media</gui>
+ <gui>Import Media</gui></guiseq>. A dialog will appear with a number of choices.</p>
- <note style="tip">
+ <note>
<p>Plugins may add additional import choices. See <link xref="#plugins"/>
below.</p>
</note>
@@ -62,29 +58,25 @@
</item>
</terms>
- <note style="tip">
+ <note>
<p>You can safely import from a folder you have already imported
from without worrying about duplicate entries in your library.</p>
</note>
-
+
<section id="import-playlist">
- <title>Import from a playlist</title>
-
- <p>You can also import music from playlists. Most playlist files end in
- <em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Import Playlist</gui></guiseq> and locate the playlist
- file in your folder, select it and press <gui style="button">Import</gui>.
- </p>
-
+ <title>Import from a Playlist</title>
+ <p>You can also import music from playlists. Most playlist files end
+ in <em>m3u</em>. To import from a playlist, from the Banshee menu
+ choose <guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and
+ locate the playlist file in your folder, select it and press
+ <gui>Import</gui>.
+ </p>
</section>
-
+
<section id="plugins">
- <title>Additional import sources</title>
-
- <p>Plugins may add additional import choices. The following additional
- sources will be available if the appropriate plugins are enabled:</p>
-
+ <title>Additional Import Sources</title>
+ <p>Plugins may add additional import choices. The following additional
+ sources will be available if the appropriate plugins are enabled:</p>
</section>
-
+
</page>
diff --git a/help/zh_CN/index.page b/help/zh_CN/index.page
index ce27e6c..b0f860d 100644
--- a/help/zh_CN/index.page
+++ b/help/zh_CN/index.page
@@ -12,39 +12,35 @@
<name>Sindhu S</name>
<email>sindhus at live.in</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
+<!--
<copyright>
<year>2010</year>
<name>GNOME Documentation Project</name>
</copyright>
--->
+-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> 媒体播放器</title>
+ <title>Banshee 媒体播放器</title>
<section id="media" style="2column">
- <title>Add, remove & play</title>
+ <title>Add, Remove & Play</title>
</section>
<section id="manage" style="2column">
- <title>Manage & sort</title>
+ <title>Manage & Sort</title>
</section>
-
+
<section id="sync" style="2column">
<title>Sync your media with a portable music player</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to <app>Banshee</app></title>
+ <title>Add additional functionality to Banshee</title>
</section>
-
+
<section id="advanced" style="2column">
- <title>Advanced options and help</title>
+ <title>Advanced options and help</title>
</section>
</page>
diff --git a/help/zh_CN/introduction.page b/help/zh_CN/introduction.page
index 3db15a9..17c63b9 100644
--- a/help/zh_CN/introduction.page
+++ b/help/zh_CN/introduction.page
@@ -4,15 +4,13 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>Banshee 媒体播放器介绍</desc>
+ <desc>
+ Introduction to the <app>Banshee Media Player</app>.
+ </desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
<!--
<copyright>
<year>2010</year>
@@ -24,24 +22,28 @@
<title>Introduction</title>
- <p><app>Banshee</app> is a media player that allows you to play your music,
- videos and other media, as well as sync it with portable devices to take your
- media on the go.</p>
-
- <p><app>Banshee</app> includes features to import your media, manage its
- metadata, and play your music and videos.</p>
-
- <p><app>Banshee</app> also helps you sync your music and videos to popular
- portable devices, such as digital audio players and smartphones.
- <app>Banshee</app> supports popular devices including most iPods, Sandisk and
- Creative MP3 players, and Android powered phones.</p>
-
+ <p>
+ <app>Banshee</app> 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.
+ </p>
+ <p>
+ <app>Banshee</app> includes features to import your media, manage its
+ metadata, and play your music and videos.
+ </p>
+ <p>
+ 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.
+ </p>
+<!--
<figure>
- <title><gui>Banshee 媒体播放器</gui> 窗口</title>
- <desc><app>Banshee 媒体播放器</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
- <p><app>Banshee</app> 库接口</p>
+ <title><gui>Banshee Media Player</gui> window</title>
+ <desc><app>Banshee Media Player</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p><app>Banshee</app> library interface</p>
</media>
</figure>
-
+-->
</page>
diff --git a/help/zh_CN/itunes-import.page b/help/zh_CN/itunes-import.page
new file mode 100644
index 0000000..e473454
--- /dev/null
+++ b/help/zh_CN/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import" xml:lang="zh_CN">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>iTunes</app> media player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>iTunes</app> library</title>
+
+</page>
diff --git a/help/zh_CN/keyboard-shortcuts.page b/help/zh_CN/keyboard-shortcuts.page
deleted file mode 100644
index b6ddc30..0000000
--- a/help/zh_CN/keyboard-shortcuts.page
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboard-shortcuts" xml:lang="zh_CN">
-
-<info>
- <link type="guide" xref="index#advanced"/>
- <desc>Keyboard shortcuts</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
-
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
-
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
-</info>
-
- <title>Control <app>Banshee</app> using keyboard shortcuts</title>
-
- <section id="playback-control">
- <title>Playback control</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Space</key></p></td>
- <td><p>Play or Pause the current song</p></td>
- </tr>
- <tr>
- <td><p><key>N</key></p></td>
- <td><p>Play the next song</p></td>
- </tr>
- <tr>
- <td><p><key>B</key></p></td>
- <td><p>Play the previous song</p></td>
- </tr>
- </table>
-
- </section>
-
- <section id="library">
- <title>Library interaction</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq></p>
- </td>
- <td><p>Move the focus to the search box</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
- <td><p>Open import media dialog</p></td>
- </tr>
-</table>
-
- </section>
-
- <section id="playlists">
-
- <title>Playlists</title>
-
-<table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td>
- <td><p>Create New Playlist</p></td>
- </tr>
-
-</table>
-
- </section>
-
- <section id="podcasts">
- <title>播客</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>Y</key></p></td>
- <td><p>Mark the selected episodes as old</p></td>
- </tr>
-
- </table>
-
- </section>
-
- <section id="interface">
- <title>Interface</title>
-
- <table frame="all" rules="rows" shade="rows">
- <tr>
- <td><p><gui>Key</gui></p></td>
- <td><p><gui>Action</gui></p></td>
- </tr>
- <tr>
- <td><p><key>F</key></p></td>
- <td><p>Toggle full-screen mode</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td>
- <td><p>Select all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td>
- <td><p>Unselect all songs in playlist view</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td>
- <td><p>Hide <app>Banshee</app>
- Window (Requires Notification Area Plug-in Enabled)</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Previous Song (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
- </p></td>
- <td><p>Play Next Song (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
- <tr>
- <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
- </p></td>
- <td><p>Toggle Play / Pause (Requires Notification Area Plug-in
- Enabled</p></td>
- </tr>
-
-</table>
-
- </section>
-</page>
diff --git a/help/zh_CN/keyboardshortcuts.page b/help/zh_CN/keyboardshortcuts.page
new file mode 100644
index 0000000..a2adeec
--- /dev/null
+++ b/help/zh_CN/keyboardshortcuts.page
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts" xml:lang="zh_CN">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Keyboard Shortcuts</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Control Banshee using Keyboard Shortcuts</title>
+
+ <section id="playbackcontrol">
+
+ <title>Playback Control</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Space Bar</p></td> <td><p>Play or Pause the current song</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Play the next song</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Play the previous song</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Library Interaction</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>
+ Move the focus to the search box</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>I</key></keyseq></p></td>
+ <td><p>Open import media dialog</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Playlists</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>
+ Create New Playlist</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>
+ Mark the selected episodes as old</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interface</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>
+ Toggle full-screen mode</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>
+ Select all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
+ </td> <td><p>
+ Unselect all songs in playlist view</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>
+ Hide Banshee Window (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Play Previous Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Play Next Song (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
+ </p></td> <td><p>
+ Toggle Play / Pause (Requires Notification Area Plug-in Enabled</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/zh_CN/lastfm.page b/help/zh_CN/lastfm.page
index b37641e..44ec129 100644
--- a/help/zh_CN/lastfm.page
+++ b/help/zh_CN/lastfm.page
@@ -2,18 +2,14 @@
<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm" xml:lang="zh_CN">
<info>
- <link type="guide" xref="extensions#official"/>
+ <link type="guide" xref="extend#official"/>
<link type="seealso" xref="sync"/>
<desc>Enable Last.fm, song reporting and Last.fm radio.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,111 +19,102 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Last.fm</title>
-
+ <title>Last.fm</title>
+
<p>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
- <app>Banshee</app> for free. If you subscribe as a paying member, you can
- also listen to streaming music from Last.fm in various music clients,
- including <app>Banshee</app>. Last.fm offers multiple channels to stream,
- including recommended music for you based on your listening habits, your
- favorites and more.</p>
-
+ 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.</p>
+
<section id="enable-lastfm">
- <title>Enable Last.fm</title>
-
- <p>To get the most out of Last.fm, you will want to create a Last.fm
- profile. Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link> to create an
- account or choose <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Preferences</gui></guiseq>
- from the <app>Banshee</app> menu.
- Once in the preferences select the <gui style="tab">Source Specific</gui>
- tab, press the <gui style="menu">Source</gui> drop down menu, choose
- <gui style="menuitem">Last.fm</gui> and finally select the <em>Sign up for
- Last.fm</em> link.</p>
-
- <p>To enable <app>Banshee</app> to report the songs you play on your
- computer to Last.fm, sign in to Last.fm in <app>Banshee</app> in the
- <gui style="tab">Source Specific</gui> preferences. Enter your username
- and press
- the <gui style="button">Log in to Last.fm</gui> button. You will be directed
- to a Last.fm webpage in your browser to grant <app>Banshee</app> access.
- Press the <gui style="button">Yes, allow access</gui> link in your browser
- and you will be redirected to a webpage that displays a message that
- <app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app>
- and press the <gui style="button">Finish Logging In</gui> button to complete
- the process.</p>
-
+ <title>Enable Last.fm</title>
+ <p>To get the most out of Last.fm, you will want to create a Last.fm profile.
+ Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
+ to create an account or choose
+ <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> from the Banshee
+ menu. Once in the preferences select the <gui>Source Specific</gui> tab, press the
+ <gui>Source</gui> drop down menu, choose <gui>Last.fm</gui> and finally select the
+ <em>Sign up for Last.fm</em> link.
+ </p>
+
+ <p>To enable Banshee to report the songs you play on your computer to Last.fm,
+ sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences.
+ Enter your username and press the <gui>Log in to Last.fm</gui> button. You
+ will be directed to a Last.fm webpage in your browser to grant Banshee access.
+ Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</gui> button
+ to complete the process.
+ </p>
+
</section>
-
- <section id="song-reporting">
- <title>Enable Last.fm song reporting from <app>Banshee</app></title>
-
- <p>After you have successfully linked <app>Banshee</app> to your Last.fm
- profile you must ensure that you have enabled <app>Banshee</app> to report
- your songs. To enable <app>Banshee</app> to report the songs to your Last.fm
- profile go to <app>Banshee</app> and select preferences, then select the
- <gui style="tab">Source Specific</gui> tab, select
- <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From <app>Banshee</app></gui>
- checkbox. If you have an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata
- Fixer extension to correct your files instead).</p>
-
+
+ <section id="songreporting">
+ <title>Enable Last.fm Song Reporting From Banshee</title>
+ <p>After you have successfully linked Banshee to your Last.fm profile you must
+ ensure that you have enabled Banshee to report your songs. To enable Banshee to
+ report the songs to your Last.fm profile go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and
+ press the <gui>Enable Song Reporting From Banshee</gui> 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 (although we recommend that
+ you use the Metadata Fixer extension to correct your files instead).
+
+ </p>
+
</section>
- <section id="device-song-reporting">
- <title>Enable Last.fm song reporting from your device</title>
-
- <p>After successfully linking <app>Banshee</app> to your Last.fm profile and
- enabling <app>Banshee</app> to report songs to Last.fm you can also enable
- scrobbling from a connected device. <app>Banshee</app> will, upon connection
- of your device, attempt to scrobble the songs you have played since the
- device was last connected and submit them to Last.fm.</p>
-
- <p>To enable scrobbling of a connected device go to <app>Banshee</app> and
- select Preferences, select the <gui style="tab">Source Specific</gui> tab,
- select <gui style="menuitem">Last.fm</gui> from the dropdown, and press the
- <gui style="checkbox">Enable Song Reporting From Device</gui> checkbox. If
- you have an active internet connection <app>Banshee</app> will, upon
- connection of your device, now attempt to gather information regarding the
- songs that you have played since it was last connected.</p>
-
- <p>As with regular <app>Banshee</app> scrobbling submissions Last.fm will
- automatically update your music metadata if any of your artist, title, or
- album information is incorrect (although we again recommend that you use the
- Metadata Fixer extension to correct your files instead).</p>
-
- <p>Please note that currently <app>Banshee</app> only supports this feature
- with Apple products that are supported by the AppleDevice extension.</p>
+ <section id="devicesongreporting">
+ <title>Enable Last.fm Song Reporting From Your Device</title>
+ <p>After successfully linking Banshee to your Last.fm profile and enabling Banshee to
+ report songs to Last.fm you can also enable scrobbling from a connected device. Banshee
+ will, upon connection of your device, attempt to scrobble the songs you have played since the
+ device was last connected and submit them to Last.fm.
+ </p>
+
+ <p>To enable scrobbling of a connected device go to Banshee's preferences, select the
+ <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from the dropdown, and press
+ the <gui>Enable Song Reporting From Device</gui> checkbox. If you have an
+ active internet connection Banshee will, upon connection of your device, now attempt to gather
+ information regarding the songs that you have played since it was last connected.
+ </p>
+
+ <p>As with regular Banshee scrobbling submissions Last.fm will automatically update
+ your music metadata if any of your artist, title, or album information is incorrect (although we
+ again recommend that you use the Metadata Fixer extension to correct your files instead).
+ </p>
+
+ <p>Please note that currently Banshee only supports this feature with Apple products that are
+ supported by the AppleDevice extension.
+ </p>
</section>
-
+
<section id="lastfm-radio">
- <title>Listen to Last.fm radio</title>
-
+ <title>Listen to Last.fm Radio</title>
<p>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.</p>
-
- <p>In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will
- communicate with Last.fm to populate songs for that radio station. Press the
- <gui style="button">Play</gui> button in <app>Banshee</app> or
- <key>Space</key> to start streaming a Last.fm radio station. You can also
- press the <gui style="button">Next</gui> button in <app>Banshee</app>,
- <key>N</key> or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Next</gui></guiseq> to play the next song in your radio
- station queue.</p>
-
+ 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.
+ </p>
+
+ <p>In Banshee's sources pane 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 <gui>Play</gui> button
+ in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio
+ station. You can also press the <gui>Next</gui> button in Banshee,
+ <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq>
+ to play the next song in your radio station queue.
+ </p>
+
</section>
-
+
</page>
diff --git a/help/zh_CN/manage-coverart.page b/help/zh_CN/manage-coverart.page
new file mode 100644
index 0000000..671d0ec
--- /dev/null
+++ b/help/zh_CN/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart" xml:lang="zh_CN">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Manage or change your albums cover art.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Cover art</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/zh_CN/manage-playlists.page b/help/zh_CN/manage-playlists.page
index 291e97e..28a20b9 100644
--- a/help/zh_CN/manage-playlists.page
+++ b/help/zh_CN/manage-playlists.page
@@ -1,157 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-playlists" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists" xml:lang="zh_CN">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-tags"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
<desc>Create and manage playlists.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Playlists</title>
-
- <p>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.</p>
-
- <p><app>Banshee</app> 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.</p>
-
+ <title>Playlists</title>
+
+ <p>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.
+ </p>
+
+ <p>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.</p>
+
<section id="manual">
- <title>Normal playlists</title>
-
- <p>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.</p>
-
- <p>You can create a new playlist by pressing <keyseq><key>Control</key>
- <key>N</key></keyseq>, from the menu choosing
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Playlist</gui></guiseq> or
- by selecing the track(s) you would like to add to the playlist. Select the
- track(s), right click them, and choose
- <guiseq><gui style="menuitem">Add to Playlist</gui>
- <gui style="menuitem">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you
- drag it over <gui>Music</gui>, a new option
- <gui style="menuitem"><em>New Playlist</em></gui> will appear and you
- can drop the track(s) over
- <gui style="menuitem"><em>New Playlist</em></gui> to add them to the
- playlist. You can repeat this process until you have added all the
- tracks you want in the playlist.</p>
-
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui style="menuitem">Rename Playlist</gui> and
- enter the name of your playlist.</p>
-
- <p>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.</p>
-
- <p>To remove a track from the playlist, select the track(s) you wish to
- remove. Press the <key>Delete</key>, from the menu choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Remove from Playlist</gui></guiseq>
- or right click the track(s) with your mouse and press
- <gui style="menuitem">Remove from Playlist</gui>.</p>
-
- </section>
-
- <section id="smart-playlists">
- <title>Smart playlist</title>
-
- <p>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.</p>
-
- <p>To create a new Smart Playlist, from the menu choose
- <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">New Smart Playlist</gui></guiseq>.
- 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:</p>
-
+
+ <title>Normal Playlists</title>
+
+ <p>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.
+ </p>
+
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key>
+ <key>N</key></keyseq>, from the menu choosing <guiseq><gui>Media</gui>
+ <gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
+ to add to the playlist. Select the track(s), right click them, and choose
+ <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
+ 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 <gui>Music</gui>. As you drag it over <gui>Music</gui>,
+ a new option <gui><em>New Playlist</em></gui> will appear and you can drop
+ the track(s) over <gui><em>New Playlist</em></gui> to add them to the
+ playlist. You can repeat this process until you have added all the tracks
+ you want in the playlist.
+ </p>
+
+ <p>To give your playlist its own name, select the playlist and right click
+ on the playlist and press <gui>Rename Playlist</gui> and enter the name
+ of your playlist.
+ </p>
+
+ <p>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.
+ </p>
+
+ <p>To remove a track from the playlist, select the track(s) you wish to
+ remove. Press the <key>Delete</key>, from the menu choose
+ <guiseq><gui>Edit</gui><gui>Remove from Playlist</gui></guiseq> or right
+ click the track(s) with your mouse and press <gui>Remove from Playlist</gui>.
+ </p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Smart Playlist</title>
+
+ <p>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.
+ </p>
+
+ <p>To create a new Smart Playlist, from the menu choose <guiseq>
+ <gui>Media</gui><gui>New Smart Playlist</gui></guiseq>. 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:
+ </p>
+
<list>
<item><p>is</p></item>
- <item><p>is not</p></item>
+ <item><p>is not</p></item>
<item><p>less than</p></item>
- <item><p>more than</p></item>
+ <item><p>more than</p></item>
<item><p>at most</p></item>
- <item><p>at least</p></item>
+ <item><p>at least</p></item>
</list>
-
- <p>You can also press the <gui style="button">+</gui> 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:</p>
-
+
+ <p>You can also press the <gui>+</gui> 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:
+ </p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Year</gui></p></td>
- <td><p><gui>is</gui></p></td>
- <td><p>2010</p></td>
+ <td><p><gui>Year</gui></p></td> <td><p><gui>is</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Rating</gui></p></td>
- <td><p><gui>is</gui></p></td>
- <td><p>5 stars</p></td>
+ <td><p><gui>Rating</gui></p></td> <td><p><gui>is</gui></p></td>
+ <td><p><gui/>5 stars</p></td>
</tr>
</table>
-
- <p>You can then optionally select how many songs are included by pressing
- the <gui style="checkbox">Limit to</gui> checkbox and choosing the number of
- songs to be included.</p>
-
- <p><app>Banshee</app> also includes smart playlists already created for you.
- Press the <gui style="button">Open in editor</gui> button to view how the
- playlist created was or to modify it. If you press
- <gui style="button">Create and save</gui>
- the playlist will be automatically generated and saved for
- you. The following playlists are included:</p>
-
+
+ <p>You can then optionally select how many songs are included by pressing
+ the <gui>Limit</gui> to checkbox and choosing the number of songs to be
+ included.
+ </p>
+
+ <p>Banshee also includes smart playlists already created for
+ you. Press the <gui>Open in editor</gui> button to view how the playlist
+ created was or to modify it. If you press <gui>Create and save</gui> the
+ playlist will be automatically generated and saved for you. The following
+ playlists are included:
+ </p>
+
<list>
- <title><app>Banshee</app> 智能播放列表</title>
- <item>
- <p>Favorites (Songs rated four and five stars)</p>
- </item>
- <item>
- <p>Recent Favorites (Songs listened to often in the past week)</p>
- </item>
- <item>
- <p>Recently Added (Songs imported within the last week)</p>
- </item>
- <item>
- <p>Unheard (Songs that have not been played or skipped)</p>
- </item>
- <item>
- <p>Neglected Favorites (Favorites not played in over two months)</p>
- </item>
- <item>
- <p>700 MB of Favorites (A data CD worth of favorite songs)</p>
- </item>
- <item>
- <p>80 Minutes of Favorites (An audio CD worth of favorite songs)</p>
- </item>
- <item>
- <p>Unrated (Songs that haven't been rated)</p>
- </item>
+ <title>Banshee Smart Playlists</title>
+ <item><p>Favorites (Songs rated four and five stars)</p></item>
+ <item><p>Recent Favorites (Songs listened to often in the past week)
+ </p></item>
+ <item><p>Recently Added (Songs imported within the last week)</p></item>
+ <item><p>Unheard (Songs that have not been played or skipped)</p></item>
+ <item><p>Neglected Favorites (Favorites not played in over two months)
+ </p></item>
+ <item><p>700 MB of Favorites (A data CD worth of favorite songs)</p></item>
+ <item><p>80 Minutes of Favorites (An audio CD worth of favorite songs)
+ </p></item>
+ <item><p>Unrated (Songs that haven't been rated)</p></item>
</list>
-
- </section>
-
+
+ </section>
+
</page>
diff --git a/help/zh_CN/manage-tags.page b/help/zh_CN/manage-tags.page
index f718711..4d53870 100644
--- a/help/zh_CN/manage-tags.page
+++ b/help/zh_CN/manage-tags.page
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="manage-tags" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags" xml:lang="zh_CN">
<info>
<link type="guide" xref="index#manage"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
<desc>Edit and change music tags and metadata.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -18,51 +19,61 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
+
+ <title>Music Metadata</title>
- <title>Music metadata</title>
+ <section id="metadata">
- <p>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, <app>Banshee</app> will include the metadata
- when ripping the CD if available. For more information on ripping CDs and
- including the metadata see the <link xref="import"/>.</p>
-
- <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis
- comments for OGG Vorbis files.</p>
-
- <p>If you have imported songs that do not contain metadata,<app>Banshee</app>
- will display <gui>Unknown</gui> for most fields in the library.</p>
-
- <section id="edit-metadata">
- <title>编辑元数据</title>
-
- <p>You can change and edit the metadata of your songs. Select the song or
- songs you want to update and hit the <key>E</key>, choose
- <guiseq><gui style="menu">Edit</gui>
- <gui style="menuitem">Edit Track Information</gui></guiseq> from the menu, or
- use your mouse and right click on the files and select
- <gui style="menuitem">Edit Track Information</gui>.</p>
-
- <p>A dialog box will appear that shows the song's metadata and allow you to
- change or update it. The default fields displayed include:</p>
-
- <list>
- <item><p><gui>Track Title</gui></p></item>
- <item><p><gui>Track Artist</gui></p></item>
- <item><p><gui>Album Title</gui></p></item>
- <item><p><gui>Genre</gui></p></item>
- <item><p><gui>Track Number</gui></p></item>
- <item><p><gui>Disc Number</gui></p></item>
- <item><p><gui>Year</gui></p></item>
- </list>
-
- <p>Update the song's information. If you have selected multiple songs to edit
- press the right arrow icon to the right of the <gui>Track Title</gui> field
- or press the <gui style="button">Forward</gui> button at the bottom of the
- dialog when finished with each song. When you have completed editing all
- metadata, press <gui style="button">Save</gui>.</p>
+ <title>Music metadata</title>
+
+ <p>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
+ <link xref="import"/>.</p>
+
+ <p>Popular metadata formats are ID3v1 and ID3v2 for MP3 files and
+ Vorbis comments for OGG Vorbis files.</p>
+
+ <p>If you have imported songs that do not contain metadata,
+ <app>Banshee</app> will display <gui>Unknown</gui> for most fields
+ in the library. </p>
+
+ </section>
+ <section id="editmetadata">
+
+ <title>Edit Your Metadata</title>
+
+ <p>You can change and edit the metadata of your songs. Select the song or
+ songs you want to update and hit the <key>E</key>, choose
+ <guiseq><gui>Edit</gui><gui>Edit Track Information</gui></guiseq> from the menu, or use
+ your mouse and right click on the files and select
+ <gui>Edit Track Information</gui>.
+ </p>
+
+ <p>A dialog box will appear that shows the song's metadata and allow you to
+ change or update it. The default fields displayed include:</p>
+
+ <list>
+ <item><p><gui>Track Title</gui></p></item>
+ <item><p><gui>Track Artist</gui></p></item>
+ <item><p><gui>Album Title</gui></p></item>
+ <item><p><gui>Genre</gui></p></item>
+ <item><p><gui>Track Number</gui></p></item>
+ <item><p><gui>Disc Number</gui></p></item>
+ <item><p><gui>Year</gui></p></item>
+ </list>
+
+ <p>Update the song's information. If you have selected multiple songs to
+ edit press the right arrow icon to the right of the <gui>Track Title</gui>
+ field or press the <gui>Forward</gui> button at the bottom of the dialog
+ when finished with each song. When you have completed editing all metadata,
+ press <gui>Save</gui>.
+ </p>
+
</section>
</page>
diff --git a/help/zh_CN/play-queue.page b/help/zh_CN/play-queue.page
index e36bdd3..484c3a0 100644
--- a/help/zh_CN/play-queue.page
+++ b/help/zh_CN/play-queue.page
@@ -1,96 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play-queue" xml:lang="zh_CN">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue" xml:lang="zh_CN">
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your <gui>Play Queue</gui>.</desc>
+ <desc>Add media to your play queue.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <credit type="editor copyright">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- <years>2013</years>
- </credit>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
+ </credit>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play queue</title>
-
- <p>The <gui>Play Queue</gui> can be used to play tracks in a sequential
- order. You can add many tracks to the <gui>Play Queue</gui> and listen
- to hours of music non-stop. You can add individual tracks or entire
- albums, and sort or re-order them as you wish.</p>
-
- <section id="add-queue">
- <title>Add music to the <gui>Play Queue</gui></title>
-
- <p>From your music library, you will need to select the music tracks or
- albums you want to add to the <gui>Play Queue</gui>.</p>
-
- <p>To add an entire album to the <gui>Play Queue</gui>, use your mouse to
- press and hold the album and drag and drop it over <gui>Play Queue</gui> in
- the far left window pane.</p>
-
- <p>You can add music tracks to the <gui>Play Queue</gui> individually or as
- a group. To add an individual file, drag and drop it over the
- <gui>Play Queue</gui> in the far left window pane, or right click the track
- and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- <p>To select multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key> or select a range of
- files by pressing <key>Shift</key> and clicking twice to select that range of
- files. You can then drag and drop it over the <gui>Play Queue</gui> in the
- far left window pane or right click the tracks and choose <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="reorder-queue">
- <title>Organize your <gui>Play Queue</gui></title>
-
- <p>Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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.</p>
-
- </section>
-
- <section id="remove-queue">
- <title>Removing tracks from the <gui>Play Queue</gui></title>
-
- <p>You can remove an individual track, a group of tracks, or clear your
- entire <gui>Play Queue</gui>:</p>
-
- <list>
- <item>
- <p>To remove an individual track, select the track with your mouse and
- then press <key>Delete</key>.</p>
- </item>
- <item>
- <p>To remove multiple tracks, select each track with
- your mouse while holding down <key>Ctrl</key>. Once all the desired
- tracks have been selected, press <key>Delete</key>.</p>
- <note style="tip">
- <p>If you accidentally select a track you do not want to remove, hold
- down <key>Ctrl</key> and select the track again with your mouse,
- to unselect it.</p>
- </note>
- </item>
- <item>
- <p>To clear your entire <gui>Play Queue</gui>, press the
- <gui style="button">Clear</gui> button in the upper right hand corner of
- the <gui>Play Queue</gui> or press
- <keyseq><key>Ctrl</key><key>A</key></keyseq> and press
- <key>Delete</key>.</p>
- </item>
- </list>
-
- </section>
-
+ <title>Play Queue</title>
+
+ <p>The <gui>Play Queue</gui> 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.</p>
+
+<section id="addqueue">
+
+ <title>Add Music to the Play Queue</title>
+
+ <p>From your music library, you will need to select the music tracks or albums
+ you want to add to the play queue.
+ </p>
+
+ <p>To add an entire album to the Play Queue, using your mouse press and hold
+ the album and drag the album over <gui>Play Queue</gui> in the far left
+ window pane.
+ </p>
+
+ <p>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 <gui>Play Queue</gui>
+ in the far left window pane, or right click the track and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+ <p>You can select multiple files by using your mouse and pressing
+ <key>Control</key> and choosing each file with your mouse or
+ select a range of files by
+ pressing <key>Shift</key> and clicking twice to select that range of files. You can then
+ drag and drop it over the <gui>Play Queue</gui>
+ in the far left window pane or right click the tracks and choose
+ <gui>Add to Play Queue</gui>.
+ </p>
+
+</section>
+
+<section id="reorderqueue">
+
+ <title>Organize Your Play Queue</title>
+
+ <p>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.
+ </p>
+
+</section>
+
+<section id="removequeue">
+
+ <title>Removing Tracks from the Play Queue</title>
+
+ <p>You can remove an individual track, a group of tracks, or clear your entire
+ play queue.
+ </p>
+
+ <p>To remove an individual track or group of tracks, select the track
+ with your mouse and then press <key>Delete</key>.
+ </p>
+
+ <p>To clear your entire Play Queue, press the <gui>Clear</gui> button in the
+ upper right hand corner of the Play Queue.
+ </p>
+
+</section>
+
</page>
diff --git a/help/zh_CN/play.page b/help/zh_CN/play.page
index 633f1f5..7bc7e8f 100644
--- a/help/zh_CN/play.page
+++ b/help/zh_CN/play.page
@@ -3,22 +3,13 @@
<info>
<link type="guide" xref="index#media"/>
- <link type="seealso" xref="play-queue"/>
+ <link type="seealso" xref="queue"/>
<desc>Play your videos and music files.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="2.6.0" version="0.2" date="2012-11-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Sindhu S</name>
- <email>sindhus at live.in</email>
- </credit>
- <credit>
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,120 +18,82 @@
-->
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
-
- <title>播放媒体</title>
-
- <section id="play-music">
- <title>Play your music</title>
-
- <p>To play music in <app>Banshee</app>, 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.</p>
-
- <p>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
- <app>Banshee</app>.</p>
-
- <p>To start playing a song, use your mouse to double click the song name,
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <title>Play Your Media</title>
+
+ <section id="playmusic">
+ <title>Play your music</title>
+
+ <p>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.</p>
+
+ <p>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.
+ </p>
+
+ <p>To start playing a song, use your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>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
- <key>Space</key>, or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
+ browser and using your mouse to double click the song name,
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
<p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> 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.</p>
-
- <p><app>Banshee</app> can be used to play music in a random order using the
- <gui style="menuitem">Shuffle</gui> mode. Enable the mode in
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Shuffle</gui></guiseq>,
- followed by a shuffle type selection.</p>
-
- <terms>
- <item>
- <title><gui style="radiobutton">By Song</gui></title>
- <p>Play tracks in a random order.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Artist</gui></title>
- <p>Play tracks by different artists every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Album</gui></title>
- <p>Play tracks from different albums every time.</p>
- </item>
- <item>
- <title><gui style="radiobutton">By Rating</gui></title>
- <p>Play tracks with higher ratings more often than unrated ones.</p>
- <note style="info">
- <p>If there are no rated tracks, the tracks are played
- in a random order.</p>
- </note>
- </item>
- <item>
- <title><gui style="radiobutton">By Score</gui></title>
- <p>Tracks that you play frequently are scored higher and played more
- often.</p>
- </item>
- </terms>
-
+ and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.
+ </p>
+
+ <p>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.
+ </p>
+
</section>
- <section id="play-video">
- <title>Play a video</title>
-
- <p>Your imported videos are listed alphabetically. To play a video, choose
- the video you wish to play from the list and press the <key>Space</key>,
- or choose <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from the
- <app>Banshee</app> menu.</p>
-
- <p><app>Banshee</app> also shows your Favorite videos (those you watch the
- most) and Unwatched videos. Choose one and you can play a video from the
- list.</p>
-
+ <section id="playvideo">
+ <title>Play a video</title>
+
+ <p>Your imported videos are listed alphabetically. To play a video,
+ choose the video you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ <p>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.</p>
+
</section>
-
- <section id="play-podcast">
- <title>播放播客</title>
-
- <p>Podcasts shows you all podcasts you are subscribed to, all podcast
- shows available, and the podcast browser lists all podcasts in order of
+
+ <section id="playpodcast">
+ <title>Play a Podcast</title>
+
+ <p>Podcasts shows you all Podcasts you're subscribed to, all Podcast
+ shows available, and the Podcast browser lists all Podcasts in order of
newest first.</p>
-
- <p>To play a podcast, choose the podcast you wish to play from the list and
- press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
+
+ <p>To play a Podcast,
+ choose the Podcast you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
</section>
-
- <section id="play-radio">
- <title>Play an internet radio station</title>
-
- <p>The Radio source shows you all internet radio stations you have added
- to <app>Banshee</app> alphabetically.</p>
-
- <p>To play an internet radio station, choose the radio station you wish to
- play from the list and press the <key>Space</key>, or choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq> from
- the <app>Banshee</app> menu.</p>
-
- </section>
-
+
+ <section id="playradio">
+ <title>Play an internet radio station</title>
+
+ <p>The Radio source shows you all internet radio stations you have added
+ to Banshee alphabetically.
+ </p>
+
+ <p>To play an internet radio station,
+ choose the radio station you wish to play from the list and
+ press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
+ <gui>Play</gui></guiseq> from the Banshee menu.</p>
+
+ </section>
+
</page>
diff --git a/help/zh_CN/podcast.page b/help/zh_CN/podcast.page
deleted file mode 100644
index b3931c5..0000000
--- a/help/zh_CN/podcast.page
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="podcast" xml:lang="zh_CN">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="radio"/>
- <link type="seealso" xref="import"/>
-
- <desc>Add, remove and play podcasts in <app>Banshee</app>.</desc>
- <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
- <revision pkgversion="3.6" version="0.1" date="2012-12-02" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Ekaterina Gerasimova</name>
- <email>kittykat3756 at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>播客</title>
-
- <section id="podcast-description">
- <title>What is a podcast?</title>
-
- <p>Podcasts are recorded programs, similar to radio programs, that are
- available on the internet and allow you to subscribe to them. When you
- subscribe to a podcast in <app>Banshee</app>, each time a new program is
- released, <app>Banshee</app> will automatically download the podcast to your
- library.</p>
-
- <p>Podcasts have been made on almost any subject, including music, movies,
- Linux and more. Search the internet using your favorite search engine with a
- search term such as "Linux podcast" and you will be presented with many
- options to choose from.</p>
-
- </section>
-
- <section id="add-podcast">
- <title>添加播客</title>
-
- <p>To add a podcast to <app>Banshee</app>, you will first need to visit the
- podcast home page. Most podcasts will have a button or link displayed to
- subscribe to the podcast. Copy the link to the podcast subscription feed. In
- most web browsers, you can right click on the link and choose
- <gui style="menuitem">Copy link</gui>.</p>
-
- <p>In <app>Banshee</app>, click <gui style="menuitem">Podcast</gui> in the
- menu on the left side of the window. Then, click
- <gui style="menuitem">Subscribe to Podcasts</gui> in the right half of the
- toolbar, from the menu choose <guiseq><gui style="menu">Media</gui>
- <gui style="menuitem">Subscribe to Podcast</gui></guiseq> or use the keyboard
- shortcut <keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>.</p>
-
- <p>By default, the podcasts will not be downloaded, so you will only be able
- to listen to them while you are connected to the internet. When you subscribe
- to a new podcast, you will be able to select the following options:</p>
-
- <list>
- <item>
- <p>Select <gui style="checkbox">Download new episodes</gui> to
- automatically download any new episodes to your computer so that you can
- access them when you do not have an internet connection.</p>
- </item>
- <item>
- <p>Select <gui style="menuitem">Archive all episodes except the newest
- one</gui> to have only the newest episode displayed.</p>
- </item>
- </list>
-
- <p>After you have added a podcast feed, <app>Banshee</app> will display the
- name of the podcast, the title of each episode and the date that it was
- published on.</p>
-
- <p>Once a podcast has been archived, it will be removed from the <gui>New
- Items</gui> list, but it will still appear in the <gui>All Items</gui>
- list.</p>
-
- <note style="tip">
- <p>You can edit the subscription options the <gui style="menuitem">Podcast
- Properties</gui>, which can be accessed by right clicking on the
- corresponding podcast name in the podcast list or by right clicking on any
- episode of that podcast.</p>
- </note>
-
- </section>
-
- <section id="play-podcast">
- <title>播放播客</title>
-
- <p>To <link xref="play">play</link> a podcast episode, double click on the
- episode or select it, then select <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>. You can also add the episode to
- the <gui xref="play-queue">Play Queue</gui> by right clicking on
- the episode and selecting <gui style="menuitem">Add to Play Queue</gui>.</p>
-
- </section>
-
- <section id="remove-podcast">
- <title>Remove a podcast</title>
-
- <p>To remove a podcast, right click on the podcast in the podcast list and
- select <gui style="menuitem">Unsubscribe and Delete</gui>. This will
- unsubscribe you from receiving podcast updates and will delete all the
- episodes of the podcast from your library.</p>
-
- </section>
-
-</page>
diff --git a/help/zh_CN/radio.page b/help/zh_CN/radio.page
deleted file mode 100644
index 3578cc2..0000000
--- a/help/zh_CN/radio.page
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="radio" xml:lang="zh_CN">
-
- <info>
- <link type="guide" xref="index#media"/>
- <link type="seealso" xref="podcast"/>
- <link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in <app>Banshee</app>.</desc>
- <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
- <revision pkgversion="2.6" version="0.1" date="2012-12-01" status="draft"/>
- <credit type="author">
- <name>Paul Cutler</name>
- <email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-<!--
- <copyright>
- <year>2010</year>
- <name>GNOME Documentation Project</name>
- </copyright>
--->
- <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
- </info>
-
- <title>Internet radio</title>
-
- <section id="radio-description">
- <title>What is internet radio?</title>
-
- <p>Internet radio stations are similar to regular radio stations, allowing
- an individual or an organization to stream music live over the internet.
- Internet radio stations can be a simultaneous stream of a regular radio
- station, amateurs broadcasting their own station, or commercial radio
- stations that include live DJs and even commercials.</p>
-
- </section>
-
- <section id="add-radio">
- <title>Add radio station</title>
-
- <p>Search for internet radio stations using your favourite search engine.
- You can specify genres, channel frequencies, names of stations and other
- details to narrow down your search. Many radio stations display either a
- button or a link to listen to their stream. In most web-browsers, you can
- right click on the link and choose <gui style="menuitem">Copy Link</gui>.
- </p>
-
- <steps>
- <title>To add an internet radio station to <app>Banshee</app>:</title>
- <item>
- <p>Select <gui>Radio</gui> in the menu on the left hand side of your
- window, then click on <gui style="menuitem">Add Station</gui> on the
- upper right hand corner of <app>Banshee</app>. Or, you can select
- <guiseq><gui style="menu">Media</gui> <gui style="menuitem">Add
- Station</gui></guiseq> from the menu.</p>
- </item>
- <item>
- <p>You will need to enter some details about the radio station that you
- wish to add. The first three fields are mandatory:</p>
- <list>
- <item>
- <p>In the <gui style="menuitem">Station Genre</gui> text box,
- describe the type of music the internet radio station plays by
- creating an appropriate label, or choose a label from the available
- drop down selections.</p>
- </item>
- <item>
- <p>In the <gui style="input">Station Name</gui> text box, enter a
- name for the radio station.</p>
- </item>
- <item>
- <p>In the <gui style="input">Stream URL</gui> field, enter or
- paste the URL of the stream by right clicking and selecting
- <gui style="menuitem">Paste</gui> or pressing
- <keyseq><key>Control</key><key>V</key></keyseq>.</p>
- </item>
- </list>
- </item>
- <item>
- <p>You can also fill out the fields for
- <gui style="input">Station Creator</gui>,
- <gui style="input">Description</gui>, and
- <gui style="input">Rating</gui>.</p>
- </item>
- <item>
- <p>Finally, click <gui style="button">Save</gui> to save the internet
- radio station in <app>Banshee</app>.</p>
- </item>
- </steps>
-
- </section>
-
- <section id="play-radio">
- <title>Play a radio station</title>
-
- <p>To <link xref="play">play</link> a radio station, double click on the
- radio station. Alternatively, right click on the station and select
- <gui style="menuitem">Play</gui> or select the radio station and choose
- <guiseq><gui style="menu">Playback</gui>
- <gui style="menuitem">Play</gui></guiseq>.</p>
-
- <!--Not sure about play queue and play after current track-->
-
- <p>To add a radio station to the
- <gui style="menuitem" xref="play-queue">Play Queue</gui>, you can right click
- on the station and select <gui style="menuitem">Add to Play Queue</gui>. This
- will play the radio station when the queue has finished playing all media
- which is ahead of the station in the <gui>Play Queue</gui>.</p>
-
- <p>You can also right click the station and select
- <gui style="menuitem">Play after Current Track</gui> to add the radio
- station to the queue after the track that is currently playing.</p>
-
- <note style="bug">
- <p><gui style="menuitem">Play after Current Track</gui> may not work on
- some <app>Banshee</app> installations.</p>
- </note>
-
- </section>
-
- <section id="remove-radio">
- <title>Remove a radio station</title>
-
- <p>To remove a radio station from <app>Banshee</app>, you can right click on
- the radio station and select <gui style="menuitem">Remove</gui>, or
- alternatively, you can select the station with your mouse and press
- <key>Delete</key>. When you are prompted for confirmation, click the
- <gui style="button">Remove</gui> button to remove the radio station.</p>
-
- </section>
-
-</page>
diff --git a/help/zh_CN/rb-import.page b/help/zh_CN/rb-import.page
new file mode 100644
index 0000000..505ae7d
--- /dev/null
+++ b/help/zh_CN/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import" xml:lang="zh_CN">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Import music and categorizations from the <app>Rhythmbox</app> music player.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Import your <app>Rhythmbox</app> library</title>
+
+</page>
diff --git a/help/zh_CN/search.page b/help/zh_CN/search.page
index 4d9ebc4..2caecc7 100644
--- a/help/zh_CN/search.page
+++ b/help/zh_CN/search.page
@@ -9,11 +9,7 @@
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,83 +19,94 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>搜索你的 <app>Banshee</app> 库</title>
-
- <p>强大的搜索语言是 <app>Banshee</app> 的特性。你可以用基本的搜索词或者用 <app>Banshee</app> 的高级搜素术语执行详细搜索来简单快速地搜索你的库。</p>
-
- <p>要在 <app>Banshee</app> 中执行媒体搜索，按下 <key>S</key> 或点击在 <app>Banshee</app> 库视图右上角的<gui>搜索</gui> 框。</p>
-
- <p>搜索条件由一些基本词语组成，例如搜索<em>dave matthews</em>。在搜索框中输入<em>dave matthews</em>，Banshee将会在所有包含<em>dave</em>和<em>matthews</em>关键词的元数据字段中搜索，包括：音轨标题，专辑标题，专辑艺术家，年代等。搜索词不区分大小写，这意味着您不需要严格大小写。<em>dave</em>,<em>Dave</em>以及<em>DAVE</em>在作为搜索关键词时都是一样的。</p>
-
- <section id="operators">
- <title>基本操作符</title>
-
- <p>操作符可以放置在搜索关键词之间或之前。默认的操作符是<gui>AND</gui>。当两个关键词之间没有其它操作符时，AND 会被使用。由于它（AND）是默认的，所以没有专门的 AND 操作符。</p>
-
- <p>其他基本操作符有：<gui>OR</gui> 和 <gui>NOT</gui>。联合使用这些操作符可以灵活精确地搜索您想要的媒体。</p>
-
- </section>
-
- <section id="logical">
- <title>逻辑操作符以及示例</title>
-
- <p>下面是逻辑操作符列表，以及使用它们进行搜索时的返回结果示例。</p>
+ <title>搜索你的 Banshee 库</title>
+
+ <p>强大的搜索语言是 Banshee 的特性。你可以用基本的搜索词或者用 Banshee 的高级搜素术语执行详细搜索来简单快速地搜索你的库。</p>
+
+ <p>要在 Banshee 中执行媒体搜索，按下 <key>S</key> 或点击在 Banshee 库视图右上角的<gui>搜索</gui> 框。</p>
+
+ <p>A search query consists of some basic terms, for example,
+ <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
+ Banshee will search all metadata fields including Track Title, Album Title,
+ Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
+ and <em>matthews</em> will be returned. Search terms are case insensitive, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ all mean the same thing when searching.</p>
+
+<section id="operators">
+ <title>基本操作</title>
+ <p>Operators can be placed between any two search words or placed before a
+ search word. The default operation is <gui>AND</gui> and is used when
+ no other operators are used between two search terms. Because it is the
+ default, there is no explicit AND operator.</p>
+
+ <p>Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together,
+ these three operations can yield very powerful queries to help you search
+ your media.</p>
+
+</section>
+<section id="logical">
+ <title>Logical Operators and Examples</title>
+ <p>The following is a list of logical operators and examples of the search
+ results when searching using them.</p>
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>操作符</gui></p></td>
- <td><p><gui>描述</gui></p></td>
+ <td><p><gui>操作</gui></p></td> <td><p><gui>描述</gui></p></td>
</tr>
<tr>
- <td><p><em>默认</em>，<em>空格</em></p></td>
- <td><p>向两个搜索关键词之间添加空格来实现同时搜索两个关键词。</p></td>
+ <td><p><em>default</em>, <em>white space</em></p></td> <td><p>
+ Search for two terms with a space between the two words or terms.</p></td>
</tr>
<tr>
- <td><p>OR, or, <key>|</key>, <key>,</key></p></td>
- <td><p>Search results will be two songs with either result in any
- field.</p></td>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>
+ Search results will be two songs with either result in any field.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td>
- <td><p>Do not display search results with any search term that follows
- the operator of NOT, not,<key>-</key></p></td>
- </tr>
- </table>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>
+ Do not display search results with any search term that follows the
+ operator of NOT, not,<key>-</key>.</p></td>
+ </tr>
+
+</table>
<p>Examples of logical operations include:</p>
-
+
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Query</gui></p></td>
- <td><p><gui>描述</gui></p></td>
+ <td><p><gui>Query</gui></p></td> <td><p><gui>描述</gui></p></td>
</tr>
<tr>
- <td><p>dave matthews</p></td>
- <td><p>Matches any fields in a track containing both <em>dave</em> and
+ <td><p>dave matthews</p></td> <td><p>
+ Matches any fields in a track containing both <em>dave</em> and
<em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave, matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave, matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
</tr>
<tr>
- <td><p>dave or matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave or matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
- </tr>
+ </tr>
<tr>
- <td><p>dave | matthews</p></td>
- <td><p>Matches any fields in a track containing either <em>dave</em> or
+ <td><p>dave | matthews</p></td> <td><p>
+ Matches any fields in a track containing either <em>dave</em> or
<em>matthews</em>.</p></td>
- </tr>
+ </tr>
<tr>
- <td><p>-"dave matthews"</p></td>
- <td><p>Displays all tracks whose fields do not contain
- <em>dave matthews</em>.</p></td>
- </tr>
-
- </table>
+ <td><p>-"dave matthews"</p></td> <td><p>
+ Displays all tracks whose fields do not contain <em>dave
+ matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>For more information on performing more complex search queries,
+ see the <link xref="adv-search"/> page.</p>
+
</section>
-
+
</page>
diff --git a/help/zh_CN/sort.page b/help/zh_CN/sort.page
index 6049448..3df9efc 100644
--- a/help/zh_CN/sort.page
+++ b/help/zh_CN/sort.page
@@ -4,16 +4,12 @@
<info>
<link type="guide" xref="index#manage"/>
<link type="seealso" xref="search"/>
- <desc>对你的媒体分类并添加附加的栏目。</desc>
+ <desc>对你的媒体分类并增加附加的栏目</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -27,19 +23,17 @@
<section id="addcolumn">
- <title>增加栏目</title>
-
+ <title>增加栏目</title>
+
<p>随着你的库增加，你或许会想要改变你的库视图来在库中增加歌曲的附加信息或者改变你查看或者分类歌曲、艺术家、专辑的方式。</p>
-
- <p>你可以在 <app>Banshee</app> 的库视图中加入附加的栏目来获得歌曲的更多信息并且你能对它们分类默认情况下，<app>Banshee</app> 显示歌曲的项目包括 <gui>名称</gui> 、 <gui>艺术家</gui> 、 <gui>专辑</gui> 和 <gui>时间</gui> 。要增加附加栏目，用鼠标右键点击任一栏目，<app>Banshee</app> 将显示所有的栏目来让你从中选择。点击你希望增加到库视图里栏目的名字旁边的复选框。</p>
-
+
+ <p>你可以在 <app>Banshee</app> 的库视图中加入附加的栏目来获得歌曲的更多信息并且你能对它们分类默认情况下，Banshee 显示歌曲的项目包括 <gui>歌曲名</gui> 、 <gui>艺术家</gui> 、 <gui>专辑</gui> 和 <gui>时间</gui> 。要增加附加栏目，用鼠标右键点击任一栏目，Banshee 将显示所有的栏目来让你从中选择。点击你希望增加到库视图里栏目的名字旁边的复选框。</p>
+
</section>
-
+
<section id="sorting">
- <title>对栏目排序</title>
-
- <p>你可以用鼠标点击库视图中显示的任何栏目来对库排序。如果你希望按艺术家对你的音乐库排序，点击 <gui>艺术家</gui> 栏目头部，<app>Banshee</app>将按字母顺序自动排序那个栏目。再次点击 <gui>艺术家</gui> 栏目，将按照逆向的字母顺序对栏目排序。</p>
-
+ <title>对栏目分类</title>
+ <p>你能用你的鼠标点击库视图中显示的任何栏目来对你的库分类。如果你希望按艺术家对你的音乐库分类，点击 <gui>艺术家</gui> 栏目头部，Bandhee 将按字母顺序自动分类那个栏目。再次点击 <gui>艺术家</gui> 栏目，将按照逆向的字母顺序对栏目分类。</p>
</section>
-
+
</page>
diff --git a/help/zh_CN/sync.page b/help/zh_CN/sync.page
index 4dd18f2..6406ffa 100644
--- a/help/zh_CN/sync.page
+++ b/help/zh_CN/sync.page
@@ -3,17 +3,13 @@
<info>
<link type="guide" xref="index#sync"/>
- <link type="seealso" xref="manage-playlists"/>
+ <link type="seealso" xref="playlists"/>
<desc>同步你的媒体到一个合适的便携媒体播放器或者智能手机上。</desc>
<revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
- </credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
+ </credit>
<!--
<copyright>
<year>2010</year>
@@ -23,79 +19,72 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>同步</title>
-
- <p><app>Banshee</app> 支持同步你的音乐到你的便携媒体播放器和智能手机上。你可以添加特定的音轨、专辑或者播放列表或让 <app>Banshee</app> 使你的音乐播放器和你的整个库保持同步。在你的播放器和你的电脑连接之后你也可以在 <app>Banshee</app> 中播放你便携播放器上的音乐。当一无损格式同步音乐的时候，比如 FLAC,如果你安装了正确的解码器，<app>Banshee</app> 会自动为你的音乐转换编码到一个有损的格式，例如 Ogg Vorbis 或者 Mp3 (如果安装了对应的编解码器)。</p>
-
+ <title>同步</title>
+
+ <p>Banshee 支持同步你的音乐到你的便携媒体播放器和智能手机上。你可以添加特定的音轨、专辑或者播放列表或让 Banshee 使你的音乐播放器和你的整个库保持同步。在你的播放器和你的电脑连接之后你也可以在 Banshee 中播放你便携播放器上的音乐。当一无损格式同步音乐的时候，比如 FLAC,如果你安装了正确的解码器，Banshee 会自动为你的音乐转换编码到一个有损的格式，例如 Ogg Vorbis 或者 Mp3。</p>
+
<section id="devices">
<title>设备支持</title>
-
- <p><app>Bandhee</app> 支持几乎所有的现代便携音乐播放器和智能手机，不过注意它不支持苹果的 iPhone, iPad 和 iPod Touch.</p>
-
- <p>当插入你的设备时，<app>Banshee</app> 会在左边的菜单显示它。按下你的设备图标，你将在 <app>Banshee</app> 中进入你的设备主页并显示你的同步偏好。</p>
-
+ <p>Bandhee 支持几乎所有的现代便携音乐播放器和智能手机,显著的例外是苹果的 iphone, ipad 和 ipod Touch.</p>
+
+ <p>当你插入你的设备，Banshee在左边的菜单显示它。按下你的设备图标，你将在 Banshee 中进入你的设备主页并显示你的同步偏好。</p>
+
</section>
-
- <section id="sync-settings">
+
+ <section id="sync-settings">
<title>同步你的音乐</title>
-
- <p>你可以选择让 <app>Banshee</app> 自动同步管理你便携音乐播放器上的媒体,或者手动管理你的音乐和媒体。</p>
-
- <p>在 <app>Banshee</app> 的菜单里选择你的设备，然后选择如何同步你的媒体，包括：</p>
-
- <list>
- <item><p>音乐</p></item>
- <item><p>有声读物</p></item>
- <item><p>视频</p></item>
- <item><p>播客</p></item>
- </list>
-
- <p>在每个媒体旁边的下拉菜单里，选择：</p>
-
- <list>
- <item><p>手动管理</p></item>
- <item><p>同步整个库</p></item>
- </list>
-
- <note style="warning">
- <p>如果你选择自动同步你的整个库到你的便携媒体播放器上，确保你的便携媒体播放器有足够的存储空间。如果你的库比大于你便携媒体播放器上的空间，<app>Banshee</app> 将会同步媒体直到你的播放器装满然后停止。</p>
- </note>
-
- <p>如果你在你的音乐库中创建了播放列表或智能播放列表，它们也会作为音乐的同步选项显示。当创建智能播放列表的时候这会有帮助，因为当一个新的播放列表根据播放列表规则被增加，智能播放列表将自动更新,并且 <app>Banshee</app> 将在你每次插入设备时把新的播放列表同步到你的设备上。</p>
-
- <p><app>Banshee</app> 将以图表的方式在底部的中心处显示你便携播放器的总磁盘空间。图表将显示音频、视频文件占用的空间及剩余空间，在正下方 <app>Banshee</app> 会显示在你的便携音乐播放器上储存的项目总数，总计时长有多少天多少小时和总的使用空间。</p>
-
+ <p>你可以选择让 Banshee 自动同步管理你便携音乐播放器上的媒体,或者手动管理你的音乐和媒体。</p>
+
+ <p>在 Benshee 的菜单里选择你的设备，然后选择如何同步你的媒体，包括：</p>
+ <list>
+ <item><p>音乐</p></item>
+ <item><p>有声读物</p></item>
+ <item><p>视频</p></item>
+ <item><p>播客</p></item>
+ </list>
+
+ <p>在每个媒体旁边的下拉菜单里，选择：</p>
+ <list>
+ <item><p>手动管理</p></item>
+ <item><p>同步整个库</p></item>
+ </list>
+
+ <note style="warning">
+ <p>如果你选择自动同步你的整个库到你的便携媒体播放器上，确保你的便携媒体播放器有足够的存储空间。如果你的库比大于你便携媒体播放器上的空间，Banshee 将会同步媒体直到你的播放器装满然后停止。</p>
+ </note>
+
+ <p>如果你在你的音乐库中创建了播放列表或智能播放列表，它们也会作为音乐的同步选项显示。当创建智能播放列表的时候这会有帮助，因为当一个新的播放列表根据播放列表规则被增加，智能播放列表将自动更新,并且 Benshee 将在你每次插入设备时把新的播放列表同步到你的设备上。</p>
+
+ <p>Benshee 将以图表的方式在底部的中心处显示你便携播放器的总磁盘空间。图表将显示音频、视频文件占用了多少空间还有剩余空间，在正下方 Banshee 会显示在你的便携音乐播放器上储存的存项目总数，和总的使用空间。</p>
+
</section>
<section id="sync-manually">
- <title>同步整个库</title>
-
- <p>你能从 <app>Banshee</app> 拖放你的媒体到你的便携音乐播放器上。选择你想要复制到你便携媒体播放器上的文件然后按住你的鼠标右键不放，拖动文件到 <app>Banshee</app> 里你的便携媒体播放器的图标上。这将会复制文件到你的设备。</p>
-
- <p>如果你的便携音乐播放器不支持你的音乐库的编码方式，像 OGG 或者 FLAC ，在你安装了必要的解码器的情况下，当你向你的便携媒体播放器传输文件时 <app>Banshee</app> 会自动把这些文件转码成Mp3。 在你的Linux 发行版中检查必要的解码器，因为这不在这个帮助范围之内且随着发行版的不同而变化。</p>
-
- <note style="tip">
- <p>你或许需要弹出你的设备来向你的便携音乐播放器正确地导入文件。要在 <app>Banshee</app> 里弹出你的设备，在 <app>Bashee</app> 菜单用鼠标右键点击设备然后按下 <gui style="menuitem">断开</gui> 。</p>
- </note>
+ <title>同步你的整个库</title>
+ <p>你能从 Benshee 拖放你的媒体到你的便携音乐播放器上。选择你想要复制到你便携媒体播放器上的文件然后按住你的鼠标右键不放，拖动文件到 Benshee 里你的便携媒体播放器的图标上。这将会复制文件到你的设备。</p>
+
+ <p>如果你的便携音乐播放器不支持你的音乐库的编码方式，像 OGG 或者 FLAC ，在你安装了必要的解码器的情况下，当你向你的便携媒体播放器传输文件时 Banshee 会自动把这些文件转码成Mp3。 在你的Linux 发行版中检查必要的解码器，因为这不在这个帮助范围之内且随着发行版的不同而变化。</p>
+
+ <note style="tip">
+ <p>你或许需要弹出你的设备来向你的便携音乐播放器正确地导入文件。要在 Banshee 里弹出你的设备，用鼠标右键在 Bashee 菜单点击设备然后按下 <gui>Disconnect</gui> 。</p>
+ </note>
</section>
-
+
<section id="pmp-play">
<title>从你的便携音乐播放器上播放音乐</title>
-
- <p>你可以在 <app>Banshee</app> 中直接播放储存在你便携音乐播放器上的音乐。在 Banshee 菜单的左边选择你的播放器，你便携播放器的库将会显示出来。你然后就能在 <app>Banshee</app> 里播放音乐，就像在你自己的库中播放音乐一样。</p>
-
+ <p>你可以在 Banshee 中直接播放储存在你便携音乐播放器上的音乐。在 Banshee 菜单的左边选择你的播放器，你便携播放器的库将会显示出来。你然后就能在 Banshee 里播放音乐，就像在你自己的库中播放音乐一样。</p>
</section>
-
+
<section id="pmp-delete">
<title>从你的便携音乐播放器上删除音乐</title>
-
- <p>要在你的便携音乐播放器上删除歌曲，在 <app>Banshee</app> 里选择你的播放器并查看它的库。然后选择你想要删除的音轨，并右键点击音轨选择 <gui style="menuitem">删除</gui> 或者从菜单中选择 <guiseq><gui style="menu">编辑</gui><gui style="menuitem">删除</gui></guiseq> 。</p>
-
- <note style="warning">
- <p>从你的便携音乐播放器里删除文件将会永久移除文件，并且你将不能恢复它们。</p>
- </note>
-
+ <p>要在你的便携音乐播放器上删除歌曲，在 Banshee 里选择你的播放器并查看它的库。然后选择你想要删除的音轨，并右键点击音轨选择 <gui>删除</gui> 或者从菜单中选择 <guiseq><gui>编辑</gui><gui>删除</gui></guiseq> 。</p>
+
+ <note style="warning">
+ <p>从你的便携音乐播放器里删除文件将会永久移除文件，并且你将不能恢复它们。</p>
+ </note>
+
</section>
+
</page>
diff --git a/help/zh_CN/ui.page b/help/zh_CN/ui.page
index 05bceb4..008abfd 100644
--- a/help/zh_CN/ui.page
+++ b/help/zh_CN/ui.page
@@ -4,17 +4,11 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <revision pkgversion="2.6" version="0.1" date="2013-05-17" status="draft"/>
- <desc><app>Banshee</app> 的用户界面概览。</desc>
+ <desc><app>Banshee 的</app> 用户界面的一个概览</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
</credit>
- <credit type="editor">
- <name>Aruna Sankaranarayanan</name>
- <email>aruna.evam at gmail.com</email>
- </credit>
-
<!--
<copyright>
<year>2010</year>
@@ -24,70 +18,42 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title><app>Banshee</app> 用户界面</title>
+ <title>Banshee 用户界面的介绍</title>
<figure>
<title><gui>Banshee 媒体播放器</gui> 窗口</title>
<desc><app>Banshee 媒体播放器</app></desc>
- <media type="image" src="figures/main-window.png" mime="image/png" style="right">
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
<p><app>Banshee</app> 库接口</p>
</media>
</figure>
+
+<section id="context">
+ <title>资源</title>
+ <p>你的音乐和视频资源将会出现在 Banshee 的左边。这些资源让你快速进入你的播放队列、音乐、亚马逊、Last.fm、播客还有更多。</p>
+
+ <note style="tip">
+ <p>菜单选项将会依照你选择的资源改变。例如，使用菜单导入播客，你需要选择播客源。当浏览视频或者音乐库的时候导入播客的菜单选项不可用。</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>库浏览器</title>
+ <p>当你从源里选择音乐或者视频资源的时候，Banshee 将在库浏览器里显示你的目录。依照你选择的资源，Banshee 能显示你的音乐或者视频库、播客订阅甚至亚马逊音乐商店来让你购买音乐。</p>
+</section>
+
+<section id="nowplaying">
+ <title>正在播放视图</title>
+ <p>当在全屏模式使用 Banshee 的时候会有帮助，正在播放模式隐藏了媒体库给你更大的视野欣赏音乐或者观看视频。当你听音乐的时候，正在播放视图将显示艺术家的名字、专辑和封面，如果它们存在的话。如果你在观看视频,Banshee 将显示这个视频。</p>
+
+ <p>要改变正在播放来隐藏 Banshee 的用户界面并使用全屏模式，你可以按 <key>F</key>，按 在 Benshee 右上角的<gui>全屏</gui>键，或者选择 <guiseq><gui>查看</gui><gui>全屏</gui></guiseq> 来选择全屏模式。</p>
+
+</section>
+
+<section id="library">
+ <title>Library</title>
+ <p>在 Banshee 里库的显示将会根据你选择的资源而改变。音乐库会在你的库中显示封面，艺术家，和歌曲列表。博客库会显示你的播客订阅，已经下载了的或者没有下载的播客，和所有，新的 或旧的播客。请查看每个源的帮助页面获得管理源的详细信息。</p>
+</section>
- <section id="context">
- <title>资源</title>
-
- <p>你的音乐和视频资源将会出现在 <app>Banshee</app> 的左边。通过它们可以快速进入<gui>播放队列</gui>、<gui>音乐</gui>、<gui>Amazon MP3 Store</gui>、<gui>Last.fm</gui>、<gui>播客</gui>等。</p>
-
- <note style="tip">
- <p>菜单选项将会依照你选择的资源改变。例如，使用菜单导入播客，你需要选择<gui>播客</gui>源。当浏览视频或者音乐库的时候导入播客的菜单选项不可用。</p>
- </note>
-
- </section>
-
- <section id="browser">
- <title>库浏览器</title>
-
- <p>当你从源里选择音乐或者视频资源的时候，<app>Banshee</app> 将在库浏览器里显示你的目录。依照你选择的资源，<app>Banshee</app> 能显示你的音乐或者视频库、播客订阅甚至亚马逊音乐商店来让你购买音乐。</p>
-
- </section>
-
- <section id="now-playing">
- <title><gui>正在播放</gui>视图</title>
-
- <p>当在全屏模式使用 <app>Banshee</app> 的时候会有帮助，<gui>正在播放</gui>模式隐藏了媒体库，给你更大的视野欣赏音乐或者观看视频。当你听音乐的时候，<gui>正在播放</gui>视图将显示艺术家的名字、专辑和封面，如果它们存在的话。如果你在观看视频,<app>Banshee</app> 将显示这个视频。</p>
-
- <p>To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app>
- user interface and view your media in full screen mode instead, you can do
- any of the following:</p>
-
- <list>
- <item>
- <p>Double-click the view with your mouse.</p>
- </item>
- <item>
- <p>Press <key>F</key>.</p>
- </item>
- <item>
- <p>Press <key>F11</key>.</p>
- </item>
- <item>
- <p>Press the <gui style="button">Fullscreen</gui> button in the upper
- right hand corner of <app>Banshee</app>.</p>
- </item>
- <item>
- <p>Select <guiseq><gui style="menu">View</gui>
- <gui style="menuitem">Fullscreen</gui></guiseq>.</p>
- </item>
- </list>
-
- </section>
-
- <section id="libraries">
- <title>库</title>
-
- <p>在 <app>Banshee</app> 里<gui>库</gui>的显示将会根据你选择的资源而改变。例如，<gui>音乐库</gui>会在库中显示封面，艺术家，和歌曲列表。<gui>播客</gui>库会显示你的播客订阅，已经下载了的或者没有下载的播客，和所有新的或旧的播客。请查看每个源的帮助页面获得管理源的详细信息。</p>
-
- </section>
</page>
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 7ac27b9..06a4953 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -6,498 +6,345 @@
msgid ""
msgstr ""
"Project-Id-Version: banshee master\n"
-"POT-Creation-Date: 2013-05-17 09:05+0000\n"
+"POT-Creation-Date: 2011-10-10 18:14+0000\n"
"PO-Revision-Date: 2011-07-31 18:27+0000\n"
"Last-Translator: longxin <longxin1991 at gmail.com>\n"
"Language-Team: Chinese (China) <i18n-zh at googlegroups.com>\n"
-"Language: zh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Language: zh_CN\n"
-"X-Source-Language: C\n"
+"Language: zh\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:35(None) C/introduction.page:44(None)
-msgid ""
-"@@image: 'figures/main-window.png'; md5=a4b2814f0dce9333bceb0d05e910a796"
-msgstr ""
-"@@image: 'figures/main-window.png'; md5=a4b2814f0dce9333bceb0d05e910a796"
+#: 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:9(desc)
-#| msgid "An overview of <app>Banshee's</app> user interface."
-msgid "An overview of the <app>Banshee</app> user interface."
-msgstr "<app>Banshee</app> 的用户界面概览。"
+#: C/ui.page:8(desc)
+msgid "An overview of <app>Banshee's</app> user interface."
+msgstr "<app>Banshee 的</app> 用户界面的一个概览"
#: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name)
-#: C/search.page:12(name) C/radio.page:14(name) C/podcast.page:15(name)
-#: C/play.page:14(name) C/play-queue.page:18(name) C/manage-tags.page:12(name)
-#: C/manage-playlists.page:12(name) C/lastfm.page:12(name)
-#: C/keyboard-shortcuts.page:10(name) C/introduction.page:10(name)
-#: C/index.page:11(name) C/import.page:12(name) C/extensions.page:11(name)
-#: C/amazon.page:11(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/radio.page:15(email) C/podcast.page:16(email)
-#: C/play.page:15(email) C/play-queue.page:19(email)
-#: C/manage-tags.page:13(email) C/manage-playlists.page:13(email)
-#: C/lastfm.page:13(email) C/keyboard-shortcuts.page:11(email)
-#: C/introduction.page:11(email) C/index.page:12(email)
-#: C/import.page:13(email) C/extensions.page:12(email) C/amazon.page:12(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 at gnome.org"
msgstr "pcutler at gnome.org"
-#: C/ui.page:16(name) C/sync.page:16(name) C/sort.page:16(name)
-#: C/radio.page:18(name) C/play.page:22(name) C/play-queue.page:13(name)
-#: C/lastfm.page:16(name) C/introduction.page:14(name) C/index.page:19(name)
-#: C/import.page:20(name) C/amazon.page:15(name)
-msgid "Aruna Sankaranarayanan"
-msgstr "Aruna Sankaranarayanan"
-
-#: C/ui.page:17(email) C/sync.page:17(email) C/sort.page:17(email)
-#: C/search.page:17(email) C/radio.page:19(email) C/play.page:23(email)
-#: C/play-queue.page:14(email) C/lastfm.page:17(email)
-#: C/introduction.page:15(email) C/index.page:20(email)
-#: C/import.page:21(email) C/amazon.page:16(email)
-msgid "aruna.evam at gmail.com"
-msgstr "aruna.evam at gmail.com"
-
-#: C/ui.page:29(title)
-#| msgid "<app>Banshee</app> library interface"
-msgid "The <app>Banshee</app> user interface"
-msgstr "<app>Banshee</app> 用户界面"
-
-#: C/ui.page:32(title) C/introduction.page:41(title)
+#: C/ui.page:24(title)
+msgid "Introduction to the Banshee User Interface"
+msgstr "Banshee 用户界面的介绍"
+
+#: C/ui.page:27(title) C/introduction.page:43(title)
msgid "<gui>Banshee Media Player</gui> window"
msgstr "<gui>Banshee 媒体播放器</gui> 窗口"
-#: C/ui.page:33(app) C/introduction.page:42(app)
+#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title)
msgid "Banshee Media Player"
msgstr "Banshee 媒体播放器"
-#: C/ui.page:36(p) C/introduction.page:45(p)
+#: C/ui.page:30(p) C/introduction.page:46(p)
msgid "<app>Banshee</app> library interface"
msgstr "<app>Banshee</app> 库接口"
-#: C/ui.page:41(title)
+#: C/ui.page:35(title)
msgid "Sources"
msgstr "资源"
-#: C/ui.page:43(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."
+#: C/ui.page:36(p)
msgid ""
-"Your music and video sources are shown on the left in <app>Banshee</app>. "
-"The sources give you quick access to your <gui>Play Queue</gui>, <gui>Music</"
-"gui>, <gui>Videos</gui>, <gui>Amazon MP3 Store</gui>, <gui>Last.fm</gui>, "
-"<gui>Podcasts</gui> and more."
+"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 ""
-"你的音乐和视频资源将会出现在 <app>Banshee</app> 的左边。通过它们可以快速进入<gui>播放队"
-"列</gui>、<gui>音乐</gui>、<gui>Amazon MP3 Store</gui>、<gui>Last.fm</gui>、<gui>播客</gui>等。"
+"你的音乐和视频资源将会出现在 Banshee 的左边。这些资源让你快速进入你的播放队"
+"列、音乐、亚马逊、Last.fm、播客还有更多。"
-#: C/ui.page:49(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."
+#: 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 "
-"<gui>Podcasts</gui> source. The menu option for importing a podcast is not "
-"available when viewing the video or music library."
+"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 ""
-"菜单选项将会依照你选择的资源改变。例如，使用菜单导入播客，你需要选择<gui>播客</gui>源。"
+"菜单选项将会依照你选择的资源改变。例如，使用菜单导入播客，你需要选择播客源。"
"当浏览视频或者音乐库的时候导入播客的菜单选项不可用。"
-#: C/ui.page:58(title)
-#| msgid "Library Browser"
-msgid "Library browser"
+#: C/ui.page:50(title)
+msgid "Library Browser"
msgstr "库浏览器"
-#: C/ui.page:60(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."
-msgid ""
-"When you select a music or video source from Sources, <app>Banshee</app> "
-"will display your content in the library browser. Depending on the source "
-"you choose, <app>Banshee</app> can display your music or video library, "
-"podcast subscriptions or even the Amazon Music Store to allow you to buy "
-"music."
-msgstr ""
-"当你从源里选择音乐或者视频资源的时候，<app>Banshee</app> 将在库浏览器里显示你的目录。依"
-"照你选择的资源，<app>Banshee</app> 能显示你的音乐或者视频库、播客订阅甚至亚马逊音乐商店"
-"来让你购买音乐。"
-
-#: C/ui.page:68(title)
-#| msgid "Now Playing View"
-msgid "<gui>Now Playing</gui> view"
-msgstr "<gui>正在播放</gui>视图"
-
-#: C/ui.page:70(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."
-msgid ""
-"Helpful when using <app>Banshee</app> in full screen mode, the <gui>Now "
-"Playing</gui> mode hides the library to give you a larger view of the music "
-"or video you are watching. When listening to music, the <gui>Now Playing</"
-"gui> view will show you the artist name, album and cover art if available. "
-"If you are watching a video, <app>Banshee</app> will display the video."
-msgstr ""
-"当在全屏模式使用 <app>Banshee</app> 的时候会有帮助，<gui>正在播放</gui>模式隐藏了媒体库，给你更大的视"
-"野欣赏音乐或者观看视频。当你听音乐的时候，<gui>正在播放</gui>视图将显示艺术家的名字、专"
-"辑和封面，如果它们存在的话。如果你在观看视频,<app>Banshee</app> 将显示这个视频。"
-
-#: C/ui.page:77(p)
+#: C/ui.page:51(p)
msgid ""
-"To change the <gui>Now Playing</gui> mode to hide the <app>Banshee</app> "
-"user interface and view your media in full screen mode instead, you can do "
-"any of the following:"
-msgstr ""
-
-#: C/ui.page:83(p)
-msgid "Double-click the view with your mouse."
-msgstr ""
-
-#: C/ui.page:86(p)
-msgid "Press <key>F</key>."
+"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 ""
+"当你从源里选择音乐或者视频资源的时候，Banshee 将在库浏览器里显示你的目录。依"
+"照你选择的资源，Banshee 能显示你的音乐或者视频库、播客订阅甚至亚马逊音乐商店"
+"来让你购买音乐。"
-#: C/ui.page:89(p)
-msgid "Press <key>F11</key>."
-msgstr ""
+#: C/ui.page:58(title)
+msgid "Now Playing View"
+msgstr "正在播放视图"
-#: C/ui.page:92(p)
+#: C/ui.page:59(p)
msgid ""
-"Press the <gui style=\"button\">Fullscreen</gui> button in the upper right "
-"hand corner of <app>Banshee</app>."
+"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 ""
+"当在全屏模式使用 Banshee 的时候会有帮助，正在播放模式隐藏了媒体库给你更大的视"
+"野欣赏音乐或者观看视频。当你听音乐的时候，正在播放视图将显示艺术家的名字、专"
+"辑和封面，如果它们存在的话。如果你在观看视频,Banshee 将显示这个视频。"
-#: C/ui.page:96(p)
+#: C/ui.page:65(p)
msgid ""
-"Select <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem"
-"\">Fullscreen</gui></guiseq>."
+"To change Now Playing to hide the Banshee user interface and use the full "
+"screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui> "
+"button in the upper right hand corner of Banshee, or choose "
+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen "
+"mode."
msgstr ""
+"要改变正在播放来隐藏 Banshee 的用户界面并使用全屏模式，你可以按 <key>F</"
+"key>，按 在 Benshee 右上角的<gui>全屏</gui>键，或者选择 <guiseq><gui>查看</"
+"gui><gui>全屏</gui></guiseq> 来选择全屏模式。"
-#: C/ui.page:104(title)
-#| msgid "Library"
-msgid "Libraries"
-msgstr "库"
+#: C/ui.page:74(title)
+msgid "Library"
+msgstr "Library"
-#: C/ui.page:106(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."
+#: C/ui.page:75(p)
msgid ""
-"The <gui>Libraries</gui> view in <app>Banshee</app> will change depending on "
-"the Source you have chosen. For example, the <gui>Music</gui> library will "
-"display cover art, artists in your library, and list of songs and the "
-"<gui>Podcasts</gui> library will display your podcast subscriptions, "
-"podcasts that are downloaded or not downloaded, and all, new or old "
-"podcasts. Please see the help page of each source for detailed information "
+"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 ""
-"在 <app>Banshee</app> 里<gui>库</gui>的显示将会根据你选择的资源而改变。例如，<gui>音乐库</gui>会在库中显示封面，"
-"艺术家，和歌曲列表。<gui>播客</gui>库会显示你的播客订阅，已经下载了的或者没有下载的播"
-"客，和所有新的或旧的播客。请查看每个源的帮助页面获得管理源的详细信息。"
+"在 Banshee 里库的显示将会根据你选择的资源而改变。音乐库会在你的库中显示封面，"
+"艺术家，和歌曲列表。博客库会显示你的播客订阅，已经下载了的或者没有下载的播"
+"客，和所有，新的 或旧的播客。请查看每个源的帮助页面获得管理源的详细信息。"
#: C/sync.page:9(desc)
msgid "Sync your media to a portable media player or smartphone."
msgstr "同步你的媒体到一个合适的便携媒体播放器或者智能手机上。"
-#: C/sync.page:28(title)
+#: C/sync.page:24(title)
msgid "Sync"
msgstr "同步"
-#: C/sync.page:30(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."
-msgid ""
-"<app>Banshee</app> supports syncing your music to portable media players and "
+#: 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 "
-"<app>Banshee</app> 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 <app>Banshee</app>. When syncing "
-"music in a lossless format, such as FLAC, <app>Banshee</app> 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 ""
-"<app>Banshee</app> 支持同步你的音乐到你的便携媒体播放器和智能手机上。你可以添加特定的音"
-"轨、专辑或者播放列表或让 <app>Banshee</app> 使你的音乐播放器和你的整个库保持同步。在你的"
-"播放器和你的电脑连接之后你也可以在 <app>Banshee</app> 中播放你便携播放器上的音乐。当一无"
-"损格式同步音乐的时候，比如 FLAC,如果你安装了正确的解码器，<app>Banshee</app> 会自动为你"
-"的音乐转换编码到一个有损的格式，例如 Ogg Vorbis 或者 Mp3 (如果安装了对应的编解码器)。"
-
-#: C/sync.page:40(title)
-#| msgid "Device Support"
-msgid "Device support"
+"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 ""
+"Banshee 支持同步你的音乐到你的便携媒体播放器和智能手机上。你可以添加特定的音"
+"轨、专辑或者播放列表或让 Banshee 使你的音乐播放器和你的整个库保持同步。在你的"
+"播放器和你的电脑连接之后你也可以在 Banshee 中播放你便携播放器上的音乐。当一无"
+"损格式同步音乐的时候，比如 FLAC,如果你安装了正确的解码器，Banshee 会自动为你"
+"的音乐转换编码到一个有损的格式，例如 Ogg Vorbis 或者 Mp3。"
+
+#: C/sync.page:37(title)
+msgid "Device Support"
msgstr "设备支持"
-#: C/sync.page:42(p)
-#| msgid ""
-#| "Banshee supports almost all modern portable music players and smartphones "
-#| "with the notable exception of the Apple iPhone, iPad and iPod Touch."
+#: C/sync.page:38(p)
msgid ""
-"<app>Banshee</app> supports almost all modern portable music players and "
-"smartphones with the notable exception of the Apple iPhone, iPad and iPod "
-"Touch."
+"Banshee supports almost all modern portable music players and smartphones "
+"with the notable exception of the Apple iPhone, iPad and iPod Touch."
msgstr ""
-"<app>Bandhee</app> 支持几乎所有的现代便携音乐播放器和智能手机，不过注意它不支持苹果的 "
-"iPhone, iPad 和 iPod Touch."
+"Bandhee 支持几乎所有的现代便携音乐播放器和智能手机,显著的例外是苹果的 "
+"iphone, ipad 和 ipod Touch."
-#: C/sync.page:46(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."
+#: C/sync.page:42(p)
msgid ""
-"When you plug your device in, <app>Banshee</app> will display it in the left "
-"menu. Pressing the device icon will take you to your device home page in "
-"<app>Banshee</app> displaying your sync preferences."
+"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 ""
-"当插入你的设备时，<app>Banshee</app> 会在左边的菜单显示它。按下你的设备图标，你将在 "
-"<app>Banshee</app> 中进入你的设备主页并显示你的同步偏好。"
+"当你插入你的设备，Banshee在左边的菜单显示它。按下你的设备图标，你将在 "
+"Banshee 中进入你的设备主页并显示你的同步偏好。"
-#: C/sync.page:53(title)
-#| msgid "Sync Your Music"
-msgid "Sync your music"
+#: C/sync.page:50(title)
+msgid "Sync Your Music"
msgstr "同步你的音乐"
-#: C/sync.page:55(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."
+#: C/sync.page:51(p)
msgid ""
-"You can choose to manage the media on your portable music by having "
-"<app>Banshee</app> automatically sync it or manage your music and media "
-"manually."
+"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 ""
-"你可以选择让 <app>Banshee</app> 自动同步管理你便携音乐播放器上的媒体,或者手动管理你的音"
+"你可以选择让 Banshee 自动同步管理你便携音乐播放器上的媒体,或者手动管理你的音"
"乐和媒体。"
-#: C/sync.page:59(p)
-#| msgid ""
-#| "Choose your device from the Banshee menu and then choose how you want to "
-#| "sync your media, including:"
+#: C/sync.page:56(p)
msgid ""
-"Choose your device from the <app>Banshee</app> menu and then choose how you "
-"want to sync your media, including:"
-msgstr "在 <app>Banshee</app> 的菜单里选择你的设备，然后选择如何同步你的媒体，包括："
+"Choose your device from the Banshee menu and then choose how you want to "
+"sync your media, including:"
+msgstr "在 Benshee 的菜单里选择你的设备，然后选择如何同步你的媒体，包括："
-#: C/sync.page:63(p)
+#: C/sync.page:60(p)
msgid "Music"
msgstr "音乐"
-#: C/sync.page:64(p)
+#: C/sync.page:61(p)
msgid "Audiobooks"
msgstr "有声读物"
-#: C/sync.page:65(p)
+#: C/sync.page:62(p)
msgid "Videos"
msgstr "视频"
-#: C/sync.page:66(p) C/podcast.page:31(title)
-#: C/keyboard-shortcuts.page:90(title)
-msgid "Podcasts"
+#: C/sync.page:63(p)
+msgid "Podcast"
msgstr "播客"
-#: C/sync.page:69(p)
+#: C/sync.page:66(p)
msgid "From the dropdown menu next to each of the media, choose from:"
msgstr "在每个媒体旁边的下拉菜单里，选择："
-#: C/sync.page:72(p)
+#: C/sync.page:69(p)
msgid "Manage manually"
msgstr "手动管理"
-#: C/sync.page:73(p)
+#: C/sync.page:70(p)
msgid "Sync entire library"
msgstr "同步整个库"
-#: C/sync.page:77(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."
+#: 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, "
-"<app>Banshee</app> will sync media until your player is full and then stop."
+"Banshee will sync media until your player is full and then stop."
msgstr ""
"如果你选择自动同步你的整个库到你的便携媒体播放器上，确保你的便携媒体播放器有"
-"足够的存储空间。如果你的库比大于你便携媒体播放器上的空间，<app>Banshee</app> 将会同步媒"
+"足够的存储空间。如果你的库比大于你便携媒体播放器上的空间，Banshee 将会同步媒"
"体直到你的播放器装满然后停止。"
-#: C/sync.page:84(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."
+#: 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 <app>Banshee</app> "
-"will sync the new playlist to your device every time you plug it in."
+"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 ""
"如果你在你的音乐库中创建了播放列表或智能播放列表，它们也会作为音乐的同步选项"
"显示。当创建智能播放列表的时候这会有帮助，因为当一个新的播放列表根据播放列表"
-"规则被增加，智能播放列表将自动更新,并且 <app>Banshee</app> 将在你每次插入设备时把新的播"
+"规则被增加，智能播放列表将自动更新,并且 Benshee 将在你每次插入设备时把新的播"
"放列表同步到你的设备上。"
-#: C/sync.page:90(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."
-msgid ""
-"<app>Banshee</app> will display the total hard drive space of your portable "
-"music player in a graph in the bottom center of <app>Banshee</app>. The "
-"graph will show you how much space is taken by audio files, video, other and "
-"free space. Directly below that <app>Banshee</app> 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 ""
-"<app>Banshee</app> 将以图表的方式在底部的中心处显示你便携播放器的总磁盘空间。图表将显示"
-"音频、视频文件占用的空间及剩余空间，在正下方 <app>Banshee</app> 会显示在你的便携音"
-"乐播放器上储存的项目总数，总计时长有多少天多少小时和总的使用空间。"
+#: 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 ""
+"Benshee 将以图表的方式在底部的中心处显示你便携播放器的总磁盘空间。图表将显示"
+"音频、视频文件占用了多少空间还有剩余空间，在正下方 Banshee 会显示在你的便携音"
+"乐播放器上储存的存项目总数，和总的使用空间。"
#: C/sync.page:100(title)
-#| msgid "Sync entire library"
-msgid "Sync your entire library"
-msgstr "同步整个库"
+msgid "Sync Your Entire Library"
+msgstr "同步你的整个库"
-#: C/sync.page:102(p)
-#| msgid ""
-#| "You can drag and drop media to your portable music player from 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."
-msgid ""
-"You can drag and drop media to your portable music player from <app>Banshee</"
-"app>. 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 <app>Banshee</app>. This will copy the "
-"files to your device."
-msgstr ""
-"你能从 <app>Banshee</app> 拖放你的媒体到你的便携音乐播放器上。选择你想要复制到你便携媒体"
-"播放器上的文件然后按住你的鼠标右键不放，拖动文件到 <app>Banshee</app> 里你的便携媒体播放"
+#: C/sync.page:101(p)
+msgid ""
+"You can drag and drop media to your portable music player from 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 ""
+"你能从 Benshee 拖放你的媒体到你的便携音乐播放器上。选择你想要复制到你便携媒体"
+"播放器上的文件然后按住你的鼠标右键不放，拖动文件到 Benshee 里你的便携媒体播放"
"器的图标上。这将会复制文件到你的设备。"
#: 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."
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, <app>Banshee</app> can automatically transcode these files to MP3 "
-"when transferring to your portable media player. Check with your Linux "
+"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 ""
"如果你的便携音乐播放器不支持你的音乐库的编码方式，像 OGG 或者 FLAC ，在你安装"
-"了必要的解码器的情况下，当你向你的便携媒体播放器传输文件时 <app>Banshee</app> 会自动把这"
+"了必要的解码器的情况下，当你向你的便携媒体播放器传输文件时 Banshee 会自动把这"
"些文件转码成Mp3。 在你的Linux 发行版中检查必要的解码器，因为这不在这个帮助范"
"围之内且随着发行版的不同而变化。"
-#: C/sync.page:116(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 <gui>Disconnect</"
-#| "gui>."
+#: 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 <app>Banshee</app>, using "
-"your mouse right click the device in the <app>Banshee</app> menu and press "
-"<gui style=\"menuitem\">Disconnect</gui>."
+"portable music player. To eject your device in Banshee, using your mouse "
+"right click the device in the Banshee menu and press <gui>Disconnect</gui>."
msgstr ""
-"你或许需要弹出你的设备来向你的便携音乐播放器正确地导入文件。要在 <app>Banshee</app> 里弹"
-"出你的设备，在 <app>Bashee</app> 菜单用鼠标右键点击设备然后按下 <gui style=\"menuitem\">断开</gui> 。"
+"你或许需要弹出你的设备来向你的便携音乐播放器正确地导入文件。要在 Banshee 里弹"
+"出你的设备，用鼠标右键在 Bashee 菜单点击设备然后按下 <gui>Disconnect</gui> 。"
-#: C/sync.page:125(title)
-#| msgid "Play Music From Your Portable Music Player"
-msgid "Play music from your portable music player"
+#: C/sync.page:127(title)
+msgid "Play Music From Your Portable Music Player"
msgstr "从你的便携音乐播放器上播放音乐"
-#: C/sync.page:127(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."
-msgid ""
-"You can play music stored on your portable music player directly in "
-"<app>Banshee</app>. Choose your player in the <app>Banshee</app> menu on the "
-"left and your portable music player's library will be displayed. You can "
-"then play music in <app>Banshee</app> just as you would music in your own "
-"library."
+#: 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 ""
-"你可以在 <app>Banshee</app> 中直接播放储存在你便携音乐播放器上的音乐。在 Banshee 菜单的"
-"左边选择你的播放器，你便携播放器的库将会显示出来。你然后就能在 <app>Banshee</app> 里播放"
+"你可以在 Banshee 中直接播放储存在你便携音乐播放器上的音乐。在 Banshee 菜单的"
+"左边选择你的播放器，你便携播放器的库将会显示出来。你然后就能在 Banshee 里播放"
"音乐，就像在你自己的库中播放音乐一样。"
-#: C/sync.page:136(title)
-#| msgid "Remove Music From your Portable Music Player"
-msgid "Remove music from your portable music player"
+#: C/sync.page:135(title)
+msgid "Remove Music From your Portable Music Player"
msgstr "从你的便携音乐播放器上删除音乐"
-#: C/sync.page:138(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 <gui>Delete</gui> or from "
-#| "the menu choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
+#: C/sync.page:136(p)
msgid ""
"To remove songs stored on your portable music player, choose your player in "
-"<app>Banshee</app> to view its library. Then choose the tracks you would "
-"like to remove and right click the tracks and choose <gui style=\"menuitem"
-"\">Delete</gui> or from the menu choose <guiseq><gui style=\"menu\">Edit</"
-"gui><gui style=\"menuitem\">Delete</gui></guiseq>."
+"Banshee to view its library. Then choose the tracks you would like to remove "
+"and right click the tracks and choose <gui>Delete</gui> or from the menu "
+"choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
msgstr ""
-"要在你的便携音乐播放器上删除歌曲，在 <app>Banshee</app> 里选择你的播放器并查看它的库。然"
-"后选择你想要删除的音轨，并右键点击音轨选择 <gui style=\"menuitem\">删除</gui> 或者从菜单中选择 <guiseq><gui style=\"menu\">编辑</"
-"gui><gui style=\"menuitem\">删除</gui></guiseq> 。"
+"要在你的便携音乐播放器上删除歌曲，在 Banshee 里选择你的播放器并查看它的库。然"
+"后选择你想要删除的音轨，并右键点击音轨选择 <gui>删除</gui> 或者从菜单中选择 "
+"<guiseq><gui>编辑</gui><gui>删除</gui></guiseq> 。"
-#: C/sync.page:146(p)
+#: C/sync.page:142(p)
msgid ""
"Deleting files from your portable music player will permanently remove the "
"files and you will not be able to recover them."
@@ -505,18 +352,17 @@ msgstr "从你的便携音乐播放器里删除文件将会永久移除文件，
#: C/sort.page:9(desc)
msgid "Sort your media and add additional columns."
-msgstr "对你的媒体分类并添加附加的栏目。"
+msgstr "对你的媒体分类并增加附加的栏目"
-#: C/sort.page:28(title)
+#: C/sort.page:24(title)
msgid "Sort your media"
msgstr "对你的媒体分类"
-#: C/sort.page:32(title)
-#| msgid "Adding Columns"
-msgid "Adding columns"
+#: C/sort.page:28(title)
+msgid "Adding Columns"
msgstr "增加栏目"
-#: C/sort.page:34(p)
+#: C/sort.page:30(p)
msgid ""
"As your library grows, you may want to change your library view to add "
"additional information about the songs in your library or change the way you "
@@ -525,869 +371,489 @@ msgstr ""
"随着你的库增加，你或许会想要改变你的库视图来在库中增加歌曲的附加信息或者改变"
"你查看或者分类歌曲、艺术家、专辑的方式。"
-#: C/sort.page:38(p)
-#| msgid ""
-#| "You can add additional columns to the library view in <app>Banshee</app> "
-#| "to give you more information about the songs and also allow you to sort "
-#| "by. By default, Banshee displays columns for songs including <gui>Name</"
-#| "gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. 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."
+#: C/sort.page:34(p)
msgid ""
"You can add additional columns to the library view in <app>Banshee</app> to "
"give you more information about the songs and also allow you to sort by. By "
-"default, <app>Banshee</app> displays columns for songs including <gui>Name</"
-"gui>, <gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To add "
-"additional columns, using your mouse right click on any of the columns and "
-"<app>Banshee</app> 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."
+"default, Banshee displays columns for songs including <gui>Name</gui>, "
+"<gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. 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 ""
"你可以在 <app>Banshee</app> 的库视图中加入附加的栏目来获得歌曲的更多信息并且"
-"你能对它们分类默认情况下，<app>Banshee</app> 显示歌曲的项目包括 <gui>名称</gui> 、 "
+"你能对它们分类默认情况下，Banshee 显示歌曲的项目包括 <gui>歌曲名</gui> 、 "
"<gui>艺术家</gui> 、 <gui>专辑</gui> 和 <gui>时间</gui> 。要增加附加栏目，用"
-"鼠标右键点击任一栏目，<app>Banshee</app> 将显示所有的栏目来让你从中选择。点击你希望增加"
+"鼠标右键点击任一栏目，Banshee 将显示所有的栏目来让你从中选择。点击你希望增加"
"到库视图里栏目的名字旁边的复选框。"
-#: C/sort.page:50(title)
-#| msgid "Sorting Columns"
-msgid "Sorting columns"
-msgstr "对栏目排序"
+#: C/sort.page:46(title)
+msgid "Sorting Columns"
+msgstr "对栏目分类"
-#: C/sort.page:52(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 <gui>Artist</gui> column header and Banshee will "
-#| "automatically sort that column alphabetically. Clicking the <gui>Artist</"
-#| "gui> column again will sort the column in reverse alphabetical order."
+#: 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 <gui>Artist</gui> column header and <app>Banshee</app> will "
-"automatically sort that column alphabetically. Clicking the <gui>Artist</"
-"gui> column again will sort the column in reverse alphabetical order."
+"click the <gui>Artist</gui> column header and Banshee will automatically "
+"sort that column alphabetically. Clicking the <gui>Artist</gui> column again "
+"will sort the column in reverse alphabetical order."
msgstr ""
-"你可以用鼠标点击库视图中显示的任何栏目来对库排序。如果你希望按艺术家对"
-"你的音乐库排序，点击 <gui>艺术家</gui> 栏目头部，<app>Banshee</app>将按字母顺序自动排序"
-"那个栏目。再次点击 <gui>艺术家</gui> 栏目，将按照逆向的字母顺序对栏目排序。"
+"你能用你的鼠标点击库视图中显示的任何栏目来对你的库分类。如果你希望按艺术家对"
+"你的音乐库分类，点击 <gui>艺术家</gui> 栏目头部，Bandhee 将按字母顺序自动分类"
+"那个栏目。再次点击 <gui>艺术家</gui> 栏目，将按照逆向的字母顺序对栏目分类。"
#: C/search.page:9(desc)
msgid "Search your media and perfom basic queries."
msgstr "搜索你的媒体并执行基本的查询。"
-#: C/search.page:16(name)
-msgid "Aruna sankaranarayanan"
-msgstr "Aruna sankaranarayanan"
+#: C/search.page:24(title)
+msgid "Searching your Banshee Library"
+msgstr "搜索你的 Banshee 库"
-#: C/search.page:28(title)
-#| msgid "Searching your Banshee Library"
-msgid "Searching your <app>Banshee</app> library"
-msgstr "搜索你的 <app>Banshee</app> 库"
-
-#: C/search.page:30(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."
+#: C/search.page:26(p)
msgid ""
-"<app>Banshee</app> features a powerful search language. You can search your "
-"library quickly and easily with basic search terms or perform detailed "
-"searches with the <app>Banshee</app> advanced search terminology."
+"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 ""
-"强大的搜索语言是 <app>Banshee</app> 的特性。你可以用基本的搜索词或者用 <app>Banshee</app> 的高级搜"
+"强大的搜索语言是 Banshee 的特性。你可以用基本的搜索词或者用 Banshee 的高级搜"
"素术语执行详细搜索来简单快速地搜索你的库。"
-#: C/search.page:34(p)
-#| msgid ""
-#| "To perform a search of your media in Banshee, press the <key>S</key> or "
-#| "click the <gui>Search</gui> box in the upper right hand corner of the "
-#| "Library view in Banshee."
+#: C/search.page:30(p)
msgid ""
-"To perform a search of your media in <app>Banshee</app>, press the <key>S</"
-"key> or click the <gui>Search</gui> box in the upper right hand corner of "
-"the Library view in <app>Banshee</app>."
+"To perform a search of your media in Banshee, press the <key>S</key> or "
+"click the <gui>Search</gui> box in the upper right hand corner of the "
+"Library view in Banshee."
msgstr ""
-"要在 <app>Banshee</app> 中执行媒体搜索，按下 <key>S</key> 或点击在 <app>Banshee</app> 库视图右上角"
+"要在 Banshee 中执行媒体搜索，按下 <key>S</key> 或点击在 Banshee 库视图右上角"
"的<gui>搜索</gui> 框。"
-#: C/search.page:38(p)
-#| msgid ""
-#| "A search query consists of some basic terms, for example, <em>dave "
-#| "matthews</em>. By entering <em>dave matthews</em> in the search box, "
-#| "Banshee will search all metadata fields including Track Title, Album "
-#| "Title, Album Artist, Year, etc. Any track whose metadata includes "
-#| "<em>dave</em> and <em>matthews</em> will be returned. Search terms are "
-#| "case insensitive, meaning you don't have to capitalize. <em>dave</em>, "
-#| "<em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching."
+#: C/search.page:35(p)
msgid ""
"A search query consists of some basic terms, for example, <em>dave matthews</"
-"em>. By entering <em>dave matthews</em> in the search box, <app>Banshee</"
-"app> will search all metadata fields including Track Title, Album Title, "
-"Album Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
-"<em>matthews</em> will be returned. Search terms are case insensitive, "
-"meaning you do not have to capitalize. <em>dave</em>, <em>Dave</em>, and "
-"<em>DAVE</em> all mean the same thing when searching."
-msgstr ""
-"搜索条件由一些基本词语组成，例如搜索<em>dave matthews</em>。在搜索框中输入"
-"<em>dave matthews</em>，Banshee将会在所有包含<em>dave</em>和<em>matthews</em>"
-"关键词的元数据字段中搜索，包括：音轨标题，专辑标题，专辑艺术家，"
-"年代等。搜索词不区分大小写，这意味着您不需要严格大小写。<em>dave</em>,"
-"<em>Dave</em>以及<em>DAVE</em>在作为搜索关键词时都是一样的。"
-
-#: C/search.page:47(title)
-#| msgid "Basic Operators"
-msgid "Basic operators"
-msgstr "基本操作符"
+"em>. By entering <em>dave matthews</em> in the search box, Banshee will "
+"search all metadata fields including Track Title, Album Title, Album Artist, "
+"Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</"
+"em> will be returned. Search terms are case insensitive, meaning you don't "
+"have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean "
+"the same thing when searching."
+msgstr ""
-#: C/search.page:49(p)
-#| msgid ""
-#| "Operators can be placed between any two search words or placed before a "
-#| "search word. The default operation is <gui>AND</gui> and is used when no "
-#| "other operators are used between two search terms. Because it is the "
-#| "default, there is no explicit AND operator."
+#: 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 <gui>AND</gui> and is used when no "
-"other operators are used between two search terms. Since it is the default, "
-"there is no explicit AND operator."
+"other operators are used between two search terms. Because it is the "
+"default, there is no explicit AND operator."
msgstr ""
-"操作符可以放置在搜索关键词之间或之前。默认的操作符是<gui>AND</gui>。当两个关"
-"键词之间没有其它操作符时，AND 会被使用。由于它（AND）是默认的，所以没有专门"
-"的 AND 操作符。"
-#: C/search.page:54(p)
+#: C/search.page:49(p)
msgid ""
"Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together, "
"these three operations can yield very powerful queries to help you search "
"your media."
msgstr ""
-"其他基本操作符有：<gui>OR</gui> 和 <gui>NOT</gui>。联合使用这些操作符可以灵活精确地"
-"搜索您想要的媒体。"
-#: C/search.page:61(title)
-#| msgid "Logical Operators and Examples"
-msgid "Logical operators and examples"
-msgstr "逻辑操作符以及示例"
+#: C/search.page:56(title)
+msgid "Logical Operators and Examples"
+msgstr ""
-#: C/search.page:63(p)
+#: 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:68(gui)
+#: C/search.page:62(gui)
msgid "Operator"
-msgstr "操作符"
+msgstr "操作"
-#: C/search.page:69(gui) C/search.page:93(gui)
+#: C/search.page:62(gui) C/search.page:84(gui)
msgid "Description"
msgstr "描述"
-#: C/search.page:72(p)
+#: C/search.page:65(p)
msgid "<em>default</em>, <em>white space</em>"
-msgstr "<em>默认</em>，<em>空格</em>"
+msgstr ""
-#: C/search.page:73(p)
+#: C/search.page:65(p)
msgid "Search for two terms with a space between the two words or terms."
-msgstr "向两个搜索关键词之间添加空格来实现同时搜索两个关键词。"
+msgstr ""
-#: C/search.page:77(p)
+#: C/search.page:69(p)
msgid "OR, or, <key>|</key>, <key>,</key>"
msgstr ""
-#: C/search.page:78(p)
+#: C/search.page:69(p)
msgid "Search results will be two songs with either result in any field."
msgstr ""
-#: C/search.page:82(p)
+#: C/search.page:73(p)
msgid "NOT, not,<key>-</key>"
msgstr ""
-#: C/search.page:83(p)
+#: C/search.page:73(p)
msgid ""
"Do not display search results with any search term that follows the operator "
-"of NOT, not,<key>-</key>"
+"of NOT, not,<key>-</key>."
msgstr ""
-#: C/search.page:88(p)
+#: C/search.page:80(p)
msgid "Examples of logical operations include:"
msgstr ""
-#: C/search.page:92(gui)
+#: C/search.page:84(gui)
msgid "Query"
msgstr ""
-#: C/search.page:96(p)
+#: C/search.page:87(p)
msgid "dave matthews"
-msgstr "dave matthews"
+msgstr ""
-#: C/search.page:97(p)
+#: C/search.page:87(p)
msgid ""
"Matches any fields in a track containing both <em>dave</em> and "
"<em>matthews</em>."
msgstr ""
-#: C/search.page:101(p)
+#: C/search.page:92(p)
msgid "dave, matthews"
-msgstr "dave, matthews"
+msgstr ""
-#: C/search.page:102(p) C/search.page:107(p) C/search.page:112(p)
+#: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p)
msgid ""
"Matches any fields in a track containing either <em>dave</em> or "
"<em>matthews</em>."
msgstr ""
-#: C/search.page:106(p)
+#: C/search.page:97(p)
msgid "dave or matthews"
-msgstr "dave or matthews"
-
-#: C/search.page:111(p)
-msgid "dave | matthews"
-msgstr "dave | matthews"
-
-#: C/search.page:116(p)
-msgid "-\"dave matthews\""
-msgstr "-\"dave matthews\""
-
-#: C/search.page:117(p)
-msgid "Displays all tracks whose fields do not contain <em>dave matthews</em>."
-msgstr ""
-
-#: C/radio.page:10(desc)
-msgid "Add, remove and play internet radio stations in <app>Banshee</app>."
-msgstr ""
-
-#: C/radio.page:30(title)
-msgid "Internet radio"
-msgstr ""
-
-#: C/radio.page:33(title)
-msgid "What is internet radio?"
-msgstr ""
-
-#: C/radio.page:35(p)
-msgid ""
-"Internet radio stations are similar to regular radio stations, allowing an "
-"individual or an organization to stream music live over the internet. "
-"Internet radio stations can be a simultaneous stream of a regular radio "
-"station, amateurs broadcasting their own station, or commercial radio "
-"stations that include live DJs and even commercials."
-msgstr ""
-
-#: C/radio.page:44(title)
-msgid "Add radio station"
-msgstr ""
-
-#: C/radio.page:46(p)
-msgid ""
-"Search for internet radio stations using your favourite search engine. You "
-"can specify genres, channel frequencies, names of stations and other details "
-"to narrow down your search. Many radio stations display either a button or a "
-"link to listen to their stream. In most web-browsers, you can right click on "
-"the link and choose <gui style=\"menuitem\">Copy Link</gui>."
-msgstr ""
-
-#: C/radio.page:54(title)
-msgid "To add an internet radio station to <app>Banshee</app>:"
-msgstr ""
-
-#: C/radio.page:56(p)
-msgid ""
-"Select <gui>Radio</gui> in the menu on the left hand side of your window, "
-"then click on <gui style=\"menuitem\">Add Station</gui> on the upper right "
-"hand corner of <app>Banshee</app>. Or, you can select <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">Add Station</gui></guiseq> from "
-"the menu."
-msgstr ""
-
-#: C/radio.page:63(p)
-msgid ""
-"You will need to enter some details about the radio station that you wish to "
-"add. The first three fields are mandatory:"
-msgstr ""
-
-#: C/radio.page:67(p)
-msgid ""
-"In the <gui style=\"menuitem\">Station Genre</gui> text box, describe the "
-"type of music the internet radio station plays by creating an appropriate "
-"label, or choose a label from the available drop down selections."
-msgstr ""
-
-#: C/radio.page:73(p)
-msgid ""
-"In the <gui style=\"input\">Station Name</gui> text box, enter a name for "
-"the radio station."
msgstr ""
-#: C/radio.page:77(p)
-msgid ""
-"In the <gui style=\"input\">Stream URL</gui> field, enter or paste the URL "
-"of the stream by right clicking and selecting <gui style=\"menuitem\">Paste</"
-"gui> or pressing <keyseq><key>Control</key><key>V</key></keyseq>."
-msgstr ""
-
-#: C/radio.page:85(p)
-msgid ""
-"You can also fill out the fields for <gui style=\"input\">Station Creator</"
-"gui>, <gui style=\"input\">Description</gui>, and <gui style=\"input"
-"\">Rating</gui>."
-msgstr ""
-
-#: C/radio.page:91(p)
-msgid ""
-"Finally, click <gui style=\"button\">Save</gui> to save the internet radio "
-"station in <app>Banshee</app>."
-msgstr ""
-
-#: C/radio.page:99(title)
-msgid "Play a radio station"
-msgstr ""
-
-#: C/radio.page:101(p)
-msgid ""
-"To <link xref=\"play\">play</link> a radio station, double click on the "
-"radio station. Alternatively, right click on the station and select <gui "
-"style=\"menuitem\">Play</gui> or select the radio station and choose "
-"<guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem\">Play</"
-"gui></guiseq>."
-msgstr ""
-
-#. Not sure about play queue and play after current track
-#: C/radio.page:109(p)
-msgid ""
-"To add a radio station to the <gui style=\"menuitem\" xref=\"play-queue"
-"\">Play Queue</gui>, you can right click on the station and select <gui "
-"style=\"menuitem\">Add to Play Queue</gui>. This will play the radio station "
-"when the queue has finished playing all media which is ahead of the station "
-"in the <gui>Play Queue</gui>."
-msgstr ""
-
-#: C/radio.page:115(p)
-msgid ""
-"You can also right click the station and select <gui style=\"menuitem\">Play "
-"after Current Track</gui> to add the radio station to the queue after the "
-"track that is currently playing."
-msgstr ""
-
-#: C/radio.page:120(p)
-msgid ""
-"<gui style=\"menuitem\">Play after Current Track</gui> may not work on some "
-"<app>Banshee</app> installations."
-msgstr ""
-
-#: C/radio.page:127(title)
-msgid "Remove a radio station"
-msgstr ""
-
-#: C/radio.page:129(p)
-msgid ""
-"To remove a radio station from <app>Banshee</app>, you can right click on "
-"the radio station and select <gui style=\"menuitem\">Remove</gui>, or "
-"alternatively, you can select the station with your mouse and press "
-"<key>Delete</key>. When you are prompted for confirmation, click the <gui "
-"style=\"button\">Remove</gui> button to remove the radio station."
-msgstr ""
-
-#: C/podcast.page:11(desc)
-msgid "Add, remove and play podcasts in <app>Banshee</app>."
-msgstr ""
-
-#: C/podcast.page:19(name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/podcast.page:20(email)
-msgid "kittykat3756 at gmail.com"
-msgstr "kittykat3756 at gmail.com"
-
-#: C/podcast.page:34(title)
-msgid "What is a podcast?"
-msgstr ""
-
-#: C/podcast.page:36(p)
-msgid ""
-"Podcasts are recorded programs, similar to radio programs, that are "
-"available on the internet and allow you to subscribe to them. When you "
-"subscribe to a podcast in <app>Banshee</app>, each time a new program is "
-"released, <app>Banshee</app> will automatically download the podcast to your "
-"library."
-msgstr ""
-
-#: C/podcast.page:42(p)
-msgid ""
-"Podcasts have been made on almost any subject, including music, movies, "
-"Linux and more. Search the internet using your favorite search engine with a "
-"search term such as \"Linux podcast\" and you will be presented with many "
-"options to choose from."
-msgstr ""
-
-#: C/podcast.page:50(title)
-#| msgid "Podcast"
-msgid "Add a podcast"
-msgstr "添加播客"
-
-#: C/podcast.page:52(p)
-msgid ""
-"To add a podcast to <app>Banshee</app>, you will first need to visit the "
-"podcast home page. Most podcasts will have a button or link displayed to "
-"subscribe to the podcast. Copy the link to the podcast subscription feed. In "
-"most web browsers, you can right click on the link and choose <gui style="
-"\"menuitem\">Copy link</gui>."
-msgstr ""
-
-#: C/podcast.page:58(p)
-msgid ""
-"In <app>Banshee</app>, click <gui style=\"menuitem\">Podcast</gui> in the "
-"menu on the left side of the window. Then, click <gui style=\"menuitem"
-"\">Subscribe to Podcasts</gui> in the right half of the toolbar, from the "
-"menu choose <guiseq><gui style=\"menu\">Media</gui><gui style=\"menuitem"
-"\">Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
-"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
-msgstr ""
-
-#: C/podcast.page:65(p)
-msgid ""
-"By default, the podcasts will not be downloaded, so you will only be able to "
-"listen to them while you are connected to the internet. When you subscribe "
-"to a new podcast, you will be able to select the following options:"
-msgstr ""
-
-#: C/podcast.page:71(p)
-msgid ""
-"Select <gui style=\"checkbox\">Download new episodes</gui> to automatically "
-"download any new episodes to your computer so that you can access them when "
-"you do not have an internet connection."
-msgstr ""
-
-#: C/podcast.page:76(p)
-msgid ""
-"Select <gui style=\"menuitem\">Archive all episodes except the newest one</"
-"gui> to have only the newest episode displayed."
+#: C/search.page:102(p)
+msgid "dave | matthews"
msgstr ""
-#: C/podcast.page:81(p)
-msgid ""
-"After you have added a podcast feed, <app>Banshee</app> will display the "
-"name of the podcast, the title of each episode and the date that it was "
-"published on."
+#: C/search.page:107(p)
+msgid "-\"dave matthews\""
msgstr ""
-#: C/podcast.page:85(p)
-msgid ""
-"Once a podcast has been archived, it will be removed from the <gui>New "
-"Items</gui> list, but it will still appear in the <gui>All Items</gui> list."
+#: C/search.page:107(p)
+msgid "Displays all tracks whose fields do not contain <em>dave matthews</em>."
msgstr ""
-#: C/podcast.page:90(p)
+#: C/search.page:114(p)
msgid ""
-"You can edit the subscription options the <gui style=\"menuitem\">Podcast "
-"Properties</gui>, which can be accessed by right clicking on the "
-"corresponding podcast name in the podcast list or by right clicking on any "
-"episode of that podcast."
+"For more information on performing more complex search queries, see the "
+"<link xref=\"adv-search\"/> page."
msgstr ""
-#: C/podcast.page:99(title) C/play.page:121(title)
-#| msgid "Podcast"
-msgid "Play a podcast"
-msgstr "播放播客"
-
-#: C/podcast.page:101(p)
+#: C/rb-import.page:8(desc)
msgid ""
-"To <link xref=\"play\">play</link> a podcast episode, double click on the "
-"episode or select it, then select <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq>. You can also add the "
-"episode to the <gui xref=\"play-queue\">Play Queue</gui> by right clicking "
-"on the episode and selecting <gui style=\"menuitem\">Add to Play Queue</gui>."
+"Import music and categorizations from the <app>Rhythmbox</app> music player."
msgstr ""
-#: C/podcast.page:110(title)
-msgid "Remove a podcast"
-msgstr ""
-
-#: C/podcast.page:112(p)
-msgid ""
-"To remove a podcast, right click on the podcast in the podcast list and "
-"select <gui style=\"menuitem\">Unsubscribe and Delete</gui>. This will "
-"unsubscribe you from receiving podcast updates and will delete all the "
-"episodes of the podcast from your library."
+#: C/rb-import.page:12(title)
+msgid "Import your <app>Rhythmbox</app> library"
msgstr ""
#: C/play.page:9(desc)
msgid "Play your videos and music files."
msgstr ""
-#: C/play.page:18(name) C/index.page:15(name)
-msgid "Sindhu S"
-msgstr "Sindhu S"
-
-#: C/play.page:19(email) C/index.page:16(email)
-msgid "sindhus at live.in"
-msgstr "sindhus at live.in"
-
-#: C/play.page:34(title)
-#| msgid "Sort your media"
-msgid "Play your media"
-msgstr "播放媒体"
+#: C/play.page:24(title)
+msgid "Play Your Media"
+msgstr ""
-#: C/play.page:37(title)
+#: C/play.page:27(title)
msgid "Play your music"
msgstr ""
-#: C/play.page:39(p)
+#: C/play.page:29(p)
msgid ""
-"To play music in <app>Banshee</app>, 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."
+"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 ""
-#: C/play.page:43(p)
+#: 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 <app>Banshee</app>."
+"or use the search bar in the upper right hand corner of Banshee."
msgstr ""
-#: C/play.page:47(p)
+#: C/play.page:37(p)
msgid ""
"To start playing a song, use your mouse to double click the song name, press "
-"the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
+"gui></guiseq> from the Banshee menu."
msgstr ""
-#: C/play.page:53(p)
+#: C/play.page:42(p)
msgid ""
"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 "
-"<key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</gui><gui "
-"style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> menu."
+"<key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></"
+"guiseq> from the Banshee menu."
msgstr ""
-#: C/play.page:59(p)
+#: C/play.page:48(p)
msgid ""
"To play all songs by one artist, choose the artist in the artist browser and "
-"press the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
-msgstr ""
-
-#: C/play.page:65(p)
-msgid ""
-"<app>Banshee</app> 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:69(p)
-msgid ""
-"<app>Banshee</app> can be used to play music in a random order using the "
-"<gui style=\"menuitem\">Shuffle</gui> mode. Enable the mode in <guiseq><gui "
-"style=\"menu\">Playback</gui><gui style=\"menuitem\">Shuffle</gui></guiseq>, "
-"followed by a shuffle type selection."
-msgstr ""
-
-#: C/play.page:77(gui)
-msgid "By Song"
-msgstr ""
-
-#: C/play.page:78(p)
-msgid "Play tracks in a random order."
-msgstr ""
-
-#: C/play.page:81(gui)
-msgid "By Artist"
-msgstr ""
-
-#: C/play.page:82(p)
-msgid "Play tracks by different artists every time."
-msgstr ""
-
-#: C/play.page:85(gui)
-msgid "By Album"
-msgstr ""
-
-#: C/play.page:86(p)
-msgid "Play tracks from different albums every time."
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
-#: C/play.page:89(gui)
-msgid "By Rating"
-msgstr ""
-
-#: C/play.page:90(p)
-msgid "Play tracks with higher ratings more often than unrated ones."
-msgstr ""
-
-#: C/play.page:92(p)
-msgid "If there are no rated tracks, the tracks are played in a random order."
-msgstr ""
-
-#: C/play.page:97(gui)
-msgid "By Score"
-msgstr ""
-
-#: C/play.page:98(p)
+#: C/play.page:53(p)
msgid ""
-"Tracks that you play frequently are scored higher and played more often."
+"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:106(title)
+#: C/play.page:61(title)
msgid "Play a video"
msgstr ""
-#: C/play.page:108(p)
+#: 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 <key>Space</key>, or "
-"choose <guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem"
-"\">Play</gui></guiseq> from the <app>Banshee</app> menu."
+"video you wish to play from the list and press the <key>Spacebar</key>, or "
+"choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee "
+"menu."
msgstr ""
-#: C/play.page:114(p)
+#: C/play.page:68(p)
msgid ""
-"<app>Banshee</app> also shows your Favorite videos (those you watch the "
-"most) and Unwatched videos. Choose one and you can play a video from the "
-"list."
+"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:123(p)
+#: C/play.page:74(title)
+msgid "Play a Podcast"
+msgstr ""
+
+#: C/play.page:76(p)
msgid ""
-"Podcasts shows you all podcasts you are subscribed to, all podcast shows "
-"available, and the podcast browser lists all podcasts in order of newest "
+"Podcasts shows you all Podcasts you're subscribed to, all Podcast shows "
+"available, and the Podcast browser lists all Podcasts in order of newest "
"first."
msgstr ""
-#: C/play.page:127(p)
+#: C/play.page:80(p)
msgid ""
-"To play a podcast, choose the podcast you wish to play from the list and "
-"press the <key>Space</key>, or choose <guiseq><gui style=\"menu\">Playback</"
-"gui><gui style=\"menuitem\">Play</gui></guiseq> from the <app>Banshee</app> "
-"menu."
+"To play a Podcast, choose the Podcast you wish to play from the list and "
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
-#: C/play.page:136(title)
+#: C/play.page:88(title)
msgid "Play an internet radio station"
msgstr ""
-#: C/play.page:138(p)
+#: C/play.page:90(p)
msgid ""
"The Radio source shows you all internet radio stations you have added to "
-"<app>Banshee</app> alphabetically."
+"Banshee alphabetically."
msgstr ""
-#: C/play.page:141(p)
+#: 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 <key>Space</key>, or choose <guiseq><gui style="
-"\"menu\">Playback</gui><gui style=\"menuitem\">Play</gui></guiseq> from the "
-"<app>Banshee</app> menu."
+"from the list and press the <key>Spacebar</key>, or choose "
+"<guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
#: C/play-queue.page:9(desc)
-msgid "Add media to your <gui>Play Queue</gui>."
+msgid "Add media to your play queue."
msgstr ""
-#: C/play-queue.page:15(years)
-msgid "2013"
-msgstr "2013"
-
-#: C/play-queue.page:24(title)
-msgid "Play queue"
+#: C/play-queue.page:18(title)
+msgid "Play Queue"
msgstr ""
-#: C/play-queue.page:26(p)
+#: C/play-queue.page:20(p)
msgid ""
-"The <gui>Play Queue</gui> can be used to play tracks in a sequential order. "
-"You can add many tracks to the <gui>Play Queue</gui> and listen to hours of "
-"music non-stop. You can add individual tracks or entire albums, and sort or "
-"re-order them as you wish."
+"The <gui>Play Queue</gui> 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:32(title)
-msgid "Add music to the <gui>Play Queue</gui>"
+#: C/play-queue.page:26(title)
+msgid "Add Music to the Play Queue"
msgstr ""
-#: C/play-queue.page:34(p)
+#: 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 <gui>Play Queue</gui>."
+"you want to add to the play queue."
msgstr ""
-#: C/play-queue.page:37(p)
+#: C/play-queue.page:32(p)
msgid ""
-"To add an entire album to the <gui>Play Queue</gui>, use your mouse to press "
-"and hold the album and drag and drop it over <gui>Play Queue</gui> in the "
-"far left window pane."
+"To add an entire album to the Play Queue, using your mouse press and hold "
+"the album and drag the album over <gui>Play Queue</gui> in the far left "
+"window pane."
msgstr ""
-#: C/play-queue.page:41(p)
+#: C/play-queue.page:37(p)
msgid ""
-"You can add music tracks to the <gui>Play Queue</gui> individually or as a "
-"group. To add an individual file, drag and drop it over the <gui>Play Queue</"
-"gui> in the far left window pane, or right click the track and choose <gui "
-"style=\"menuitem\">Add to Play Queue</gui>."
+"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 <gui>Play Queue</gui> in "
+"the far left window pane, or right click the track and choose <gui>Add to "
+"Play Queue</gui>."
msgstr ""
-#: C/play-queue.page:46(p)
+#: C/play-queue.page:43(p)
msgid ""
-"To select multiple tracks, select each track with your mouse while holding "
-"down <key>Ctrl</key> or select a range of files by pressing <key>Shift</key> "
-"and clicking twice to select that range of files. You can then drag and drop "
-"it over the <gui>Play Queue</gui> in the far left window pane or right click "
-"the tracks and choose <gui style=\"menuitem\">Add to Play Queue</gui>."
+"You can select multiple files by using your mouse and pressing <key>Control</"
+"key> and choosing each file with your mouse or select a range of files by "
+"pressing <key>Shift</key> and clicking twice to select that range of files. "
+"You can then drag and drop it over the <gui>Play Queue</gui> in the far left "
+"window pane or right click the tracks and choose <gui>Add to Play Queue</"
+"gui>."
msgstr ""
#: C/play-queue.page:56(title)
-msgid "Organize your <gui>Play Queue</gui>"
+msgid "Organize Your Play Queue"
msgstr ""
#: C/play-queue.page:58(p)
msgid ""
-"Your <gui>Play Queue</gui> 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 <gui>Play Queue</gui> 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."
+"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:68(title)
-msgid "Removing tracks from the <gui>Play Queue</gui>"
+#: C/play-queue.page:70(title)
+msgid "Removing Tracks from the Play Queue"
msgstr ""
-#: C/play-queue.page:70(p)
+#: C/play-queue.page:72(p)
msgid ""
"You can remove an individual track, a group of tracks, or clear your entire "
-"<gui>Play Queue</gui>:"
+"play queue."
msgstr ""
-#: C/play-queue.page:75(p)
+#: C/play-queue.page:76(p)
msgid ""
-"To remove an individual track, select the track with your mouse and then "
-"press <key>Delete</key>."
+"To remove an individual track or group of tracks, select the track with your "
+"mouse and then press <key>Delete</key>."
msgstr ""
-#: C/play-queue.page:79(p)
+#: C/play-queue.page:80(p)
msgid ""
-"To remove multiple tracks, select each track with your mouse while holding "
-"down <key>Ctrl</key>. Once all the desired tracks have been selected, press "
-"<key>Delete</key>."
+"To clear your entire Play Queue, press the <gui>Clear</gui> button in the "
+"upper right hand corner of the Play Queue."
msgstr ""
-#: C/play-queue.page:83(p)
-msgid ""
-"If you accidentally select a track you do not want to remove, hold down "
-"<key>Ctrl</key> and select the track again with your mouse, to unselect it."
+#: C/manage-tags.page:10(desc)
+msgid "Edit and change music tags and metadata."
msgstr ""
-#: C/play-queue.page:89(p)
-msgid ""
-"To clear your entire <gui>Play Queue</gui>, press the <gui style=\"button"
-"\">Clear</gui> button in the upper right hand corner of the <gui>Play Queue</"
-"gui> or press <keyseq><key>Ctrl</key><key>A</key></keyseq> and press "
-"<key>Delete</key>."
+#: C/manage-tags.page:25(title)
+msgid "Music Metadata"
msgstr ""
-#: C/manage-tags.page:9(desc)
-msgid "Edit and change music tags and metadata."
-msgstr ""
-
-#: C/manage-tags.page:24(title)
+#: C/manage-tags.page:29(title)
msgid "Music metadata"
msgstr ""
-#: C/manage-tags.page:26(p)
+#: 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, <app>Banshee</app> will include the "
-"metadata when ripping the CD if available. For more information on ripping "
-"CDs and including the metadata see the <link xref=\"import\"/>."
+"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 <link xref=\"import\"/>."
msgstr ""
-#: C/manage-tags.page:33(p)
+#: 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:36(p)
+#: C/manage-tags.page:42(p)
msgid ""
-"If you have imported songs that do not contain metadata,<app>Banshee</app> "
+"If you have imported songs that do not contain metadata, <app>Banshee</app> "
"will display <gui>Unknown</gui> for most fields in the library."
msgstr ""
-#: C/manage-tags.page:40(title)
-#| msgid "Sort your media"
-msgid "Edit your metadata"
-msgstr "编辑元数据"
+#: C/manage-tags.page:50(title)
+msgid "Edit Your Metadata"
+msgstr ""
-#: C/manage-tags.page:42(p)
+#: 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 <key>E</key>, choose <guiseq><gui style=\"menu"
-"\">Edit</gui><gui style=\"menuitem\">Edit Track Information</gui></guiseq> "
-"from the menu, or use your mouse and right click on the files and select "
-"<gui style=\"menuitem\">Edit Track Information</gui>."
+"you want to update and hit the <key>E</key>, choose <guiseq><gui>Edit</"
+"gui><gui>Edit Track Information</gui></guiseq> from the menu, or use your "
+"mouse and right click on the files and select <gui>Edit Track Information</"
+"gui>."
msgstr ""
-#: C/manage-tags.page:49(p)
+#: 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:53(gui)
+#: C/manage-tags.page:63(gui)
msgid "Track Title"
msgstr ""
-#: C/manage-tags.page:54(gui)
+#: C/manage-tags.page:64(gui)
msgid "Track Artist"
msgstr ""
-#: C/manage-tags.page:55(gui)
+#: C/manage-tags.page:65(gui)
msgid "Album Title"
msgstr ""
-#: C/manage-tags.page:56(gui)
+#: C/manage-tags.page:66(gui)
msgid "Genre"
msgstr ""
-#: C/manage-tags.page:57(gui)
+#: C/manage-tags.page:67(gui)
msgid "Track Number"
msgstr ""
-#: C/manage-tags.page:58(gui)
+#: C/manage-tags.page:68(gui)
msgid "Disc Number"
msgstr ""
-#: C/manage-tags.page:59(gui) C/manage-playlists.page:107(gui)
+#: C/manage-tags.page:69(gui) C/manage-playlists.page:109(gui)
msgid "Year"
msgstr ""
-#: C/manage-tags.page:62(p)
+#: 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 <gui>Track Title</gui> field "
-"or press the <gui style=\"button\">Forward</gui> button at the bottom of the "
-"dialog when finished with each song. When you have completed editing all "
-"metadata, press <gui style=\"button\">Save</gui>."
+"or press the <gui>Forward</gui> button at the bottom of the dialog when "
+"finished with each song. When you have completed editing all metadata, press "
+"<gui>Save</gui>."
msgstr ""
-#: C/manage-playlists.page:9(desc)
+#: C/manage-playlists.page:10(desc)
msgid "Create and manage playlists."
msgstr ""
-#: C/manage-playlists.page:18(title) C/keyboard-shortcuts.page:73(title)
+#: C/manage-playlists.page:19(title) C/keyboardshortcuts.page:69(title)
msgid "Playlists"
msgstr ""
-#: C/manage-playlists.page:20(p)
+#: 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 "
@@ -1396,18 +862,18 @@ msgid ""
"playlist so you can take it with you on the go."
msgstr ""
-#: C/manage-playlists.page:26(p)
+#: C/manage-playlists.page:28(p)
msgid ""
-"<app>Banshee</app> supports normal playlists, which include songs you add to "
-"the playlist, as well as smart playlists. Smart Playlists are automatically "
+"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:32(title)
-msgid "Normal playlists"
+#: C/manage-playlists.page:34(title)
+msgid "Normal Playlists"
msgstr ""
-#: C/manage-playlists.page:34(p)
+#: 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 "
@@ -1415,31 +881,29 @@ msgid ""
"you exercise."
msgstr ""
-#: C/manage-playlists.page:39(p)
+#: C/manage-playlists.page:42(p)
msgid ""
"You can create a new playlist by pressing <keyseq><key>Control</key><key>N</"
-"key></keyseq>, from the menu choosing <guiseq><gui style=\"menu\">Media</"
-"gui><gui style=\"menuitem\">New Playlist</gui></guiseq> or by selecing the "
-"track(s) you would like to add to the playlist. Select the track(s), right "
-"click them, and choose <guiseq><gui style=\"menuitem\">Add to Playlist</"
-"gui><gui style=\"menuitem\">New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you drag it over "
-"<gui>Music</gui>, a new option <gui style=\"menuitem\"><em>New Playlist</"
-"em></gui> will appear and you can drop the track(s) over <gui style="
-"\"menuitem\"><em>New Playlist</em></gui> to add them to the playlist. You "
-"can repeat this process until you have added all the tracks you want in the "
-"playlist."
+"key></keyseq>, from the menu choosing <guiseq><gui>Media</gui><gui>New "
+"Playlist</gui></guiseq> or by selecing the track(s) you would like to add to "
+"the playlist. Select the track(s), right click them, and choose "
+"<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. 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 <gui>Music</gui>. As you "
+"drag it over <gui>Music</gui>, a new option <gui><em>New Playlist</em></gui> "
+"will appear and you can drop the track(s) over <gui><em>New Playlist</em></"
+"gui> 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 <gui style=\"menuitem\">Rename Playlist</gui> and "
-"enter the name of your playlist."
+"the playlist and press <gui>Rename Playlist</gui> and enter the name of your "
+"playlist."
msgstr ""
-#: C/manage-playlists.page:60(p)
+#: 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 "
@@ -1448,17 +912,16 @@ msgid ""
"blank and then re-order the playlist."
msgstr ""
-#: C/manage-playlists.page:66(p)
+#: C/manage-playlists.page:68(p)
msgid ""
"To remove a track from the playlist, select the track(s) you wish to remove. "
-"Press the <key>Delete</key>, from the menu choose <guiseq><gui style=\"menu"
-"\">Edit</gui><gui style=\"menuitem\">Remove from Playlist</gui></guiseq> or "
-"right click the track(s) with your mouse and press <gui style=\"menuitem"
-"\">Remove from Playlist</gui>."
+"Press the <key>Delete</key>, from the menu choose <guiseq><gui>Edit</"
+"gui><gui>Remove from Playlist</gui></guiseq> or right click the track(s) "
+"with your mouse and press <gui>Remove from Playlist</gui>."
msgstr ""
#: C/manage-playlists.page:76(title)
-msgid "Smart playlist"
+msgid "Smart Playlist"
msgstr ""
#: C/manage-playlists.page:78(p)
@@ -1468,229 +931,186 @@ msgid ""
"a specific artist, favorites or more."
msgstr ""
-#: C/manage-playlists.page:82(p)
+#: C/manage-playlists.page:83(p)
msgid ""
-"To create a new Smart Playlist, from the menu choose <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">New Smart Playlist</gui></"
-"guiseq>. 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:"
+"To create a new Smart Playlist, from the menu choose <guiseq><gui>Media</"
+"gui><gui>New Smart Playlist</gui></guiseq>. 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:92(p) C/manage-playlists.page:108(gui)
+#: 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:93(p)
+#: C/manage-playlists.page:94(p)
msgid "is not"
msgstr ""
-#: C/manage-playlists.page:94(p)
+#: C/manage-playlists.page:95(p)
msgid "less than"
msgstr ""
-#: C/manage-playlists.page:95(p)
+#: C/manage-playlists.page:96(p)
msgid "more than"
msgstr ""
-#: C/manage-playlists.page:96(p)
+#: C/manage-playlists.page:97(p)
msgid "at most"
msgstr ""
-#: C/manage-playlists.page:97(p)
+#: C/manage-playlists.page:98(p)
msgid "at least"
msgstr ""
-#: C/manage-playlists.page:100(p)
+#: C/manage-playlists.page:101(p)
msgid ""
-"You can also press the <gui style=\"button\">+</gui> 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:"
+"You can also press the <gui>+</gui> 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:109(p)
+#: C/manage-playlists.page:110(gui)
msgid "2010"
-msgstr "2010"
+msgstr ""
-#: C/manage-playlists.page:112(gui)
+#: C/manage-playlists.page:113(gui)
msgid "Rating"
msgstr ""
#: C/manage-playlists.page:114(p)
-msgid "5 stars"
+msgid "<gui/>5 stars"
msgstr ""
#: C/manage-playlists.page:118(p)
msgid ""
"You can then optionally select how many songs are included by pressing the "
-"<gui style=\"checkbox\">Limit to</gui> checkbox and choosing the number of "
-"songs to be included."
+"<gui>Limit</gui> to checkbox and choosing the number of songs to be included."
msgstr ""
-#: C/manage-playlists.page:122(p)
+#: C/manage-playlists.page:123(p)
msgid ""
-"<app>Banshee</app> also includes smart playlists already created for you. "
-"Press the <gui style=\"button\">Open in editor</gui> button to view how the "
-"playlist created was or to modify it. If you press <gui style=\"button"
-"\">Create and save</gui> the playlist will be automatically generated and "
-"saved for you. The following playlists are included:"
+"Banshee also includes smart playlists already created for you. Press the "
+"<gui>Open in editor</gui> button to view how the playlist created was or to "
+"modify it. If you press <gui>Create and save</gui> the playlist will be "
+"automatically generated and saved for you. The following playlists are "
+"included:"
msgstr ""
-#: C/manage-playlists.page:130(title)
-#| msgid "<app>Banshee</app> library interface"
-msgid "<app>Banshee</app> smart playlists"
-msgstr "<app>Banshee</app> 智能播放列表"
+#: 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:135(p)
+#: C/manage-playlists.page:133(p)
msgid "Recent Favorites (Songs listened to often in the past week)"
msgstr ""
-#: C/manage-playlists.page:138(p)
+#: C/manage-playlists.page:135(p)
msgid "Recently Added (Songs imported within the last week)"
msgstr ""
-#: C/manage-playlists.page:141(p)
+#: C/manage-playlists.page:136(p)
msgid "Unheard (Songs that have not been played or skipped)"
msgstr ""
-#: C/manage-playlists.page:144(p)
+#: C/manage-playlists.page:137(p)
msgid "Neglected Favorites (Favorites not played in over two months)"
msgstr ""
-#: C/manage-playlists.page:147(p)
+#: C/manage-playlists.page:139(p)
msgid "700 MB of Favorites (A data CD worth of favorite songs)"
msgstr ""
-#: C/manage-playlists.page:150(p)
+#: C/manage-playlists.page:140(p)
msgid "80 Minutes of Favorites (An audio CD worth of favorite songs)"
msgstr ""
-#: C/manage-playlists.page:153(p)
+#: 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:28(title)
+#: C/lastfm.page:24(title)
msgid "Last.fm"
-msgstr "Last.fm"
+msgstr ""
-#: C/lastfm.page:30(p)
+#: 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 "
-"<app>Banshee</app> for free. If you subscribe as a paying member, you can "
-"also listen to streaming music from Last.fm in various music clients, "
-"including <app>Banshee</app>. Last.fm offers multiple channels to stream, "
-"including recommended music for you based on your listening habits, your "
-"favorites and more."
+"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."
msgstr ""
-#: C/lastfm.page:40(title)
+#: C/lastfm.page:35(title)
msgid "Enable Last.fm"
msgstr ""
-#: C/lastfm.page:42(p)
+#: C/lastfm.page:36(p)
msgid ""
"To get the most out of Last.fm, you will want to create a Last.fm profile. "
"Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> "
-"to create an account or choose <guiseq><gui style=\"menu\">Edit</gui><gui "
-"style=\"menuitem\">Preferences</gui></guiseq> from the <app>Banshee</app> "
-"menu. Once in the preferences select the <gui style=\"tab\">Source Specific</"
-"gui> tab, press the <gui style=\"menu\">Source</gui> drop down menu, choose "
-"<gui style=\"menuitem\">Last.fm</gui> and finally select the <em>Sign up for "
-"Last.fm</em> link."
-msgstr ""
-
-#: C/lastfm.page:53(p)
-msgid ""
-"To enable <app>Banshee</app> to report the songs you play on your computer "
-"to Last.fm, sign in to Last.fm in <app>Banshee</app> in the <gui style=\"tab"
-"\">Source Specific</gui> preferences. Enter your username and press the <gui "
-"style=\"button\">Log in to Last.fm</gui> button. You will be directed to a "
-"Last.fm webpage in your browser to grant <app>Banshee</app> access. Press "
-"the <gui style=\"button\">Yes, allow access</gui> link in your browser and "
-"you will be redirected to a webpage that displays a message that "
-"<app>Banshee</app> now has access to Last.fm. Return to <app>Banshee</app> "
-"and press the <gui style=\"button\">Finish Logging In</gui> button to "
-"complete the process."
-msgstr ""
-
-#: C/lastfm.page:68(title)
-msgid "Enable Last.fm song reporting from <app>Banshee</app>"
+"to create an account or choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq> from the Banshee menu. Then press the <gui>Source Specific</"
+"gui> tab and press the <gui>Source</gui> drop down menu and choose <gui>Last."
+"fm</gui> and select the <em>Sign up for Last.fm</em> link."
msgstr ""
-#: C/lastfm.page:70(p)
+#: C/lastfm.page:45(p)
msgid ""
-"After you have successfully linked <app>Banshee</app> to your Last.fm "
-"profile you must ensure that you have enabled <app>Banshee</app> to report "
-"your songs. To enable <app>Banshee</app> to report the songs to your Last.fm "
-"profile go to <app>Banshee</app> and select preferences, then select the "
-"<gui style=\"tab\">Source Specific</gui> tab, select <gui style=\"menuitem"
-"\">Last.fm</gui> from the dropdown, and press the <gui style=\"checkbox"
-"\">Enable Song Reporting From <app>Banshee</app></gui> checkbox. If you have "
-"an active internet connection <app>Banshee</app> 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 (although we recommend that you use the Metadata Fixer extension "
-"to correct your files instead)."
-msgstr ""
-
-#: C/lastfm.page:87(title)
-msgid "Enable Last.fm song reporting from your device"
+"To enable Banshee to report the songs you play on your computer to Last.fm, "
+"sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences. "
+"Enter your username and press the <gui>Log in to Last.fm</gui> button. You "
+"will be directed to a Last.fm webpage in your browser to grant Banshee "
+"access. Press the <gui>Yes, allow access</gui> 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 <gui>Finish Logging In</"
+"gui> button to complete the process."
msgstr ""
-#: C/lastfm.page:89(p)
-msgid ""
-"After successfully linking <app>Banshee</app> to your Last.fm profile and "
-"enabling <app>Banshee</app> to report songs to Last.fm you can also enable "
-"scrobbling from a connected device. <app>Banshee</app> will, upon connection "
-"of your device, attempt to scrobble the songs you have played since the "
-"device was last connected and submit them to Last.fm."
+#: C/lastfm.page:58(title)
+msgid "Enable Last.fm Song Reporting"
msgstr ""
-#: C/lastfm.page:95(p)
+#: C/lastfm.page:59(p)
msgid ""
-"To enable scrobbling of a connected device go to <app>Banshee</app> and "
-"select Preferences, select the <gui style=\"tab\">Source Specific</gui> tab, "
-"select <gui style=\"menuitem\">Last.fm</gui> from the dropdown, and press "
-"the <gui style=\"checkbox\">Enable Song Reporting From Device</gui> "
-"checkbox. If you have an active internet connection <app>Banshee</app> will, "
-"upon connection of your device, now attempt to gather information regarding "
-"the songs that you have played since it was last connected."
+"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 "
+"<gui>Source Specific</gui> tab in Banshee's preferences, press the "
+"<gui>Enable Song Reporting</gui> 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:103(p)
-msgid ""
-"As with regular <app>Banshee</app> scrobbling submissions Last.fm will "
-"automatically update your music metadata if any of your artist, title, or "
-"album information is incorrect (although we again recommend that you use the "
-"Metadata Fixer extension to correct your files instead)."
+#: C/lastfm.page:72(title)
+msgid "Listen to Last.fm Radio"
msgstr ""
-#: C/lastfm.page:108(p)
-msgid ""
-"Please note that currently <app>Banshee</app> only supports this feature "
-"with Apple products that are supported by the AppleDevice extension."
-msgstr ""
-
-#: C/lastfm.page:114(title)
-msgid "Listen to Last.fm radio"
-msgstr ""
-
-#: C/lastfm.page:116(p)
+#: 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 "
@@ -1699,185 +1119,196 @@ msgid ""
"you've loved or tagged."
msgstr ""
-#: C/lastfm.page:122(p)
+#: C/lastfm.page:80(p)
msgid ""
-"In the sources panel on the left hand side of <app>Banshee</app>, 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 <app>Banshee</app> will communicate "
-"with Last.fm to populate songs for that radio station. Press the <gui style="
-"\"button\">Play</gui> button in <app>Banshee</app> or <key>Space</key> to "
-"start streaming a Last.fm radio station. You can also press the <gui style="
-"\"button\">Next</gui> button in <app>Banshee</app>, <key>N</key> or choose "
-"<guiseq><gui style=\"menu\">Playback</gui><gui style=\"menuitem\">Next</"
-"gui></guiseq> to play the next song in your radio station queue."
+"In Banshee's sources pane 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 <gui>Play</gui> button in Banshee or "
+"<key>Spacebar</key> to start streaming a Last.fm radio station. You can also "
+"press the <gui>Next</gui> button in Banshee, <key>N</key> or choose "
+"<guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in "
+"your radio station queue."
msgstr ""
-#: C/keyboard-shortcuts.page:7(desc)
-msgid "Keyboard shortcuts"
+#: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title)
+#: C/advanced.page:29(title)
+msgid "Keyboard Shortcuts"
msgstr ""
-#: C/keyboard-shortcuts.page:24(title)
-msgid "Control <app>Banshee</app> using keyboard shortcuts"
+#: C/keyboardshortcuts.page:24(title)
+msgid "Control Banshee using Keyboard Shortcuts"
msgstr ""
-#: C/keyboard-shortcuts.page:27(title)
-msgid "Playback control"
+#: C/keyboardshortcuts.page:28(title)
+msgid "Playback Control"
msgstr ""
-#: C/keyboard-shortcuts.page:31(gui) C/keyboard-shortcuts.page:55(gui)
-#: C/keyboard-shortcuts.page:77(gui) C/keyboard-shortcuts.page:94(gui)
-#: C/keyboard-shortcuts.page:111(gui)
+#: 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/keyboard-shortcuts.page:32(gui) C/keyboard-shortcuts.page:56(gui)
-#: C/keyboard-shortcuts.page:78(gui) C/keyboard-shortcuts.page:95(gui)
-#: C/keyboard-shortcuts.page:112(gui)
+#: 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/keyboard-shortcuts.page:35(key)
-msgid "Space"
+#: C/keyboardshortcuts.page:35(p)
+msgid "Space Bar"
msgstr ""
-#: C/keyboard-shortcuts.page:36(p)
+#: C/keyboardshortcuts.page:35(p)
msgid "Play or Pause the current song"
msgstr ""
-#: C/keyboard-shortcuts.page:39(key) C/keyboard-shortcuts.page:81(key)
+#: C/keyboardshortcuts.page:38(p) C/keyboardshortcuts.page:76(key)
msgid "N"
-msgstr "N"
+msgstr ""
-#: C/keyboard-shortcuts.page:40(p)
+#: C/keyboardshortcuts.page:38(p)
msgid "Play the next song"
msgstr ""
-#: C/keyboard-shortcuts.page:43(key)
+#: C/keyboardshortcuts.page:41(p)
msgid "B"
-msgstr "B"
+msgstr ""
-#: C/keyboard-shortcuts.page:44(p)
+#: C/keyboardshortcuts.page:41(p)
msgid "Play the previous song"
msgstr ""
-#: C/keyboard-shortcuts.page:51(title)
-msgid "Library interaction"
+#: C/keyboardshortcuts.page:49(title)
+msgid "Library Interaction"
msgstr ""
-#: C/keyboard-shortcuts.page:59(p)
-msgid "<key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq>"
-msgstr "<key>/</key>,<keyseq><key>Control</key><key>F</key></keyseq>"
+#: C/keyboardshortcuts.page:56(p)
+msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
+msgstr ""
-#: C/keyboard-shortcuts.page:61(p)
+#: C/keyboardshortcuts.page:56(p)
msgid "Move the focus to the search box"
msgstr ""
-#: C/keyboard-shortcuts.page:64(key) C/keyboard-shortcuts.page:81(key)
-#: C/keyboard-shortcuts.page:119(key) C/keyboard-shortcuts.page:123(key)
-#: C/keyboard-shortcuts.page:128(key) C/keyboard-shortcuts.page:133(key)
-#: C/keyboard-shortcuts.page:139(key) C/keyboard-shortcuts.page:145(key)
+#: C/keyboardshortcuts.page:60(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 "Control"
+msgstr ""
-#: C/keyboard-shortcuts.page:64(key)
+#: C/keyboardshortcuts.page:60(key)
msgid "I"
-msgstr "I"
+msgstr ""
-#: C/keyboard-shortcuts.page:65(p)
+#: C/keyboardshortcuts.page:61(p)
msgid "Open import media dialog"
msgstr ""
-#: C/keyboard-shortcuts.page:82(p)
+#: C/keyboardshortcuts.page:76(p)
msgid "Create New Playlist"
msgstr ""
-#: C/keyboard-shortcuts.page:98(key)
+#: C/keyboardshortcuts.page:86(title) C/add-podcast.page:26(title)
+msgid "Podcasts"
+msgstr ""
+
+#: C/keyboardshortcuts.page:93(key)
msgid "Y"
-msgstr "Y"
+msgstr ""
-#: C/keyboard-shortcuts.page:99(p)
+#: C/keyboardshortcuts.page:93(p)
msgid "Mark the selected episodes as old"
msgstr ""
-#: C/keyboard-shortcuts.page:107(title)
+#: C/keyboardshortcuts.page:103(title)
msgid "Interface"
msgstr ""
-#: C/keyboard-shortcuts.page:115(key)
+#: C/keyboardshortcuts.page:110(key)
msgid "F"
-msgstr "F"
+msgstr ""
-#: C/keyboard-shortcuts.page:116(p)
+#: C/keyboardshortcuts.page:110(p)
msgid "Toggle full-screen mode"
msgstr ""
-#: C/keyboard-shortcuts.page:119(key) C/keyboard-shortcuts.page:123(key)
+#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
msgid "A"
-msgstr "A"
+msgstr ""
-#: C/keyboard-shortcuts.page:120(p)
+#: C/keyboardshortcuts.page:114(p)
msgid "Select all songs in playlist view"
msgstr ""
-#: C/keyboard-shortcuts.page:123(key)
+#: C/keyboardshortcuts.page:118(key)
msgid "Shift"
-msgstr "Shift"
+msgstr ""
-#: C/keyboard-shortcuts.page:125(p)
+#: C/keyboardshortcuts.page:119(p)
msgid "Unselect all songs in playlist view"
msgstr ""
-#: C/keyboard-shortcuts.page:128(key)
+#: C/keyboardshortcuts.page:123(key)
msgid "W"
-msgstr "W"
+msgstr ""
-#: C/keyboard-shortcuts.page:129(p)
-msgid ""
-"Hide <app>Banshee</app> Window (Requires Notification Area Plug-in Enabled)"
+#: C/keyboardshortcuts.page:123(p)
+msgid "Hide Banshee Window (Requires Notification Area Plug-in Enabled"
msgstr ""
-#: C/keyboard-shortcuts.page:133(key)
+#: C/keyboardshortcuts.page:127(key)
msgid "Left Mouse Button"
msgstr ""
-#: C/keyboard-shortcuts.page:135(p)
+#: C/keyboardshortcuts.page:128(p)
msgid "Play Previous Song (Requires Notification Area Plug-in Enabled"
msgstr ""
-#: C/keyboard-shortcuts.page:139(key)
+#: C/keyboardshortcuts.page:132(key)
msgid "Right Mouse Button"
msgstr ""
-#: C/keyboard-shortcuts.page:141(p)
+#: C/keyboardshortcuts.page:133(p)
msgid "Play Next Song (Requires Notification Area Plug-in Enabled"
msgstr ""
-#: C/keyboard-shortcuts.page:145(key)
+#: C/keyboardshortcuts.page:137(key)
msgid "Middle Mouse Button"
msgstr ""
-#: C/keyboard-shortcuts.page:147(p)
+#: 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 <app>iTunes</app> media player."
+msgstr ""
+
+#: C/itunes-import.page:12(title)
+msgid "Import your <app>iTunes</app> library"
+msgstr ""
+
#: C/introduction.page:8(desc)
-#| msgid "Introduction to the Banshee User Interface"
-msgid "Introduction to the <app>Banshee</app> media player."
-msgstr "Banshee 媒体播放器介绍"
+msgid "Introduction to the <app>Banshee Media Player</app>."
+msgstr ""
-#: C/introduction.page:26(title)
+#: C/introduction.page:24(title)
msgid "Introduction"
msgstr ""
-#: C/introduction.page:28(p)
+#: C/introduction.page:26(p)
msgid ""
"<app>Banshee</app> is a media player that allows you to play your music, "
-"videos and other media, as well as sync it with portable devices to take "
-"your media on the go."
+"videos, and other media as well sync it with portable devices to take your "
+"media on the go."
msgstr ""
-#: C/introduction.page:32(p)
+#: C/introduction.page:31(p)
msgid ""
"<app>Banshee</app> includes features to import your media, manage its "
"metadata, and play your music and videos."
@@ -1885,110 +1316,108 @@ msgstr ""
#: C/introduction.page:35(p)
msgid ""
-"<app>Banshee</app> also helps you sync your music and videos to popular "
-"portable devices, such as digital audio players and smartphones. "
-"<app>Banshee</app> supports popular devices including most iPods, Sandisk "
-"and Creative MP3 players, and Android powered phones."
+"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:31(title)
-#| msgid "<app>Banshee</app> library interface"
-msgid "<app>Banshee</app> media player"
-msgstr "<app>Banshee</app> 媒体播放器"
-
-#: C/index.page:34(title)
-msgid "Add, remove & play"
+#: C/index.page:24(title)
+msgid "Add, Remove & Play"
msgstr ""
-#: C/index.page:38(title)
-msgid "Manage & sort"
+#: C/index.page:28(title)
+msgid "Manage & Sort"
msgstr ""
-#: C/index.page:42(title)
+#: C/index.page:32(title)
msgid "Sync your media with a portable music player"
msgstr ""
-#: C/index.page:46(title)
-msgid "Add additional functionality to <app>Banshee</app>"
+#: C/index.page:36(title)
+msgid "Add additional functionality to Banshee"
msgstr ""
-#: C/index.page:50(title)
+#: C/index.page:40(title)
msgid "Advanced options and help"
msgstr ""
-#: C/import.page:7(desc)
-msgid ""
-"Add music and videos from your computer to your <app>Banshee</app> library."
+#: 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 ""
-#: C/import.page:16(name)
+#: C/import.page:15(name)
msgid "Shaun McCance"
-msgstr "Shaun McCance"
+msgstr ""
-#: C/import.page:17(email)
+#: C/import.page:16(email)
msgid "shaunm at gnome.org"
-msgstr "shaunm at gnome.org"
+msgstr ""
-#: C/import.page:26(title)
+#: C/import.page:21(title)
msgid "Import music & videos"
msgstr ""
-#: C/import.page:28(p)
+#: C/import.page:23(p)
msgid ""
-"You can import music and videos stored on your computer into <app>Banshee</"
-"app>. Imported files appear in your sources and can be edited and managed "
-"like any other media in <app>Banshee</app>."
+"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 ""
-#: C/import.page:32(p)
+#: C/import.page:27(p)
msgid ""
-"To import music or video files on your computer, choose <guiseq><gui style="
-"\"menu\">Media</gui><gui style=\"menuitem\">Import Media</gui></guiseq>. A "
-"dialog wil appear with a number of choices."
+"To import music or video files on your computer, choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq>. A dialog will appear with a number of "
+"choices."
msgstr ""
-#: C/import.page:37(p)
+#: C/import.page:31(p)
msgid ""
"Plugins may add additional import choices. See <link xref=\"#plugins\"/> "
"below."
msgstr ""
-#: C/import.page:43(gui)
+#: C/import.page:37(gui)
msgid "Local Folders"
msgstr ""
-#: C/import.page:44(p)
+#: 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 ""
-#: C/import.page:49(gui)
+#: C/import.page:43(gui)
msgid "Local Files"
msgstr ""
-#: C/import.page:50(p)
+#: 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:55(gui)
+#: C/import.page:49(gui)
msgid "Home Folder"
msgstr ""
-#: C/import.page:56(p)
+#: 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:60(gui)
+#: C/import.page:54(gui)
msgid "Videos From Photos Folder"
msgstr ""
-#: C/import.page:61(p)
+#: C/import.page:55(p)
msgid ""
"Many digital cameras can take short videos, and photo-management "
"applications often download these videos directly into your Photos folder. "
@@ -1996,118 +1425,131 @@ msgid ""
"folder."
msgstr ""
-#: C/import.page:69(p)
+#: 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 ""
-#: C/import.page:74(title)
-msgid "Import from a playlist"
+#: C/import.page:68(title)
+msgid "Import from a Playlist"
msgstr ""
-#: C/import.page:76(p)
+#: C/import.page:69(p)
msgid ""
"You can also import music from playlists. Most playlist files end in "
-"<em>m3u</em>. To import from a playlist, from the <app>Banshee</app> menu "
-"choose <guiseq><gui style=\"menu\">Media</gui><gui style=\"menuitem\">Import "
-"Playlist</gui></guiseq> and locate the playlist file in your folder, select "
-"it and press <gui style=\"button\">Import</gui>."
+"<em>m3u</em>. To import from a playlist, from the Banshee menu choose "
+"<guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and locate the "
+"playlist file in your folder, select it and press <gui>Import</gui>."
msgstr ""
-#: C/import.page:86(title)
-msgid "Additional import sources"
+#: C/import.page:78(title)
+msgid "Additional Import Sources"
msgstr ""
-#: C/import.page:88(p)
+#: 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 ""
#: C/extensions.page:8(desc)
-msgid "Add additional functionality to <app>Banshee</app>."
+msgid "Add additional functionality to Banshee."
msgstr ""
#: C/extensions.page:23(title)
-#| msgid "<app>Banshee</app> library interface"
-msgid "<app>Banshee</app> extensions"
-msgstr "<app>Banshee</app> 扩展"
+msgid "Banshee Extensions"
+msgstr ""
#: C/extensions.page:27(title)
-msgid "Official <app>Banshee</app> extensions"
+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:30(title)
-msgid "Manage extensions for <app>Banshee</app>"
+#: C/extensions.page:36(title)
+msgid "Add community built extensions for Banshee"
msgstr ""
-#: C/amazon.page:8(desc)
+#: 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:28(title)
-msgid "Amazon MP3 store"
-msgstr "Amazon MP3 store"
+#: C/amazon.page:24(title)
+msgid "Amazon MP3 Store"
+msgstr ""
-#: C/amazon.page:30(p)
+#: C/amazon.page:26(p)
msgid ""
-"<app>Banshee</app> 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 <app>Banshee</app>. 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 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:37(p)
+#: C/amazon.page:34(p)
msgid ""
-"<app>Banshee</app> uses an Amazon affiliate code for all music purchases. "
-"All money made via this affiliate code is donated to the GNOME Foundation."
+"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:43(title)
+#: C/amazon.page:40(title)
msgid "Purchase Amazon MP3s in your web browser"
msgstr ""
-#: C/amazon.page:45(p)
+#: C/amazon.page:42(p)
msgid ""
-"Music purchased from the Amazon MP3 store can be automatically downloaded "
-"and imported into <app>Banshee</app>. <app>Banshee</app> 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 <app>Banshee</app> "
-"will automatically open it and begin the download and import the music."
+"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:54(title)
-msgid "Buy Amazon MP3s in <app>Banshee</app>"
+#: C/amazon.page:51(title)
+msgid "Buy Amazon MP3s in Banshee"
msgstr ""
-#: C/amazon.page:56(p)
+#: C/amazon.page:53(p)
msgid ""
-"You can also search for songs on Amazon within <app>Banshee</app>. Choose "
-"the Amazon MP3 Store from the <app>Banshee</app> 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. <app>Banshee</app> will automatically download and "
-"import your purchase into the library."
+"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."
msgstr ""
-#: C/amazon.page:66(title)
+#: C/amazon.page:63(title)
msgid "Import Amazon MP3s manually"
msgstr ""
-#: C/amazon.page:68(p)
+#: 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 <app>Banshee</app> choose <guiseq><gui "
-"style=\"menu\">Media</gui><gui style=\"menuitem\">Import Media</gui></"
-"guiseq> from the menu and select the *.amz file to be imported. "
-"<app>Banshee</app> will then open this file and connect to the Amazon MP3 "
-"store to begin the download."
+"purchased manually from Amazon, in Banshee choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq> 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:78(p)
+#: 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 "
@@ -2116,34 +1558,159 @@ msgid ""
"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 broadcasting 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 <gui>Add Station</gui> in "
+"the upper right hand corner of Banshee or, from the menu, choose "
+"<guiseq><gui>Media</gui><gui>Add Station</gui></guiseq>."
+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 <gui>Copy Link</gui>."
+msgstr ""
+
+#: C/add-radio.page:54(p)
+msgid ""
+"Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
+"kind of music the internet radio station plays from the available drop down "
+"selections. You will then need to enter the <gui>Station Name</gui>. Enter a "
+"name for the radio station. Then press tab or use your mouse to select the "
+"<gui>Stream URL</gui> field to paste the URL of the radio station. Using "
+"your mouse right click and choose <gui>Paste</gui> or press "
+"<keyseq><key>Control</key><key>V</key></keyseq>."
+msgstr ""
+
+#: C/add-radio.page:62(p)
+msgid ""
+"You can optionally also fill out the fields for <gui>Station Creator</gui>, "
+"<gui>Description</gui>, and <gui>Rating</gui>."
+msgstr ""
+
+#: C/add-radio.page:66(p)
+msgid ""
+"Then press <gui>Save</gui> 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 <gui>Copy link</gui>."
+msgstr ""
+
+#: C/add-podcast.page:53(p)
+msgid ""
+"In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the upper "
+"right hand corner, from the menu choose <guiseq><gui>Media</gui><gui> "
+"Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
+"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
+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 "<gui>Name</gui>: (Name of the specific episode)"
+msgstr ""
+
+#: C/add-podcast.page:74(p)
+msgid "<gui>Podcast</gui>: (Name of the Podcast)"
+msgstr ""
+
+#: C/add-podcast.page:75(p)
+msgid "<gui>Published</gui> (Date the episode was published or released)"
+msgstr ""
+
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
msgid "translator-credits"
-msgstr "longxin <longxin1991 at gmail.com>, 2011\n"
-"Techlive Zheng <techlivezheng at gmail.com>, 2012\n"
-"dyzdyz010 <dyzdyz010 at sina.com>, 2012"
-
-#~ msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
-#~ msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
-
-#~ msgid ""
-#~ "To change Now Playing to hide the Banshee user interface and use the full "
-#~ "screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</"
-#~ "gui> button in the upper right hand corner of Banshee, or choose "
-#~ "<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> to start Fullscreen "
-#~ "mode."
-#~ msgstr ""
-#~ "要改变正在播放来隐藏 Banshee 的用户界面并使用全屏模式，你可以按 <key>F</"
-#~ "key>，按 在 Banshee 右上角的<gui>全屏</gui>键，或者选择 <guiseq><gui>查看"
-#~ "</gui><gui>全屏</gui></guiseq> 来选择全屏模式。"
-
-#~ msgid "Sync Your Entire Library"
-#~ msgstr "同步你的整个库"
-
-#, fuzzy
-#~ msgid "After you have added a Podcast feed, Banshee will display:"
-#~ msgstr "在您订阅了一个播客之后，Banshee将显示："
-
-#, fuzzy
-#~ msgid "<gui>Name</gui>: (Name of the specific episode)"
-#~ msgstr "<gui>名称</gui>：（特定条目的名称）"
+msgstr ""
diff --git a/libbanshee/Makefile.in b/libbanshee/Makefile.in
index 6839f0e..b3e85e8 100644
--- a/libbanshee/Makefile.in
+++ b/libbanshee/Makefile.in
@@ -245,15 +245,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -262,6 +271,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -276,6 +287,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -283,6 +296,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
index 825c8ef..20804c4 100644
--- a/libbanshee/banshee-player-missing-elements.c
+++ b/libbanshee/banshee-player-missing-elements.c
@@ -166,7 +166,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
#ifdef GDK_WINDOWING_X11
if (player->window != NULL) {
gst_install_plugins_context_set_xid (player->install_plugins_context,
- GDK_WINDOW_XID (player->window));
+ GDK_WINDOW_XWINDOW (player->window));
}
#endif
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
index 4dae104..ed845f3 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -360,12 +360,9 @@ _bp_pipeline_construct (BansheePlayer *player)
player->volume = gst_element_factory_make ("volume", NULL);
g_return_val_if_fail (player->volume != NULL, FALSE);
-// gstreamer on OS X does not call the callback upon initialization (see bgo#680917)
-#ifdef __APPLE__
// call the volume changed callback once so the volume from the pipeline is
// set in the player object
bp_volume_changed_callback (player->playbin, NULL, player);
-#endif
audiosinkqueue = gst_element_factory_make ("queue", "audiosinkqueue");
g_return_val_if_fail (audiosinkqueue != NULL, FALSE);
diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
index 673a81d..c655a72 100644
--- a/libbanshee/banshee-player.c
+++ b/libbanshee/banshee-player.c
@@ -232,17 +232,12 @@ bp_set_next_track (BansheePlayer *player, const gchar *uri, gboolean maybe_video
}
P_INVOKE gboolean
-bp_set_position (BansheePlayer *player, guint64 time_ms, gboolean accurate_seek)
+bp_set_position (BansheePlayer *player, guint64 time_ms)
{
g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE);
-
- GstSeekFlags seek_flag = GST_SEEK_FLAG_FLUSH;
- if (accurate_seek) {
- seek_flag |= GST_SEEK_FLAG_ACCURATE;
- }
-
+
if (player->playbin == NULL || !gst_element_seek (player->playbin, 1.0,
- GST_FORMAT_TIME, seek_flag,
+ GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
GST_SEEK_TYPE_SET, time_ms * GST_MSECOND,
GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) {
g_warning ("Could not seek in stream");
diff --git a/ltmain.sh b/ltmain.sh
index b9205ee..0096fe6 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
TIMESTAMP=""
package_revision=1.3337
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 18fbcde..19669bf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,7 +13,6 @@ data/audio-profiles/wavpack.xml.in
data/audio-profiles/wav.xml.in
data/audio-profiles/wma.xml.in
data/desktop-files/common.desktop.in
-data/banshee.appdata.xml.in
libbanshee/banshee-bpmdetector.c
libbanshee/banshee-ripper.c
libbanshee/banshee-transcoder.c
@@ -272,6 +271,7 @@ src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs
src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs
diff --git a/po/ca.po b/po/ca.po
index 44ef1f8..cdf5062 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3835,7 +3835,7 @@ msgstr "C_opyright:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:100
msgid "Set all licenses to this value"
-msgstr "Dóna aquest valor a totes les llicències"
+msgstr "Dóna aquest valor a tots les llicències"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:101
msgid "_License URI:"
@@ -3859,7 +3859,7 @@ msgstr "Lletres"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
-msgstr "Avança fins a la propera cançó i edita el seu títol"
+msgstr "Avança fins la propera cançó i edita el seu títol"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:42
msgid "Sorting"
@@ -4453,7 +4453,7 @@ msgstr "Disponible"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:123
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
msgid "Serial number"
-msgstr "Número de sèrie"
+msgstr "Número de serie"
#. AddDapProperty (Catalog.GetString ("Produced on"), ipod_device.ProductionInfo.DisplayDate);
#. AddDapProperty (Catalog.GetString ("Firmware"), ipod_device.FirmwareVersion);
@@ -4563,7 +4563,7 @@ msgid ""
"Begin synchronizing the device as soon as the device is plugged in or the "
"libraries change."
msgstr ""
-"Comença a sincronitzar el dispositiu tan aviat el dispositiu es connecti o "
+"Comença a sincronitzar el dispositiu tant aviat el dispositiu es connecti o "
"quan les biblioteques canviïn."
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
@@ -6507,7 +6507,7 @@ msgstr ""
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
msgid "_Eject when done importing"
-msgstr "_Expulsa després de la importació"
+msgstr "_Expulsa després de l'importació"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:120
msgid "When an audio CD has been imported, automatically eject it."
@@ -7046,7 +7046,7 @@ msgstr "Subscriviu-vos a podcasts nous"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
msgid ""
"Please enter the URL of the podcast to which you would like to subscribe."
-msgstr "Introduïu l'URL del podcast al qual voleu subscriviu-vos."
+msgstr "Introduïu l'URL del podcast al que voleu subscriviu-vos."
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
msgid "Download all episodes"
@@ -7408,7 +7408,7 @@ msgstr "Aquest usuari no se li permet escoltar la ràdio durant hores puntes d'
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
msgid "Radio station not found"
-msgstr "No s'ha trobat l'emissora de ràdio"
+msgstr "No s'ha trobat la emissora de ràdio"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
msgid "This application is not allowed to make requests to the web services"
diff --git a/po/cs.po b/po/cs.po
index fa30cc6..3c8ca2e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,15 +5,15 @@
# Lukáš Novotný <lukasnov at cvs.gnome.org>, 2005, 2006.
# Jakub Friedl <jfriedl at suse.cz>, 2006, 2007.
# Jiří Eischmann <jiri at eischmann.cz>, 2009.
-# Marek Černocký <marek at manet.cz>, 2010, 2011, 2012, 2013.
+# Marek Černocký <marek at manet.cz>, 2010, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: banshee\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-03 18:04+0000\n"
-"PO-Revision-Date: 2013-10-04 10:50+0200\n"
+"POT-Creation-Date: 2012-08-21 19:53+0000\n"
+"PO-Revision-Date: 2012-09-03 00:09+0200\n"
"Last-Translator: Marek Černocký <marek at manet.cz>\n"
"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
"Language: cs\n"
@@ -21,7 +21,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.6\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
#: ../data/addin-xml-strings.cs:8
@@ -624,15 +623,15 @@ msgid "Audio Quality"
msgstr "Kvalita zvuku"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Multimediální přehrávač"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Multimediální přehrávač Banshee"
@@ -640,34 +639,6 @@ msgstr "Multimediální přehrávač Banshee"
msgid "Play and organize your media collection"
msgstr "Přehrávat a organizovat své multimediální kolekce"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"video;videa;filmy;klipy;série;seriály;přehrávač;dvd;disk;mp3;audio;zvuk;cd;"
-"mtp;přenosný přehrávač;podcast;daap;playlist;seznam skladeb;seznam k "
-"přehrání;ipod;multimédia;kolekce;sbírka;hudba;rádio;stanice;"
-
-#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
-#: ../data/banshee.appdata.xml.in.h:2
-msgid ""
-"Banshee is an open source multimedia management and playback application for "
-"GNOME, Mac and Windows."
-msgstr ""
-"Banshee je svobodná aplikace s otevřeným kódem sloužící ke správě a "
-"přehrávání multimédií v GNOME, na Macu a ve Windows."
-
-#: ../data/banshee.appdata.xml.in.h:3
-msgid ""
-"Play your music and videos. Stay entertained and up to date with podcasts "
-"and video podcasts. Sync your Android, iPod, and other devices. We think "
-"you'll love Banshee!"
-msgstr ""
-"Přehrávejte si svoji hudbu a videa. Mějte k dispozici nepřetržitou zábavu s "
-"vždy aktuálními podcasty a videopodcasty. Synchronizujte vše se svými "
-"zařízeními Android, iPod a dalšími. Věříme, že budete Banshee milovat."
-
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
@@ -795,18 +766,18 @@ msgstr "Nelze vytvořit ovladač na zjišťování BPM."
msgid "Could not initialize GStreamer library"
msgstr "Nelze inicializovat knihovnu GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Neznámá chyba"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Zapnout korekci hlasitosti ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -814,11 +785,11 @@ msgstr ""
"Pro stopy, které mají data ReplayGain, automaticky změnit (normalizovat) "
"hlasitost přehrávání."
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Zapnout přehrávání bez _mezer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -835,7 +806,7 @@ msgstr "Nelze vytvořit transkodér"
msgid "Could not create encoder pipeline : {0}"
msgstr "Nelze vytvořit rouru kodéru: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -914,61 +885,61 @@ msgstr "Stažení aktualizace dokončeno"
msgid "Check for Updates"
msgstr "Zkontrolovat aktualizace"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Možnosti nápovědy"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Zobrazit tuto nápovědu"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Zobrazit volby pro ovládání přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Zobrazit volby pro dotazování přehrávaných skladeb"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Zobrazit volby pro dotazování nástroje pro přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Zobrazit volby pro uživatelské rozhraní"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Zobrazit volby pro vývojáře a ladění"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Zobrazit všechny skupiny voleb"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Zobrazit informace o verzi"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Volby ovládání přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Přehrát následující skladbu, volitelně restartovat, pokud je nastavena "
"hodnota „restart“"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
"Přehrát předchozí skladbu, volitelně restartovat, pokud je nastavena hodnota "
"„restart“"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -976,29 +947,29 @@ msgstr ""
"Pokud se současná skladba přehrává déle než 4 sekundy, tak se spustí znovu "
"od začátku, jinak má stejnou funkci jak --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Automaticky začít přehrávat všechny skladby zařazené ve frontě v příkazové "
"řádce"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Začít přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pozastavit přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Přepnout přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Úplně zastavit přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1006,97 +977,97 @@ msgstr ""
"Povolit nebo zakázat zastavení přehrávání po právě hrané stopě (hodnota by "
"měla být „true“ nebo „false“)"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Nastavit hlasitost přehrávání (0 - 100), relativní hodnoty zadejte pomocí "
"znaménka +/- před číslem"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Přesun na zadanou pozici (v sekundách, desetinné číslo)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Nastavit hodnocení právě přehrávané stopy (0 až 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Volby dotazování přehrávacího jádra"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Aktuální stav přehrávače"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Poslední stav přehrávače"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Zeptat se, jestli může být přehrávač pozastaven"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Zeptat se, jestli může přehrávač přeskakovat"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Hlasitost přehrávače"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Pozice přehrávače v právě přehrávané stopě"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Volby dotazování na metadata přehrávané stopy"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Jméno umělce"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Název alba"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Název skladby"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Délka"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Číslo stopy"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Počet stop"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Číslo disku"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1107,7 +1078,7 @@ msgstr "Číslo disku"
msgid "Year"
msgstr "Rok"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1115,82 +1086,82 @@ msgstr "Rok"
msgid "Rating"
msgstr "Hodnocení"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Bodování"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Datový tok"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Volby uživatelského rozhraní"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Zobrazit uživatelské rozhraní na aktivní pracovní ploše"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Vstoupit do režimu celé obrazovky"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Skrýt uživatelské rozhraní"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Nezobrazovat uživatelské rozhraní, bez ohledu na jakékoliv další volby"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Zobrazit dialogové okno importu médií"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Zobrazit dialogové okno o aplikaci"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Zobrazit dialogové okno otevření umístění"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Zobrazit dialogové okno předvoleb"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Volby ladění a vývoje"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Zapnout obecné ladicí funkce"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Zapnout ladicí výstup SQL dotazů"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Zapnout ladicí výstup Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Určit alternativní databázi, která se má použít"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Vynutit stažení chybějících přebalů"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Určit alternativní klíč, výchozí je /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1198,34 +1169,29 @@ msgstr ""
"Přizpůsobit instanci pro běh bez instalace; tímto se především vytvoří "
"alternativní databáze Mono.Addins v pracovním adresáři"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Úplně zakázat podporu DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr "Přeskočit načítání souboru gtk.css ({0}), pokud existuje"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Přeskočit načítání souboru gtkrc ({0}), pokud existuje"
-#: ../src/Clients/Booter/Booter/Entry.cs:230
-#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Znovu načíst vlastní soubor gtk.css ({0}) každých 5 sekund"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Následující pomocné argumenty jsou neplatné: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Přehrát album"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "_Zařadit do fronty"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1248,16 +1214,16 @@ msgstr "Přehrát _album"
msgid "Add an album to the playlist"
msgstr "Přidat album do seznamu skladeb"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "zbývá {0}"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Přehrát skladbu"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1265,7 +1231,7 @@ msgid "Close"
msgstr "Zavřít"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:492
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Hledat"
@@ -1302,85 +1268,91 @@ msgstr "Žánr"
msgid "Comment"
msgstr "Poznámka"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Neznámé album"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Neznámý umělec"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Neznámé album"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Neznámý název"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Různí umělci"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Umístění proudu nebylo nalezeno"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
msgid "File not found"
msgstr "Soubor nenalezen"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Kodek na přehrávání tohoto typu média není dostupný"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Soubor chráněný pomocí DRM (Digital Rights Management)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Neznámá chyba"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Restartovat podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Přehrát mluvenou knihu od začátku"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Přehrát video od začátku"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Přehrát skladbu od začátku"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Restartovat položku"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Přejít na přehrávaný podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Přejít na přehrávanou mluvenou knihu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Přejít na přehrávané video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Přejít na přehrávanou skladbu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Přejít na přehrávanou položku"
@@ -1400,7 +1372,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Všichni umělci alb ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Všechna alba ({0})"
@@ -1506,7 +1478,7 @@ msgid "Scanning for media"
msgstr "Vyhledávají se média"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Prohledává se…"
@@ -1531,7 +1503,7 @@ msgstr "Právě probíhá import. Chcete jej zastavit?"
msgid "Importing {0} of {1}"
msgstr "Importuje se {0} z {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Opětovné prohledávání {0} z {1}"
@@ -1547,7 +1519,7 @@ msgstr ""
"Vyčkejte prosím, dokud nebude vaše stará databáze Banshee převedena do "
"nového formátu."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Obnovování metadat"
@@ -1623,29 +1595,29 @@ msgstr "Měkký Rock"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Odstranit z kolekce"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Organizace souborů"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
msgid "Co_py files to media folder when importing"
msgstr "Při importu ko_pírovat soubory do složky médií"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "_Aktualizovat názvy souborů a složek"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Přejmenovat soubory a složky podle metadat média"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "Složka {0}"
@@ -1709,28 +1681,29 @@ msgstr "Počet disků"
msgid "Grouping"
msgstr "Seskupení"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Hudba"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Hledat svoji hudbu"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Různé"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "Ř_adit umělcova alba podle roku, ne názvu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1738,89 +1711,89 @@ msgstr[0] "{0} skladba"
msgstr[1] "{0} skladby"
msgstr[2] "{0} skladeb"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Složka s hudbou"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Oblíbené"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Skladby hodnocené čtyřmi a pěti hvězdičkami"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Nedávno oblíbené"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "Skladby často poslouchané poslední týden"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Nedávno přidané"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Skladby importované poslední týden"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Naposledy přehráno"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Naposledy přehrané skladby"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "Neposlouchané"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Skladby, které nebyly dosud hrány nebo byly přeskočeny"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Opomenuté oblíbené"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Oblíbené nehrané poslední dva měsíce"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Nejméně oblíbené"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr "Skladby hodnocené jednou či dvěma hvězdičkami nebo často přeskakované"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "700 MB oblíbených"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Datové CD s oblíbenými skladbami"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "80 minut oblíbených"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Hudební CD s oblíbenými skladbami"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "Nehodnocené"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Skladby, které dosud nebyly hodnocené"
@@ -1991,8 +1964,8 @@ msgstr "Vymazat seznam skladeb"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nový seznam skladeb"
@@ -2595,7 +2568,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
msgid "Unknown"
msgstr "Neznámý"
@@ -2622,7 +2595,7 @@ msgid "Delete Smart Playlist"
msgstr "Odstranit chytrý seznam skladeb"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Všechny žánry ({0})"
@@ -2679,7 +2652,7 @@ msgstr "Chyba"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Podrobnosti"
@@ -2779,12 +2752,12 @@ msgid "Show:"
msgstr "Zobrazit:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Vše"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Aktivované"
@@ -2820,8 +2793,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} z {1}"
@@ -2882,20 +2855,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bitů"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Zvětšit nebo zmenšit kontextový panel"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Skrýt kontextový panel"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Čeká se, až začne přehrávání…"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Načítá se…"
@@ -2922,7 +2895,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Ekvalizér"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Nová předvolba"
@@ -2957,11 +2930,11 @@ msgstr "Udržují"
msgid "Contributors"
msgstr "Přispěli"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Výjimečná správa multimédií a přehrávání"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2972,7 +2945,7 @@ msgstr ""
"Copyright © 2005 – {1} Ostatní\n"
"Copyright © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Webové stránky Banshee"
@@ -3077,105 +3050,92 @@ msgid "Import a playlist"
msgstr "Importovat seznam skladeb"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Znovu prohledat hudební kolekci"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Znovu prohledat složku Hudební kolekce"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Otevřít _umístění…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Otevřít k přehrávání vzdálené umístění"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Ukončit"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Ukončit Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Upravit"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Předvolby"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Změnit své osobní předvolby"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Nástroje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Znovu prohledat hudební kolekci"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Znovu prohledat složku Hudební kolekce"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Po opětovném prohledání bude z vaší hudební kolekce odebrána jedna stopa."
-msgstr[1] ""
-"Po opětovném prohledání budou z vaší hudební kolekce odebrány {0} stopy."
-msgstr[2] ""
-"Po opětovném prohledání bude z vaší hudební kolekce odebráno {0} stop."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Nápověda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Obsah"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Pokročilé prohledávání kolekce"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Naučte se pokročilé způsoby, jak prohledávat svoji kolekci multimédií"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Domovská stránka Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Navštivte domovskou stránku Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Zapojte se"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Přispějte k vývoji Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Informace o _verzi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Zobrazit podrobné informace o verzi a nastavení"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importovat seznam skladeb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Seznamy skladeb"
@@ -3497,7 +3457,7 @@ msgstr "Trvale odstranit vybrané položky z média"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3563,25 +3523,17 @@ msgstr[0] "Opravdu chcete odstranit vybranou položku ze své {1}?"
msgstr[1] "Opravdu chcete odstranit vybrané {0} položky ze své {1}?"
msgstr[2] "Opravdu chcete odstranit vybraných {0} položek ze své {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Opravdu chcete pokračovat?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Odstranit stopy"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Kom_pilace umělců alba:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Zaškrtněte, pokud je skladba součástí alba se skladbami od různých autorů"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3648,19 +3600,19 @@ msgstr "Nastavit čísla a počítadla všech disků na tuto hodnotu"
msgid "_Disc Number:"
msgstr "Číslo _disku:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Nastavit všechny roky na tuto hodnotu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Rok:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Nastavit všechna hodnocení na tuto hodnotu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Hodnocení:"
@@ -3724,7 +3676,7 @@ msgstr "Nastavit všechny komentáře na tuto hodnotu"
msgid "Co_mment:"
msgstr "Ko_mentář:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Nápověda"
@@ -3732,7 +3684,7 @@ msgstr "Nápověda"
msgid "Lyrics"
msgstr "Text skladby"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Pokročit na další stopu a upravit její název"
@@ -3855,39 +3807,39 @@ msgstr "Velikost souboru:"
msgid "bytes"
msgstr "bajtů"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Editor skladby"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Vlastnosti skladby"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Zobrazit předchozí stopu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Zobrazit následující stopu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Název:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Umělec:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Album:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Synchronizovat _hodnoty všech polí"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3895,12 +3847,12 @@ msgstr ""
"Aplikovat hodnoty všech společných polí nastavených pro tuto skladbu na "
"všechny skladby vybrané v editoru"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Upravuje se {0} z {1} položek<i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3908,11 +3860,11 @@ msgstr[0] "Uložit změny provedené v otevřené skladbě?"
msgstr[1] "Uložit změny provedené ve {0} z {1} otevřených skladeb?"
msgstr[2] "Uložit změny provedené ve {0} z {1} otevřených skladeb?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Zavřít _bez uložení"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "Pokud změny z posledního {0} neuložíte, budou nenávratně ztraceny."
@@ -3963,19 +3915,19 @@ msgstr[2] "Aktivovat běžící úlohy"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}z{1} {2} {0}publikované{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}na{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3983,56 +3935,56 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}od{1} {2} {0}z{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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}z{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}od{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Zastavit operaci"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Zastavit {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Tato operace stále probíhá. Chcete ji zastavit?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "Operace „{0}“ stále probíhá. Chcete ji zastavit?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Pokračovat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Pokračovat {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Probíhá zastavení…"
@@ -4105,7 +4057,7 @@ msgstr "Žádné dostupné profily"
msgid "Advanced"
msgstr "Pokročilé"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Nastavování {0}"
@@ -4170,80 +4122,80 @@ msgstr "Otevřít v editoru"
msgid "Create and save"
msgstr "Vytvořit a uložit"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Obsah prohlížeče"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Nastavit filtry dostupné v prohlížeči"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Zobrazit filtr umělce"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Zobrazit seznam umělců, aby šli filtrovat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Zobrazit všechny umělce"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Zobrazit ve filtru umělců všechny umělce"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Zobrazit umělce alba"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Zobrazit pouze umělce z alb, ne umělce pouze s samostatnými stopami"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Zobrazit filtr žánru"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Zobrazit seznam žánrů, aby šly filtrovat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Zobrazit filtr roku"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Zobrazit seznam roků, aby šly filtrovat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Nenastaveno"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Prohlížeč nalevo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Zobrazit prohlížeč umělců/alb nalevo od seznamu skladeb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Prohlížeč nahoře"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Zobrazit prohlížeč umělců/alb nad seznamem skladeb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Zobrazit prohlížeč"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Zobrazit nebo skrýt prohlížeč umělců/alb"
@@ -4260,12 +4212,12 @@ msgstr ""
msgid "The security certificate for {0} is invalid."
msgstr "Bezpečnostní certifikát pro {0} není platný."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Načítá se {0}…"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4273,20 +4225,24 @@ msgstr ""
"Vložte\n"
"Disk"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Vymazat hledání"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Posunout"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Nečinný"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Připojuje se…"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Načítá se do vyrovnávací paměti"
@@ -4326,39 +4282,29 @@ msgstr "Podporuje přebaly alb"
msgid "Supports photos"
msgstr "Podporuje fotografie"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "Délka stopy je nulová"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "Synchronizace s iPodem"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Připravuje se synchronizace…"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Přidává se stopa {0} z {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Aktualizují se metadata ve stopě {0} z {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Odstraňuje se stopa {0} z {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Čistí se, odstraňuje se neplatná stopa {0} z {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Zapisuje se databáze médií"
@@ -4367,7 +4313,7 @@ msgstr "Zapisuje se databáze médií"
msgid "Sync {0}"
msgstr "Synchronizovat {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Zařízení"
@@ -4376,31 +4322,31 @@ msgstr "Zařízení"
msgid "Device Properties"
msgstr "Vlastnosti zařízení"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Produkt"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Dodavatel"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Probíhá načítání {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Ano"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Žádný"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4409,11 +4355,11 @@ msgstr ""
"Formát {0} není zařízením podporován a nebyl nalezen žádný převodník, který "
"by jej převedl"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
msgid "File format conversion support is not available"
msgstr "Podpora převodu formátu souboru není dostupná"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
msgid "Error converting file"
msgstr "Chyba při převádění souboru"
@@ -4433,8 +4379,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Předvolby synchronizace"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Synchronizovat"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4442,9 +4392,13 @@ msgstr[0] "Synchronizací se z vašeho zařízení odstraní jedna stopa."
msgstr[1] "Synchronizací se z vašeho zařízení odstraní {0} stopy."
msgstr[2] "Synchronizací se z vašeho zařízení odstraní {0} stop."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Synchronizovat"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Opravdu chcete pokračovat?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Odstranit stopy"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4517,12 +4471,12 @@ msgstr "Importovat koupenou hudbu"
msgid "Disconnect"
msgstr "Odpojit"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Odpojuje se {0}…"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Nelze odpojit {0}: {1}"
@@ -4656,13 +4610,12 @@ msgstr "Spojené království (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Spojené státy (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Prohledat obchod s MP3 Amazon"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Jak vaše nákupy podporují GNOME"
@@ -4769,15 +4722,15 @@ msgstr "_Rozpoznat"
msgid "T_ap"
msgstr "Klep_at"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Nechte Banshee automaticky rozpoznat tempo BPM této skladby"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Přehrát tuto skladbu"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Klepejte na toto tlačítko, chcete-li ručně nastavit tempo BMP pro tuto "
@@ -4892,11 +4845,11 @@ msgstr "Přihlášení"
msgid "Connecting to {0}"
msgstr "Připojování k {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Přidat vzdálený server DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Přidat nový vzdálený server DAAP"
@@ -5155,10 +5108,6 @@ msgstr "Chyba při získávání podrobností položky z Internetového archivu"
msgid "Description"
msgstr "Popis"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Tvůrce:"
@@ -5172,7 +5121,7 @@ msgid "Location:"
msgstr "Umístění:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Datum:"
@@ -5185,7 +5134,7 @@ msgid "Publisher:"
msgstr "Vydavatel:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Klíčová slova:"
@@ -5260,16 +5209,16 @@ msgstr "{0} od {1} na {2}"
msgid "Write your own review"
msgstr "Napsat svoji vlastní recenzi"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Sbírka:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Volitelný dotaz"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Řadit podle:"
@@ -5657,7 +5606,7 @@ msgstr "Upravit stanici"
msgid "Station"
msgstr "Stanice"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5665,15 +5614,15 @@ msgstr[0] "{0} stanice"
msgstr[1] "{0} stanice"
msgstr[2] "{0} stanic"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Zadejte prosím správnou adresu URI stanice"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Zadejte prosím žánr stanice"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Zadejte prosím název stanice"
@@ -5685,7 +5634,7 @@ msgstr "Přidat novou rozhlasovou stanici"
msgid "Edit radio station"
msgstr "Upravit rozhlasovou stanici"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5693,80 +5642,80 @@ msgstr ""
"Zadejte žánr, název a URL rozhlasové stanice, kterou chcete přidat. Popis je "
"volitelný."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Žánr stanice:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Název stanice:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
-msgstr "Adresa URL vysílání:"
+msgstr "Adresa URL proudu:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Tvůrce stanice:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Popis:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Hodnocení:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Zpracovává se stopa {0} z {1}…"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Nastavit zásuvný modul Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Navštívit stránku s profilem _uživatele"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Navštívit stránku se svým profilem na Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "Povolit oznamování skladeb z Bansh_ee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Povolit oznamování skladeb z Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "Povolit oznamování skladeb ze zaříz_ení"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Povolit oznamování skladeb ze zařízení"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Scrobbling do Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Scrobbling ze zařízení"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Provádí se scrobbling do Last.fm…"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Provádí se scrobbling ze zařízení…"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Zpracovává se stopa {0} z {1}…"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5824,28 +5773,28 @@ msgstr "Zobrazit stránku této stopy na Last.fm"
msgid "Recommend this track to someone"
msgstr "Doporučit někomu tuto stopu"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5897,19 +5846,19 @@ msgstr "Jste přihlášeni k Last.fm jako uživatel <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Odhlášení z Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Nedávno oblíbené stopy"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Naposledy přehrané stopy"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Moji nejoblíbenější umělci"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} přehrání"
@@ -5999,17 +5948,17 @@ msgstr "Zakázaná stopa"
msgid "Mark current track as banned"
msgstr "Označit tuto stopu jako zakázanou"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "Fanoušci od {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Podobné jako {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "_Přidat stanici"
@@ -6025,7 +5974,7 @@ msgstr "Celkový počet přehrání"
msgid "New Station"
msgstr "Nová stanice"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "_Typ stanice:"
@@ -6179,15 +6128,15 @@ msgstr "Lišta rychlého přístupu k vašim médiím"
msgid "_Mini Mode"
msgstr "_Minimální režim"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Plný režim"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Přepnout zpět do plného režimu"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Změna režimu opakování při přehrávání"
@@ -6224,11 +6173,11 @@ msgstr "_Zobrazovat oznámení"
msgid "Show notifications when item changes"
msgstr "Zobrazovat oznámení při změně položky"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Stále běží"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6236,23 +6185,19 @@ msgstr ""
"Banshee bylo zavřeno do oznamovací oblasti. Pro ukončení sezení použijte "
"volbu <i>Ukončit</i>."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Předchozí"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Přeskočit tuto položku"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Nelze zobrazit oznámení"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6261,6 +6206,10 @@ msgstr ""
"{0}od{1} {2}\n"
"{0}z{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Zjednodušit"
@@ -6658,16 +6607,16 @@ msgstr[0] "{0} díl"
msgstr[1] "{0} díly"
msgstr[2] "{0} dílů"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nikdy neaktualizované"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Aktualizované v {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Aktualizované {0}"
@@ -6707,7 +6656,7 @@ msgstr "Přihlásit se k novému podcastu"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:93
msgid "Unsubscribe and Delete"
-msgstr "Odhlásit a odstranit"
+msgstr "Odhlásit se a odstranit"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:99
msgid "Check for New Episodes"
@@ -6750,7 +6699,7 @@ msgstr "Navštívit webové stránky"
msgid "Add Podcast"
msgstr "Přidat podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
@@ -6758,11 +6707,11 @@ msgstr[0] "Smazat soubor"
msgstr[1] "Smazat soubory"
msgstr[2] "Smazat soubory"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "Neplatné URL"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "URL podcastu je neplatné."
@@ -6770,11 +6719,11 @@ msgstr "URL podcastu je neplatné."
msgid "Episode Details"
msgstr "Podrobnosti o dílu"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Pravidelně kontrolovat nové díly"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
@@ -6782,59 +6731,59 @@ msgstr ""
"Pokud je zaškrtnuto, bude aplikace Banshee každou hodinu kontrolovat, zda "
"tento kanál neobsahuje nové díly"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
-msgstr "Stahovat nové díly"
+msgstr "Stáhnout nové díly"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Archivovat všechny díly vyjma nejnovějšího"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Není dostupný žádný popis"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Název:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Webové stránky:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Navštívit"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Volby přihlášení"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "Adresa URL kanálu:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Naposledy občerstveno:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Kategorie:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Copyright:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6952,22 +6901,22 @@ msgstr "kliknout"
msgid "menu"
msgstr "nabídka"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Skrýt <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "Aplikace {0} narazila na kritickou chybu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Podrobnosti o chybě"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Nastala neošetřená výjimka: "
@@ -7121,15 +7070,15 @@ msgstr "začíná na"
msgid "ends with"
msgstr "končí na"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Přihlášení k účtu Last.fm"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Zadejte prosím přihlašovací údaje pro svůj účet na Last.fm."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Uložit a přihlásit se"
diff --git a/po/da.po b/po/da.po
index f4b258a..adffeb0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,8 +1,8 @@
# Danish translation of Banshee.
-# Copyright (C) 2013 Banshee og nedenstående oversættere.
+# Copyright (C) 2012 Banshee og nedenstående oversættere.
# This file is distributed under the same license as the Banshee package.
# Lasse Bang Mikkelsen <lbm at lbm.dk>, 2005, 06, 07, 08.
-# Joe Hansen <joedalton2 at yahoo.dk>, 2010, 2011, 2012, 2013.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2010, 2011, 2012.
#
# Konventioner:
#
@@ -21,8 +21,6 @@
# playlist -> afspilningsliste
# rating -> bedømmelse
# scrobbling -> scrobble er bare et navn, der bruges som ord, ligesom at google
-# Forstår at det drejer sig om at publicere ens egen musiksmag, jf.
-# http://en.wiktionary.org/wiki/scrobble
# shuffle -> tilfældig
# smart playlist -> intelligent spilleliste
# tag -> mærke
@@ -31,8 +29,8 @@ msgid ""
msgstr ""
"Project-Id-Version: banshee\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-11 22:36+0200\n"
-"PO-Revision-Date: 2013-09-11 23:31+0200\n"
+"POT-Creation-Date: 2012-04-21 17:18+0200\n"
+"PO-Revision-Date: 2012-04-16 23:31+0200\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
"Language: da\n"
@@ -339,7 +337,7 @@ msgstr ""
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
#: ../data/addin-xml-strings.cs:148
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:207
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:200
#: ../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:211
@@ -420,21 +418,17 @@ msgid "Show related YouTube videos in the context pane."
msgstr "Vis relaterede YouTube-videoer i kontekstpanelet."
#: ../data/audio-profiles/aac-novell.xml.in.h:1
-msgid "AAC (Novell Encoder)"
-msgstr "AAC (Novell-koder)"
+msgid "3GPP"
+msgstr "3GPP"
#: ../data/audio-profiles/aac-novell.xml.in.h:2
-msgid ""
-"Designed to be the successor of the MP3 format, AAC generally achieves "
-"better sound quality than MP3 at many bit rates."
-msgstr ""
-"Designet som efterfølger til MP3-formatet. AAC opnår generelt bedre "
-"lydkvalitet end MP3 ved mange bitrater."
+msgid "AAC (Novell Encoder)"
+msgstr "AAC (Novell-koder)"
#: ../data/audio-profiles/aac-novell.xml.in.h:3
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
-#: ../data/audio-profiles/mp3-xing.xml.in.h:3
-#: ../data/audio-profiles/wavpack.xml.in.h:13
+#: ../data/audio-profiles/mp3-lame.xml.in.h:3
+#: ../data/audio-profiles/mp3-xing.xml.in.h:2
+#: ../data/audio-profiles/wavpack.xml.in.h:3
#: ../data/audio-profiles/wma.xml.in.h:4
msgid "Bitrate"
msgstr "Bitrate"
@@ -444,33 +438,37 @@ msgid "Container"
msgstr "Beholder"
#: ../data/audio-profiles/aac-novell.xml.in.h:5
-msgid "MPEG-4 ISO"
-msgstr "MPEG-4 ISO"
+msgid ""
+"Designed to be the successor of the MP3 format, AAC generally achieves "
+"better sound quality than MP3 at many bit rates."
+msgstr ""
+"Designet som efterfølger til MP3-formatet. AAC opnår generelt bedre "
+"lydkvalitet end MP3 ved mange bitrater."
#: ../data/audio-profiles/aac-novell.xml.in.h:6
-msgid "MPEG-4 QuickTime"
-msgstr "MPEG-4 QuickTime"
+msgid "Long Term Prediction"
+msgstr "Langtidsforudsigelse"
#: ../data/audio-profiles/aac-novell.xml.in.h:7
-msgid "3GPP"
-msgstr "3GPP"
+msgid "Low Complexity"
+msgstr "Lav kompleksitet"
#: ../data/audio-profiles/aac-novell.xml.in.h:8
-msgid "Profile"
-msgstr "Profil"
+msgid "MPEG-4 ISO"
+msgstr "MPEG-4 ISO"
#: ../data/audio-profiles/aac-novell.xml.in.h:9
-msgid "Low Complexity"
-msgstr "Lav kompleksitet"
+msgid "MPEG-4 QuickTime"
+msgstr "MPEG-4 QuickTime"
#: ../data/audio-profiles/aac-novell.xml.in.h:10
-msgid "Long Term Prediction"
-msgstr "Langtidsforudsigelse"
-
-#: ../data/audio-profiles/aac-novell.xml.in.h:11
msgid "Output Format"
msgstr "Uddataformat"
+#: ../data/audio-profiles/aac-novell.xml.in.h:11
+msgid "Profile"
+msgstr "Profil"
+
#: ../data/audio-profiles/base.xml.in.h:1
msgid "Channels"
msgstr "Kanaler"
@@ -488,11 +486,7 @@ msgstr ""
"forringe lydkvaliteten."
#: ../data/audio-profiles/mp3-lame.xml.in.h:1
-msgid "MP3 (LAME Encoder)"
-msgstr "MP3 (LAME-koder)"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:2
-#: ../data/audio-profiles/mp3-xing.xml.in.h:2
+#: ../data/audio-profiles/mp3-xing.xml.in.h:1
msgid ""
"A proprietary and older, but also popular, lossy audio format that produces "
"larger files at lower bitrates."
@@ -500,45 +494,53 @@ msgstr ""
"Et proprietært og ældre, men også populært, forringende lydformat som "
"producerer større filer med lavere bitrater."
-#: ../data/audio-profiles/mp3-lame.xml.in.h:3
-msgid "Encoding Mode"
-msgstr "Kodningstilstand"
+#: ../data/audio-profiles/mp3-lame.xml.in.h:2
+#: ../data/audio-profiles/vorbis.xml.in.h:2
+#: ../data/audio-profiles/wavpack.xml.in.h:2
+#: ../data/audio-profiles/wma.xml.in.h:3
+msgid "Best"
+msgstr "Bedste"
#: ../data/audio-profiles/mp3-lame.xml.in.h:4
msgid "Constant Bitrate"
msgstr "Konstant bitrate"
#: ../data/audio-profiles/mp3-lame.xml.in.h:5
-msgid "Variable Bitrate"
-msgstr "Variabel bitrate"
+msgid "Encoding Mode"
+msgstr "Kodningstilstand"
#: ../data/audio-profiles/mp3-lame.xml.in.h:6
-msgid "VBR Quality"
-msgstr "VBR-kvalitet"
+msgid "MP3 (LAME Encoder)"
+msgstr "MP3 (LAME-koder)"
#: ../data/audio-profiles/mp3-lame.xml.in.h:7
-#: ../data/audio-profiles/vorbis.xml.in.h:4
-#: ../data/audio-profiles/wavpack.xml.in.h:14
-#: ../data/audio-profiles/wma.xml.in.h:6
-msgid "Worst"
-msgstr "Dårligste"
+msgid "VBR Quality"
+msgstr "VBR-kvalitet"
#: ../data/audio-profiles/mp3-lame.xml.in.h:8
+msgid "Variable Bitrate"
+msgstr "Variabel bitrate"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
#: ../data/audio-profiles/vorbis.xml.in.h:5
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
-msgid "Best"
-msgstr "Bedste"
+msgid "Worst"
+msgstr "Dårligste"
-#: ../data/audio-profiles/mp3-xing.xml.in.h:1
+#: ../data/audio-profiles/mp3-xing.xml.in.h:3
msgid "MP3 (Xing Encoder)"
msgstr "MP3 (Xing-koder)"
#: ../data/audio-profiles/vorbis.xml.in.h:1
+msgid "Audio quality"
+msgstr "Lydkvalitet"
+
+#: ../data/audio-profiles/vorbis.xml.in.h:3
msgid "Ogg Vorbis"
msgstr "Ogg Vorbis"
-#: ../data/audio-profiles/vorbis.xml.in.h:2
+#: ../data/audio-profiles/vorbis.xml.in.h:4
msgid ""
"Vorbis is an open source, lossy audio codec with high quality output at a "
"lower file size than MP3."
@@ -546,15 +548,7 @@ msgstr ""
"Vorbis er et åbent, forringende højkvalitets lydformat med mindre "
"filstørrelser end MP3."
-#: ../data/audio-profiles/vorbis.xml.in.h:3
-msgid "Audio quality"
-msgstr "Lydkvalitet"
-
#: ../data/audio-profiles/wavpack.xml.in.h:1
-msgid "Wavpack"
-msgstr "Wavpack"
-
-#: ../data/audio-profiles/wavpack.xml.in.h:2
msgid ""
"A fast and efficient open source audio format offering lossless and high-"
"quality lossy encoding with great dynamic range."
@@ -562,51 +556,51 @@ msgstr ""
"Et hurtigt og effektivt åbent lydformat som tilbyder både forringende og "
"ikke-forringende højkvalitetskodning med god dynamik."
-#: ../data/audio-profiles/wavpack.xml.in.h:3
-msgid "Mode"
-msgstr "Tilstand"
-
#: ../data/audio-profiles/wavpack.xml.in.h:4
-msgid "Fast Compression"
-msgstr "Hurtig komprimering"
+msgid "Default"
+msgstr "Standard"
#: ../data/audio-profiles/wavpack.xml.in.h:5
msgid "Default Compression"
msgstr "Standardkomprimering"
#: ../data/audio-profiles/wavpack.xml.in.h:6
-msgid "High Compression"
-msgstr "Høj komprimering"
+msgid "Extra processing"
+msgstr "Yderligere behandling"
#: ../data/audio-profiles/wavpack.xml.in.h:7
-msgid "Very High Compression"
-msgstr "Meget høj komprimering"
+msgid "Fast Compression"
+msgstr "Hurtig komprimering"
#: ../data/audio-profiles/wavpack.xml.in.h:8
-msgid "Lossy mode"
-msgstr "Forringende tilstand"
+msgid "High Compression"
+msgstr "Høj komprimering"
#: ../data/audio-profiles/wavpack.xml.in.h:9
-msgid "Store MD5 sum in the file"
-msgstr "Gem MD5-sum i filen"
+msgid "Highest"
+msgstr "Højeste"
#: ../data/audio-profiles/wavpack.xml.in.h:10
-msgid "Extra processing"
-msgstr "Yderligere behandling"
+msgid "Lossy mode"
+msgstr "Forringende tilstand"
#: ../data/audio-profiles/wavpack.xml.in.h:11
-msgid "Default"
-msgstr "Standard"
+msgid "Mode"
+msgstr "Tilstand"
#: ../data/audio-profiles/wavpack.xml.in.h:12
-msgid "Highest"
-msgstr "Højeste"
+msgid "Store MD5 sum in the file"
+msgstr "Gem MD5-sum i filen"
-#: ../data/audio-profiles/wav.xml.in.h:1
-msgid "Waveform PCM"
-msgstr "Bølgeform PCM"
+#: ../data/audio-profiles/wavpack.xml.in.h:13
+msgid "Very High Compression"
+msgstr "Meget høj komprimering"
-#: ../data/audio-profiles/wav.xml.in.h:2
+#: ../data/audio-profiles/wavpack.xml.in.h:14
+msgid "Wavpack"
+msgstr "Wavpack"
+
+#: ../data/audio-profiles/wav.xml.in.h:1
msgid ""
"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
"modulated (PCM) audio."
@@ -614,11 +608,11 @@ msgstr ""
"WAV+PCM er et ikke-forringende format som indeholder ukomprimeret, rå "
"pulskodemoduleret (PCM) lyd."
-#: ../data/audio-profiles/wma.xml.in.h:1
-msgid "Windows Media Audio"
-msgstr "Windows Media Audio"
+#: ../data/audio-profiles/wav.xml.in.h:2
+msgid "Waveform PCM"
+msgstr "Bølgeform PCM"
-#: ../data/audio-profiles/wma.xml.in.h:2
+#: ../data/audio-profiles/wma.xml.in.h:1
msgid ""
"A proprietary lossy audio format with high quality output at a lower file "
"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
@@ -626,27 +620,31 @@ msgstr ""
"Et proprietært forringende højkvalitets lydformat med mindre filstørrelser "
"end MP3. En 96 kbps WMA svarer til en 128 kbps MP3."
-#: ../data/audio-profiles/wma.xml.in.h:3
+#: ../data/audio-profiles/wma.xml.in.h:2
+msgid "Audio Quality"
+msgstr "Lydkvalitet"
+
+#: ../data/audio-profiles/wma.xml.in.h:5
msgid "Use a variable bitrate"
msgstr "Brug variabel bitrate"
-#: ../data/audio-profiles/wma.xml.in.h:5
-msgid "Audio Quality"
-msgstr "Lydkvalitet"
+#: ../data/audio-profiles/wma.xml.in.h:6
+msgid "Windows Media Audio"
+msgstr "Windows Media Audio"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
-msgid "Media Player"
-msgstr "Medieafspiller"
-
-#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Banshee medieafspiller"
+#: ../data/desktop-files/common.desktop.in.h:2
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:193
+msgid "Media Player"
+msgstr "Medieafspiller"
+
#: ../data/desktop-files/common.desktop.in.h:3
msgid "Play and organize your media collection"
msgstr "Afspil og organiser din mediesamling"
@@ -778,18 +776,18 @@ msgstr "Kunne ikke oprette BPM-genkendelsesdriver."
msgid "Could not initialize GStreamer library"
msgstr "Kunne ikke initialisere GStreamer-bibliotek"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
msgid "Unknown Error"
msgstr "Ukendt fejl"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
msgid "_Enable ReplayGain correction"
msgstr "_Aktiver ReplayGain-korrektion"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -800,11 +798,11 @@ msgstr ""
# gap-less, altså uden 'huller' imellem. Jeg tror det er en funktion,
# der afspiller efterfølgende spor uden at vente imellem (jeg ser nu at
# strengen nedenunder faktisk skriver dette også)
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
msgid "Enable _gapless playback"
msgstr "Aktiver afspilning af _gapless (uden afspilningshuller)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -821,7 +819,7 @@ msgstr "Kunne ikke oprette omkoder"
msgid "Could not create encoder pipeline : {0}"
msgstr "Kunne ikke oprette kodningskanal: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -830,10 +828,19 @@ msgstr "GStreamer# 0.10"
msgid "Could not create encoding pipeline : {0}"
msgstr "Kunne ikke oprette kodningskanal: {0}"
-#. Translators: verb
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
-msgid "Import"
-msgstr "Importer"
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+msgid "_Close"
+msgstr "_Luk"
+
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+msgid "Close"
+msgstr "Luk"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
msgid "Can't check for updates"
@@ -901,61 +908,61 @@ msgstr "Opdatering hentet"
msgid "Check for Updates"
msgstr "Kontroller om der er opdateringer"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Tilvalg for hjælp"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Vis denne hjælp"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Vis tilvalg for kontrol af afspilning"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Vis tilvalg for forespørgsel på det spillende nummer"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Vis tilvalg for forespørgsel på afspillermoteren"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Vis tilvalg for brugergrænsefladen"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Vis tilvalg for udviklere og fejlsøgning"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Vis alle tilvalgsgrupper"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Vis versionsinformation"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Tilvalg for kontrol af afspilning"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Afspil det næste nummer, genstart eventuelt hvis \"restart\"-værdien "
"(genstart) er sat"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
"Afspil det forrige nummer, genstart eventuelt hvis \"restart\"-værdien "
"(genstart) er sat"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -963,28 +970,28 @@ msgstr ""
"Hvis den nuværende sang er blevet spillet mere end 4 sekunder, så genstart "
"den, ellers det samme som --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr "Start automatisk afspilning af numre sat i kø på kommandolinjen"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Start afspilning"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pause afspilning"
# Skift afspilning
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Start/stop afspilning"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Stop afspilning fuldstændigt"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -992,95 +999,95 @@ msgstr ""
"Aktiver eller deaktiver afspilningsstop efter det nuværende nummer (værdien "
"skal være enten \"true\" (sand) eller \"false\" (falsk))"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr "Sæt afspilningsvolumen (0-100), præfiks med +/- for relative værdier"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Spol til et bestemt sted (sekunder, flydende)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Angiv bedømmelse af det nuværende nummer (0 til 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Tilvalg for forespørgsel på afspillermotor"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Nuværende afspillertilstand"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Sidste afspillertilstand"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Forespørg om afspilleren kan pauses"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Forespørg om afspilleren kan spole"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Afspillervolume"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Afspillerposition i det nuværende nummer"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Tilvalg for forespørgsel af metadata på det spillende nummer"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Kunstner"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Albumtitel"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Nummertitel"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Varighed"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Spornummer"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Antal spor"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Disknummer"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1091,7 +1098,7 @@ msgstr "Disknummer"
msgid "Year"
msgstr "År"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1099,83 +1106,83 @@ msgstr "År"
msgid "Rating"
msgstr "Bedømmelse"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Pointgivning"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Bitrate"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Tilvalg for brugergrænseflade"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Vis brugergrænsefladen på det aktive arbejdsområde"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Gå til fuldskærmstilstand"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Skjul brugergrænsefladen"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Vis ikke brugergrænsefladen, uanset ethvert andet argument"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Vis dialogboksen for importering af medie"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Vis dialogen om"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Vis dialogen for åbn placering"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Vis dialogen for indstillinger"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Tilvalg for fejlsøgning og udvikling"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Aktiver generel fejlsøgningfunktionalitet"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Aktiver fejlsøgningsudskrift på SQL-forespørgsler"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Aktiver fejlsøgningsudskrift på Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Angiv en alternativ database som skal bruges"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Tvungen hentning af manglende omslag"
# hvad sker der her?
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Angiv en alternativ tast, standard er /apps/bashee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1183,35 +1190,31 @@ msgstr ""
"Optimer instansen til at køre afinstalleret. Mest bemærkelsesværdig, vil "
"dette oprette en alternativ Mono.Addins-database i arbejdsmappen"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Deaktiver DBus-understøttelse fuldstændigt"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
msgstr ""
-"Spring over indlæsning af brugerdefineret gtk.css-fil ({0}), hvis den findes"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:230
-#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Genindlæs den brugerdefinerede gtk.css-fil ({0}) hvert 5. sekund"
+"Spring over indlæsning af brugerdefineret gtkrc-fil ({0}), hvis den "
+"eksisterer"
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "De følgende hjælpeargumenter er ugyldige: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Afspil album"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "S_æt i kø"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1234,24 +1237,17 @@ msgstr "Afspil _album"
msgid "Add an album to the playlist"
msgstr "Tilføj et album til afspilningslisten"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "{0} tilbage"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Afspil sang"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
-msgid "Close"
-msgstr "Luk"
-
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:497
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Søg"
@@ -1288,85 +1284,91 @@ msgstr "Genre"
msgid "Comment"
msgstr "Kommentar"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Ukendt album"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Ukendt kunstner"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Ukendt album"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Ukendt titel"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Forskellige kunstnere"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Strømplacering ikke fundet"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "Fil ikke fundet"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Codec til afspilning af denne medietype er ikke tilgængelig"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Fil beskyttet af Digital Rights Management (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Ukendt fejl"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "Gensta_rt podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "Gensta_rt lydbog"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "Gensta_rt video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "Gensta_rt sang"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "Gensta_rt element"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Spring til podcast der afspilles"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Spring til spillende lydbog"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Spring til spillende video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Spring til sang der afspilles"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Spring til spillende element"
@@ -1386,7 +1388,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Alle albumkunstnere ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Alle album ({0})"
@@ -1491,7 +1493,7 @@ msgid "Scanning for media"
msgstr "Søger efter medie"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Leder..."
@@ -1516,7 +1518,7 @@ msgstr "Importeringsprocessen kører i øjeblikket. Vil du afbryde denne?"
msgid "Importing {0} of {1}"
msgstr "Importerer {0} af {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Gensøger {0} af {1}"
@@ -1531,7 +1533,7 @@ msgid ""
msgstr ""
"Vent venligst mens din gamle Banshee-database migreres til det nye format."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Genopfrisker metadata"
@@ -1609,29 +1611,12 @@ msgstr "Blød rock"
msgid "Techno"
msgstr "Tekno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Fjern fra bibliotek"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
-msgid "File Organization"
-msgstr "Filorganisering"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
-msgid "Co_py files to media folder when importing"
-msgstr "Ko_pier filer til mediemappe ved importering"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
-msgid "_Update file and folder names"
-msgstr "_Opdater fil- og mappenavne"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
-msgid "Rename files and folders according to media metadata"
-msgstr "Omdøb filer og mapper ud fra mediemetadata"
-
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
#, csharp-format
msgid "{0} Folder"
msgstr "{0}-mappe"
@@ -1695,118 +1680,119 @@ msgstr "Antal diske"
msgid "Grouping"
msgstr "Gruppering"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Musik"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Søg i din musiksamling"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
msgid "Miscellaneous"
msgstr "Diverse"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "_Sorter en kunstners album efter år, ikke titel"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} sang"
msgstr[1] "{0} sange"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
msgid "Music Folder"
msgstr "Musikmappe"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "Sange bedømt med fire eller fem stjerner"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "Seneste favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "Sange ofte lyttet til den sidste uge"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Senest tilføjede"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "Sange importeret indenfor den sidste uge"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
msgid "Recently Played"
msgstr "Senest afspillet"
# fejl her, det hedder vel seneste og ikke senest (flertal)
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
msgid "Recently played songs"
msgstr "Seneste afspillede sange"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "Ikke hørte"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "Sange der ikke har været afspillet eller sprunget over"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Oversete favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "Favoritter der ikke har været afspillet i over to måneder"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "Mindst foretrukne"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr "Sange bedømt med én eller to stjerner eller du ofte har sprunget over"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 MB af favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "En data-cd fuld af favoritsange"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 minutter af favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "En lyd-cd fuld af favoritsange"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "Ikke bedømt"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr "Sange der ikke er bedømt"
@@ -1820,41 +1806,41 @@ msgid "Importing From {0}"
msgstr "Importerer fra {0}"
#. Catalog.GetString ("Video Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
#: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
msgid "Videos"
msgstr "Videoer"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
msgid "Search your videos"
msgstr "Søg i din videosamling"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
msgid "Produced By"
msgstr "Produceret af"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
#, csharp-format
msgid "{0} video"
msgid_plural "{0} videos"
msgstr[0] "{0} video"
msgstr[1] "{0} videoer"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
msgid "Videos Folder"
msgstr "Mappe til videoer"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr "Videoer bedømt med fire eller fem stjerner"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "Usete"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr "Videoer der ikke har været afspillet endnu"
@@ -1930,6 +1916,14 @@ msgstr ""
"Aktiver denne indstilling for at holde metadata for optælling af "
"afspilninger synkroniseret mellem dit bibliotek og understøttede lydfiler"
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67
+msgid "_Update file and folder names"
+msgstr "_Opdater fil- og mappenavne"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68
+msgid "Rename files and folders according to media metadata"
+msgstr "Omdøb filer og mapper ud fra mediemetadata"
+
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
msgstr "Der er ingen tilgængelig netværksforbindelse"
@@ -1977,8 +1971,8 @@ msgstr "Slet afspilningsliste"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Ny afspilningsliste"
@@ -2020,7 +2014,11 @@ msgstr "Udvidelser"
msgid "File Policies"
msgstr "Filpolitikker"
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+msgid "Co_py files to media folders when importing"
+msgstr "Ko_pier filer til mediemapper ved importering"
+
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70
msgid "Improve Banshee by sending anonymous usage data"
msgstr "Forbedr Banshee ved at indsende anonyme brugsdata"
@@ -2581,7 +2579,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Ukendt"
@@ -2608,7 +2606,7 @@ msgid "Delete Smart Playlist"
msgstr "Slet intelligent afspilningsliste"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Alle genre ({0})"
@@ -2661,37 +2659,41 @@ msgstr "Fejl"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Detaljer"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:156
msgid "Errors"
msgstr "Fejl"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:215
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:213
msgid "Sort Playlists By"
msgstr "Sorter afspilningslister efter"
#. Translators: this is a noun, referring to the harddisk
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:225
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:223
msgid "Drive"
msgstr "Drev"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:247
+msgid "File Organization"
+msgstr "Filorganisering"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:248
msgid "Folder hie_rarchy"
msgstr "Mappehie_rarki"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File _name"
msgstr "Fil_navn"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:701
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "Tilføjer {0} af {1} til {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:720
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "Sletter {0} af {1} fra {2}"
@@ -2760,12 +2762,12 @@ msgid "Show:"
msgstr "Vis:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Alle"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Aktiveret"
@@ -2802,8 +2804,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} af {1}"
@@ -2864,20 +2866,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bit"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Gør kontekstpanelet større eller mindre"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Skjul kontekstpanel"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Venter på at afspilning skal begynde..."
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Indlæser..."
@@ -2904,7 +2906,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Equalizer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Nyt forvalg"
@@ -2939,11 +2941,11 @@ msgstr "Vedligeholdere"
msgid "Contributors"
msgstr "Bidragydere"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Ekstraordinær multimediehåndtering og afspilning"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2956,7 +2958,7 @@ msgstr ""
# 'Banshees hjemmeside', tror jeg (der er sikkert et link ved siden af)
# Evt. Hjemmeside(n) for Banshee
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Banshees hjemmeside"
@@ -3003,7 +3005,7 @@ msgid "Make Banshee the Default"
msgstr "Gør Banshee til standardafspiller"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "I_mporter"
@@ -3061,101 +3063,92 @@ msgid "Import a playlist"
msgstr "Importer en afspilningsliste"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Gensøg musikbibliotek"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Gensøg musikbiblioteket"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Åbn p_lacering..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Åbn en fjernplacering til afspilning"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Afslut"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Afslut Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Rediger"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Indstillinger"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Rediger dine personlige indstillinger"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "Værk_tøjer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Gensøg musikbibliotek"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Gensøg musikbiblioteket"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "Genskanhandlingen vil fjerne et nummer fra dit musikbibliotek."
-msgstr[1] "Genskanhandlingen vil fjerne {0} numre fra dit musikbibliotek."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Hjælp"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Indhold"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Avanceret søgning i samling"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Lær avancerede måder at søge i din mediesamling"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Banshee _hjemmeside"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Besøg Banshee hjemmesiden"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Bliv involveret"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Bliv bidragyder til Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Versioner"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Vis detaljeret versions- og konfigurationsinformation"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importer afspilningsliste"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Afspilningslister"
@@ -3352,7 +3345,7 @@ msgstr "Skift til en kilde ved at indtaste dets navn"
#: ../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:87
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:85
msgid "Preferences"
msgstr "Indstillinger"
@@ -3477,7 +3470,7 @@ msgstr "Slet valgte elementer permanent fra lagringsmedie"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3542,26 +3535,18 @@ msgstr[0] "Er du sikker på, at du vil fjerne det valgte element fra din {1}?"
msgstr[1] ""
"Er du sikker på, at du vil fjerne de valgte {0} elementer fra din {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Er du sikker på, at du vil fortsætte?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Fjern numre"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Kunstner for _opsamlingsalbum:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Afkryds denne, hvis nummeret er en del af et album med numre fra forskellige "
"kunstnere"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3629,19 +3614,19 @@ msgstr "Sæt alle disknumre til denne værdi"
msgid "_Disc Number:"
msgstr "_Disknummer:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Sæt alle år til denne værdi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_År:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Sæt alle bedømmelser til denne værdi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Bedømmelse:"
@@ -3705,7 +3690,7 @@ msgstr "Sæt alle kommentarer til denne værdi"
msgid "Co_mment:"
msgstr "Ko_mmentar:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Hjælp"
@@ -3713,7 +3698,7 @@ msgstr "Hjælp"
msgid "Lyrics"
msgstr "Sangtekster"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Gå til det næste nummer og rediger dets titel"
@@ -3836,39 +3821,39 @@ msgstr "Filstørrelse:"
msgid "bytes"
msgstr "byte"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Redigering af numre"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Egenskaber for nummer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Vis det forrige nummer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Vis det næste nummer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Titel:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Kunstner:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Album:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Synkroniser alle _feltværdier"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3876,23 +3861,23 @@ msgstr ""
"Anvend værdierne fra alle fælles felter sat for dette nummer, på alle numre "
"valgt i denne redigering"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Redigerer {0} af {1} elementer</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "Gem ændringerne lavet på det åbne nummer?"
msgstr[1] "Gem ændringerne lavet på {0} af {1} åbne numre?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Luk _uden at gemme"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "Gemmer du ikke, vil ændringer fra de sidste {0} gå tabt."
@@ -3942,19 +3927,19 @@ msgstr[1] "Aktive opgaver der kører"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}fra{1} {2} {0}publiceret{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}på{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3962,56 +3947,56 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}af{1} {2} {0}fra{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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}fra{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}af{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Afbryd operation"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Afbryd {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Denne operation arbejder stadig. Vil du afbryde den?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "Operationen \"{0}\" arbejder stadig. Vil du afbryde den?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Fortsæt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Fortsæt {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Afbryder..."
@@ -4084,7 +4069,7 @@ msgstr "Ingen tilgængelige profiler"
msgid "Advanced"
msgstr "Avanceret"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Konfigurerer {0}"
@@ -4149,80 +4134,80 @@ msgstr "Åbn til redigering"
msgid "Create and save"
msgstr "Opret og gem"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Browserindhold"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Konfigurer filtrene der er tilgængelige i browseren"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Vis kunstnerfilter"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Vis en liste af kunstnere at filtrere efter"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Vis alle kunstnere"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Vis alle kunstnere i kunstnerfilteret"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Vis albumkunstnere"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Vis kun albumkunstnere, ikke kunstnere kun med enkelte numre"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Vis genrefilter"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Vis en liste over genrer at filtrere efter"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Vis filter for år"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Vis en liste af år at filtrere efter"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Ikke sat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Browser til venstre"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Vis kunstner/album-browser til venstre for nummerlisten"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Browser i top"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Vis kunstner/album-browser over nummerlisten"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Vis browser"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Vis eller skjul kunstner/album-browseren"
@@ -4238,12 +4223,12 @@ msgstr ""
msgid "The security certificate for {0} is invalid."
msgstr "Sikkerhedscertifikatet for {0} er ugyldigt."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Indlæser {0}..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4251,43 +4236,59 @@ msgstr ""
"Indsæt\n"
"disk"
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Ryd søgning"
+
# søgning?
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Søg"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Klar"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Kontakter..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Mellemlagrer"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+msgid "Volume"
+msgstr "Lydstyrke"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+msgid "Muted"
+msgstr "Lydløs"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+msgid "Full Volume"
+msgstr "Fuld lydstyrke"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108
msgid "Device"
msgstr "Enhed"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109
msgid "Generation"
msgstr "Generation"
#. FIXME
#. AddDapProperty (Catalog.GetString ("Color"), "black");
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:121
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:114
msgid "Capacity"
msgstr "Kapacitet"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:122
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
msgid "Available"
msgstr "Tilgængelig"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:123
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
msgid "Serial number"
msgstr "Serienummer"
@@ -4297,47 +4298,37 @@ msgstr "Serienummer"
#. 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:130
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:123
msgid "Supports cover art"
msgstr "Understøtter omslag"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:131
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:124
msgid "Supports photos"
msgstr "Understøtter billeder"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:453
msgid "Track duration is zero"
msgstr "Nummerets varighed er nul"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:556
msgid "Syncing iPod"
msgstr "Synkroniserer iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:557
msgid "Preparing to synchronize..."
msgstr "Klargør til synkronisering..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:560
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Tilføjer nummer {0} af {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Opdaterer metadata i nummer {0} af {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:596
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Fjerner nummer {0} af {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Rydder op, fjerner ugyldigt nummer {0} af {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:649
msgid "Writing media database"
msgstr "Skriver mediedatabase"
@@ -4346,40 +4337,40 @@ msgstr "Skriver mediedatabase"
msgid "Sync {0}"
msgstr "Synkroniser {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Enheder"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:179
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
msgid "Device Properties"
msgstr "Egenskaber for enhed"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
msgid "Product"
msgstr "Produkt"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
msgid "Vendor"
msgstr "Leverandør"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Indlæser {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Ja"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Nej"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4388,11 +4379,11 @@ msgstr ""
"{0}-formatet er ikke understøttet af enheden og ingen omkoder blev fundet "
"til at konvertere det"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr "Understøttelse af filformatskonvertering er ikke tilgængelig"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
msgstr "Fejl ved konvertering af fil"
@@ -4412,17 +4403,25 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Indstillinger for synkronisering"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Synkroniser"
+
#. 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.Gui/DapActions.cs:106
#, 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."
msgstr[0] "Synkroniseringshandlingen vil fjerne et nummer fra din enhed."
msgstr[1] "Synkroniseringshandlingen vil fjerne {0} numre fra din enhed."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Synkroniser"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Er du sikker på, at du vil fortsætte?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Fjern numre"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4495,12 +4494,12 @@ msgstr "Importer købt musik"
msgid "Disconnect"
msgstr "Frakobl"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Frakobler {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Kunne ikke frakoble {0}: {1}"
@@ -4632,13 +4631,12 @@ msgstr "Storbritannien (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "USA (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Søg i Amazons MP3-butik"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Hvordan dit køb støtter GNOME"
@@ -4743,15 +4741,15 @@ msgstr "_Bestem"
msgid "T_ap"
msgstr "_Prik"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Få Banshee til at forsøge automatisk at bestemme BPM'en på denne sang"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Afspil denne sang"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Prik på denne knap til rytmen for at angive BPM'en for denne sang manuelt"
@@ -4865,11 +4863,11 @@ msgstr "Log ind"
msgid "Connecting to {0}"
msgstr "Tilslutter til {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Tilføj ekstern DAAP-server"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Tilføj en ny ekstern DAAP-server"
@@ -5108,7 +5106,7 @@ msgstr "Tidsudløb under forsøg på indhentning af detaljer fra internetarkivet
#: ../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:309
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:301
msgid "Try Again"
msgstr "Forsøg igen"
@@ -5125,10 +5123,6 @@ msgstr "Fejl ved indhentning af elementdetaljer fra internetarkivet"
msgid "Description"
msgstr "Beskrivelse"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Ejer:"
@@ -5142,7 +5136,7 @@ msgid "Location:"
msgstr "Placering:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Dato:"
@@ -5155,7 +5149,7 @@ msgid "Publisher:"
msgstr "Udgiver:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Nøgleord:"
@@ -5229,16 +5223,16 @@ msgstr "{0} af {1} den {2}"
msgid "Write your own review"
msgstr "Skriv din egen anmeldelse"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Samling:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Valgfri forespørgsel"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Sorter efter:"
@@ -5328,10 +5322,6 @@ msgstr "NASA"
msgid "Library of Congress"
msgstr "Kongresbiblioteket"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
-msgid "Examples:"
-msgstr "Eksempler:"
-
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148
msgid ""
"The Internet Archive, a 501(c)(3) non-profit, is building a digital library "
@@ -5632,22 +5622,22 @@ msgstr "Rediger station"
msgid "Station"
msgstr "Station"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} station"
msgstr[1] "{0} stationer"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Angiv venligst en gyldig stations-URI"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Angiv venligst en stationsgenre"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Angiv venligst en stationstitel"
@@ -5659,7 +5649,7 @@ msgstr "Tilføj ny radiostation"
msgid "Edit radio station"
msgstr "Rediger radiostation"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5667,80 +5657,58 @@ msgstr ""
"Indtast genre, titel og URL på den radiostation du ønsker at tilføje. En "
"beskrivelse er valgfri."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Stationsgenre:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Stationsnavn:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "Stream-URL:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Stationsejer:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Beskrivelse:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Bedømmelse:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Behandlede {0} af {1} numre"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:129
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:130
msgid "Configure the Audioscrobbler plugin"
msgstr "Konfigurer Audioscrobbler-udvidelsesmodulet"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:133
msgid "Visit _User Profile Page"
msgstr "Besøg br_ugerprofilside"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:134
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:164
msgid "Visit Your Last.fm Profile Page"
msgstr "Besøg din Last.fm-profilside"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
-msgid "_Enable Song Reporting From Banshee"
-msgstr "_Aktiver sangrapportering fra Banshee"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:139
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:91
+msgid "_Enable Song Reporting"
+msgstr "Aktiver sangrapport_ering"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
-msgid "Enable song reporting From Banshee"
-msgstr "Aktiver sangrapportering fra Banshee"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
-msgid "_Enable Song Reporting From Device"
-msgstr "_Aktiver sangrapportering fra enhed"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
-msgid "Enable song reporting From Device"
-msgstr "Aktiver sangrapportering fra enhed"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Scrobble til Last.FM"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Scrobble til Last.FM ..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
+msgid "Enable song reporting"
+msgstr "Aktiver sangrapportering"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5798,48 +5766,48 @@ msgstr "Se dette nummers Last.fm-side"
msgid "Recommend this track to someone"
msgstr "Anbefal dette nummer til nogen"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
msgstr "http://da.wikipedia.org/wiki/{0}"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:78
msgid "Account"
msgstr "Konto"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:82
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:278
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:270
msgid "_Username"
msgstr "_Brugernavn"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:168
+#: ../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 "Tilmeld Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
+#: ../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"
@@ -5847,43 +5815,43 @@ msgstr ""
"Åbn Last.fm i en browser. Giver dig muligheden for at godkende Banshee til "
"at arbejde med din konto"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273
+#: ../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 "Log ind på Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+#: ../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 "Du skal give Banshee lov til at tilgå din konto hos Last.fm."
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:296
msgid "Finish Logging In"
msgstr "Færdig med logind"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:318
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:310
#, csharp-format
msgid "You are logged in to Last.fm as the user <i>{0}</i>."
msgstr "Du er logget ind på last.fm som bruger <i>{0}</i>."
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:321
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:313
msgid "Log out of Last.fm"
msgstr "Log ud af Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Senest elskede numre"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Senest afspillede numre"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Mine topkunstnere"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} afspilninger"
@@ -5973,17 +5941,17 @@ msgstr "Forbyd nummer"
msgid "Mark current track as banned"
msgstr "Marker nuværende nummer som forbudt"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "Fans af {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Ligner {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "Tilføj st_ation"
@@ -5999,7 +5967,7 @@ msgstr "Antal afspilninger"
msgid "New Station"
msgstr "Ny station"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "Stations_type:"
@@ -6140,11 +6108,11 @@ msgid "Now Playing"
msgstr "Afspiller nu"
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60
-#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
msgid "media"
msgstr "medie"
-#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
msgid "Quick access panel for your media"
msgstr "Hurtigt adgangspanel for dine medier"
@@ -6152,15 +6120,15 @@ msgstr "Hurtigt adgangspanel for dine medier"
msgid "_Mini Mode"
msgstr "_Minitilstand"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Fuld tilstand"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Skift tilbage til fuld tilstand"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Skift gentagelsestilstand"
@@ -6184,11 +6152,6 @@ msgstr "Søg efter podcasts"
msgid "Search for video podcasts"
msgstr "Søg efter videopodcast"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
-msgid "_Close"
-msgstr "_Luk"
-
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
msgid "_Show Notifications"
msgstr "Vi_s påmindelser"
@@ -6197,11 +6160,11 @@ msgstr "Vi_s påmindelser"
msgid "Show notifications when item changes"
msgstr "Vis påmindelser når der skiftes element"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Kører stadig"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6209,23 +6172,19 @@ msgstr ""
"Banshee blev lukket til statusområdet. Brug <i>Afslut</i> for at lukke din "
"session."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Forrige"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Spring dette element over"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Kan ikke vise påmindelse"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6234,6 +6193,10 @@ msgstr ""
"{0}af{1} {2}\n"
"{0}fra{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Forenkle"
@@ -6633,16 +6596,16 @@ msgid_plural "{0} episodes"
msgstr[0] "{0} afsnit"
msgstr[1] "{0} afsnit"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Aldrig opdateret"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Opdateret {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Opdateret {0}"
@@ -6725,18 +6688,18 @@ msgstr "Besøg hjemmeside"
msgid "Add Podcast"
msgstr "Tilføj podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
msgstr[0] "Slet fil"
msgstr[1] "Slet filer"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "Ugyldig URL"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "Podcast-URL er ugyldig."
@@ -6744,11 +6707,11 @@ msgstr "Podcast-URL er ugyldig."
msgid "Episode Details"
msgstr "Afsnitdetaljer"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Undersøg periodisk for nye episoder"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
@@ -6756,59 +6719,59 @@ msgstr ""
"Hvis afkrydset vil Banshee tjekke hver time for at se, om denne podcast har "
"nye episoder."
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Hent alle episoder"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Arkiver alle episoder undtagen den nyeste"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Ingen beskrivelse tilgængelig"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Navn:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Hjemmeside:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Besøg"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Indstillinger for abonnement"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "Adresse på nyhedskilde:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Sidst genopfrisket:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Kategori:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Ophavsret:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6928,23 +6891,23 @@ msgstr "klik"
msgid "menu"
msgstr "menu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Skjul <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "Der opstod en fatal fejl i {0}"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Oplysninger om fejl"
# brug samme formulering i GNOME f-spot
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "En uhåndterbar undtagelse opstod: "
@@ -7102,15 +7065,15 @@ msgstr "starter med"
msgid "ends with"
msgstr "slutter med"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Last.fm konto-logind"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Indtast venligst dine Last.fm-kontodetaljer."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Gem og log ind"
@@ -7118,115 +7081,97 @@ msgstr "Gem og log ind"
msgid "Authorize for Last.fm"
msgstr "Godkend til Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450
+msgid ""
+"Last.fm username is invalid or Banshee is not authorized to access your "
+"account."
+msgstr ""
+"Brugernavnet til Last.fm er ugyldigt, eller Banshee er ikke godkendt til at "
+"tilgå din konto."
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
msgid "This service does not exist."
msgstr "Denne tjeneste eksisterer ikke."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
msgid "Stations are only available to paying Last.fm subscribers."
msgstr "Stationer er kun tilgængelige for betalende Last.fm-abonnenter."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
msgid "This station is not available."
msgstr "Denne station er ikke tilgængelig."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
msgid "The request is missing a required parameter."
msgstr "Forespørgslen mangler en krævet parameter."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
msgid "The specified resource is invalid."
msgstr "Den angivne ressource er ugyldig."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
msgid "Server error, please try again later."
msgstr "Serverfejl, forsøg venligst igen senere."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
msgid "Invalid authentication information, please re-authenticate."
msgstr "Ugyldig godkendelsesinformation, gengodkend venligst."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
msgid "The API key used by this application is invalid."
msgstr "API-nøglen brugt af dette program er ugyldig."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
msgid ""
"The streaming system is offline for maintenance, please try again later."
msgstr ""
"Streamingsystemet er offline for vedligeholdelse, prøv venligst igen senere."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
msgid "The method signature is invalid."
msgstr "Metodeunderskriften er ugyldig."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
msgid "There is not enough content to play this station."
msgstr "Der er ikke nok indhold til at afspille denne station."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
msgid "This group does not have enough members for radio."
msgstr "Denne gruppe har ikke nok medlemmer til radio."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
msgid "This artist does not have enough fans for radio."
msgstr "Denne kunstner har ikke nok fans til radio."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
msgid "There are not enough neighbours for this station."
msgstr "Der er ikke nok naboer til denne station."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
-msgid "This user is not allowed to listen to radio during peak usage"
-msgstr "Denne bruger har ikke lov til at lytte til radio under spidsbelastning"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
-msgid "Radio station not found"
-msgstr "Radiostation blev ikke fundet"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
-msgid "This application is not allowed to make requests to the web services"
-msgstr ""
-"Dette program har ikke tilladelse til at udføre forespørgsler til "
-"nettjenesterne"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
-msgid "This type of request is no longer supported"
-msgstr "Denne forespørgselstype er ikke længere understøttet"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
-msgid ""
-"Your IP has made too many requests in a short period, exceeding our API "
-"guidelines"
-msgstr ""
-"Din IP har udført for mange forespørgsler indenfor en kort periode, hvilket "
-"overskriver vores API-retningslinjer."
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
msgid "There was an unknown error."
msgstr "Der opstod en ukendt fejl."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
msgid "Not connected to Last.fm."
msgstr "Ikke tilsluttet til Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
msgid "Account details are needed before you can connect to Last.fm"
msgstr "Kontodetaljer er nødvendige før du kan tilslutte til Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
msgid "No network connection detected."
msgstr "Ingen netværksforbindelse fundet."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
msgid "Last.fm username is invalid."
msgstr "Brugernavn til Last.fm er ugyldigt."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
msgid "Connecting to Last.fm."
msgstr "Tilslutter til Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
msgid "Connected to Last.fm."
msgstr "Tilsluttet til Last.fm."
diff --git a/po/el.po b/po/el.po
index b422d49..504b4f0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4,23 +4,21 @@
# Michael Kotsarinis <mk73628 at gmail.com>, 2011.
# Emmanouel Kapernaros <manolis at kapcom.gr>, 2011.
# Ioannis Zampoukas <ioza1964 at yahoo.gr>, 2011.
-# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32 at gmail.com>, 2013.
+#
msgid ""
msgstr ""
"Project-Id-Version: Banshee\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshe"
-"e&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-02 07:27+0000\n"
-"PO-Revision-Date: 2013-04-10 11:57+0300\n"
-"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32 at gmail.com>\n"
-"Language-Team: team at gnome.gr\n"
-"Language: el\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-06-03 13:55+0000\n"
+"PO-Revision-Date: 2012-06-14 01:19+0200\n"
+"Last-Translator: Tom Tryfonidis <tomtryf at gmail.com>\n"
+"Language-Team: Greek <team at gnome.gr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
-"X-Project-Style: gnome\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Virtaal 0.6.1\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
#: ../data/addin-xml-strings.cs:8
@@ -31,8 +29,10 @@ msgstr "Υποστήριξη συσκευών Apple"
msgid "Support for most iPod/iPhone/iPad devices."
msgstr "Υποστήριξη για τις περισσότερες συσκευές iPod/iPhone/iPad."
-#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15
-#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25
+#: ../data/addin-xml-strings.cs:10
+#: ../data/addin-xml-strings.cs:15
+#: ../data/addin-xml-strings.cs:20
+#: ../data/addin-xml-strings.cs:25
msgid "Device Support"
msgstr "Υποστήριξη Συσκευής"
@@ -51,12 +51,8 @@ msgid "Mass Storage Media Player Support"
msgstr "Υποστήριξη αναπαραγωγέα πολυμέσων μαζικής αποθήκευσης"
#: ../data/addin-xml-strings.cs:19
-msgid ""
-"Support for USB-drive based devices, including many iAudio devices and "
-"Android, Pre, and Galaxy phones."
-msgstr ""
-"Υποστήριξη για συσκευές τύπου USB-drive, συμπεριλαμβανομένων πολλών iAudio "
-"συσκευών και Android, Pre και Galaxy τηλεφώνων."
+msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones."
+msgstr "Υποστήριξη για συσκευές τύπου USB-drive, συμπεριλαμβανομένων πολλών iAudio συσκευών και Android, Pre και Galaxy τηλεφώνων."
#. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
#: ../data/addin-xml-strings.cs:23
@@ -65,9 +61,7 @@ msgstr "Υποστήριξη αναπαραγωγέα πολυμέσων MTP"
#: ../data/addin-xml-strings.cs:24
msgid "Support for MTP devices, including many Creative Zen devices."
-msgstr ""
-"Υποστήριξη για συσκευές MTP, συμπεριλαμβανομένων πολλών συσκευών Creative "
-"Zen."
+msgstr "Υποστήριξη για συσκευές MTP, συμπεριλαμβανομένων πολλών συσκευών Creative Zen."
#. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml
#: ../data/addin-xml-strings.cs:28
@@ -76,13 +70,16 @@ msgstr "Κατάστημα Amazon MP3"
#: ../data/addin-xml-strings.cs:29
msgid "Browse, search, and purchase music from the Amazon MP3 store."
-msgstr ""
-"Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα MP3 του Amazon."
-
-#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
-#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
-#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
-#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα MP3 του Amazon "
+
+#: ../data/addin-xml-strings.cs:30
+#: ../data/addin-xml-strings.cs:35
+#: ../data/addin-xml-strings.cs:65
+#: ../data/addin-xml-strings.cs:70
+#: ../data/addin-xml-strings.cs:85
+#: ../data/addin-xml-strings.cs:95
+#: ../data/addin-xml-strings.cs:100
+#: ../data/addin-xml-strings.cs:115
#: ../data/addin-xml-strings.cs:165
msgid "Online Sources"
msgstr "Πηγές στο διαδίκτυο"
@@ -105,9 +102,12 @@ msgstr "Βιβλιοθήκη ηοχγραφημένων βιβλίων"
msgid "Organize audiobooks, lectures, etc."
msgstr "Οργανώστε ηχογραφημένα βιβλία, διαλέξεις, κλπ."
-#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
-#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
-#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
+#: ../data/addin-xml-strings.cs:40
+#: ../data/addin-xml-strings.cs:75
+#: ../data/addin-xml-strings.cs:90
+#: ../data/addin-xml-strings.cs:135
+#: ../data/addin-xml-strings.cs:145
+#: ../data/addin-xml-strings.cs:150
msgid "Core"
msgstr "Πυρήνας"
@@ -120,13 +120,20 @@ msgstr "Σενάρια ενεργειών Boo"
msgid "Customize and extend Banshee with Boo-language scripts."
msgstr "Προσαρμόστε και επεκτείνετε το Banshee με script σε γλώσσα Boo."
-#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
-#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
-#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
-#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
-#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
-#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
-#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+#: ../data/addin-xml-strings.cs:45
+#: ../data/addin-xml-strings.cs:50
+#: ../data/addin-xml-strings.cs:55
+#: ../data/addin-xml-strings.cs:60
+#: ../data/addin-xml-strings.cs:80
+#: ../data/addin-xml-strings.cs:105
+#: ../data/addin-xml-strings.cs:110
+#: ../data/addin-xml-strings.cs:120
+#: ../data/addin-xml-strings.cs:125
+#: ../data/addin-xml-strings.cs:130
+#: ../data/addin-xml-strings.cs:140
+#: ../data/addin-xml-strings.cs:155
+#: ../data/addin-xml-strings.cs:160
+#: ../data/addin-xml-strings.cs:170
msgid "Utilities"
msgstr "Εφαρμογές"
@@ -155,8 +162,7 @@ msgstr "Διαμοιρασμός DAAP"
#: ../data/addin-xml-strings.cs:59
msgid "Browse and listen to music shared over your local network."
-msgstr ""
-"Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας δίκτυο."
+msgstr "Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας δίκτυο."
#. ../src/Extensions/Banshee.Emusic.Store/Banshee.Emusic.Store.addin.xml
#: ../data/addin-xml-strings.cs:63
@@ -165,7 +171,7 @@ msgstr "Κατάστημα eMusic"
#: ../data/addin-xml-strings.cs:64
msgid "Browse, search, and purchase music and audiobooks from eMusic"
-msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα του eMusic"
+msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα του eMusic "
#. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
#: ../data/addin-xml-strings.cs:68
@@ -192,9 +198,7 @@ msgstr "Επιδιόρθωση μεταδεδομένων"
#: ../data/addin-xml-strings.cs:79
msgid "Fix broken and missing metadata using bulk operations."
-msgstr ""
-"Επιδιόρθωση κατεστραμμένων και ελλιπών μεταδεδομένων με χρήση μαζικών "
-"διαδικασιών."
+msgstr "Επιδιόρθωση κατεστραμμένων και ελλιπών μεταδεδομένων με χρήση μαζικών διαδικασιών."
#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
#: ../data/addin-xml-strings.cs:83
@@ -204,9 +208,7 @@ msgstr "Internet Archive"
#: ../data/addin-xml-strings.cs:84
msgid "Browse and search the Internet Archive's vast media collection."
-msgstr ""
-"Περιήγηση και αναζήτηση της απέραντης συλλογής πολυμέσων της αρχειοθήκης "
-"διαδικτύου."
+msgstr "Περιήγηση και αναζήτηση της απέραντης συλλογής πολυμέσων του Internet Archive"
#. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
#: ../data/addin-xml-strings.cs:88
@@ -224,9 +226,7 @@ msgstr "Υπηρεσία σύλληψης του Last.fm"
#: ../data/addin-xml-strings.cs:94
msgid "Last.fm scrobbling and context pane recommendations."
-msgstr ""
-"Αυτόματη σύλληψη τραγουδιών του Last.fm (scrobbling) και προτάσεις στο "
-"πλαίσιο περιεχομένου."
+msgstr "Αυτόματη σύλληψη τραγουδιών του Last.fm (scrobbling) και προτάσεις στο πλαίσιο περιεχομένου."
#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
#: ../data/addin-xml-strings.cs:98
@@ -252,12 +252,8 @@ msgid "Mini Mode"
msgstr "Μικροσκοπική κατάσταση λειτουργίας"
#: ../data/addin-xml-strings.cs:109
-msgid ""
-"Control Banshee through a small window with only playback controls and track "
-"information."
-msgstr ""
-"Έλεγχος του Banshee μέσω ενός μικρού παραθύρου μόνο με κουμπιά αναπαραγωγής "
-"και πληροφορίες κομματιών."
+msgid "Control Banshee through a small window with only playback controls and track information."
+msgstr "Έλεγχος του Banshee μέσω ενός μικρού παραθύρου μόνο με κουμπιά αναπαραγωγής και πληροφορίες κομματιών."
#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
#: ../data/addin-xml-strings.cs:113
@@ -266,9 +262,7 @@ msgstr "Miro Guide Podcast Directory"
#: ../data/addin-xml-strings.cs:114
msgid "Browse and subscribe to thousands of audio and video podcasts."
-msgstr ""
-"Περιηγηθείτε και γίνεται συνδρομητές σε χιλιάδες φορητές εκπομπές ήχου και "
-"βίντεο."
+msgstr "Περιηγηθείτε και γίνεται συνδρομητές σε χιλιάδες φορητές εκπομπές ήχου και βίντεο."
#. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
#: ../data/addin-xml-strings.cs:118
@@ -295,9 +289,7 @@ msgstr "Εικονίδιο περιοχής ειδοποιήσεων"
#: ../data/addin-xml-strings.cs:129
msgid "Display an icon in the notification area for controlling Banshee."
-msgstr ""
-"Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του "
-"Banshee."
+msgstr "Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του Banshee."
#. ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.addin.xml
#: ../data/addin-xml-strings.cs:133
@@ -326,9 +318,7 @@ msgstr "Σειρά αναπαραγωγής"
#: ../data/addin-xml-strings.cs:144
msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
-msgstr ""
-"Βάλτε σε σειρά τα κομμάτια σε μια λίστα αναπαραγωγής της στιγμής ή αφήστε "
-"τον Αυτόματο DJ να αναλάβει."
+msgstr "Βάλτε σε σειρά τα κομμάτια σε μια λίστα αναπαραγωγής της στιγμής ή αφήστε τον Αυτόματο DJ να αναλάβει."
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
#: ../data/addin-xml-strings.cs:148
@@ -341,9 +331,7 @@ msgstr "Φορητές εκπομπές (Podcasts)"
#: ../data/addin-xml-strings.cs:149
msgid "Subscribe to podcasts and stream or download episodes."
-msgstr ""
-"Εγγραφείτε σε φορητές εκπομπές και μεταφορτώστε ή παρακολουθήστε σε ροή τα "
-"επεισόδια."
+msgstr "Εγγραφείτε σε φορητές εκπομπές και μεταφορτώστε ή παρακολουθήστε σε ροή τα επεισόδια."
#. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
#: ../data/addin-xml-strings.cs:153
@@ -361,7 +349,7 @@ msgstr "Πρόγραμμα μεταφόρτωσης torrent"
#: ../data/addin-xml-strings.cs:159
msgid "Support downloading BitTorrent files from podcasts."
-msgstr "Υποστήριξη μεταφόρτωσης αρχείων BitTorrent από διαδικτυακές μεταδόσεις."
+msgstr "Υποστήριξη μεταφόρτωσης αρχείων φορητών εκπομπών με BitTorrent."
#. ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
#: ../data/addin-xml-strings.cs:163
@@ -372,12 +360,8 @@ msgid "Ubuntu One Music Store"
msgstr "Κατάστημα μουσικής Ubuntu One"
#: ../data/addin-xml-strings.cs:164
-msgid ""
-"This extension grants access to the Ubuntu One Music Store, powered by "
-"7digital."
-msgstr ""
-"Αυτή η επέκταση δίνει πρόσβαση στο κατάστημα μουσικής Ubuntu One, που "
-"υποστηρίζεται από την 7digital."
+msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+msgstr "Αυτή η επέκταση δίνει πρόσβαση στο κατάστημα μουσικής Ubuntu One, που υποστηρίζεται από την 7digital."
#. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
#: ../data/addin-xml-strings.cs:168
@@ -385,11 +369,9 @@ msgid "UPnP Client"
msgstr "Πελάτης UPnP"
#: ../data/addin-xml-strings.cs:169
-msgid ""
-"Browse and play music and videos shared over your local network using UPnP."
-msgstr ""
-"Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας "
-"χρησιμοποιώντας το UPnP."
+#| msgid "Browse and listen to music shared over your local network."
+msgid "Browse and play music and videos shared over your local network using UPnP."
+msgstr "Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας χρησιμοποιώντας το UPnP."
#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
#: ../data/addin-xml-strings.cs:173
@@ -399,10 +381,10 @@ msgstr "Wikipedia"
#: ../data/addin-xml-strings.cs:174
msgid "View artist information from Wikipedia in the context pane."
-msgstr ""
-"Προβολή πληροφοριών καλλιτέχνη από τη Wikipedia στο πλαίσιο περιεχομένου."
+msgstr "Προβολή πληροφοριών καλλιτέχνη από τη Wikipedia στο πλαίσιο περιεχομένου."
-#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+#: ../data/addin-xml-strings.cs:175
+#: ../data/addin-xml-strings.cs:180
msgid "Context Pane"
msgstr "Πλαίσιο περιεχομένου"
@@ -421,12 +403,8 @@ msgid "AAC (Novell Encoder)"
msgstr "AAC (Κωδικοποιητής της Novell)"
#: ../data/audio-profiles/aac-novell.xml.in.h:2
-msgid ""
-"Designed to be the successor of the MP3 format, AAC generally achieves "
-"better sound quality than MP3 at many bit rates."
-msgstr ""
-"Σχεδιασμένο ως ο αντικαταστάτης του MP3, το AAC γενικά επιτυγχάνει καλύτερη "
-"ποιότητα ήχου σε σχέση με το MP3 σε διάφορους ρυθμούς διαμεταγωγής (bitrate)."
+msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates."
+msgstr "Σχεδιασμένο ως ο αντικαταστάτης του MP3, το AAC γενικά επιτυγχάνει καλύτερη ποιότητα ήχου σε σχέση με το MP3 σε διάφορους ρυθμούς διαμεταγωγής (bitrate)."
#: ../data/audio-profiles/aac-novell.xml.in.h:3
#: ../data/audio-profiles/mp3-lame.xml.in.h:9
@@ -477,13 +455,8 @@ msgid "Free Lossless Audio Codec"
msgstr "Ελεύθερος Μη Απωλεστικός Κωδικοποιητής Ήχου (FLAC)"
#: ../data/audio-profiles/flac.xml.in.h:2
-msgid ""
-"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but "
-"does not degrade audio quality."
-msgstr ""
-"Ο ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC) είναι ένας "
-"κωδικοποιητής ανοιχτού κώδικα που συμπιέζει αλλά δεν υποβαθμίζει την "
-"ποιότητα του ήχου."
+msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality."
+msgstr "Ο ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC) είναι ένας κωδικοποιητής ανοιχτού κώδικα που συμπιέζει αλλά δεν υποβαθμίζει την ποιότητα του ήχου."
#: ../data/audio-profiles/mp3-lame.xml.in.h:1
msgid "MP3 (LAME Encoder)"
@@ -491,12 +464,8 @@ msgstr "MP3 (Κωδικοποιητής LAME)"
#: ../data/audio-profiles/mp3-lame.xml.in.h:2
#: ../data/audio-profiles/mp3-xing.xml.in.h:2
-msgid ""
-"A proprietary and older, but also popular, lossy audio format that produces "
-"larger files at lower bitrates."
-msgstr ""
-"Μια ιδιοταγής και παλιότερο, αλλά επίσης διάσημη, απωλεστική μορφή συμπίεσης "
-"ήχου που παράγει μεγαλύτερα αρχεία σε χαμηλότερους ρυθμούς διαμεταγωγής."
+msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates."
+msgstr "Μια ιδιοταγής και παλιότερο, αλλά επίσης διάσημη, απωλεστική μορφή συμπίεσης ήχου που παράγει μεγαλύτερα αρχεία σε χαμηλότερους ρυθμούς διαμεταγωγής."
#: ../data/audio-profiles/mp3-lame.xml.in.h:3
msgid "Encoding Mode"
@@ -537,12 +506,8 @@ msgid "Ogg Vorbis"
msgstr "Ogg Vorbis"
#: ../data/audio-profiles/vorbis.xml.in.h:2
-msgid ""
-"Vorbis is an open source, lossy audio codec with high quality output at a "
-"lower file size than MP3."
-msgstr ""
-"Το Vorbis είναι ένας απωλεστικός κωδικοποιητής ήχου, ανοιχτού κώδικα, με "
-"υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος αρχείου από το MP3."
+msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3."
+msgstr "Το Vorbis είναι ένας απωλεστικός κωδικοποιητής ήχου, ανοιχτού κώδικα, με υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος αρχείου από το MP3."
#: ../data/audio-profiles/vorbis.xml.in.h:3
msgid "Audio quality"
@@ -553,13 +518,8 @@ msgid "Wavpack"
msgstr "Wavpack"
#: ../data/audio-profiles/wavpack.xml.in.h:2
-msgid ""
-"A fast and efficient open source audio format offering lossless and high-"
-"quality lossy encoding with great dynamic range."
-msgstr ""
-"Μία γρήγορη και αποδοτική μορφή αρχείου, ανοιχτού κώδικα, που προσφέρει μη "
-"απωλεστική και υψηλής ποιότητας απωλεστική κωδικοποίηση με μεγάλο δυναμικό "
-"εύρος."
+msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range."
+msgstr "Μία γρήγορη και αποδοτική μορφή αρχείου, ανοιχτού κώδικα, που προσφέρει μη απωλεστική και υψηλής ποιότητας απωλεστική κωδικοποίηση με μεγάλο δυναμικό εύρος."
#: ../data/audio-profiles/wavpack.xml.in.h:3
msgid "Mode"
@@ -606,25 +566,16 @@ msgid "Waveform PCM"
msgstr "Κυματομορφή PCM"
#: ../data/audio-profiles/wav.xml.in.h:2
-msgid ""
-"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
-"modulated (PCM) audio."
-msgstr ""
-"Το WAV+PCM είναι μία μη απωλεστική μορφή που διατηρεί μη συμπιεσμένο, "
-"ακατέργαστο ήχο, παλμοκωδικής διαμόρφωσης (PCM)."
+msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+msgstr "Το WAV+PCM είναι μία μη απωλεστική μορφή που διατηρεί μη συμπιεσμένο, ακατέργαστο ήχο, παλμοκωδικής διαμόρφωσης (PCM)."
#: ../data/audio-profiles/wma.xml.in.h:1
msgid "Windows Media Audio"
msgstr "Windows Media Audio"
#: ../data/audio-profiles/wma.xml.in.h:2
-msgid ""
-"A proprietary lossy audio format with high quality output at a lower file "
-"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
-msgstr ""
-"Μία ιδιοταγής απωλεστική μορφή ήχου με υψηλής ποιότητας έξοδο σε μικρότερο "
-"μέγεθος από MP3. Ένα αρχείο στα 96 kbps με WMA είναι ισοδύναμο με ένα στα "
-"128 kbps με MP3."
+msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+msgstr "Μία ιδιοταγής απωλεστική μορφή ήχου με υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος από MP3. Ένα αρχείο στα 96 kbps με WMA είναι ισοδύναμο με ένα στα 128 kbps με MP3."
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Use a variable bitrate"
@@ -635,7 +586,7 @@ msgid "Audio Quality"
msgstr "Ποιότητα ήχου"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Αναπαραγωγέας πολυμέσων"
@@ -651,7 +602,8 @@ msgstr "Αναπαραγωγή πολυμέσων Banshee"
msgid "Play and organize your media collection"
msgstr "Αναπαραγωγή και οργάνωση της συλλογής σας πολυμέσων"
-#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+#: ../libbanshee/banshee-bpmdetector.c:202
+#: ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
msgstr "Δεν μπορεί να δημιουργηθεί διοχέτευση"
@@ -681,7 +633,8 @@ msgid "Could not create fakesink plugin"
msgstr "Δεν μπορεί να δημιουργηθεί πρόσθετο fakesink"
#: ../libbanshee/banshee-bpmdetector.c:241
-#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+#: ../libbanshee/banshee-bpmdetector.c:250
+#: ../libbanshee/banshee-ripper.c:311
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281
msgid "Could not link pipeline elements"
msgstr "Δεν μπορούν να συνδεθούν στοιχεία διοχέτευσης"
@@ -741,7 +694,7 @@ msgstr "Αδύνατη η κατασκευή διοχέτευσης"
#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65
msgid "Write CD..."
-msgstr "Εγγραφή CD..."
+msgstr "Εγγραφή CD…"
#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:66
msgid "Write selected tracks to an audio CD"
@@ -778,36 +731,28 @@ msgstr "Αδυναμία δημιουργίας οδηγού ανίχνευση
msgid "Could not initialize GStreamer library"
msgstr "Η αρχικοποίηση της βιβλιοθήκης GStreamer δεν μπορεί να γίνει"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
msgid "Unknown Error"
msgstr "Άγνωστο σφάλμα"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
msgid "_Enable ReplayGain correction"
msgstr "_Ενεργοποίηση διόρθωσης του ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
-msgid ""
-"For tracks that have ReplayGain data, automatically scale (normalize) "
-"playback volume"
-msgstr ""
-"Για κομμάτια που έχουν δεδομένα κανονικοποίησης αναπαραγωγής (ReplayGain), "
-"αυτόματη προσαρμογή (κανονικοποίηση) της έντασης της αναπαραγωγής"
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
+msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
+msgstr "Για κομμάτια που έχουν δεδομένα κανονικοποίησης αναπαραγωγής (ReplayGain), αυτόματη προσαρμογή (κανονικοποίηση) της έντασης της αναπαραγωγής"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
msgid "Enable _gapless playback"
msgstr "Ενεργοποίηση αναπαραγωγής δίχως _κενά"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
-msgid ""
-"Eliminate the small playback gap on track change. Useful for concept albums "
-"and classical music"
-msgstr ""
-"Εξάλειψη της μικρής διακοπής αναπαραγωγής κατά την αλλαγή κομματιού. Χρήσιμο "
-"για ειδικά λευκώματα και για κλασσική μουσική"
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
+msgstr "Εξάλειψη της μικρής διακοπής αναπαραγωγής κατά την αλλαγή κομματιού. Χρήσιμο για ειδικά λευκώματα και για κλασσική μουσική"
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
msgid "Could not create transcoder"
@@ -818,7 +763,7 @@ msgstr "Δεν είναι δυνατή η δημιουργία του διακω
msgid "Could not create encoder pipeline : {0}"
msgstr "Δεν μπορεί να δημιουργηθεί διοχέτευση κωδικοποιητή: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -827,23 +772,27 @@ msgstr "GStreamer# 0.10"
msgid "Could not create encoding pipeline : {0}"
msgstr "Δεν είναι δυνατή η δημιουργία κωδικοποίησης διοχέτευσης: {0}"
-#. Translators: verb
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
-#| msgid "_Import"
-msgid "Import"
-msgstr "Εισαγωγή"
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+msgid "Close"
+msgstr "Κλείσιμο"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
msgid "Can't check for updates"
msgstr "Αδυναμία ελέγχου ενημερώσεων"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
-msgid ""
-"We're currently not able to check if there's a new version available. Please "
-"try again later."
-msgstr ""
-"Αυτήν τη στιγμή δεν είμαστε σε θέση να ελέγξουμε αν υπάρχει μια νέα έκδοση "
-"διαθέσιμη. Παρακαλώ δοκιμάστε αργότερα."
+msgid "We're currently not able to check if there's a new version available. Please try again later."
+msgstr "Αυτήν τη στιγμή δεν είμαστε σε θέση να ελέγξουμε αν υπάρχει μια νέα έκδοση διαθέσιμη. Παρακαλώ δοκιμάστε αργότερα."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
msgid "No update available"
@@ -851,14 +800,12 @@ msgstr "Δεν υπάρχει διαθέσιμη ενημέρωση"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
msgid "You already have the latest version of Banshee installed."
-msgstr "Έχετε ήδη την τελευταία έκδοση του Banshee εγκατεστημένη."
+msgstr "Έχετε ήδη την τελευταία έκδοση του Banshee εγκατεστημένη"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106
#, csharp-format
msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?"
-msgstr ""
-"Μια νέα έκδοση του Banshee ({0}) είναι διαθέσιμη.{1}Θέλετε να την "
-"ενημερώσετε;"
+msgstr "Μια νέα έκδοση του Banshee ({0}) είναι διαθέσιμη.{1}Θέλετε να την ενημερώσετε;"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108
msgid "Banshee update available"
@@ -872,6 +819,7 @@ msgstr "Μεταφόρτωση {0}"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:144
#, csharp-format
+#| msgid "{0} by {1} on {2}"
msgid "{0} MB / {1} MB ({2} KB/s)"
msgstr "{0} MB / {1} MB ({2} KB/s)"
@@ -885,12 +833,8 @@ msgstr "Η μεταφόρτωση απέτυχε Παρακαλώ προσπαθ
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165
#, csharp-format
-msgid ""
-"The update finished downloading.{0}Do you want to shutdown Banshee and run "
-"the installer?"
-msgstr ""
-"Η λήψη της ενημέρωσης ολοκληρώθηκε.{0}Θέλετε να κλείσετε το Banshee και να "
-"εκτελέσετε το πρόγραμμα εγκατάστασης;"
+msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?"
+msgstr "Η λήψη της ενημέρωσης ολοκληρώθηκε.{0}Θέλετε να κλείσετε το Banshee και να εκτελέσετε το πρόγραμμα εγκατάστασης;"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
msgid "Update finished downloading"
@@ -941,35 +885,24 @@ msgid "Playback Control Options"
msgstr "Επιλογές ελέγχου αναπαραγωγής"
#: ../src/Clients/Booter/Booter/Entry.cs:164
-msgid ""
-"Play the next track, optionally restarting if the 'restart' value is set"
-msgstr ""
-"Αναπαραγωγή του επόμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή "
-"'restart' έχει ορισθεί"
+msgid "Play the next track, optionally restarting if the 'restart' value is set"
+msgstr "Αναπαραγωγή του επόμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή 'restart' έχει ορισθεί"
#: ../src/Clients/Booter/Booter/Entry.cs:165
+#, fuzzy
#| msgid ""
#| "Play the previous track, optionally restarting if the 'restart value is "
#| "set"
-msgid ""
-"Play the previous track, optionally restarting if the 'restart' value is set"
-msgstr ""
-"Αναπαραγωγή του προηγούμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή "
-"'restart' έχει ορισθεί"
+msgid "Play the previous track, optionally restarting if the 'restart' value is set"
+msgstr "Αναπαραγωγή του προηγούμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή 'restart' έχει ορισθεί"
#: ../src/Clients/Booter/Booter/Entry.cs:166
-msgid ""
-"If the current song has been played longer than 4 seconds then restart it, "
-"otherwise the same as --previous"
-msgstr ""
-"Αν το τρέχον τραγούδι έχει αναπαραχθεί για περισσότερα από 4 δευτερόλεπτα "
-"μετά επανέναρξη, αλλιώς είναι ίδιο με --previous"
+msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous"
+msgstr "Αν το τρέχον τραγούδι έχει αναπαραχθεί για περισσότερα από 4 δευτερόλεπτα μετά επανέναρξη, αλλιώς είναι ίδιο με --previous"
#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
-msgstr ""
-"Αυτόματη έναρξη αναπαραγωγής οποιουδήποτε κομματιού ακολουθεί στη γραμμή "
-"εντολών"
+msgstr "Αυτόματη έναρξη αναπαραγωγής οποιουδήποτε κομματιού ακολουθεί στη γραμμή εντολών"
#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
@@ -988,17 +921,12 @@ msgid "Completely stop playback"
msgstr "Ολοκληρωτική διακοπή αναπαραγωγής"
#: ../src/Clients/Booter/Booter/Entry.cs:173
-msgid ""
-"Enable or disable playback stopping after the currently playing track (value "
-"should be either 'true' or 'false')"
-msgstr ""
-"Ενεργοποίηση ή απενεργοποίηση διακοπής αναπαραγωγής μετά το τρέχον "
-"αναπαραγόμενο κομμάτι (η τιμή θα πρέπει να είναι 'true' ή 'false')"
+msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')"
+msgstr "Ενεργοποίηση ή απενεργοποίηση διακοπής αναπαραγωγής μετά το τρέχον αναπαραγόμενο κομμάτι (η τιμή θα πρέπει να είναι 'true' ή 'false')"
#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
-msgstr ""
-"Ρυθμίστε την ένταση αναπαραγωγής (0-100), με πρόσημο +/- για σχετικές τιμές"
+msgstr "Ρυθμίστε την ένταση αναπαραγωγής (0-100), με πρόσημο +/- για σχετικές τιμές"
#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
@@ -1006,8 +934,7 @@ msgstr "Αναζήτηση σε συγκεκριμένο σημείο (δευτ
#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
-msgstr ""
-"Ορίστε τη βαθμολόγηση του τρέχοντος κομματιού που αναπαράγεται (0 ως 5)"
+msgstr "Ορίστε τη βαθμολόγηση του τρέχοντος κομματιού που αναπαράγεται (0 ως 5)"
#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
@@ -1133,8 +1060,7 @@ msgstr "Απόκρυψη της διεπαφής χρήστη"
#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
-msgstr ""
-"Η διεπαφή χρήστη δεν παρουσιάζεται, ανεξάρτητα από οποιαδήποτε άλλη επιλογή"
+msgstr "Η διεπαφή χρήστη δεν παρουσιάζεται, ανεξάρτητα από οποιαδήποτε άλλη επιλογή"
#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
@@ -1170,7 +1096,7 @@ msgstr "Ενεργοποίηση εξαγωγής αποσφαλμάτωσης
#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
-msgstr "Ορίστε μία εναλλακτική βάση δεδομένων για χρήση"
+msgstr "Ορίστε μία εναλλακτική βάση δεδομένων για χρήση "
#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
@@ -1181,13 +1107,8 @@ msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Ορίστε ένα εναλλακτικό κλειδί, η προεπιλογή είναι /apps/banshee-1/"
#: ../src/Clients/Booter/Booter/Entry.cs:221
-msgid ""
-"Optimize instance for running uninstalled; most notably, this will create an "
-"alternate Mono.Addins database in the working directory"
-msgstr ""
-"Βελτιστοποίηση στιγμιότυπου για απεγκατεστημένη εκτέλεση• ειδικότερα, αυτό "
-"θα δημιουργήσει μία εναλλακτική βάση δεδομένων Mono.Addins στον τρέχοντα "
-"κατάλογο"
+msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory"
+msgstr "Βελτιστοποίηση στιγμιότυπου για απεγκατεστημένη εκτέλεση• ειδικότερα, αυτό θα δημιουργήσει μία εναλλακτική βάση δεδομένων Mono.Addins στον τρέχοντα κατάλογο"
#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
@@ -1196,9 +1117,7 @@ msgstr "Εξολοκλήρου απενεργοποίηση υποστήριξη
#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
msgid "Skip loading a custom gtkrc file ({0}) if it exists"
-msgstr ""
-"Παραβλέψτε την φόρτωση ενός προσαρμοσμένου αρχείου gtkrc ({0}) αν αυτό "
-"υπάρχει"
+msgstr "Παραβλέψτε την φόρτωση ενός προσαρμοσμένου αρχείου gtkrc ({0}) αν αυτό υπάρχει"
#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
@@ -1245,13 +1164,6 @@ msgstr "{0} υπολείπονται"
msgid "Play Song"
msgstr "Αναπαραγωγή τραγουδιού"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
-msgid "Close"
-msgstr "Κλείσιμο"
-
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
@@ -1290,93 +1202,96 @@ msgstr "Είδος"
msgid "Comment"
msgstr "Σχόλιο"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "Άγνωστος δίσκος"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Άγνωστος καλλιτέχνης"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Άγνωστος δίσκος"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Άγνωστος τίτλος"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Διάφοροι καλλιτέχνες"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Η τοποθεσίας της ροής δε βρέθηκε"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
msgid "File not found"
msgstr "Το αρχείο δε βρέθηκε"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
-msgstr ""
-"Ο αποκωδικοποιητής για την αναπαραγωγή αυτού του τύπου πολυμέσων δεν είναι "
-"διαθέσιμος"
+msgstr "Ο αποκωδικοποιητής για για την αναπαραγωγή αυτού του τύπου πολυμέσων δεν είναι διαθέσιμος"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Αρχείο προστατευμένο με Digital Rights Management (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Άγνωστο σφάλμα"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Επανεκκίνηση φορητής εκπομπής"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Επανεκκίνηση ηχογραφημένου βιβλίου"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Επανεκκίνηση βίντεο"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Επανεκκίνηση τραγουδιού"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Επανεκκίνηση αντικειμένου"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Μεταπήδηση στην αναπαραγόμενη φορητή εκπομπή"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Μεταπήδηση στο αναπαραγόμενο ηχογραφημένο βιβλίο"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Μεταπήδηση στο αναπαραγόμενο βίντεο"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Μεταπήδηση στο αναπαραγόμενο τραγούδι"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Μεταπήδηση στο αναπαραγόμενο αντικείμενο"
#: ../src/Core/Banshee.Core/Banshee.Collection/YearInfo.cs:38
+#| msgid "Unknown error"
msgid "Unknown Year"
msgstr "Άγνωστο έτος"
@@ -1389,6 +1304,7 @@ msgstr "{0} ({1}:{2:00})"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs:76
#, csharp-format
+#| msgid "All Artists ({0})"
msgid "All Album Artists ({0})"
msgstr "Όλοι οι δίσκοι των καλλιτεχνών ({0})"
@@ -1405,7 +1321,7 @@ msgstr "Όλοι οι καλλιτέχνες ({0})"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs:173
#, csharp-format
msgid "File is empty so it could not be imported: {0}"
-msgstr "Το αρχείο είναι κενό, γιαυτό δεν μπόρεσε να εισαχθεί: {0}"
+msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:96
@@ -1414,6 +1330,7 @@ msgstr "Τιμή"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs:66
#, csharp-format
+#| msgid "All Genres ({0})"
msgid "All Years ({0})"
msgstr "Όλα τα έτη ({0})"
@@ -1427,9 +1344,7 @@ msgstr "κατά δίσκο"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
msgid "Play all songs from an album, then randomly choose another album"
-msgstr ""
-"Αναπαραγωγή όλων των τραγουδιών από ένα δίσκο, και στη συνέχεια τυχαία "
-"επιλογή άλλου δίσκου"
+msgstr "Αναπαραγωγή όλων των τραγουδιών από ένα δίσκο, και στη συνέχεια τυχαία επιλογή άλλου δίσκου"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50
msgid "Shuffle by A_rtist"
@@ -1441,9 +1356,7 @@ msgstr "κατά καλλιτέχνη"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52
msgid "Play all songs by an artist, then randomly choose another artist"
-msgstr ""
-"Αναπαραγωγή όλων των τραγουδιών ενός καλλιτέχνη, έπειτα τυχαία επιλογή άλλου "
-"καλλιτέχνη"
+msgstr "Αναπαραγωγή όλων των τραγουδιών ενός καλλιτέχνη, έπειτα τυχαία επιλογή άλλου καλλιτέχνη"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
@@ -1467,8 +1380,7 @@ msgstr "κατά βαθμολογία"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
msgid "Play songs randomly, prefer higher rated songs"
-msgstr ""
-"Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με υψηλότερη αξιολόγηση"
+msgstr "Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με υψηλότερη αξιολόγηση"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43
msgid "Shuffle by S_core"
@@ -1481,9 +1393,7 @@ msgstr "κατά βαθμολογία"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:45
msgid "Play songs randomly, prefer higher scored songs"
-msgstr ""
-"Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με την υψηλότερη "
-"βαθμολογία"
+msgstr "Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με την υψηλότερη βαθμολογία"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
msgid "Shuffle by _Song"
@@ -1502,14 +1412,14 @@ msgid "Scanning for media"
msgstr "Σάρωση για μέσα"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
-msgstr "Σάρωση..."
+msgstr "Σάρωση…"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204
#, csharp-format
msgid "Scanning ({0} files)..."
-msgstr "Σάρωση ({0} αρχείων)..."
+msgstr "Σάρωση ({0} αρχείων)…"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
msgid "Importing Media"
@@ -1518,8 +1428,7 @@ msgstr "Εισαγωγή μέσων"
#: ../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 ""
-"Η διαδικασία εισαγωγής εκτελείται αυτή τη στιγμή. Θα θέλατε να την διακόψετε;"
+msgstr "Η διαδικασία εισαγωγής εκτελείται αυτή τη στιγμή. Θα θέλατε να την διακόψετε;"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
@@ -1528,7 +1437,7 @@ msgstr ""
msgid "Importing {0} of {1}"
msgstr "Εισαγωγή {0} από {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Επανασάρωση {0} από {1}"
@@ -1538,13 +1447,10 @@ msgid "Upgrading your Banshee Database"
msgstr "Αναβαθμίστε την βάση δεδομένων σας του Banshee"
#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
-msgid ""
-"Please wait while your old Banshee database is migrated to the new format."
-msgstr ""
-"Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee μεταφέρεται "
-"στη νέα μορφή."
+msgid "Please wait while your old Banshee database is migrated to the new format."
+msgstr "Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee μεταφέρεται στη νέα μορφή."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Ανανέωση μεταδεδομένων"
@@ -1620,31 +1526,12 @@ msgstr "Απαλό Ροκ"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Αφαίρεση από τη βιβλιοθήκη"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
-msgid "File Organization"
-msgstr "Οργάνωση αρχείων"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
-#| msgid "Co_py files to media folders when importing"
-msgid "Co_py files to media folder when importing"
-msgstr "Αντι_γραφή αρχείων σε φακέλους πολυμέσων όταν γίνεται εισαγωγή"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
-msgid "_Update file and folder names"
-msgstr "_Ενημέρωση αρχείου και ονόματα φακέλων"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
-msgid "Rename files and folders according to media metadata"
-msgstr ""
-"Μετονομασία αρχείων και φακέλων σύμφωνα με τα μεταδεδομένα των πολυμέσων"
-
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
#, csharp-format
msgid "{0} Folder"
msgstr "Φάκελος {0}"
@@ -1721,107 +1608,105 @@ msgid "Search your music"
msgstr "Αναζήτηση της μουσικής σας"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
msgid "Miscellaneous"
msgstr "Διάφορα"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "_Ταξινόμηση των δίσκων ενός καλλιτέχνη κατά έτος και όχι κατά τίτλο"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} τραγούδι"
msgstr[1] "{0} τραγούδια"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
msgid "Music Folder"
msgstr "Φάκελος μουσικής"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Αγαπημένα"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "Τραγούδια που αξιολογήθηκαν με τέσσερα και πέντε αστέρια"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "Πρόσφατα αγαπημένα"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "Τραγούδια που ακούστηκαν αρκετά συχνά την προηγούμενη εβδομάδα"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Πρόσφατες προσθήκες"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "Τραγούδια που εισάχθηκαν μέσα στην προηγούμενη εβδομάδα"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
msgid "Recently Played"
msgstr "Πρόσφατες αναπαραγωγές"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
msgid "Recently played songs"
msgstr "Πρόσφατα αναπαραχθέντα τραγούδια"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "Δεν το έχετε ακούσει"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "Τραγούδια που δεν έχουν αναπαραχθεί ή παραλειφθεί"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Παραμελημένα αγαπημένα"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "Αγαπημένα που δεν έχουν αναπαραχθεί πάνω από δύο μήνες"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "Λιγότερο Αγαπημένο"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
-msgstr ""
-"Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που παραλείπονται "
-"συχνά"
+msgstr "Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που παραλείπονται συχνά"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 MB από Αγαπημένα"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "Ένας ψηφιακός δίσκος (CD) δεδομένων για αγαπημένα τραγούδια"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 λεπτά από αγαπημένα"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "Ένα CD ήχου γεμάτο αγαπημένα τραγούδια"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "Μη αξιολογημένο"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr "Τραγούδια που δεν έχουν αξιολογηθεί"
@@ -1835,41 +1720,41 @@ msgid "Importing From {0}"
msgstr "Εισήχθηκε από {0}"
#. Catalog.GetString ("Video Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
#: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
msgid "Videos"
msgstr "Βίντεο"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
msgid "Search your videos"
msgstr "Αναζήτηση των βίντεο σας"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
msgid "Produced By"
msgstr "Δημιουργήθηκε από"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
#, csharp-format
msgid "{0} video"
msgid_plural "{0} videos"
msgstr[0] "{0} βίντεο"
msgstr[1] "{0} βίντεο"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
msgid "Videos Folder"
msgstr "Φάκελος βίντεο"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr "Βίντεο αξιολογημένα με τέσσερα και πέντε αστέρια"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "Δεν προβλήθηκαν"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr "Βίντεο που δεν έχουν αναπαραχθεί ακόμη"
@@ -1878,12 +1763,8 @@ msgid "Default player engine"
msgstr "Προεπιλεγμένη μηχανή αναπαραγωγής"
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
-msgid ""
-"No player engines were found. Please ensure Banshee has been cleanly "
-"installed."
-msgstr ""
-"Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee "
-"έχει εγκατασταθεί σωστά."
+msgid "No player engines were found. Please ensure Banshee has been cleanly installed."
+msgstr "Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee έχει εγκατασταθεί σωστά."
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
msgid "Problem with Player Engine"
@@ -1899,12 +1780,8 @@ msgid "Initializing"
msgstr "Αρχικοποίηση"
#: ../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 ""
-"Τα αρχεία αυτή τη στιγμή μετατρέπονται σε άλλη μορφή. Θα θέλατε να διακόψετε "
-"τη διαδικασία;"
+msgid "Files are currently being converted to another format. Would you like to stop this?"
+msgstr "Τα αρχεία αυτή τη στιγμή μετατρέπονται σε άλλη μορφή. Θα θέλατε να διακόψετε τη διαδικασία;"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
msgid "Saving Metadata to File"
@@ -1912,45 +1789,44 @@ msgstr "Αποθήκευση μεταδεδομένων σε αρχείο"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
msgid "Sync _metadata between library and files"
-msgstr "Συγχρονισμός _μεταδεδομένων μεταξύ βιβλιοθήκης και αρχείων"
+msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
+#, fuzzy
#| msgid ""
#| "Enable this option to save rating metadata inside supported audio files"
-msgid ""
-"Enable this option to have metadata in sync between your library and "
-"supported media files"
-msgstr ""
-"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων μεταξύ της "
-"βιβλιοθήκης και των υποστηριζόμενων αρχείων μέσων"
+msgid "Enable this option to have metadata in sync between your library and supported media files"
+msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
msgid "Sync _ratings between library and files"
-msgstr "Συγχρονισμός _ταξινόμησης μεταξύ βιβλιοθήκης και αρχείων"
+msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
+#, fuzzy
#| msgid ""
#| "Enable this option to save rating metadata inside supported audio files"
-msgid ""
-"Enable this option to have rating metadata synced between your library and "
-"supported audio files"
-msgstr ""
-"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων ταξινόμησης "
-"μεταξύ της βιβλιοθήκης και των υποστηριζόμενων αρχείων ήχου"
+msgid "Enable this option to have rating metadata synced between your library and supported audio files"
+msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
msgid "Sync play counts between library and files"
-msgstr "Συγχρονισμός αριθμών αναπαραγωγής μεταξύ βιβλιοθήκης και αρχείων"
+msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
+#, fuzzy
#| msgid ""
#| "Enable this option to save playcount metadata inside supported audio files"
-msgid ""
-"Enable this option to have playcount metadata synced between your library "
-"and supported audio files"
-msgstr ""
-"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων αριθμού "
-"αναπαραγωγής μεταξύ της βιβλιοθήκης σας και των υποστηριζόμενων αρχείων ήχου"
+msgid "Enable this option to have playcount metadata synced between your library and supported audio files"
+msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67
+msgid "_Update file and folder names"
+msgstr "_Ενημέρωση αρχείου και ονόματα φακέλων"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68
+msgid "Rename files and folders according to media metadata"
+msgstr "Μετονομασία αρχείων και φακέλων σύμφωνα με τα μεταδεδομένα των πολυμέσων"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
@@ -1958,24 +1834,19 @@ msgstr "Δεν υπάρχει διαθέσιμη δικτυακή σύνδεση
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:78
msgid "Cannot connect to NetworkManager or Wicd"
-msgstr ""
-"Δεν είναι δυνατή η σύνδεση στη διαχείριση δικτύου (Network Manager ή Wicd)"
+msgstr "Δεν είναι δυνατή η σύνδεση στη διαχείριση δικτύου (Network Manager ή Wicd)"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:79
msgid "An available, working network connection will be assumed"
-msgstr "Θα υποτεθεί διαθέσιμη, σε λειτουργία, σύνδεση δικτύου"
+msgstr "Θα υποτεθεί διαθέσιμη, σε λειτουργία, σύνδεση δικτύου "
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159
msgid "_Disable features requiring Internet access"
msgstr "_Απενεργοποίηση χαρακτηριστικών που απαιτούν πρόσβαση στο διαδίκτυο"
#: ../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 ""
-"Κάποια χαρακτηριστικά απαιτούν ευρυζωνική σύνδεση διαδικτύου όπως είναι το "
-"Last.fm ή η αναζήτηση για εξώφυλλο"
+msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching"
+msgstr "Κάποια χαρακτηριστικά απαιτούν ευρυζωνική σύνδεση διαδικτύου όπως είναι το Last.fm ή η αναζήτηση για εξώφυλλο"
#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
msgid "Search this playlist"
@@ -2000,7 +1871,7 @@ msgstr "Διαγραφή λίστας αναπαραγωγής"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Νέα λίστα αναπαραγωγής"
@@ -2043,7 +1914,11 @@ msgstr "Επεκτάσεις"
msgid "File Policies"
msgstr "Πολιτικές αρχείου"
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+msgid "Co_py files to media folders when importing"
+msgstr "Αντι_γραφή αρχείων σε φακέλους πολυμέσων όταν γίνεται εισαγωγή"
+
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70
msgid "Improve Banshee by sending anonymous usage data"
msgstr "Βελτιώστε το Banshee στέλνοντας ανώνυμες πληροφορίες χρήσης"
@@ -2604,7 +2479,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
msgid "Unknown"
msgstr "Άγνωστο"
@@ -2631,7 +2506,7 @@ msgid "Delete Smart Playlist"
msgstr "Διαγραφή έξυπνης λίστας αναπαραγωγής"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Όλα τα είδη ({0})"
@@ -2701,20 +2576,24 @@ msgstr "Ταξινόμηση λιστών αναπαραγωγής κατά"
msgid "Drive"
msgstr "Δίσκος"
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
+msgid "File Organization"
+msgstr "Οργάνωση αρχείων"
+
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
msgid "Folder hie_rarchy"
msgstr "Ιε_ραρχία φακέλων"
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
msgid "File _name"
-msgstr "Ό_νομα αρχείου"
+msgstr "_Όνομα αρχείου"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:703
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "Προσθήκη {0} από {1} σε {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:722
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "Διαγραφή {0} από {1} από {2}"
@@ -2774,9 +2653,9 @@ msgid ""
"\n"
" Check your 'Preferred Applications' settings."
msgstr ""
-"Το {0} δεν μπόρεσε να ανοιχτεί: {1}\n"
+"Δεν ήταν δυνατό το άνοιγμα του {0}: {1}\n"
"\n"
-"Ελέγξτε τις ρυθμίσεις για τις 'Προτιμώμενες εφαρμογές' σας."
+"Ελέγξτε τις ρυθμίσεις για τις «Προτιμώμενες Εφαρμογές» σας."
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:49
msgid "Show:"
@@ -2813,13 +2692,8 @@ msgid "Cannot Reorder While Sorted"
msgstr "Αδυναμία επαναδιάταξης ενόσω είναι ταξινομημένα"
#: ../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."
-msgstr ""
-"Για να θέσετε τη λίστα αναπαραγωγής σε χειροκίνητη ταξινόμηση, κάντε κλικ "
-"στην κεφαλίδα της τρέχουσας ταξινομημένης στήλης μέχρι το βέλος ταξινόμησης "
-"να φύγει."
+msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away."
+msgstr "Για να θέσετε τη λίστα αναπαραγωγής σε χειροκίνητη ταξινόμηση, κάντε κλικ στην κεφαλίδα της τρέχουσας ταξινομημένης στήλης μέχρι το βέλος ταξινόμησης να φύγει."
#. Translators: this is {disc number} of {disc count}
#. Translators: this is {track number} of {track count}
@@ -2849,7 +2723,7 @@ msgstr "Εξωτερικό Έγγραφο"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
msgid "Choose New Cover Art..."
-msgstr "Επιλέξτε νέο εξώφυλλο..."
+msgstr "Επιλέξτε νέο εξώφυλλο…"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98
msgid "Delete This Cover Art"
@@ -2897,12 +2771,12 @@ msgstr "Απόκρυψη πλαισίου περιεχομένου"
#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
-msgstr "Αναμονή για έναρξη της αναπαραγωγής..."
+msgstr "Αναμονή για έναρξη της αναπαραγωγής…"
#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
-msgstr "Φόρτωση..."
+msgstr "Φόρτωση…"
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:74
msgid "Preamp"
@@ -2968,6 +2842,10 @@ msgstr "Καταπληκτική Διαχείριση και Αναπαραγω
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
+#| msgid ""
+#| "Copyright © 2005–{0} Novell, Inc.\n"
+#| "Copyright © 2005–{0} Others\n"
+#| "Copyright © 2005 Aaron Bockover"
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
"Copyright © 2005–{1} Others\n"
@@ -2986,13 +2864,8 @@ msgid "Important tasks are running"
msgstr "Εκτελούνται σημαντικές εργασίες"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
-msgid ""
-"Closing Banshee now will cancel any currently running tasks. They cannot be "
-"resumed automatically the next time Banshee is run."
-msgstr ""
-"Το κλείσιμο του Banshee θα ακυρώσει τις τρέχουσες εκτελέσιμες εργασίες. Δεν "
-"μπορούν να επαναληφθούν αυτόματα την επόμενη φορά που θα εκτελεστεί το "
-"Banshee."
+msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run."
+msgstr "Το κλείσιμο του Banshee θα ακυρώσει τις τρέχουσες εκτελέσιμες εργασίες. Δεν μπορούν να επαναληφθούν αυτόματα την επόμενη φορά που θα εκτελεστεί το Banshee."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
msgid "Quit Anyway"
@@ -3007,12 +2880,8 @@ msgid "Make Banshee the default media player?"
msgstr "Να γίνει το Banshee η προεπιλεγμένη εφαρμογή αναπαραγωγής πολυμέσων;"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
-msgid ""
-"Currently another program is configured as the default media player. Would "
-"you prefer Banshee to be the default?"
-msgstr ""
-"Αυτή τη στιγμή ένα άλλο πρόγραμμα έχει ρυθμιστεί ως η προεπιλεγμένη εφαρμογή "
-"αναπαραγωγής πολυμέσων. Θα προτιμούσατε να είναι προεπιλεγμένο το Banshee;"
+msgid "Currently another program is configured as the default media player. Would you prefer Banshee to be the default?"
+msgstr "Αυτή τη στιγμή ένα άλλο πρόγραμμα έχει ρυθμιστεί σαν η προεπιλεγμένη εφαρμογή αναπαραγωγής πολυμέσων. Θα προτιμούσατε να είναι προεπιλεγμένο το Banshee;"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
@@ -3025,7 +2894,7 @@ msgid "Make Banshee the Default"
msgstr "Ορίστε το Banshee ως προεπιλεγμένο"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "Ε_ισαγωγή"
@@ -3052,7 +2921,7 @@ msgstr "Άνοιγμα τοποθεσίας"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:54
msgid "Browse..."
-msgstr "Περιήγηση..."
+msgstr "Περιήγηση…"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:64
msgid "Enter the address of the file you would like to open:"
@@ -3068,7 +2937,7 @@ msgstr "_Πολυμέσα"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:53
msgid "Import _Media..."
-msgstr "Εισαγωγή _πολυμέσων..."
+msgstr "Εισαγωγή _πολυμέσων…"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:54
msgid "Import media from a variety of sources"
@@ -3076,114 +2945,99 @@ msgstr "Εισαγωγή μέσων από διάφορες πηγές"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:57
msgid "Import _Playlist..."
-msgstr "Εισαγωγή _λίστας αναπαραγωγής..."
+msgstr "Εισαγωγή _λίστας αναπαραγωγής"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:58
msgid "Import a playlist"
msgstr "Εισαγωγή μιας λίστας αναπαραγωγής"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
-msgid "Open _Location..."
-msgstr "Άνοιγμα _τοποθεσίας..."
+msgid "Rescan Music Library"
+msgstr "Νέα σάρωση της βιβλιοθήκης μουσικής"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Νέα σάρωση του φακέλου της Μουσικής Βιβλιοθήκης"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
+msgid "Open _Location..."
+msgstr "Άνοιγμα _τοποθεσίας…"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Ανοίξτε μία απομακρυσμένη τοποθεσία για αναπαραγωγή"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "Έ_ξοδος"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Τερματισμός Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Επεξεργασία"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Προτιμήσεις"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Τροποποιήστε τις προσωπικές σας προτιμήσεις"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "Ε_ργαλεία"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Νέα σάρωση της βιβλιοθήκης μουσικής"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Νέα σάρωση του φακέλου της Μουσικής Βιβλιοθήκης"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, 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."
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Η διαδικασία επανασάρωσης θα αφαιρέσει ένα κομμάτι από τη μουσική βιβλιοθήκη "
-"σας."
-msgstr[1] ""
-"Η διαδικασία επανασάρωσης θα αφαιρέσει {0} κομμάτια από τη μουσική "
-"βιβλιοθήκη σας."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Βοήθεια"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "Περιε_χόμενα"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Προχωρημένη αναζήτηση στη συλλογή"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Μάθετε προχωρημένους τρόπους αναζήτησης στη συλλογή πολυμέσων σας"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Αρχική σελίδα του Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Επισκεφτείτε την ιστοσελίδα του Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Συμμετοχή"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Γίνετε συντελεστής του Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Πληροφορίες Έκδοσης"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Δείτε λεπτομερείς πληροφορίες έκδοσης και διαμόρφωσης"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Εισαγωγή λίστας αναπαραγωγής"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Λίστες αναπαραγωγής"
@@ -3210,7 +3064,7 @@ msgstr "Αναπαραγωγή του προηγούμενου αντικειμ
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85
msgid "Seek _To..."
-msgstr "Μετάβαση _Στο..."
+msgstr "Μετάβαση _Στο…"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
msgid "Seek to a specific location in current item"
@@ -3230,9 +3084,7 @@ msgstr "_Διακοπή όταν ολοκληρωθεί"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
msgid "Stop playback after the current item finishes playing"
-msgstr ""
-"Διακοπή αναπαραγωγής μετά το τέλος της αναπαραγωγής του τρέχοντος "
-"αντικειμένου"
+msgstr "Διακοπή αναπαραγωγής μετά το τέλος της αναπαραγωγής του τρέχοντος αντικειμένου"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
msgid "_Playback"
@@ -3269,8 +3121,7 @@ msgstr "Επανάληψη ό_λων"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84
msgid "Play all songs before repeating playlist"
-msgstr ""
-"Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής"
+msgstr "Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:88
msgid "Repeat Singl_e"
@@ -3293,7 +3144,7 @@ msgstr "Υπότιτλος"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
msgid "Load File..."
-msgstr "Φόρτωση αρχείου..."
+msgstr "Φόρτωση αρχείου…"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
msgid "Load subtitle file"
@@ -3335,7 +3186,7 @@ msgstr "Δημιουργία νέας κενής λίστας αναπαραγω
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:79
msgid "New _Smart Playlist..."
-msgstr "Νέα έ_ξυπνη λίστα αναπαραγωγής..."
+msgstr "Νέα έ_ξυπνη λίστα αναπαραγωγής…"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:80
msgid "Create a new smart playlist"
@@ -3355,7 +3206,7 @@ msgstr "Μετονομασία"
#: ../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"
@@ -3466,9 +3317,7 @@ msgstr "Προσθήκη στη _λίστα αναπαραγωγής"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
-msgstr ""
-"Προσαρτήστε τα επιλεγμένα στοιχεία στη λίστα αναπαραγωγής ή δημιουργήστε νέα "
-"λίστα αναπαραγωγής από την επιλογή"
+msgstr "Προσαρτήστε τα επιλεγμένα στοιχεία στη λίστα αναπαραγωγής ή δημιουργήστε νέα λίστα αναπαραγωγής από την επιλογή"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
@@ -3537,7 +3386,7 @@ msgstr "Αναζήτηση όλων των τραγουδιών αυτού το
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322
#, csharp-format
msgid "_Delete From \"{0}\""
-msgstr "_Διαγραφή από \"{0}\""
+msgstr "_Διαγραφή από «{0}»"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
msgid "The folder could not be found."
@@ -3545,18 +3394,14 @@ msgstr "Ο φάκελος δεν μπόρεσε να βρεθεί."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:536
msgid "Please check that the track's location is accessible by the system."
-msgstr ""
-"Παρακαλώ ελέγξτε ότι η τοποθεσία του κομματιού είναι προσβάσιμη από το "
-"σύστημα."
+msgstr "Παρακαλώ ελέγξτε ότι η τοποθεσία του κομματιού είναι προσβάσιμη από το σύστημα."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the selected {0} items?"
+msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
msgstr[0] "Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα αυτό το αντικείμενο;"
-msgstr[1] ""
-"Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα τα επιλεγμένα {0} αντικείμενα;"
+msgstr[1] "Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα τα επιλεγμένα {0} αντικείμενα;"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611
msgid "If you delete the selection, it will be permanently lost."
@@ -3570,42 +3415,21 @@ msgstr "Αφαίρεση επιλογής από {0};"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
-msgid_plural ""
-"Are you sure you want to remove the selected {0} items from your {1}?"
-msgstr[0] ""
-"Είστε σίγουροι για την διαγραφή του επιλεγμένου αντικειμένου από το δικό σας "
-"{1};"
-msgstr[1] ""
-"Είστε σίγουροι για την διαγραφή των επιλεγμένων {0} αντικειμένων από το δικό "
-"σας {1};"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Είστε σίγουρος ότι θέλετε να συνεχίσετε;"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Αφαίρεση κομματιών"
+msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
+msgstr[0] "Είστε σίγουροι για την διαγραφή του επιλεγμένου αντικειμένου από το δικό σας {1};"
+msgstr[1] "Είστε σίγουροι για την διαγραφή των επιλεγμένων {0} αντικειμένων από το δικό σας {1};"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
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 ""
-"Έλεγχος εάν αυτό το κομμάτι αποτελεί μέρος ενός δίσκου με κομμάτια από "
-"διάφορους καλλιτέχνες"
+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
-msgid ""
-"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 ""
-"Η επιλογή αυτή θα επηρεάσει τον τρόπο με τον οποίο θα ταξινομηθεί αυτός ο "
-"δίσκος• αν εισάγετε 'Διάφοροι Καλλιτέχνες' τότε ο δίσκος θα τοποθετηθεί με "
-"τους υπόλοιπους δίσκους που ξεκινάνε με 'Δ'."
+msgid "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"
@@ -3660,26 +3484,25 @@ msgstr "Αριθμός _κομματιού:"
#. Catalog.GetString ("Automatically set disc number and count"),
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166
msgid "Set all disc numbers and counts to these values"
-msgstr ""
-"Ρυθμίστε όλους τους αριθμούς των δίσκων και τις μετρήσεις σε αυτές τις τιμές"
+msgstr "Ρυθμίστε όλους τους αριθμούς των δίσκων και τις μετρήσεις σε αυτές τις τιμές"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167
msgid "_Disc Number:"
msgstr "_Αριθμός δίσκου:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Βάλτε σε όλα τα έτη αυτή τη τιμή"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "Έ_τος:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Βάλτε σε όλες τις αξιολογήσεις αυτή τη τιμή"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Αξιολόγηση:"
@@ -3733,7 +3556,7 @@ msgstr "Βάλτε σε όλες τις άδειες αυτή την τιμή"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:101
msgid "_License URI:"
-msgstr "Ά_δεια URI:"
+msgstr "_Άδεια URI"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:110
msgid "Set all comments to this value"
@@ -3761,8 +3584,7 @@ msgstr "Ταξινόμηση"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:52
msgid "Set all sort track titles to this value"
-msgstr ""
-"Ρυθμίστε όλες τις ταξινομημένες ονομασίες των κομματιών σε αυτή τη τιμή"
+msgstr "Ρυθμίστε όλες τις ταξινομημένες ονομασίες των κομματιών σε αυτή τη τιμή"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:53
msgid "Sort Track Title:"
@@ -3770,8 +3592,7 @@ msgstr "Ταξινόμηση τίτλου κομματιού:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:60
msgid "Set all sort track artists to this value"
-msgstr ""
-"Ρυθμίστε όλες τις ταξινομημένες ονομασίες των καλλιτεχνών σε αυτή την τιμή"
+msgstr "Ρυθμίστε όλες τις ταξινομημένες ονομασίες των καλλιτεχνών σε αυτή την τιμή"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:61
msgid "Sort Track Artist:"
@@ -3909,12 +3730,8 @@ msgid "Sync all field _values"
msgstr "Συγχρονίστε όλα τα πεδία _τιμών"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
-msgid ""
-"Apply the values of all common fields set for this track to all of the "
-"tracks selected in this editor"
-msgstr ""
-"Εφαρμόστε τις τιμές όλων των κοινών πεδίων που έχουν ρυθμιστεί για αυτό το "
-"κομμάτι σε όλα τα επιλεγμένα κομμάτια του επεξεργαστή"
+msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
+msgstr "Εφαρμόστε τις τιμές όλων των κοινών πεδίων που έχουν ρυθμιστεί για αυτό το κομμάτι σε όλα τα επιλεγμένα κομμάτια του επεξεργαστή"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
@@ -3935,9 +3752,7 @@ msgstr "Κλείσιμο _χωρίς αποθήκευση"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
-msgstr ""
-"Αν δεν αποθηκεύσετε, οι αλλαγές που έγιναν από το τελευταίο {0} θα χαθούν "
-"μόνιμα."
+msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές που έγιναν από το τελευταίο {0} θα χαθούν μόνιμα."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62
msgid "_View"
@@ -3965,7 +3780,7 @@ msgstr "_Πλήρης οθόνη"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:83
msgid "Enter or leave fullscreen mode"
-msgstr "Είσοδος ή έξοδος από την κατάσταση πλήρους οθόνης"
+msgstr "Είσοδος ή έξοδος από την κατάσταση λειτουργίας πλήρους οθόνης "
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:88
msgid "Show Cover _Art"
@@ -4042,9 +3857,8 @@ msgstr "Αυτή η εργασία εκτελείται ακόμη. Θα θέλ
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
-msgid ""
-"The '{0}' operation is still performing work. Would you like to stop it?"
-msgstr "Η εργασία '{0}' εκτελείται ακόμη. Θα θέλατε να τη διακόψετε;"
+msgid "The '{0}' operation is still performing work. Would you like to stop it?"
+msgstr "Η εργασία '{0}' εκτελείται ακόμη. Θα θέλατε να τη διακόψετε; "
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
@@ -4057,7 +3871,7 @@ msgstr "Συνέχεια {0}"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
-msgstr "Γίνεται διακοπή..."
+msgstr "Γίνεται διακοπή…"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:45
msgid "Import Files to Library"
@@ -4077,7 +3891,7 @@ msgstr "Αρχεία"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
msgid "C_hoose Files..."
-msgstr "Ε_πιλογή αρχείων..."
+msgstr "Ε_πιλογή αρχείων…"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:43
msgid "Import Folders to Library"
@@ -4093,19 +3907,15 @@ msgstr "Φάκελοι"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
msgid "C_hoose Folders..."
-msgstr "Ε_πιλογή φακέλων..."
+msgstr "Ε_πιλογή φακέλων…"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:73
msgid "<big><b>Import Media to Library</b></big>"
msgstr "<big><b>Εισαγωγή μέσων στη βιβλιοθήκη</b></big>"
#: ../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."
-msgstr ""
-"Η βιβλιοθήκη των πολυμέσων σας είναι κενή. Μπορείτε να εισαγάγετε μουσική "
-"και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα."
+msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later."
+msgstr "Η βιβλιοθήκη των πολυμέσων σας είναι κενή. Μπορείτε να εισαγάγετε μουσική και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
msgid "Import _from:"
@@ -4143,7 +3953,7 @@ msgstr "Εξαγωγή"
#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:54
msgid "Select Format: "
-msgstr "Επιλογή μορφής: "
+msgstr "Επιλογή μορφής:"
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:104
msgid "Select library location"
@@ -4167,7 +3977,7 @@ msgstr "Πηγή:"
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:55
msgid "Could not show preferences"
-msgstr "Αδυναμία εμφάνισης προτιμήσεων"
+msgstr "Αδυναμία εμφάνισης προτιμήσεων "
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:56
msgid "The preferences service could not be found."
@@ -4179,7 +3989,7 @@ msgstr "Νέα έξυπνη λίστα αναπαραγωγής"
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:96
msgid "Playlist _Name:"
-msgstr "Ό_νομα λίστας αναπαραγωγής:"
+msgstr "_Όνομα λίστας αναπαραγωγής:"
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108
msgid "Predefined Smart Playlists"
@@ -4194,58 +4004,63 @@ msgid "Create and save"
msgstr "Δημιουργία και αποθήκευση"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
+#, fuzzy
#| msgid "Browser on Left"
msgid "Browser Content"
-msgstr "Περιεχόμενο περιηγητή"
+msgstr "Περιηγητής στα αριστερά"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
-msgstr "Ρύθμιση των διαθέσιμων φίλτρων στον περιηγητή"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
+#, fuzzy
#| msgid "Show this help"
msgid "Show Artist Filter"
-msgstr "Εμφάνιση καλλιτεχνικού φίλτρου"
+msgstr "Εμφάνιση αυτής της βοήθειας"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
-msgstr "Εμφάνιση μιας λίστας καλλιτεχνών για φιλτράρισμα από"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
+#| msgid "Sort Track Artist:"
msgid "Show all Artists"
msgstr "Προβολή όλων των καλλιτεχνών"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
+#, fuzzy
#| msgid "Set all track artists to this value"
msgid "Show all artists in the artist filter"
-msgstr "Εμφάνιση όλων των καλλιτεχνών στο καλλιτεχνικό φίλτρο"
+msgstr "Ορίστε για όλους τους καλλιτέχνες του κομματιού αυτή την τιμή"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
+#, fuzzy
#| msgid "Sort Album Artist:"
msgid "Show Album Artists"
-msgstr "Εμφάνιση συλλογών καλλιτεχνών"
+msgstr "Ταξινόμηση καλλιτέχνη δίσκου:"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr ""
-"Εμφάνιση μόνο συλλογών καλλιτεχνών, όχι καλλιτεχνών με μεμονωμένα κομμάτια"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
+#, fuzzy
#| msgid "Show the next track"
msgid "Show Genre Filter"
-msgstr "Εμφάνιση είδους φίλτρου"
+msgstr "Εμφάνιση του επόμενου κομματιού"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
-msgstr "Εμφάνιση μιας λίστας είδους για φιλτράρισμα από"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
-msgstr "Εμφάνιση ετήσιου φίλτρου"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
-msgstr "Εμφάνιση μιας λίστας ετών για φιλτράρισμα από"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
@@ -4258,8 +4073,7 @@ msgstr "Περιηγητής στα αριστερά"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
-msgstr ""
-"Εμφάνιση του περιηγητή καλλιτέχνη/δίσκου στα αριστερά της λίστας κομματιών"
+msgstr "Εμφάνιση του περιηγητή καλλιτέχνη/δίσκου στα αριστερά της λίστας κομματιών"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
@@ -4278,22 +4092,20 @@ msgid "Show or hide the artist/album browser"
msgstr "Εμφάνιση ή απόκρυψη του περιηγητή καλλιτεχνών/δίσκων"
#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
-msgid ""
-"This page is blocked because it is probably not the one you are looking for!"
+msgid "This page is blocked because it is probably not the one you are looking for!"
msgstr ""
-"Αυτή η σελίδα είναι φραγμένη επειδή δεν είναι προφανώς η μία που ψάχνετε!"
#. Translators: {0} is the URL of the web page that was requested
#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
-#, csharp-format
+#, fuzzy, csharp-format
#| msgid "The specified resource is invalid."
msgid "The security certificate for {0} is invalid."
-msgstr "Το πιστοποιητικό ασφάλειας για το {0} είναι άκυρο."
+msgstr "Η καθορισμένη πηγή είναι άκυρη."
#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
-msgstr "Φόρτωση {0}..."
+msgstr "Φόρτωση {0}…"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
@@ -4318,12 +4130,24 @@ msgstr "Αδρανής"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
-msgstr "Επικοινωνία..."
+msgstr "Επικοινωνία…"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Αποθήκευση στην ενδιάμεση μνήμη"
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+msgid "Volume"
+msgstr "Ένταση"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+msgid "Muted"
+msgstr "Σίγαση"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+msgid "Full Volume"
+msgstr "Μέγιστη ένταση"
+
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
msgid "Device"
msgstr "Συσκευή"
@@ -4360,41 +4184,29 @@ msgstr "Υποστηρίζει εξώφυλλο δίσκου"
msgid "Supports photos"
msgstr "Υποστηρίζει φωτογραφίες"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463
msgid "Track duration is zero"
msgstr "Η διάρκεια του κομματιού είναι μηδέν"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:569
msgid "Syncing iPod"
msgstr "Συγχρονισμός του iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
msgid "Preparing to synchronize..."
-msgstr "Προετοιμασία για συγχρονισμό..."
+msgstr "Προετοιμασία για συγχρονισμό…"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:573
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Προσθήκη κομματιού {0} από {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-#| msgid "Adding track {0} of {1}"
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Ενημέρωση μεταδεδομένων στο κομμάτι {0} από {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:609
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Απομάκρυνση κομματιού {0} από {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-#| msgid "Removing track {0} of {1}"
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Καθαρισμός, αφαίρεση άκυρου κομματιού {0} από {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:662
msgid "Writing media database"
msgstr "Εγγραφή σε βάση δεδομένων πολυμέσων"
@@ -4403,7 +4215,7 @@ msgstr "Εγγραφή σε βάση δεδομένων πολυμέσων"
msgid "Sync {0}"
msgstr "Συγχρονισμός {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Συσκευές"
@@ -4412,78 +4224,74 @@ msgstr "Συσκευές"
msgid "Device Properties"
msgstr "Ιδιότητες συσκευής"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Προϊόν"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Πωλητής"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Φόρτωση {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Ναι"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Όχι"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
#, csharp-format
-msgid ""
-"The {0} format is not supported by the device, and no converter was found to "
-"convert it"
-msgstr ""
-"Η μορφή {0} δεν υποστηρίζεται από τη συσκευή και δε βρέθηκε μετατροπέας για "
-"να γίνει μετατροπή"
+msgid "The {0} format is not supported by the device, and no converter was found to convert it"
+msgstr "Η μορφή {0} δεν υποστηρίζεται από τη συσκευή και δε βρέθηκε μετατροπέας για να γίνει μετατροπή "
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
msgid "File format conversion support is not available"
msgstr "Δεν είναι διαθέσιμη η υπόστηριξη μετατροπής μορφής αρχείου"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
msgid "Error converting file"
msgstr "Σφάλμα μετατροπής αρχείου"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:135
msgid "Sync when first plugged in and when the libraries change"
-msgstr ""
-"Αυτόματος συγχρονισμός της συσκευής όταν συνδέεται για πρώτη φορά και όταν "
-"αλλάζουν οι βιβλιοθήκες"
+msgstr "Αυτόματος συγχρονισμός της συσκευής όταν συνδέεται για πρώτη φορά και όταν αλλάζουν οι βιβλιοθήκες"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
-msgid ""
-"Begin synchronizing the device as soon as the device is plugged in or the "
-"libraries change."
-msgstr ""
-"Έναρξη συγχρονισμού της συσκευής μόλις η συσκευή έχει συνδεθεί ή οι "
-"βιβλιοθήκες έχουν αλλάξει."
+msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change."
+msgstr "Έναρξη συγχρονισμού της συσκευής μόλις η συσκευή έχει συνδεθεί ή οι βιβλιοθήκες έχουν αλλάξει."
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
msgid "Sync Preferences"
msgstr "Προτιμήσεις συγχρονισμού"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+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.Gui/DapActions.cs:106
#, 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."
-msgstr[0] ""
-"Η διαδικασία συγχρονισμού θα αφαιρέσει ένα κομμάτι από τη συσκευή σας."
-msgstr[1] ""
-"Η διαδικασία συγχρονισμού θα αφαιρέσει {0} κομμάτια από τη συσκευή σας."
+msgstr[0] "Η διαδικασία συγχρονισμού θα αφαιρέσει ένα κομμάτι από τη συσκευή σας."
+msgstr[1] "Η διαδικασία συγχρονισμού θα αφαιρέσει {0} κομμάτια από τη συσκευή σας."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Συγχρονισμός"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Είστε σίγουρος ότι θέλετε να συνεχίσετε;"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Αφαίρεση κομματιών"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4545,7 +4353,7 @@ msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκη
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:154
#, csharp-format
msgid "Sync from “{0}”"
-msgstr "Συγχρονισμός από “{0}”"
+msgstr "Συγχρονισμός από «{0}»"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs:53
msgid "Import Purchased Music"
@@ -4556,12 +4364,12 @@ msgstr "Εισαγωγή αγορασμένης μουσικής"
msgid "Disconnect"
msgstr "Αποσύνδεση"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
-msgstr "Αποσύνδεση {0}..."
+msgstr "Αποσύνδεση {0}…"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Αδυναμία αποσύνδεσης {0}: {1}"
@@ -4605,9 +4413,10 @@ msgid "Error Initializing MTP Device Support"
msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP"
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:83
+#, fuzzy
#| msgid "There was an error intializing MTP device support."
msgid "There was an error initializing MTP device support."
-msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP."
+msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP"
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142
#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
@@ -4666,8 +4475,7 @@ msgstr "Χώρα"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:60
msgid "Which Amazon MP3 storefront to use by default."
-msgstr ""
-"Ποια βιτρίνα του καταστήματος Amazon MP3 θα χρησιμοποιηθεί ως προεπιλογή."
+msgstr "Ποια βιτρίνα του καταστήματος Amazon MP3 θα χρησιμοποιηθεί ως προεπιλογή."
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90
msgid "Automatic (Geo IP detection)"
@@ -4710,12 +4518,13 @@ msgstr "Άνοιγμα βιβλίου"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:56
msgid "Merge Discs..."
-msgstr "Συγχώνευση δίσκων..."
+msgstr "Συγχώνευση δίσκων…"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:57
+#, fuzzy
#| msgid "Audiobooks"
msgid "Go to Audiobooks"
-msgstr "Μετάβαση σε ηχητικά βιβλία"
+msgstr "Ηχογραφημένα βιβλία"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65
@@ -4736,13 +4545,8 @@ msgstr[0] "Συγχώνευση των {0} επιλεγμένων δίσκων
msgstr[1] "Συγχώνευση των {0} επιλεγμένων δίσκων σε ένα βιβλίο;"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
-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 ""
-"Αυτό θα εξασφαλίσει ότι οι αριθμοί των δίσκων είναι ορισμένοι σωστά, και "
-"μετά θα οριστεί ο συγγραφέας και ο τίτλος βιβλίου για όλα τα κομμάτια όλων "
-"αυτών των δίσκων στις παρακάτω τιμές"
+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:153
msgid "Author:"
@@ -4809,8 +4613,7 @@ msgstr "Χ_τύπημα"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
-msgstr ""
-"Αφήστε το Banshee να προσπαθήσει να ανιχνεύσει αυτόματα το BPM του τραγουδιού"
+msgstr "Αφήστε το Banshee να προσπαθήσει να ανιχνεύσει αυτόματα το BPM του τραγουδιού"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
@@ -4818,21 +4621,15 @@ msgstr "Αναπαραγωγή αυτού του τραγουδιού"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
-msgstr ""
-"Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα τους χτύπους "
-"ανά λεπτό αυτού του τραγουδιού"
+msgstr "Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα τους χτύπους ανά λεπτό αυτού του τραγουδιού"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
msgstr "_Αυτόματη ανίχνευση BPM για όλα τα τραγούδια"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
-msgid ""
-"Detect beats per minute (BPM) for all songs that don't already have a value "
-"set"
-msgstr ""
-"Ανιχνεύστε χτύπους ανά λεπτό (BPM) για όλα τα τραγούδια που δεν έχουν ήδη "
-"μία ρυθμισμένη τιμή"
+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
msgid "Downloading Cover Art"
@@ -4861,19 +4658,13 @@ msgstr "Πίσω"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
msgid ""
-"iTunes® 7 introduced new compatibility issues and currently only works with "
-"other iTunes® 7 clients.\n"
+"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n"
"\n"
-"No third-party clients can connect to iTunes® music shares anymore. This is "
-"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
-"the unfortunate inconvenience."
+"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience."
msgstr ""
-"Το iTunes® 7 εισήγαγε νέα ζητήματα συμβατότητας και αυτή τη στιγμή δουλεύει "
-"μόνο με άλλους πελάτες iTunes® 7.\n"
+"Το iTunes® 7 εισήγαγε νέα ζητήματα συμβατότητας και αυτή τη στιγμή δουλεύει μόνο με άλλους πελάτες iTunes® 7.\n"
"\n"
-"Κανένα πρόγραμμα πελάτης τρίτων δεν μπορεί να συνδεθεί στη κοινόχρηστη "
-"μουσική του iTunes® πια. Είναι ένας σκόπιμος περιορισμός από την Apple στο "
-"iTunes® 7 και σας ζητάμε συγγνώμη για την ατυχή αναστάτωση."
+"Κανένα πρόγραμμα πελάτης τρίτων δεν μπορεί να συνδεθεί στη κοινόχρηστη μουσική του iTunes® πια. Είναι ένας σκόπιμος περιορισμός από την Apple στο iTunes® 7 και σας ζητάμε συγγνώμη για την ατυχή αναστάτωση."
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
msgid "Common reasons for connection failures:"
@@ -4931,11 +4722,11 @@ msgstr "Είσοδος"
msgid "Connecting to {0}"
msgstr "Σύνδεση στο {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Προσθήκη απομακρυσμένου εξυπηρετητή DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Προσθήκη ενός νέου απομακρυσμένου DAAP εξυπηρετητή"
@@ -4965,7 +4756,7 @@ msgstr "Άνοιγμα απομακρυσμένου DAAP εξυπηρετητή"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:51
msgid "Enter server IP address and port:"
-msgstr "Εισαγωγή διεύθυνσης IP και θύρας εξυπηρετητή:"
+msgstr "Εισαγωγή διεύθυνσης IP και θύρας εξυπηρετητή:"
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:46
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:133
@@ -4982,7 +4773,7 @@ msgstr "Μεταφόρτωση κομματιού/ών eMusic"
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:51
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:51
msgid "Initializing..."
-msgstr "Αρχικοποίηση..."
+msgstr "Αρχικοποίηση…"
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:52
msgid "Cancel all eMusic downloads?"
@@ -5004,7 +4795,7 @@ msgstr "Ακύρωση μεταφορτώσεων"
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:135
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:135
msgid "Waiting for downloads to terminate..."
-msgstr "Αναμονή για τερματισμό μεταφορτώσεων..."
+msgstr "Αναμονή για τερματισμό μεταφορτώσεων…"
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
msgid "Import eMusic Downloads to Library"
@@ -5060,30 +4851,20 @@ 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 ""
-"Οι προβαλλόμενοι είναι δίσκοι που πιθανότατα πρέπει να συγχωνευθούν. Για "
-"κάθε σειρά, πατήστε στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή "
-"αποεπιλέξτε τον για να μη γίνει καμία ενέργεια."
+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"
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 ""
-"Εμφανίζονται καλλιτέχνες που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε "
-"γραμμή, πατήστε στο επιθυμητό όνομα για να το κάνετε έντονο ή αποεπιλέξτε το "
-"για να μη γίνει καμία ενέργεια."
+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 "Διόρθωση Μεταδεδομένων Μουσικής..."
+msgstr "Διόρθωση Μεταδεδομένων Μουσικής…"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48
msgid "Metadata Fixer"
@@ -5102,17 +4883,12 @@ 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 ""
-"Εμφανίζονται είδη που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, "
-"πατήστε στο επιθυμητό είδος για να το κάνετε έντονο ή αποεπιλέξτε το για να "
-"μη γίνει καμία ενέργεια."
+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 " και "
+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,
@@ -5169,9 +4945,7 @@ msgstr "Λήψη λεπτομερειών αντικειμένου από το I
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148
msgid "Timed out getting item details from the Internet Archive"
-msgstr ""
-"Υπέρβαση χρονικού ορίου κατά την λήψη λεπτομερειών αντικειμένου από το "
-"Internet Archive"
+msgstr "Υπέρβαση χρονικού ορίου κατά την λήψη λεπτομερειών αντικειμένου από το Internet Archive"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:149
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:190
@@ -5311,7 +5085,7 @@ msgstr "Προτιμώμενοι τύποι πολυμέσων"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:122
msgid "_Audio"
-msgstr "Ή_χος"
+msgstr "_Ήχος"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:125
msgid "_Video"
@@ -5324,7 +5098,7 @@ msgstr "_Κείμενο"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:100
#, csharp-format
msgid "Search..."
-msgstr "Αναζήτηση..."
+msgstr "Αναζήτηση…"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:111
msgid "_Go"
@@ -5388,20 +5162,13 @@ msgid "Library of Congress"
msgstr "Βιβλιοθήκη του Κογκρέσου"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+#| msgid "Sample"
msgid "Examples:"
msgstr "Παραδείγματα:"
#: ../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 "
-"library, we provide free access to researchers, historians, scholars, and "
-"the general public."
-msgstr ""
-"Το Internet Archive, μια μη κερδοσκοπική οργάνωση του 501(c)(3), δομεί μια "
-"ψηφιακή βιβλιοθήκη ιστοσελίδων διαδικτύου και άλλων καλλιτεχνημάτων σε "
-"ψηφιακή μορφή. Όπως και μια παραδοσιακή βιβλιοθήκη, παρέχουμε ελεύθερη "
-"πρόσβαση σε ερευνητές, ιστορικούς, μελετητές και το ευρύ κοινό."
+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 library, we provide free access to researchers, historians, scholars, and the general public."
+msgstr "Το Internet Archive, μια μη κερδοσκοπική οργάνωση του 501(c)(3), δομεί μια ψηφιακή βιβλιοθήκη ιστοσελίδων διαδικτύου και άλλων καλλιτεχνημάτων σε ψηφιακή μορφή. Όπως και μια παραδοσιακή βιβλιοθήκη, παρέχουμε ελεύθερη πρόσβαση σε ερευνητές, ιστορικούς, μελετητές και το ευρύ κοινό."
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
msgid "Visit the Internet Archive online at archive.org"
@@ -5440,8 +5207,8 @@ msgstr "Δεν βρέθηκαν αποτελέσματα."
#, csharp-format
msgid "Showing 1 match"
msgid_plural "Showing 1 to {0:N0} of {1:N0} total matches"
-msgstr[0] "Προβολή 1 συμφωνίας"
-msgstr[1] "Προβολή 1 έως {0:N0} από {1:N0} συνολικές συμφωνίες"
+msgstr[0] "Προβάλλεται 1 αποτέλεσμα"
+msgstr[1] "Προβάλλεται 1 έως {0:N0} από {1:N0} συνολικά αποτελεσμάτων"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:189
msgid "Timed out searching the Internet Archive"
@@ -5688,22 +5455,22 @@ msgstr "Επεξεργασία σταθμού"
msgid "Station"
msgstr "Σταθμός"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} σταθμός"
msgstr[1] "{0} σταθμοί"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../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:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Παρακαλώ ορίστε ένα είδος σταθμού"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Παρακαλώ ορίστε μία ονομασία σταθμού"
@@ -5716,12 +5483,8 @@ msgid "Edit radio station"
msgstr "Επεξεργασία σταθμού ραδιοφώνου"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
-msgid ""
-"Enter the Genre, Title and URL of the radio station you wish to add. A "
-"description is optional."
-msgstr ""
-"Εισαγάγετε το είδος, ονομασία και το URL του ραδιοφωνικού σταθμού που θα "
-"επιθυμούσατε να προστεθεί. Η περιγραφή είναι προαιρετική."
+msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional."
+msgstr "Εισαγάγετε το είδος, ονομασία και το URL του ραδιοφωνικού σταθμού που θα επιθυμούσατε να προστεθεί. Η περιγραφή είναι προαιρετική."
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
@@ -5750,60 +5513,62 @@ msgstr "Περιγραφή:"
msgid "Rating:"
msgstr "Βαθμολογία:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-#| msgid "Removing track {0} of {1}"
-msgid "Processed {0} of {1} tracks"
-msgstr "Επεξεργασμένα {0} από {1} κομμάτια"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Ρυθμίστε το πρόσθετο Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Επισκεφτείτε τη σελίδα προφίλ του _χρήστη"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Επισκεφτείτε τη σελίδα προφίλ σας στο Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+#, fuzzy
#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Banshee"
-msgstr "_Ενεργοποίηση αναφοράς τραγουδιού από το Banshee"
+msgstr "_Ενεργοποίηση αναφοράς τραγουδιού"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#, fuzzy
#| msgid "Enable song reporting"
msgid "Enable song reporting From Banshee"
-msgstr "Ενεργοποίηση αναφοράς τραγουδιού από το Banshee"
+msgstr "Ενεργοποίηση αναφοράς τραγουδιού"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+#, fuzzy
#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Device"
-msgstr "_Ενεργοποίηση αναφοράς τραγουδιού από συσκευή"
+msgstr "_Ενεργοποίηση αναφοράς τραγουδιού"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+#, fuzzy
#| msgid "Enable song reporting"
msgid "Enable song reporting From Device"
-msgstr "Ενεργοποίηση αναφοράς τραγουδιού από συσκευή"
+msgstr "Ενεργοποίηση αναφοράς τραγουδιού"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-#| msgid "Log in to Last.fm"
-msgid "Scrobbling to Last.FM"
-msgstr "Συνδεθείτε στο Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-#| msgid "Connecting to Last.fm."
-msgid "Scrobbling to Last.FM..."
-msgstr "Γίνεται σύνδεση στο Last.FM..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, fuzzy, csharp-format
+#| msgid "Removing track {0} of {1}"
+msgid "Processing track {0} of {1} ..."
+msgstr "Απομάκρυνση κομματιού {0} από {1}"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5903,12 +5668,8 @@ msgid "Sign up for Last.fm"
msgstr "Εγγραφείτε για το Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
-msgid ""
-"Open Last.fm in a browser, giving you the option to authorize Banshee to "
-"work with your account"
-msgstr ""
-"Άνοιγμα του Last.fm σε έναν περιηγητή, δίνοντάς σας την επιλογή να "
-"εξουσιοδοτήστε το Banshee για να δουλέψτε με το λογαριασμό σας"
+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:273
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
@@ -5916,11 +5677,10 @@ msgid "Log in to Last.fm"
msgstr "Συνδεθείτε στο Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+#: ../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."
+msgstr "Πρέπει να επιτρέψτε στο Banshee να έχει πρόσβαση στο λογαριασμό σας Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304
msgid "Finish Logging In"
@@ -5935,19 +5695,19 @@ msgstr "Έχετε εισέλθει στο Last.fm ως ο χρήστης <i>{0}
msgid "Log out of Last.fm"
msgstr "Αποσύνδεση από το Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Πρόσφατα αγαπημένα κομμάτια"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Πρόσφατα αναπαραχθέντα κομμάτια"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Οι κορυφαίοι μου καλλιτέχνες"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} αναπαραγωγές"
@@ -5993,7 +5753,7 @@ msgstr "Άγνωστη ομοιότητα"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59
msgid "_Add Station..."
-msgstr "_Προσθήκη σταθμού..."
+msgstr "_Προσθήκη σταθμού.."
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:60
msgid "Add a new Last.fm radio station"
@@ -6065,7 +5825,7 @@ msgstr "Νέος σταθμός"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
-msgstr "_Τύπος σταθμού:"
+msgstr "_Τύπος σταθμού"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58
msgid "Last.fm Station"
@@ -6082,7 +5842,7 @@ msgstr "Διαγραφή του σταθμού Last.fm"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239
#, csharp-format
msgid "Tuning Last.fm to {0}."
-msgstr "Συντονισμός του Last.fm σε {0}."
+msgstr "Συντονισμός του Last.fm σε {0}."
#. Translators: {0} is an error message sentence from RadioConnection.cs.
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249
@@ -6210,7 +5970,7 @@ msgstr "πολυμέσα"
#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
msgid "Quick access panel for your media"
-msgstr "Πίνακας γρήγορης πρόσβασης για τα πολυμέσα σας."
+msgstr "Πάνελ γρήγορης πρόσβασης για τα πολυμέσα σας."
#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeService.cs:25
msgid "_Mini Mode"
@@ -6234,8 +5994,7 @@ msgstr "Οδηγός Miro"
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:97
msgid "Discover interesting podcasts in the Miro Guide podcast directory!"
-msgstr ""
-"Ανακαλύψτε ενδιαφέρουσες φορητές εκπομπές στο Miro Guide podcast directory!"
+msgstr "Ανακαλύψτε ενδιαφέρουσες φορητές εκπομπές στο Miro Guide podcast directory!"
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:100
msgid "Open Miro Guide"
@@ -6249,11 +6008,6 @@ msgstr "Αναζήτηση φορητών εκπομπών (podcasts)"
msgid "Search for video podcasts"
msgstr "Αναζήτηση για φορητές εκπομπές βίντεο (Podcasts)"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
msgid "_Show Notifications"
msgstr "_Εμφάνιση ειδοποιήσεων"
@@ -6267,12 +6021,8 @@ msgid "Still Running"
msgstr "Εκτελείται ακόμη"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
-msgid ""
-"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
-"end your session."
-msgstr ""
-"Το Banshee έχει κλείσει στη περιοχή ειδοποιήσεων. Χρησιμοποιήστε την επιλογή "
-"<i>Έξοδος</i> για να τερματίσετε τη συνεδρία σας."
+msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session."
+msgstr "Το Banshee έχει κλείσει στη περιοχή ειδοποιήσεων. Χρησιμοποιήστε την επιλογή <i>Έξοδος</i> για να τερματίσετε τη συνεδρία σας."
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
@@ -6305,9 +6055,7 @@ msgstr "Απλοποίηση"
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:60
msgid "Hide/Show the source list, menu, toolbar, and status bar"
-msgstr ""
-"Απόκρυψη/Εμφάνιση της λίστας πηγής, γραμμής μενού, γραμμής εργαλείων, και "
-"της μπάρας κατάστασης"
+msgstr "Απόκρυψη/Εμφάνιση της λίστας πηγής, γραμμής μενού, γραμμής εργαλείων, και της μπάρας κατάστασης"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:75
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:54
@@ -6329,12 +6077,8 @@ msgstr "Αρχικοποίηση οδηγού"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
#, csharp-format
-msgid ""
-"<i>{0}</i> is still being imported into the music library. Would you like to "
-"stop it?"
-msgstr ""
-"<i>{0}</i> ακόμη εισάγεται στη βιβλιοθήκη μουσικής. Θα θέλατε να το "
-"διακόψετε;"
+msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?"
+msgstr "<i>{0}</i> ακόμη εισάγεται στη βιβλιοθήκη μουσικής. Θα θέλατε να το διακόψετε;"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
msgid "Cannot Import CD"
@@ -6357,12 +6101,8 @@ msgid "_Automatically import audio CDs when inserted"
msgstr "_Αυτόματη εισαγωγή ψηφιακών δίσκων (CD) ήχου όταν εισάγονται"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
-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 (ψηφιακός δίσκος) ήχου εισάγεται, αυτόματη εκκίνηση της "
-"εισαγωγής του αν βρεθούν τα μεταδεδομένα και δεν είναι ήδη στην βιβλιοθήκη."
+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.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
msgid "_Eject when done importing"
@@ -6370,21 +6110,15 @@ msgstr "_Αποβολή όταν ολοκληρωθεί η εισαγωγή"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:120
msgid "When an audio CD has been imported, automatically eject it."
-msgstr ""
-"Όταν ένας ηχητικός ψηφιακός δίσκος έχει εισαχθεί, να γίνει αυτόματη αποβολή."
+msgstr "Όταν ένας ηχητικός ψηφιακός δίσκος έχει εισαχθεί, να γίνει αυτόματη αποβολή. "
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:123
msgid "Use error correction when importing"
msgstr "Χρήση της διόρθωσης σφάλματος κατά την εισαγωγή"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
-msgid ""
-"Error correction tries to work around problem areas on a disc, such as "
-"surface scratches, but will slow down importing substantially."
-msgstr ""
-"Η διόρθωση σφάλματος προσπαθεί να αντιμετωπίσει προβληματικές περιοχές του "
-"δίσκου, όπως χαράγματα στην επιφάνεια, αλλά αυτό θα καθυστερήσει την "
-"εισαγωγή σημαντικά."
+msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+msgstr "Η διόρθωση σφάλματος προσπαθεί να αντιμετωπίσει προβληματικές περιοχές του δίσκου, όπως χαράγματα στην επιφάνεια, αλλά αυτό θα καθυστερήσει την εισαγωγή σημαντικά."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
@@ -6405,7 +6139,7 @@ msgstr "Δημιουργία αντιγράφου αυτού του CD ήχου"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:113
msgid "Searching for track information..."
-msgstr "Αναζήτηση για πληροφορίες κομματιού..."
+msgstr "Αναζήτηση για πληροφορίες κομματιού…"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:146
msgid "Could not fetch track information"
@@ -6413,9 +6147,7 @@ msgstr "Αδυναμία λήψης πληροφοριών κομματιού."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
msgid "Automatic import off since this album is already in the Music Library."
-msgstr ""
-"Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη "
-"Βιβλιοθήκη Μουσικής."
+msgstr "Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη Βιβλιοθήκη Μουσικής."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
msgid "Could not import CD"
@@ -6437,11 +6169,12 @@ msgstr "Αποβολή δίσκου"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:310
#, csharp-format
msgid "Import ‟{0}”"
-msgstr "Εισαγωγή ‟{0}”"
+msgstr "Εισαγωγή «{0}»"
#. Translators: {0} is the type of disc, "Audio CD" or "DVD"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
#, csharp-format
+#| msgid "Eject {0}"
msgid "Ejecting {0}..."
msgstr "Αποβολή {0}..."
@@ -6456,9 +6189,10 @@ msgid "Go to Menu"
msgstr "Μετάβαση στο μενού"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs:92
+#, fuzzy
#| msgid "Naviguate to menu"
msgid "Navigate to menu"
-msgstr "Περιήγηση στο μενού"
+msgstr "Μεταβείτε στο μενού"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:38
msgid "DVD"
@@ -6501,12 +6235,12 @@ msgstr "Εισαγωγή λιστών αναπαραγωγής"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
#, csharp-format
msgid "Locate your \"{0}\" file..."
-msgstr "Εντοπισμός του \"{0}\" αρχείου σας..."
+msgstr "Εντοπισμός του «{0}» αρχείου σας…"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
#, csharp-format
msgid "Locate \"{0}\""
-msgstr "Εντοπισμός \"{0}\""
+msgstr "Εντοπισμός «{0}»"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
msgid "Locate iTunes Music Directory"
@@ -6514,28 +6248,16 @@ msgstr "Εντοπισμός του iTunes Music Directory"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
#, csharp-format
-msgid ""
-"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
-"not able to infer the location of this directory. Please locate it."
-msgstr ""
-"Η βιβλιοθήκη του iTunes αναφέρει τον κατάλογο της μουσικής σας ως \"{0}\" αλλά "
-"το Banshee δεν ήταν δυνατό να εντοπίσει την τοποθεσία αυτού του καταλόγου. "
-"Παρακαλώ εντοπίστε τον."
+msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it."
+msgstr "Η βιβλιοθήκη του iTunes αναφέρει τον κατάλογο της μουσικής σας ως «{0}» αλλά το Banshee δεν ήταν δυνατό να εντοπίσει την τοποθεσία αυτού του καταλόγου. Παρακαλώ εντοπίστε τον."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
msgid "iTunes Media Player"
msgstr "Αναπαραγωγέας πολυμέσων iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
-msgid ""
-"Banshee is not familiar with this version of the iTunes library format. "
-"Importing may or may not work as expected, or at all. Would you like to "
-"attempt to import anyway?"
-msgstr ""
-"Το Banshee δεν είναι εξοικειωμένο με αυτή την έκδοση της μορφής της "
-"βιβλιοθήκης του iTunes. Η εισαγωγή μπορεί να δουλέψει ή να μη δουλέψει κατά "
-"το αναμενόμενο, ή και καθόλου. Θέλετε να γίνει προσπάθεια εισαγωγής έτσι και "
-"αλλιώς;"
+msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?"
+msgstr "Το Banshee δεν είναι εξοικειωμένο με αυτή την έκδοση της μορφής της βιβλιοθήκης του iTunes. Η εισαγωγή μπορεί να δουλέψει ή να μη δουλέψει κατά το αναμενόμενο, ή και καθόλου. Θέλετε να γίνει προσπάθεια εισαγωγής έτσι και αλλιώς;"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
@@ -6568,8 +6290,7 @@ msgstr "Αναπαραγωγή μετά"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
msgid "Add selected songs after the currently playing track, album, or artist"
-msgstr ""
-"Προσθήκη επιλεγμένων τραγουδιών μετά το τρέχον κομμάτι, δίσκο ή καλλιτέχνη"
+msgstr "Προσθήκη επιλεγμένων τραγουδιών μετά το τρέχον κομμάτι, δίσκο ή καλλιτέχνη"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
msgid "Current Track"
@@ -6577,9 +6298,7 @@ msgstr "Τρέχον κομμάτι"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
msgid "Add selected songs to the play queue after the currently playing song"
-msgstr ""
-"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το τραγούδι "
-"που αναπαράγεται τώρα"
+msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το τραγούδι που αναπαράγεται τώρα"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
msgid "Current Album"
@@ -6587,9 +6306,7 @@ msgstr "Τρέχων δίσκος"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
msgid "Add selected songs to the play queue after the currently playing album"
-msgstr ""
-"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το δίσκο που "
-"αναπαράγεται τώρα"
+msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το δίσκο που αναπαράγεται τώρα"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
msgid "Current Artist"
@@ -6597,9 +6314,7 @@ msgstr "Τρέχων καλλιτέχνης"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
msgid "Add selected songs to the play queue after the currently playing artist"
-msgstr ""
-"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά τον καλλιτέχνη "
-"που αναπαράγεται τώρα"
+msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά τον καλλιτέχνη που αναπαράγεται τώρα"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
@@ -6607,8 +6322,7 @@ msgstr "Ανανέωση τυχαίων κομματιών στη σειρά α
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
-msgstr ""
-"Τυχαιοποίηση της σειράς αναπαραγωγής των αντικειμένων στη σειρά αναπαραγωγής"
+msgstr "Τυχαιοποίηση της σειράς αναπαραγωγής των αντικειμένων στη σειρά αναπαραγωγής"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
@@ -6630,11 +6344,11 @@ msgstr "Καθαρισμός της σειράς αναπαραγωγής κατ
msgid "Remove From Play Queue"
msgstr "Αφαίρεση από τη σειρά αναπαραγωγής"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
msgid "Number of _played songs to show"
msgstr "Αριθμός _παιγμένων τραγουδιών προς εμφάνιση"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:971
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
msgid "Number of _upcoming songs to show"
msgstr "Αριθμός _επόμενων τραγουδιών προς εμφάνιση"
@@ -6752,7 +6466,7 @@ msgstr "Έλεγχος όλων των podcasts για νέα επεισόδια
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
msgid "Add Podcast..."
-msgstr "Προσθήκη δικτυομετάδοσης..."
+msgstr "Προσθήκη φορητής εκπομπής (Podcast)…"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79
msgid "Subscribe to a new podcast"
@@ -6827,12 +6541,8 @@ msgid "Check periodically for new episodes"
msgstr "Περιοδικός έλεγχος για νέα επεισόδια"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
-msgid ""
-"If checked, Banshee will check every hour to see if this podcast has new "
-"episodes"
-msgstr ""
-"Αν επιλεγεί το Banshee θα ελέγχει κάθε ώρα για νέα επεισόδια αυτής της "
-"φορητής εκπομπής"
+msgid "If checked, Banshee will check every hour to see if this podcast has new episodes"
+msgstr "Αν επιλεγεί το Banshee θα ελέγχει κάθε ώρα για νέα επεισόδια αυτής της φορητής εκπομπής"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
@@ -6896,11 +6606,8 @@ msgid "Subscribe to New Podcast"
msgstr "Εγγραφή σε νέα φορητή εκπομπή (Podcast)"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
-msgid ""
-"Please enter the URL of the podcast to which you would like to subscribe."
-msgstr ""
-"Παρακαλώ εισάγετε τη διεύθυνση URL της φορητής εκπομπής (podcast) στην οποία "
-"θα θέλατε να εγγραφείτε."
+msgid "Please enter the URL of the podcast to which you would like to subscribe."
+msgstr "Παρακαλώ εισάγετε τη διεύθυνση URL της φορητής εκπομπής (podcast) στην οποία θα θέλατε να εγγραφείτε."
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
msgid "Download all episodes"
@@ -6969,6 +6676,7 @@ msgid "Track Preview"
msgstr "Προεπισκόπηση κομματιού"
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPContainerSource.cs:39
+#| msgid "Shared Music"
msgid "Shared Media"
msgstr "Κοινόχρηστα πολυμέσα"
@@ -6983,12 +6691,12 @@ msgstr "Αποστολή από"
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:233
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:234
msgid "Play in Banshee..."
-msgstr "Αναπαραγωγή στο Banshee..."
+msgstr "Αναπαραγωγή στο Banshee…"
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:237
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:238
msgid "Play in Web Browser..."
-msgstr "Αναπαραγωγή στον περιηγητή ιστού..."
+msgstr "Αναπαραγωγή στον περιηγητή ιστού…"
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs:61
msgid "No videos found"
@@ -7023,7 +6731,7 @@ msgstr "Λεπτομέρειες σφάλματος"
#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
-msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε: "
+msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε:"
#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
msgid "Assembly Version Information"
@@ -7179,7 +6887,7 @@ msgstr "Σύνδεση στο λογαριασμό Last.fm"
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
-msgstr "Παρακαλώ εισάγετε τα πιστοποιητικά του λογαριασμού σας στο Last.fm."
+msgstr "Παρακαλώ εισάγετε τα πιστοποιητικά του λογαριασμού σας στο Last.fm"
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
@@ -7189,119 +6897,91 @@ msgstr "Αποθήκευση και είσοδος"
msgid "Authorize for Last.fm"
msgstr "Εξουσιοδότηση για το Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450
+msgid "Last.fm username is invalid or Banshee is not authorized to access your account."
+msgstr "Το Last.fm όνομα χρήστη είναι άκυρο ή το Banshee δεν έχει εξουσιοδοτηθεί να έχει πρόσβαση στον λογαριασμό σας."
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
msgid "This service does not exist."
msgstr "Η υπηρεσία δεν υπάρχει."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
msgid "Stations are only available to paying Last.fm subscribers."
-msgstr ""
-"Οι σταθμοί είναι διαθέσιμοι για αναπαραγωγή μόνο στους συνδρομητές του "
-"Last.fm."
+msgstr "Οι σταθμοί είναι διαθέσιμοι για αναπαραγωγή μόνο στους συνδρομητές του Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
msgid "This station is not available."
msgstr "Αυτός ο σταθμός δεν είναι διαθέσιμος."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
msgid "The request is missing a required parameter."
msgstr "Το αίτημα δεν έχει μια απαιτούμενη παράμετρο."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
msgid "The specified resource is invalid."
msgstr "Η καθορισμένη πηγή είναι άκυρη."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
msgid "Server error, please try again later."
msgstr "Σφάλμα εξυπηρετητή, παρακαλώ προσπαθήστε ξανά αργότερα."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
msgid "Invalid authentication information, please re-authenticate."
msgstr "Άκυρες πληροφορίες εξουσιοδότησης, παρακαλώ εξουσιοδοτήστε ξανά."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
msgid "The API key used by this application is invalid."
msgstr "Το κλειδί API που χρησιμοποιείται από αυτή την εφαρμογή είναι άκυρο."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
-msgid ""
-"The streaming system is offline for maintenance, please try again later."
-msgstr ""
-"Το σύστημα ροής είναι εκτός σύνδεσης για συντήρηση, προσπαθήστε ξανά "
-"αργότερα."
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+msgid "The streaming system is offline for maintenance, please try again later."
+msgstr "Το σύστημα ροής είναι εκτός σύνδεσης για συντήρηση, προσπαθήστε ξανά αργότερα."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
msgid "The method signature is invalid."
msgstr "Η υπογραφή της μεθόδου είναι άκυρη."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
msgid "There is not enough content to play this station."
msgstr "Δεν υπάρχει αρκετό περιεχόμενο για αναπαραγωγή του σταθμού."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
msgid "This group does not have enough members for radio."
msgstr "Αυτή η ομάδα δεν έχει αρκετά μέλη για ραδιόφωνο."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
msgid "This artist does not have enough fans for radio."
msgstr "Ο καλλιτέχνης δεν έχει πολλούς οπαδούς για ραδιόφωνο."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
msgid "There are not enough neighbours for this station."
msgstr "Δεν υπάρχουν αρκετοί γείτονες για αυτό το σταθμό."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
-msgid "This user is not allowed to listen to radio during peak usage"
-msgstr ""
-"Αυτός ο χρήστης δεν επιτρέπεται να ακούσει ραδιόφωνο κατά τη διάρκεια αιχμής"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
-#| msgid "Stream location not found"
-msgid "Radio station not found"
-msgstr "Δε βρέθηκε ο ραδιοφωνικός σταθμός"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
-msgid "This application is not allowed to make requests to the web services"
-msgstr ""
-"Αυτή η εφαρμογή δεν επιτρέπεται να υποβάλει αιτήματα στις υπηρεσίες ιστού"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
-msgid "This type of request is no longer supported"
-msgstr "Αυτός ο τύπος αιτήματος δεν υποστηρίζεται πια"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
-msgid ""
-"Your IP has made too many requests in a short period, exceeding our API "
-"guidelines"
-msgstr ""
-"Το IP σας έχει κάνει υπερβολικό αριθμό αιτημάτων σε σύντομη περίοδο, που "
-"υπερβαίνει τις οδηγίες του API μας"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
msgid "There was an unknown error."
msgstr "Υπήρξε ένα άγνωστο σφάλμα."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
msgid "Not connected to Last.fm."
-msgstr "Δεν συνδέθηκε στο Last.fm."
+msgstr "Δεν συνδέθηκε στο Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
msgid "Account details are needed before you can connect to Last.fm"
msgstr "Λεπτομέρειες λογαριασμού χρειάζονται πριν την σύνδεση σας στο Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
msgid "No network connection detected."
msgstr "Δεν εντοπίστηκε σύνδεση δικτύου."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
msgid "Last.fm username is invalid."
-msgstr "Άκυρο όνομα χρήστη του Last.fm."
+msgstr "Άκυρο όνομα χρήστη του Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
msgid "Connecting to Last.fm."
msgstr "Γίνεται σύνδεση στο Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
msgid "Connected to Last.fm."
msgstr "Συνδέθηκε στο Last.fm."
@@ -7311,22 +6991,6 @@ msgstr "Συνδέθηκε στο Last.fm."
msgid "Unknown Podcast"
msgstr "Άγνωστη φορητή εκπομπή (Podcast)"
-#~ msgid "Volume"
-#~ msgstr "Ένταση"
-
-#~ msgid "Muted"
-#~ msgstr "Σίγαση"
-
-#~ msgid "Full Volume"
-#~ msgstr "Μέγιστη ένταση"
-
-#~ msgid ""
-#~ "Last.fm username is invalid or Banshee is not authorized to access your "
-#~ "account."
-#~ msgstr ""
-#~ "Το Last.fm όνομα χρήστη είναι άκυρο ή το Banshee δεν έχει εξουσιοδοτηθεί "
-#~ "να έχει πρόσβαση στον λογαριασμό σας."
-
#~ msgid "Write _metadata to files"
#~ msgstr "Εγγραφή _μεταδεδομένων σε αρχεία"
diff --git a/po/es.po b/po/es.po
index c362216..ad72f62 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,15 +9,15 @@
# Andrés Herrera <andres at usr.cl>, 2008.
# Jorge González <jorgegonz at svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
# Benjamín Valero Espinosa <benjavalero at gmail.com>, 2008, 2009, 2010, 2011, 2012.
-# Daniel Mustieles <daniel.mustieles at gmail.com>, 2011, 2012, 2013.
+# Daniel Mustieles <daniel.mustieles at gmail.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: banshee.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-03 15:41+0000\n"
-"PO-Revision-Date: 2013-10-03 18:18+0200\n"
+"POT-Creation-Date: 2012-08-21 19:53+0000\n"
+"PO-Revision-Date: 2012-08-25 12:06+0200\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
"Language-Team: Español <gnome-es-list at gnome.org>\n"
"Language: \n"
@@ -25,7 +25,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Gtranslator 2.91.5\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
#: ../data/addin-xml-strings.cs:8
@@ -624,15 +624,15 @@ msgid "Audio Quality"
msgstr "Calidad del sonido"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Reproductor multimedia"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Reproductor multimedia Banshee"
@@ -640,33 +640,6 @@ msgstr "Reproductor multimedia Banshee"
msgid "Play and organize your media collection"
msgstr "Reproduzca y organice su colección multimedia"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"Vídeo;Película;Clip;Series;Reproductor;DVD;Disco;Mp3;Sonido;CD;MTP;Podcast;"
-"DAAP;Lista;Reproducción;Ipod;Multimedia;Colección;Música;Radio;"
-
-#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
-#: ../data/banshee.appdata.xml.in.h:2
-msgid ""
-"Banshee is an open source multimedia management and playback application for "
-"GNOME, Mac and Windows."
-msgstr ""
-"Banshee es una aplicación de software libre para GNOME, Mac y Windows para "
-"gestionar y reproducir archivos multimedia."
-
-#: ../data/banshee.appdata.xml.in.h:3
-msgid ""
-"Play your music and videos. Stay entertained and up to date with podcasts "
-"and video podcasts. Sync your Android, iPod, and other devices. We think "
-"you'll love Banshee!"
-msgstr ""
-"Reproduzca su música y sus vídeos. Entreténgase y mantenga al día sus "
-"podcasts de sonido y de vídeo. Sincronice su dispositivo Android, iPod y "
-"otros. ¡Seguro que le gustará Banshee!"
-
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
@@ -794,18 +767,18 @@ msgstr "No se pudo crear el controlador de detección de PPM."
msgid "Could not initialize GStreamer library"
msgstr "No se pudo inicializar la biblioteca de GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Error desconocido"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "Activar corrección _ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -813,11 +786,11 @@ msgstr ""
"Para las pistas que tienen datos ReplayGain, escalar (normalizar) "
"automáticamente el volumen de reproducción"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Activar reproducción sin _huecos"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -834,7 +807,7 @@ msgstr "No se pudo crear el transcodificador"
msgid "Could not create encoder pipeline : {0}"
msgstr "No se pudo crear la tubería del codificador: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -845,6 +818,7 @@ msgstr "No se pudo crear la tubería de codificación: {0}"
#. Translators: verb
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+#| msgid "_Import"
msgid "Import"
msgstr "Importar"
@@ -914,61 +888,61 @@ msgstr "Se terminó de descargar la actualización"
msgid "Check for Updates"
msgstr "Comprobar si hay actualizaciones"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Opciones de la ayuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Muestra esta ayuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Muestra las opciones para controlar la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Muestra las opciones para consultar la pista en reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Muestra las opciones para consultar el motor de reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Muestra las opciones para la interfaz de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Muestras las opciones para desarrolladores y depuración"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Muestra todos los grupos de opciones"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Muestra la información de la versión"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Opciones de control de reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
-"Reproduce la pista siguiente, reiniciando opcionalmente si el valor «restart» "
-"está establecido"
+"Reproduce la pista siguiente, reiniciando opcionalmente si el valor "
+"«restart» está establecido"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
"Reproduce la pista anterior, reiniciando opcionalmente si el valor «restart» "
"está establecido"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -976,29 +950,29 @@ msgstr ""
"Si la canción actual se ha reproducido más de 4 segundos la reinicia, si no "
"es lo mismo que --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Comenzar a reproducir automáticamente las pistas en cola en la línea de "
"comandos"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Comenzar la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pausar la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Conmutar la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Detiene completamente la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1007,97 +981,97 @@ msgstr ""
"actualmente en reproducción. El valor debe ser «true» (verdadero) o "
"«false» (falso)."
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Establecer el volumen de reproducción (0-100), prefijando +/- para valores "
"relativos"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Saltar a un punto específico (segundos, decimales)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Establecer la valoración de la pista en reproducción (0 a 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Opciones de consulta del motor de reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Estado actual del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Último estado del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Consulta si el reproductor puede pausarse"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Consulta si el reproductor puede saltar de posición"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Volumen del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Posición del reproductor en la pista actualmente en reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Opciones de consulta de metadatos de la pista en reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nombre del artista"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Título del álbum"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Título de la pista"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Duración"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Número de pista"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Número de pistas"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Número de disco"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1108,7 +1082,7 @@ msgstr "Número de disco"
msgid "Year"
msgstr "Año"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1116,83 +1090,83 @@ msgstr "Año"
msgid "Rating"
msgstr "Valoración"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Puntuación"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Tasa de bits"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Opciones de la interfaz de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Muestra la interfaz de usuario en el área de trabajo activa"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Entrar en el modo de pantalla completa"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Oculta la interfaz de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "No muestra la interfaz de usuario, sin importar cualquier otra opción"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Presentar el diálogo de importación multimedia"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Presentar el diálogo acerca de"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Presentar el diálogo de abrir ubicación"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Presentar el diálogo de preferencias"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Opciones de desarrollo y depuración"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Activa las características de depuración general"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Activa la salida de depuración de las consultas SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Activa la salida de depuración de Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Especifica una base de datos alternativa que usar"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Fuerza la descarga de las portadas que faltan"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr ""
"Especifica una clave alternativa, la predeterminada es /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1200,34 +1174,29 @@ msgstr ""
"Optimiza la instancia para ejecutarse sin instalación; en particular, esto "
"crea una base de datos de Mono.Addins alternativa en la carpeta de trabajo"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Desactiva completamente el soporte de DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
-#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr "Omitir la carga de un archivo gtk.css personalizado ({0}) si existe"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:230
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Recargar el archivo gtk.css ({0}) cada 5 segundos"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Omitir la carga de un archivo gtkrc personalizado ({0}) si existe"
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Los siguientes argumentos para la ayuda son no válidos: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Reproducir álbum"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "Añadir a la _cola"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1250,16 +1219,16 @@ msgstr "Reproducir _álbum"
msgid "Add an album to the playlist"
msgstr "Añadir un álbum a la lista de reproducción"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "quedan {0}"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Reproducir canción"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1267,7 +1236,7 @@ msgid "Close"
msgstr "Cerrar"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:492
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Buscar"
@@ -1304,85 +1273,91 @@ msgstr "Género"
msgid "Comment"
msgstr "Comentario"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Álbum desconocido"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Artista desconocido"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Álbum desconocido"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Título desconocido"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Varios artistas"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "No se encontró la ubicación del flujo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
msgid "File not found"
msgstr "No se encontró el archivo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "El códec para reproducir este tipo de medios no está disponible"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Archivo protegido por Digital Rights Management (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Error desconocido"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Reiniciar podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Reiniciar audiolibro"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Reiniciar vídeo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Reiniciar canción"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Reiniciar elemento"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "Sa_ltar al podcast en reproducción"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "Sa_ltar al audiolibro en reproducción"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "Sa_ltar al vídeo en reproducción"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "Sa_ltar a la canción en reproducción"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "Sa_ltar al elemento en reproducción"
@@ -1402,7 +1377,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Todos los artistas del álbum ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Todos los álbumes ({0})"
@@ -1512,7 +1487,7 @@ msgid "Scanning for media"
msgstr "Examinando contenido multimedia"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Examinando…"
@@ -1537,7 +1512,7 @@ msgstr "El proceso de importación está ejecutándose. ¿Quiere pararlo?"
msgid "Importing {0} of {1}"
msgstr "Importando {0} de {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Reanalizando {0} de {1}"
@@ -1552,7 +1527,7 @@ msgid ""
msgstr ""
"Espere mientras se migra su antigua base de datos Banshee al nuevo formato."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Actualizando metadatos"
@@ -1628,29 +1603,29 @@ msgstr "Rock suave"
msgid "Techno"
msgstr "Tecno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Quitar de la colección"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Organización de los archivos"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
msgid "Co_py files to media folder when importing"
msgstr "C_opiar archivos a las carpetas de contenido multimedia al importar"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "Act_ualizar los nombres de los archivos y las carpetas"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Renombrar los archivos y carpetas conforme a los metadatos"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "Carpeta de {0}"
@@ -1714,117 +1689,118 @@ msgstr "Número de discos"
msgid "Grouping"
msgstr "Agrupación"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Música"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Buscar en su música"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Miscelánea"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "_Ordenar los álbumes de un artista por año en lugar de por título"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} canción"
msgstr[1] "{0} canciones"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Carpeta de música"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Canciones valoradas con cuatro o cinco estrellas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Favoritos recientes"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "Canciones escuchadas a menudo en la última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Añadidas recientemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Canciones importadas durante la última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Reproducidas recientemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Canciones reproducidas recientemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "No oídas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Canciones omitidas o no reproducidas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Favoritos abandonados"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Favoritos no reproducidos en más de dos meses"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Menos favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr "Canciones valoradas con una o dos estrellas u omitidas frecuentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "700 MB de favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Un CD de datos lleno de canciones favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "80 minutos de favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Un CD de sonido lleno de canciones favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "No valoradas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Canciones que no se han valorado"
@@ -1995,8 +1971,8 @@ msgstr "Eliminar la lista de reproducción"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Lista de reproducción nueva"
@@ -2599,7 +2575,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
msgid "Unknown"
msgstr "Desconocido"
@@ -2626,7 +2602,7 @@ msgid "Delete Smart Playlist"
msgstr "Eliminar la lista de reproducción inteligente"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Todos los géneros ({0})"
@@ -2679,7 +2655,7 @@ msgstr "Error"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Detalles"
@@ -2779,12 +2755,12 @@ msgid "Show:"
msgstr "Mostrar:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Todo"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Activado"
@@ -2822,8 +2798,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} de {1}"
@@ -2884,20 +2860,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bits"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Hacer el panel contextual mayor o menor"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Ocultar el panel contextual"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Esperando a que empiece la reproducción…"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Cargando…"
@@ -2924,7 +2900,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Ecualizador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Lista de reproducción nueva"
@@ -2959,11 +2935,11 @@ msgstr "Mantenedores"
msgid "Contributors"
msgstr "Colaboradores"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Extraordinaria gestión y reproducción multimedia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2974,7 +2950,7 @@ msgstr ""
"Copyright © 2005–{1} Otros\n"
"Copyright © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Página web de Banshee"
@@ -3079,103 +3055,92 @@ msgid "Import a playlist"
msgstr "Importar una lista de reproducción"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Reanalizar la colección de música"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Reanalizar la carpeta de música"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Abrir _ubicación…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Abre un lugar remoto para reproducir"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Salir"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Salir de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Editar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Preferencias"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Modificar sus preferencias personales"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Herramientas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Reanalizar la colección de música"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Reanalizar la carpeta de música"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"La operación de reanálisis quitará una pista de su colección de música."
-msgstr[1] ""
-"La operación de reanálisis quitará {0} pistas de su colección de música."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Ay_uda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "Índ_ice"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Búsqueda avanzada en la colección"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Aprender técnicas avanzadas para buscar en su colección multimedia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Página de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Visitar la página de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Involucrarse"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Convertirse en colaborador de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Información de la _versión"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Ver información detallada de la versión y la configuración"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importar lista de reproducción"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listas de reproducción"
@@ -3499,7 +3464,7 @@ msgstr "Eliminar permanentemente lo(s) elemento(s) seleccionado(s) del soporte"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3566,26 +3531,18 @@ msgstr[0] "¿Está seguro de querer quitar el elemento seleccionado de {1}?"
msgstr[1] ""
"¿Está seguro de querer quitar los {0} elementos seleccionados de {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "¿Está seguro de que quiere continuar?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Quitar pistas"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Artista del álbum _recopilatorio:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Marcar esta casilla si esta pista es parte de un álbum con pistas de varios "
"artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3653,19 +3610,19 @@ msgstr "Establecer todos los números de disco y totales a estos valores"
msgid "_Disc Number:"
msgstr "Número de di_sco:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Establecer todos los años a este valor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "A_ño:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Establecer todas las valoraciones a este valor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "Valo_ración:"
@@ -3729,7 +3686,7 @@ msgstr "Establecer todos los comentarios a este valor"
msgid "Co_mment:"
msgstr "Come_ntario:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Ayuda"
@@ -3737,7 +3694,7 @@ msgstr "Ayuda"
msgid "Lyrics"
msgstr "Letras"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Avanzar a la siguiente pista y editar su título"
@@ -3860,39 +3817,39 @@ msgstr "Tamaño del archivo:"
msgid "bytes"
msgstr "bytes"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Editor de pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Propiedades de la pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Mostrar la pista anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Mostrar la siguiente pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Título:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Artista:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Álbum:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Sincr. todos los _valores"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3900,23 +3857,23 @@ msgstr ""
"Aplicar los valores de todos los campos comunes establecidos para esta pista "
"a todas las pistas seleccionadas en este editor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Editando elemento {0} de {1}</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "¿Guardar los cambios hechos a la pista abierta?"
msgstr[1] "¿Guardar los cambios hechos a {0} de {1} pistas abiertas?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Cerrar _sin guardar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr ""
@@ -3967,19 +3924,19 @@ msgstr[1] "Tareas activas en ejecución"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}de{1} {2} {0}publicado el{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}en{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3987,56 +3944,56 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}por{1} {2} {0}de{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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}de{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}por{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Parar la operación"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Parar «{0}»"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Esta operación aún está trabajando. ¿Quiere pararla?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "La operación «{0}» aún está trabajando. ¿Quiere pararla?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Continuar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Continuar «{0}»"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Parando…"
@@ -4109,7 +4066,7 @@ msgstr "Perfiles no disponibles"
msgid "Advanced"
msgstr "Avanzado"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Configurando «{0}»"
@@ -4174,81 +4131,81 @@ msgstr "Abrir en el editor"
msgid "Create and save"
msgstr "Crear y guardar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Contenido del examinador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Configurar los filtros disponibles en el examinador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Mostrar filtro de artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Mostrar una lista de artistas por los que filtrar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Mostrar todos los artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Mostrar todos los artistas en el filtro de artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Mostrar artistas de álbum"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Mostrar sólo artistas de álbum, no artistas con una sola pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Mostrar filtro de géneros"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Mostrar una lista de géneros por los que filtrar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Mostrar filtro de años"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Mostrar una lista de años por los que filtrar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Sin configurar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Examinador a la izquierda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr ""
"Mostrar el examinador de artista/álbum a la izquierda de la lista de pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Examinador arriba"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Mostrar el examinador de artista/álbum encima de la lista de pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Mostrar el examinador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Mostrar u ocultar el examinador de artista/álbum"
@@ -4264,12 +4221,12 @@ msgstr ""
msgid "The security certificate for {0} is invalid."
msgstr "El certificado de seguridad para {0} no es válido."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Cargando {0}…"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4277,20 +4234,24 @@ msgstr ""
"Insertar\n"
"disco"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Limpiar la búsqueda"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Buscar"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "En reposo"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Contactando…"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Buffering"
@@ -4330,39 +4291,29 @@ msgstr "Soporta portadas"
msgid "Supports photos"
msgstr "Soporta imágenes"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "La duración de la pista es cero"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "Sincronizando iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Preparándose para sincronizar…"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Añadiendo pista {0} de {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Actualizando los metadatos en la pista {0} de {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Quitando pista {0} de {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Limpiando, quitando pista no válida {0} de {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Escribiendo la base de datos multimedia"
@@ -4371,7 +4322,7 @@ msgstr "Escribiendo la base de datos multimedia"
msgid "Sync {0}"
msgstr "Sincronizar {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Dispositivos"
@@ -4380,31 +4331,31 @@ msgstr "Dispositivos"
msgid "Device Properties"
msgstr "Propiedades del dispositivo"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Producto"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Fabricante"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Cargando {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Sí"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "No"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4413,12 +4364,12 @@ msgstr ""
"El formato {0} no está soportado por el dispositivo, y no se ha encontrado "
"ningún conversor para convertirlo."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
msgid "File format conversion support is not available"
msgstr ""
"El soporte para la conversión de formatos de archivo no está disponible"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
msgid "Error converting file"
msgstr "Error al convertir el archivo"
@@ -4439,8 +4390,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Preferencias de sincronización"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Sincronizar"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4448,9 +4403,13 @@ msgstr[0] "La operación de sincronización quitará una pista de su dispositivo
msgstr[1] ""
"La operación de sincronización quitará {0} pistas de su dispositivo."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Sincronizar"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "¿Está seguro de que quiere continuar?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Quitar pistas"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4523,12 +4482,12 @@ msgstr "Importar música adquirida"
msgid "Disconnect"
msgstr "Desconectar"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Desconectando {0}…"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "No se pudo desconectar {0}: {1}"
@@ -4660,13 +4619,12 @@ msgstr "Reino Unido (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Estados Unidos (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Buscar en la tienda de Amazon MP3"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Cómo ayudan sus adquisiciones a GNOME"
@@ -4771,15 +4729,15 @@ msgstr "D_etectar"
msgid "T_ap"
msgstr "_Marcar"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Hace que Banshee intente autodetectar los PPM de esta canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Reproducir esta canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Marque el ritmo con este botón para establecer manualmente los PPM de esta "
@@ -4894,11 +4852,11 @@ msgstr "Iniciar sesión"
msgid "Connecting to {0}"
msgstr "Conectando a {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Añadir servidor DAAP remoto"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Añadir un nuevo servidor DAAP remoto"
@@ -5155,10 +5113,6 @@ msgstr "Error al obtener los detalles del elemento desde Internet Archive"
msgid "Description"
msgstr "Descripción"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Creador:"
@@ -5172,7 +5126,7 @@ msgid "Location:"
msgstr "Ubicación:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Fecha:"
@@ -5185,7 +5139,7 @@ msgid "Publisher:"
msgstr "Editorial:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Palabras clave:"
@@ -5259,16 +5213,16 @@ msgstr "{0}por{1} en {2}"
msgid "Write your own review"
msgstr "Escriba su propia revisión"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Colección:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Consulta opcional"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Ordenar por:"
@@ -5656,22 +5610,22 @@ msgstr "Editar emisora"
msgid "Station"
msgstr "Emisora"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} emisora"
msgstr[1] "{0} emisoras"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Proporcione un URI de emisora válida"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Porporcione un género para la emisora"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Proporcione un título para la emisora"
@@ -5683,7 +5637,7 @@ msgstr "Añadir emisora de radio nueva"
msgid "Edit radio station"
msgstr "Editar emisora de radio"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5691,80 +5645,80 @@ msgstr ""
"Introduzca el género, título y URL de la emisora de radio que quiere añadir. "
"La descripción es opcional."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Género de la emisora:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Nombre de la emisora:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "URL del flujo:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Creador de la emisora:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Descripción:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Valoración:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Procesadas{0} pistas de {1}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Configurar el complemento de Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Visitar la página del perfil de _usuario"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Visitar la página de su perfil de Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "Activar _informe de canciones desde Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Activar informe de canciones desde Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "Activar _informe de canciones desde el dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Activar informe de canciones desde el dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "«Scrobbling» a Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "«Scrobbling» desde el dispositivo"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "«Scrobbling» desde el dispositivo…"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "«Scrobbling» a Last.fm…"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Procesando pista pista {0} de {1}…"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5822,28 +5776,28 @@ msgstr "Visitar la página de Last.fm para esta pista"
msgid "Recommend this track to someone"
msgstr "Recomendar esta pista a alguien"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5895,19 +5849,19 @@ msgstr "Ha iniciado sesión en Last.fm como el usuario <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Cerrar sesión en Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Pistas favoritas recientes"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Pistas reproducidas recientemente"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Mis artistas destacados"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} reproducciones"
@@ -5997,17 +5951,17 @@ msgstr "Pista rechazada"
msgid "Mark current track as banned"
msgstr "Marcar la pista actual como rechazada"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "Seguidores de {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Similares a {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "_Añadir emisora"
@@ -6023,7 +5977,7 @@ msgstr "Número total de reproducciones"
msgid "New Station"
msgstr "Nueva emisora"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "_Tipo de emisora:"
@@ -6176,15 +6130,15 @@ msgstr "Panel de acceso rápido para sus archivos multimedia"
msgid "_Mini Mode"
msgstr "Modo _mini"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Modo completo"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Cambiar a modo completo"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Cambiar el modo de repetición de la reproducción"
@@ -6222,11 +6176,11 @@ msgstr "Mostrar _notificaciones"
msgid "Show notifications when item changes"
msgstr "Mostrar notificaciones al cambiar de elemento"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Aún en ejecución"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6234,23 +6188,19 @@ msgstr ""
"Banshee se cerró en el área de notificación. Use la opción <i>Salir</i> para "
"finalizar la sesión."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Saltar este elemento"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "No se pudo mostrar la notificación"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6259,6 +6209,10 @@ msgstr ""
"{0}por{1} {2}\n"
"{0}de{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Simplificar"
@@ -6475,8 +6429,9 @@ msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
"not able to infer the location of this directory. Please locate it."
msgstr ""
-"La colección de iTunes indica que su carpeta de música es «{0}», pero Banshee "
-"no ha podido deducir la ubicación de esta carpeta. Por favor, localícela."
+"La colección de iTunes indica que su carpeta de música es «{0}», pero "
+"Banshee no ha podido deducir la ubicación de esta carpeta. Por favor, "
+"localícela."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
msgid "iTunes Media Player"
@@ -6663,16 +6618,16 @@ msgid_plural "{0} episodes"
msgstr[0] "{0} episodio"
msgstr[1] "{0} episodios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nunca actualizado"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Actualizado en {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Actualizado {0}"
@@ -6755,18 +6710,18 @@ msgstr "Visitar el sitio web"
msgid "Add Podcast"
msgstr "Añadir podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
msgstr[0] "Eliminar archivo"
msgstr[1] "Eliminar archivos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "URL no válido"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "El URL del podcast no es válido."
@@ -6774,11 +6729,11 @@ msgstr "El URL del podcast no es válido."
msgid "Episode Details"
msgstr "Detalles del episodio"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Comprobar periódicamente si hay episodios nuevos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
@@ -6786,59 +6741,59 @@ msgstr ""
"Si se marca, Banshee comprobará cada hora si el podcast tiene episodios "
"nuevos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Descargar episodios nuevos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Archivar todos los episodios excepto el más reciente"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "No hay descripción disponible"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Nombre:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Sitio web:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Visitar"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Opciones de suscripción"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "URL del proveedor:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Última actualización:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Categoría:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Copyright:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6956,22 +6911,22 @@ msgstr "pulsar"
msgid "menu"
msgstr "menú"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Esconder <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "{0} encontró un error fatal"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Detalles del error"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Se produjo una excepción no tratada: "
@@ -7123,15 +7078,15 @@ msgstr "comienza por"
msgid "ends with"
msgstr "acaba en"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Identificación de cuenta en Last.fm"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Introduzca sus credenciales de la cuenta Last.fm."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Guardar e iniciar sesión"
@@ -7259,15 +7214,6 @@ msgstr "Conectado a Last.fm"
msgid "Unknown Podcast"
msgstr "Podcast desconocido"
-#~ msgid "Clear search"
-#~ msgstr "Limpiar la búsqueda"
-
-#~ msgid "Banshee"
-#~ msgstr "Banshee"
-
-#~ msgid "Scrobbling from device"
-#~ msgstr "«Scrobbling» desde el dispositivo"
-
#~ msgid "Volume"
#~ msgstr "Volumen"
diff --git a/po/fr.po b/po/fr.po
index 01d56bf..94c4def 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
# Robert-André Mauchin <zebob.m at pengzone.org>, 2007-2008.
# Florent Le Coz <louizatakk at gmail.com>, 2007.
# Claude Paroz <claude at 2xlibre.net>, 2008.
-# Alexandre Franke <alexandre.franke at gmail.com>, 2008, 2013.
+# Alexandre Franke <alexandre.franke at gmail.com>, 2008.
# Yannick Tailliez <ytdispatch-libre at yahoo.com>, 2008.
# Bruno Brouard <annoa.b at gmail.com>, 2009-2012.
# Laurent Coudeur <laurentc at iol.ie>, 2009, 2010.
@@ -19,9 +19,9 @@ msgstr ""
"Project-Id-Version: banshee 2.4\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-19 19:47+0000\n"
-"PO-Revision-Date: 2013-02-19 21:49+0100\n"
-"Last-Translator: Alexandre Franke <alexandre.franke at gmail.com>\n"
+"POT-Creation-Date: 2013-02-12 20:25+0000\n"
+"PO-Revision-Date: 2013-02-18 23:06+0100\n"
+"Last-Translator: Pierre Henry <pierrehenry73 at yahoo.fr>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -781,18 +781,18 @@ msgstr "Impossible de créer le pilote de détection du nombre de BPM."
msgid "Could not initialize GStreamer library"
msgstr "Impossible d'initialiser la bibliothèque GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Erreur inconnue"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Activer la correction de gain (ReplayGain)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -800,11 +800,11 @@ msgstr ""
"Adapte automatiquement (normalise) le volume de lecture pour les morceaux "
"intégrant des données ReplayGain."
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Activer la lecture _gapless (sans silence)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -821,7 +821,7 @@ msgstr "Impossible de créer le transcodeur"
msgid "Could not create encoder pipeline : {0}"
msgstr "Impossible de créer le pipeline du codeur : {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -1287,87 +1287,91 @@ msgstr "Genre"
msgid "Comment"
msgstr "Commentaire"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "Album inconnu"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Artiste inconnu"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Album inconnu"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Titre inconnu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Divers artistes"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "L'emplacement du flux n'a pas été trouvé"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
msgid "File not found"
msgstr "Fichier introuvable"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Le codec pour lire ce type de média n'est pas disponible"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Fichier protégé par gestion des droits numériques (GDN)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Erreur inconnue"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Redémarrer le podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Redémarrer le livre audio"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Redémarrer la vidéo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Redémarrer le morceau"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Redémarrer l'élément"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Aller au podcast en cours de lecture"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Aller au livre audio en cours de lecture"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Aller à la vidéo en cours de lecture"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Aller au morceau en cours de lecture"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Aller à l'élément en cours de lecture"
@@ -1491,7 +1495,7 @@ msgid "Scanning for media"
msgstr "Analyse de médias"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Analyse..."
@@ -1517,7 +1521,7 @@ msgstr ""
msgid "Importing {0} of {1}"
msgstr "Importation {0} sur {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Réanalyse {0} sur {1}"
@@ -1533,7 +1537,7 @@ msgstr ""
"Veuillez patienter pendant que votre ancienne base de données migre vers le "
"nouveau format."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Actualisation des métadonnées"
@@ -2613,7 +2617,7 @@ msgid "Delete Smart Playlist"
msgstr "Supprimer la liste de lecture intelligente"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Tous les genres ({0})"
@@ -3065,105 +3069,94 @@ msgid "Import a playlist"
msgstr "Importe une liste de lecture"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Réanalyser la bibliothèque musicale"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Réanalyser le dossier de la bibliothèque musicale"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Ouvrir un _emplacement..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Ouvrir un emplacement distant pour la lecture"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Quitter"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Quitte Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "É_dition"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Préférences"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Modifie vos préférences personnelles"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "Ou_tils"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Réanalyser la bibliothèque musicale"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Réanalyser le dossier de la bibliothèque musicale"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"La nouvelle analyse va supprimer une piste de votre périphérique."
-msgstr[1] ""
-"La nouvelle analyse va supprimer {0} pistes de votre périphérique."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Aid_e"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Sommaire"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Recherche avancée dans la bibliothèque"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr ""
"Apprenez à utiliser les méthodes avancées pour faire des recherches dans "
"votre bibliothèque multimédia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Page d'_accueil de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Consultez la page d'accueil de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Participer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Devenez un contributeur de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Information de _version"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Affiche des informations détaillées sur la version et la configuration"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importer une liste de lecture"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listes de lecture"
@@ -3553,14 +3546,6 @@ msgstr[0] "Voulez-vous vraiment supprimer l'élément sélectionné de votre {1}
msgstr[1] ""
"Voulez-vous vraiment supprimer les {0} éléments sélectionnés de votre {1} ?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Voulez-vous vraiment continuer ?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Supprimer les pistes"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Artistes de l'album de com_pilation :"
@@ -4331,39 +4316,29 @@ msgstr "Prend en charge l'affichage des pochettes d'albums"
msgid "Supports photos"
msgstr "Prend en charge l'affichage des photos"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:462
msgid "Track duration is zero"
msgstr "La durée de la piste est nulle"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
msgid "Syncing iPod"
msgstr "Synchronisation de l'iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
msgid "Preparing to synchronize..."
msgstr "Préparation de la synchronisation..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:589
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Ajout de la piste {0} sur {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Mise à jour des métadonnées pour la piste {0} sur {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:632
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Suppression de la piste {0} sur {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Nettoyage, suppression de la piste invalide {0} sur {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:706
msgid "Writing media database"
msgstr "Écriture de la base de données des médias"
@@ -4372,7 +4347,7 @@ msgstr "Écriture de la base de données des médias"
msgid "Sync {0}"
msgstr "Synchronisation de {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Périphériques"
@@ -4441,8 +4416,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Préférences de synchronisation"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Synchronisation"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4451,9 +4430,13 @@ msgstr[0] ""
msgstr[1] ""
"L'opération de synchronisation va supprimer {0} pistes de votre périphérique."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Synchronisation"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Voulez-vous vraiment continuer ?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+msgid "Remove tracks"
+msgstr "Supprimer les pistes"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4526,12 +4509,12 @@ msgstr "Importer de la musique achetée"
msgid "Disconnect"
msgstr "Déconnecter"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Déconnexion de {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Impossible de déconnecter {0} : {1}"
@@ -5661,22 +5644,22 @@ msgstr "Modifier la station"
msgid "Station"
msgstr "Station"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} station"
msgstr[1] "{0} stations"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Renseignez un URI de station valide"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Renseignez un type de station"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Renseignez un titre de station"
@@ -5900,19 +5883,19 @@ msgstr "Vous êtes authentifié chez Last.fm en tant que <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Se déconnecter de Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Morceaux récemment appréciés"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Morceaux récemment lus"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Mes artistes préférés"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} joue"
@@ -7279,3 +7262,4 @@ msgstr "Connecté à Last.fm."
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:103
msgid "Unknown Podcast"
msgstr "Podcast inconnu"
+
diff --git a/po/gl.po b/po/gl.po
index fb38093..eabba31 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4,21 +4,23 @@
# Ignacio Casal Quinteiro <nacho.resa at gmail.com>, 2008.
# Antón Méixome <meixome at mancomun.org>, 2009.
# Fran Diéguez <frandieguez at gnome.org>, 2010, 2011.
-# Fran Dieguez <frandieguez at gnome.org>, 2009, 2010, 2011, 2012, 2013.
+# Fran Dieguez <frandieguez at gnome.org>, 2009, 2010, 2011, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: banshee-master-po-gl-3484\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-23 01:06+0200\n"
-"PO-Revision-Date: 2013-09-23 01:07+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=banshee&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-08-21 19:53+0000\n"
+"PO-Revision-Date: 2012-08-30 14:28+0200\n"
"Last-Translator: Fran Dieguez <frandieguez at gnome.org>\n"
-"Language-Team: gnome-l10n-gl at gnome.org\n"
+"Language-Team: Galician <gnome-l10n-gl at gnome.org>\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
"X-Project-Style: gnome\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
@@ -617,15 +619,15 @@ msgid "Audio Quality"
msgstr "Calidade do son"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Reprodutor de música"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Reprodutor de música Banshee"
@@ -633,14 +635,6 @@ msgstr "Reprodutor de música Banshee"
msgid "Play and organize your media collection"
msgstr "Reproduzca e organice a súa colección multimedia"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"Vídeo;Filme;Película;Curta;Series;Reprodutor;DVD;Música;Disco;Mp3;Son;CD;Pod"
-"cast;DAAP;Lista de reprodución;Ipod;Multimedia;Colección;Música;Radio;"
-
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
@@ -768,18 +762,18 @@ msgstr "Non foi posíbel crear o controlador de detección de BPM."
msgid "Could not initialize GStreamer library"
msgstr "Non foi posíbel inicializar a biblioteca de GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Erro descoñecido"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Activar a corrección ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -787,11 +781,11 @@ msgstr ""
"Para las pistas que teñen datos ReplayGain, escalar (normalizar) "
"automaticamente o volume de reprodución"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Activar a reprodución sen _saltos"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -808,7 +802,7 @@ msgstr "Non foi posíbel crear o transcodificador"
msgid "Could not create encoder pipeline : {0}"
msgstr "Non foi posíbel crear a tubería do codificador: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -819,6 +813,7 @@ msgstr "Non foi posíbel crear a tubería de codificación: {0}"
#. Translators: verb
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+#| msgid "_Import"
msgid "Import"
msgstr "Importar"
@@ -888,61 +883,61 @@ msgstr "Rematouse de descargar a anovación"
msgid "Check for Updates"
msgstr "Comprobar novas anovacións"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Opcións de axuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Mostrar esta axuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Mostra as opción para controlar a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Mostrar as opcións para consultar a pista en reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Mostra as opcións para consultar o motor de reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Mostra as opcións para a interface de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Mostra as opcións para desenvolvedores e depuración"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Mostra todos os grupos de opcións"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Mostra a información da versión"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Opcións de control de reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Reproduce a pista seguinte, reiniciando opcionalmente se o valor 'restart' "
"está estabelecido"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
"Reproduce a pista anterior, reiniciando opcionalmente se o valor 'restart' "
"está estabelecido"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -950,27 +945,27 @@ msgstr ""
"Se a canción actual reproduciuse máis de 4 segundos reiníciaa, en caso "
"contrario é o mesmo que --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr "Comeza a reproducir automaticamente as pistas á cola na liña de ordes"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Iniciar a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pausar a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Trocar a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Detén completamente a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -978,97 +973,97 @@ msgstr ""
"Activa ou desactiva a detención da reprodución trala pista actualmente en "
"reprodución (o valor debe ser 'true' ou 'false')"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Establecer o volume de reprodución (0-100), prefixando +/- para valores "
"relativos"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Salta a un punto específico (segundos, decimales)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Estabelecer a valoración da pista en reprodución (0 a 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Opcións de consulta do motor de reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Estado actual do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Último estado do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Consulta se o reprodutor pode pausarse"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Consulta se o reprodutor pode saltar de posición"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Volume do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Posición do reprodutor na pista actualmente en reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Opcións de consulta de metadatos da pista en reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nome do artista"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Título do álbum"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Título da pista"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Duración"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Número de pista"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Contador de pista"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Número de disco"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1079,7 +1074,7 @@ msgstr "Número de disco"
msgid "Year"
msgstr "Ano"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1087,82 +1082,82 @@ msgstr "Ano"
msgid "Rating"
msgstr "Puntuación"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Puntuación"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Taxa de bits"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Opcións da interface de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Mostra a interface de usuario na área de traballo activa"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Entrar en modo a pantalla completa"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Oculta a interface de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Non mostra a interface de usuario, sen importar calquer outra opción"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Presentar o diálogo de importación multimedia"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Presentar o diálogo Sobre"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Presentar o diálogo de abrir localización"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Presentar el diálogo de preferencias"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Opción de desenvolvemento e depuración"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Activar as características de depuración xeral"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Activa a saída de depuración da consultas SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Activa a saída de depuración de Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Especifica unha base de datos alternativa para usar"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Forza a descarga das portadas que faltan"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Especifica unha tecla alternativa, a predeterminada é /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1170,34 +1165,29 @@ msgstr ""
"Optimiza a instancia para executarse sen instalación; en particular, isto "
"crea unha base de datos de Mono.Addins alternativa no directorio de traballo"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Desactiva completamente a compatibilidade con DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
-#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr "Omitir a carga dun ficheiro gtk.css personalizado ({0}) se existe"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:230
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Recargar o ficheiro gtk.css personalizado ({0}) cada 5 segundos"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Omitir a carga dun ficheiro gtkrc personalizado ({0}) se existe"
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Os seguintes argumentos para a axuda non son válidos: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Reproducir álbum"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "Meter na _cola"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1220,16 +1210,16 @@ msgstr "Reproducir á_lbum"
msgid "Add an album to the playlist"
msgstr "Engadir un álbum á lista de reprodución"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "quedan {0}"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Reproducir canción"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1237,7 +1227,7 @@ msgid "Close"
msgstr "Pechar"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:492
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Buscar"
@@ -1274,85 +1264,91 @@ msgstr "Xénero"
msgid "Comment"
msgstr "Comentario"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Álbum descoñecido"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Artista descoñecido"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Álbum descoñecido"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Título descoñecido"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Varios artistas"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Non se encontrou a localización do fluxo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
msgid "File not found"
msgstr "Non se encontrou o ficheiro"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "O códec para reproducir este tipo de medios non está dispoñíbel"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Ficheiro protexido con Digital Rights Management (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Erro descoñecido"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Reiniciar podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Reiniciar audiolibro"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Reiniciar vídeo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Reiniciar canción"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Reiniciar elemento"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Saltar á canción do podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Saltar ao audiolibro en reprodución"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Saltar ao vídeo en reprodución"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Saltar á canción en reprodución"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Saltar ao elemento en reprodución"
@@ -1372,7 +1368,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Todos os artistas do álbum ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Todos os álbums ({0})"
@@ -1482,7 +1478,7 @@ msgid "Scanning for media"
msgstr "Analizando o contido multimedia"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Analizando..."
@@ -1507,7 +1503,7 @@ msgstr "Estase executando o proceso de importación. Quere detelo?"
msgid "Importing {0} of {1}"
msgstr "Importando {0} de{1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Analizando de novo {0} de {1}"
@@ -1523,7 +1519,7 @@ msgstr ""
"Espera mentras se migra a súa base de datos antiga de Banshee ao novo "
"formato."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Actualizando os metadatos"
@@ -1599,29 +1595,30 @@ msgstr "Rock suave"
msgid "Techno"
msgstr "Tecno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Eliminar da fonoteca"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Organización dos ficheiros"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
+#| msgid "Co_py files to media folders when importing"
msgid "Co_py files to media folder when importing"
msgstr "Co_piar ficheiros aos cartafoles multimedia ao importar"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "Act_ualizar os nomes dos ficheiros e os cartafoles"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Renomear os ficheiros e cartafoles conforme aos metadatos"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "Cartafol {0}"
@@ -1685,119 +1682,120 @@ msgstr "Contador de disco"
msgid "Grouping"
msgstr "Agrupación"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Música"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Buscar na súa música"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Misceláneo"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "_Ordenar os albumes dun artista por ano no lugar de por título"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} canción"
msgstr[1] "{0} cancións"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Cartafol de música"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Cancións puntuadas con catro ou cinco estrelas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Favoritos recentes"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "Cancións escoitadas a miúdo na última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Engadido recentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Cancións importadas durante a última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Reproducidas recentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Cancións reproducidas recentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "Non escoitadas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Cancións que foron omitidas ou non reproducidas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Favoritos abandoados"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Favoritos non reproducidos en máis de dous meses"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Menos favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
"Cancións puntuadas cunha ou dúas estrelas ou que foron omitidas "
"frecuentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "700 MB de favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Un CD de datos cheo de cancións favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "80 minutos de favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Un CD de son cheo de cancións favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "Non puntuadas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Cancións que non foron puntuadas"
@@ -1967,8 +1965,8 @@ msgstr "Eliminar a lista de reprodución"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nova lista de reprodución"
@@ -2571,7 +2569,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
msgid "Unknown"
msgstr "Descoñecido"
@@ -2598,7 +2596,7 @@ msgid "Delete Smart Playlist"
msgstr "Eliminar a lista de reprodución intelixente"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Todo os xéneros ({0})"
@@ -2651,7 +2649,7 @@ msgstr "Erro"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Detalles"
@@ -2750,12 +2748,12 @@ msgid "Show:"
msgstr "Mostrar:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Todo"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Activado"
@@ -2793,8 +2791,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} de {1}"
@@ -2855,20 +2853,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bits"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Facer o panel de contexto máis longo ou máis curto"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Ocultar o contexto do panel"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Esperando a que a reprodución comece..."
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Cargando..."
@@ -2895,7 +2893,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Ecualizador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Nova preconfiguración"
@@ -2930,11 +2928,11 @@ msgstr "Mantedores"
msgid "Contributors"
msgstr "Contribuidores"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Extraordinaria xestión e reprodución multimedia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2945,7 +2943,7 @@ msgstr ""
"Copyright © 2005–{1} Outros\n"
"Copyright © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Páxina web de Banshee"
@@ -3050,101 +3048,92 @@ msgid "Import a playlist"
msgstr "Importar unha lista de reprodución"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Analizar de novo a fonoteca"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Analizar de novo o cartafol da fonoteca"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Abrir _localización..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Abre unha localización remota para reproducir"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Saír"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Saír de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Editar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Preferencias"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Modificar as súas preferencias persoais"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Ferramentas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Analizar de novo a fonoteca"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Analizar de novo o cartafol da fonoteca"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "A operación de sincronización eliminará unha pista da súa fonoteca."
-msgstr[1] "A operación de sincronización eliminará {0} pistas da súa fonoteca."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Axuda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "Índ_ice"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Busca avanzada na colección"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Aprenda técnicas avanzadas para buscar na súa colección multimedia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Páxina do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Visite a páxina do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Involúcrese"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Converterse en contribuidor de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Información de _versión"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Ver información detallada da versión e a configuración"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importar lista de reprodución"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listas de reprodución"
@@ -3468,7 +3457,7 @@ msgstr "Eliminar permanentemente os elementos seleccionados do medio"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3535,25 +3524,17 @@ msgstr[0] "Está seguro de que quere quitar o elemento seleccionado do seu {1}?"
msgstr[1] ""
"Está seguro de que quere quitar os {0} elementos seleccionado do seu {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Ten certeza que quere continuar?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Sacar pistas"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Com_pilación por Artista do álbum:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Marcar isto se esta pista é parte dun álbum con pista de varios artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3620,19 +3601,19 @@ msgstr "Estabelecer todos os números de disco e contaxes a estes valores"
msgid "_Disc Number:"
msgstr "Número de _disco:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Estabelecer todos os anos a este valor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Ano:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Estabelecer todas as puntuacións a este valor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Puntuación:"
@@ -3696,7 +3677,7 @@ msgstr "Estabelecer todos os comentarios a este valor"
msgid "Co_mment:"
msgstr "Co_mentario:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Axuda"
@@ -3704,7 +3685,7 @@ msgstr "Axuda"
msgid "Lyrics"
msgstr "Letras"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Avanzar ás seguinte pista e editar este título"
@@ -3827,39 +3808,39 @@ msgstr "Tamaño de ficheiro:"
msgid "bytes"
msgstr "bytes"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Editor de pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Propiedades da pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Mostrar a pista anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Mostrar a seguinte pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Título:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Artista:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Álbum:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Sincronizar todos os _valores dos campos"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3867,23 +3848,23 @@ msgstr ""
"Aplicar os valores dos campos comúns estabelecidos para esta pista a todas "
"as pistas seleccionadas neste editor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Editando {0} de {1} elementos</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "Gardar os cambios feitos á pista aberta?"
msgstr[1] "Gardar os cambios feitos ás {0} de {1} pistas abertas?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Pechar _sen gardar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "Se non garda, os cambios das últimas {0} perderanse permanentemente."
@@ -3933,19 +3914,19 @@ msgstr[1] "Executando as tarefas activas"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0} de {1} {2} {0} publicado o {1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0} en {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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3953,56 +3934,56 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0} por {1} {2} {0} de {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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}do{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}de{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Deter a operación"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Deter {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Esta operación aínda está traballando. Quere detelo?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "A operación '{0}' aínda está traballando. Quere detela?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Continuar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Continuar {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Detención..."
@@ -4075,7 +4056,7 @@ msgstr "Perfís non dispoñíbeis"
msgid "Advanced"
msgstr "Avanzado"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Configurando {0}"
@@ -4140,80 +4121,80 @@ msgstr "Abrir en editor"
msgid "Create and save"
msgstr "Crear e gardar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Contido do examinador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Configurar os filtros dispoñíbeis no examinador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Mostrar filtro de artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Mostrar unha lista de artistas polos que filtrar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Mostrar todos os artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Mostrar todos os artistas no filtro de artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Mostrar artistas de álbum"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Mostrar só artistas de álbum, non artistas cunha sola pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Mostrar filtro de xéneros"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Mostrar unha lista de xéneros polos que filtrar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Mostrar filtro de anos"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Mostrar unha lista de anos polos que filtrar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Sen configurar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Examinador á esquerda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Mostrar o examinador de artista/álbum á esquerda da lista de pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Examinador enriba"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Mostrar o examinador de artista/álbum enriba da lista de pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Mostrar o examinador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Mostrar ou ocultar o examinador de artista/álbum"
@@ -4229,12 +4210,12 @@ msgstr ""
msgid "The security certificate for {0} is invalid."
msgstr "O certificado de seguranza para {0} non é válido."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Cargando {0}..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4242,20 +4223,24 @@ msgstr ""
"Inserir\n"
"disco"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Limpar a busca"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Buscar"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Reposo"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Contactando..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Almacenando no búfer"
@@ -4295,39 +4280,29 @@ msgstr "Permite portadas"
msgid "Supports photos"
msgstr "Permite imaxes"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "A duración da pista é cero"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "Sincronizando iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Preparándose para sincronizar..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Engadindo a pista {0} de{1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Actualizando os metadatos na pista {0} de {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Eliminando a pista {0} de{1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Limpando, eliminando a pista non válida {0} de {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Escribindo a base de datos multimedia"
@@ -4336,7 +4311,7 @@ msgstr "Escribindo a base de datos multimedia"
msgid "Sync {0}"
msgstr "Sincronizar {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Dispositivos"
@@ -4345,31 +4320,31 @@ msgstr "Dispositivos"
msgid "Device Properties"
msgstr "Propiedades do dispositivo"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Produto"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Fabricante"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Cargando {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Si"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Non"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4378,13 +4353,13 @@ msgstr ""
"O formato {0} non é compatíbel co dispositivo e non se atopou ningún "
"conversor para convertelo"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
msgid "File format conversion support is not available"
msgstr ""
"A compatibilidade para a conversión de formatos de ficheiro non está "
"dispoñíbel"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
msgid "Error converting file"
msgstr "Produciuse un erro ao converter o ficheiro"
@@ -4406,8 +4381,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Sincronizar as preferencias"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Sincronizar"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4416,9 +4395,13 @@ msgstr[0] ""
msgstr[1] ""
"A operación de sincronización eliminará {0} pista do seu dispositivo."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Sincronizar"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Ten certeza que quere continuar?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Sacar pistas"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4491,12 +4474,12 @@ msgstr "Importar a música comprada"
msgid "Disconnect"
msgstr "Desconectar"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Desconectando {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Non foi posíbel desconectar {0}: {1}"
@@ -4630,13 +4613,12 @@ msgstr "Reino Unido (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Estados Unidos (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Buscar na Tenda de MP3 de Amazon"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Como poden as súas compras apoiar a GNOME"
@@ -4741,15 +4723,15 @@ msgstr "D_etectar"
msgid "T_ap"
msgstr "T_oque"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Tentar que Banshee autodetecte os BPM desta canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Reproducir esta canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Toque este botón de golpeo para estabelecer o BPM para esta canción "
@@ -4864,11 +4846,11 @@ msgstr "Iniciar sesión"
msgid "Connecting to {0}"
msgstr "Conectado a {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Engadir servidor remoto DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Engadir un novo servidor remoto DAAP"
@@ -5126,10 +5108,6 @@ msgstr ""
msgid "Description"
msgstr "Descrición"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Creador:"
@@ -5143,7 +5121,7 @@ msgid "Location:"
msgstr "Localización:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Data:"
@@ -5156,7 +5134,7 @@ msgid "Publisher:"
msgstr "Editorial:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Palabras chave:"
@@ -5230,16 +5208,16 @@ msgstr "{0}por{1} en {2}"
msgid "Write your own review"
msgstr "Escriba a súa propia revisión"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Colección:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Consulta opcional"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Ordenar por:"
@@ -5326,6 +5304,7 @@ msgid "Library of Congress"
msgstr "Biblioteca do congreso"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+#| msgid "Sample"
msgid "Examples:"
msgstr "Exemplos:"
@@ -5627,22 +5606,22 @@ msgstr "Editar emisora"
msgid "Station"
msgstr "Emisora"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} emisora"
msgstr[1] "{0} emisoras"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Proporcione un URI de emisora válida"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Proporcione un xénero para a emisora"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Proporcione un título para a emisora"
@@ -5654,7 +5633,7 @@ msgstr "Engadir unha emisora de radio"
msgid "Edit radio station"
msgstr "Editar emisora de radio"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5662,80 +5641,85 @@ msgstr ""
"Introduza o xénero, título e URL da emisora de radio que desexa engadir. A "
"descrición é opcional."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Xénero da emisora:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Nome da emisora:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "URL do fluxo:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Creador da emisora:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Descrición:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Puntuación:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Procesadas {0} de {1} pistas"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Configurar o engadido de Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Visitar a páxina do perfil de _usuario"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Visitar a páxina do seu perfil de Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Banshee"
msgstr "_Activar o informe de cancións desde Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Banshee"
msgstr "_Activar o informe de cancións desde Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Device"
msgstr "_Activar o informe de cancións desde o dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Device"
msgstr "_Activar o informe de cancións desde o dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Scrobbling a Last.FM"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Scrobbling desde o dispositivo"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Scrobbling desde o dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Scrobbling a Last.FM…"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+#| msgid "Removing track {0} of {1}"
+msgid "Processing track {0} of {1} ..."
+msgstr "Procesando a pista {0} de{1} …"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5793,28 +5777,28 @@ msgstr "Visitar a páxina de Last.fm para esta pista"
msgid "Recommend this track to someone"
msgstr "Recomendar esta pista a alguén"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5866,19 +5850,19 @@ msgstr "vostede iniciou a sesión en Last.fm como o usuario <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Saír da sesión en Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Pistas favoritas recentes"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Pistas reproducidas recentemente"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Os meus artistas destacados"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} reproducións"
@@ -5968,17 +5952,17 @@ msgstr "Pista rexeitada"
msgid "Mark current track as banned"
msgstr "Marcar a pista actual como rexeitada"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "Seguidores de {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Similares a {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "_Engadir emisora"
@@ -5994,7 +5978,7 @@ msgstr "Número total de reproducións"
msgid "New Station"
msgstr "Nova emisora"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "_Tipo de emisora:"
@@ -6147,15 +6131,15 @@ msgstr "Panel de acceso rápido para os seus ficheiros multimedia"
msgid "_Mini Mode"
msgstr "Modo _mini"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Modo completo"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Cambiar a modo completo"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Cambiar o modo de reprodución repetir canción"
@@ -6192,11 +6176,11 @@ msgstr "_Mostrar notificacións"
msgid "Show notifications when item changes"
msgstr "Mostrar notificacións ao cambiar o elemento"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Aínda en execución"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6204,23 +6188,19 @@ msgstr ""
"Banshee pechouse na área de notificación. Use a opción <i>Saír</i> para "
"finalizar a sesión."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Saltar este elemento"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Non foi posíbel mostrar a notificación"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6229,6 +6209,10 @@ msgstr ""
"{0}por{1} {2}\n"
"{0}de{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Simplificar"
@@ -6369,6 +6353,7 @@ msgstr "Importar ‟{0}”"
#. Translators: {0} is the type of disc, "Audio CD" or "DVD"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
#, csharp-format
+#| msgid "Eject {0}"
msgid "Ejecting {0}..."
msgstr "Expulsar {0}"
@@ -6630,16 +6615,16 @@ msgid_plural "{0} episodes"
msgstr[0] "{0} capítulo"
msgstr[1] "{0} capítulos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nunca actualizado"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Actualizado en {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Actualizado {0}"
@@ -6722,18 +6707,18 @@ msgstr "Visitar sitio web"
msgid "Add Podcast"
msgstr "Engadir podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
msgstr[0] "Eliminar ficheiro"
msgstr[1] "Eliminar ficheiros"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "URL inválido"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "O URL do podcast non é válido."
@@ -6741,11 +6726,11 @@ msgstr "O URL do podcast non é válido."
msgid "Episode Details"
msgstr "Detalles do capítulo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Comprobar periodicamente se hai novos capítulos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
@@ -6753,59 +6738,59 @@ msgstr ""
"Se está marcado, Banshee comprobará cada hora se este podcast ten novos "
"capítulos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Descargar os novos capítulos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Arquivar tódolos capítulos agás o más actual"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Non hai descrición dispoñíbel"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Nome:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Sitio web:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Visitar"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Opcións de subscrición"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "URL do feed:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Última actualización:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Categoría"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Copyright:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6923,22 +6908,22 @@ msgstr "clic"
msgid "menu"
msgstr "menú"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Ocultar <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "Banshee encontrou un erro fatal {0} "
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Detalles do erro"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Produciuse unha excepción non tratada: "
@@ -7090,15 +7075,15 @@ msgstr "comeza por"
msgid "ends with"
msgstr "remata en"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Identificación de conta de Last.fm"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Introduza os seus credenciais da conta Last.fm."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Gardar e iniciar sesión"
@@ -7170,6 +7155,7 @@ msgstr ""
"Estes usuario non ten permiso para escoitar a radio durante un pico de uso"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
+#| msgid "Stream location not found"
msgid "Radio station not found"
msgstr "Non se encontrou a localización do fluxo"
@@ -7223,15 +7209,6 @@ msgstr "Conectado a Last.fm."
msgid "Unknown Podcast"
msgstr "Podcast descoñecido"
-#~ msgid "Clear search"
-#~ msgstr "Limpar a busca"
-
-#~ msgid "Banshee"
-#~ msgstr "Banshee"
-
-#~ msgid "Scrobbling from device"
-#~ msgstr "Scrobbling desde o dispositivo"
-
#~ msgid "Volume"
#~ msgstr "Volume"
diff --git a/po/hu.po b/po/hu.po
index 5e6b69b..886ea20 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,21 +4,20 @@
#
# Kéménczy Kálmán <kkemenczy at novell dot com>, 2006.
# Gabor Kelemen <kelemeng at gnome dot hu>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
-# Balázs Úr <urbalazs at gmail dot com>, 2012, 2013.
msgid ""
msgstr ""
"Project-Id-Version: banshee master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-16 09:51+0000\n"
-"PO-Revision-Date: 2013-09-21 18:47+0200\n"
-"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
+"POT-Creation-Date: 2012-09-04 17:57+0000\n"
+"PO-Revision-Date: 2012-09-20 15:05+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
@@ -617,15 +616,15 @@ msgid "Audio Quality"
msgstr "Hangminőség"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Médialejátszó"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Banshee médialejátszó"
@@ -633,14 +632,6 @@ msgstr "Banshee médialejátszó"
msgid "Play and organize your media collection"
msgstr "Médiagyűjteményének lejátszása és rendszerezése"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"Videó;Mozifilm;Film;Klip;Flick;Sorozat;Média;Lejátszó;DVD;Lemez;Mp3;Hang;CD;MT"
-"P;Podcast;DAAP;Lejátszólista;Ipod;Multimédia;Gyűjtemény;Zene;Rádió;"
-
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
@@ -768,18 +759,18 @@ msgstr "A BPM-felismerő meghajtó nem hozható létre."
msgid "Could not initialize GStreamer library"
msgstr "A GStreamer könyvtár előkészítése nem sikerült"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Ismeretlen hiba"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Visszhangerősítés javításának engedélyezése"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -787,11 +778,11 @@ msgstr ""
"A ReplayGain adatokat tartalmazó számok esetén a lejátszási hangerő "
"automatikus normalizálása"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "_Szünetmentes lejátszás bekapcsolása"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -808,7 +799,7 @@ msgstr "Az átkódoló létrehozása nem sikerült"
msgid "Could not create encoder pipeline : {0}"
msgstr "A kódoló adatcsatorna létrehozása nem sikerült: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -819,6 +810,7 @@ msgstr "A kódoló adatcsatorna nem hozható létre: {0}"
#. Translators: verb
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+#| msgid "_Import"
msgid "Import"
msgstr "Importálás"
@@ -887,61 +879,61 @@ msgstr "A frissítés letöltése befejeződött"
msgid "Check for Updates"
msgstr "Frissítések keresése"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Súgólehetőségek"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Ezen súgó megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "A lejátszást vezérlő kapcsolók megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "A lejátszott számot lekérdező kapcsolók megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "A lejátszóalrendszert lekérdező kapcsolók megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "A felhasználói felület kapcsolóinak megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Fejlesztőknek szóló és hibakeresési kapcsolók megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Minden kapcsolócsoport megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Verzióinformációk megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Lejátszást vezérlő kapcsolói"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"A következő szám lejátszása, újraindítással, ha az „újraindítás” érték be "
"van állítva"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
"Az előző szám lejátszása, újraindítással, ha az „újraindítás” érték be van "
"állítva"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -949,28 +941,28 @@ msgstr ""
"Ha a jelenlegi szám 4 másodpercnél tovább volt lejátszva, akkor újraindítja, "
"egyébként ugyanaz mint a --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"A parancssorban sorba állított számok lejátszásának automatikus elindítása"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Lejátszás indítása"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Lejátszás szüneteltetése"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Lejátszás átváltása"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Lejátszás leállítása"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -978,97 +970,97 @@ msgstr ""
"Lejátszás leállításának engedélyezése vagy tiltása a lejátszott szám után "
"(true vagy false értékű lehet)"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Lejátszás hangerejének beállítása (0-100), relatív értékek +/- előtaggal "
"jelölhetők"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Adott helyre tekerés (másodperc, lebegőpontos)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "A jelenleg lejátszott szám értékelésének beállítása (0 - 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Lejátszómotor lekérdezési kapcsolói"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Jelenlegi lejátszóállapot"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Utolsó lejátszóállapot"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "A lejátszó szüneteltetési képességének lekérdezése"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "A lejátszó tekerési képességének lekérdezése"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Lejátszó hangereje"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Lejátszópozíció az épp lejátszott számban"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Lejátszott szám metaadat-lekérdezési kapcsolói"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Előadó neve"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Album címe"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Szám címe"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Hossz"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Szám sorszáma"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Számok összesen"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Lemezszám"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1079,7 +1071,7 @@ msgstr "Lemezszám"
msgid "Year"
msgstr "Év"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1087,82 +1079,82 @@ msgstr "Év"
msgid "Rating"
msgstr "Értékelés"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Pontszám"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Bitsebesség"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Felhasználói felület kapcsolói"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "A felhasználói felület megjelenítése az aktív munkaterületen"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Teljes képernyős mód"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Felhasználói felület elrejtése"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Ne jelenjen meg a felhasználói felület, más kapcsolóktól függetlenül"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "A média importálása ablak megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "A névjegyablak megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "A hely megnyitása ablak megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "A beállítások ablak megjelenítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Hibakeresési és fejlesztői kapcsolók"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Általános hibakeresési szolgáltatások engedélyezése"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "SQL lekérdezések hibakeresési kimenetének engedélyezése"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "A Mono.Addins hibakeresési kimenetének engedélyezése"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Használandó alternatív adatbázis megadása"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Hiányzó borító letöltésének kényszerítése"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Alternatív kulcs megadása, az alapértelmezett az /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1170,34 +1162,29 @@ msgstr ""
"Példány optimalizálása telepítés nélküli futásra, ez legfőképp egy másik "
"Mono.Addins adatbázis hoz létre a munkakönyvtárban"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "D-Bus támogatás teljes letiltása"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
-#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr "Egyéni gtk.css fájl ({0}) betöltésének kihagyása, ha van"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:230
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Az egyéni gtk.css fájl ({0}) újratöltése 5 másodpercenként"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Egyéni gtkrc fájl ({0}) betöltésének kihagyása, ha van"
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "A következő súgóargumentumok érvénytelenek: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Album lejátszása"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "S_orba állítás"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1220,16 +1207,16 @@ msgstr "_Album lejátszása"
msgid "Add an album to the playlist"
msgstr "Album hozzáadása a lejátszólistához"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "{0} van hátra"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Szám lejátszása"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1237,7 +1224,7 @@ msgid "Close"
msgstr "Bezárás"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:497
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Keresés"
@@ -1274,85 +1261,91 @@ msgstr "Műfaj"
msgid "Comment"
msgstr "Megjegyzés"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Ismeretlen album"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Ismeretlen előadó"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Ismeretlen album"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Ismeretlen cím"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Vegyes előadók"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Az adatfolyam helye nem található"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
msgid "File not found"
msgstr "A fájl nem található"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Nem érhető el a médiatípus lejátszásához szükséges kodek"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "A fájlt digitális jogkezelés (DRM) védi"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Ismeretlen hiba"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Podcast újraindítása"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Hangoskönyv újraindítása"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Videó újraindítása"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "S_zám újraindítása"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "Elem új_raindítása"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "Ugrás a lejátszott p_odcastra"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "Ugrás a lejátszott _hangoskönyvre"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "Ugrás a lejátszott vi_deóra"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Ugrás a lejátszott számra"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "Ugrás a lejátszott _elemre"
@@ -1372,7 +1365,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Minden albumelőadó ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Minden album ({0})"
@@ -1478,7 +1471,7 @@ msgid "Scanning for media"
msgstr "Adathordozó elemzése"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Vizsgálat…"
@@ -1503,7 +1496,7 @@ msgstr "Az importálási folyamat jelenleg fut. Meg szeretné állítani?"
msgid "Importing {0} of {1}"
msgstr "{1}/{0}. importálása"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "{1}/{0}. ismételt vizsgálata"
@@ -1517,7 +1510,7 @@ msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr "Várjon a régi Banshee adatbázis új formátumúra alakításáig."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Metaadatok frissítése"
@@ -1593,29 +1586,30 @@ msgstr "Lágy rock"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Eltávolítás a gyűjteményből"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Fájlrendszerezés"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
+#| msgid "Co_py files to media folders when importing"
msgid "Co_py files to media folder when importing"
msgstr "_Fájlok másolása a médiamappába importáláskor"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "_Fájl- és mappanevek frissítése"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Fájlok és mappák átnevezése a média metaadatainak megfelelően"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "{0} mappa"
@@ -1679,117 +1673,118 @@ msgstr "Lemezek száma"
msgid "Grouping"
msgstr "Csoportosítás"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Zene"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Zenék keresése"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Egyéb"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "Előadó albumainak rendezése é_v, és nem cím szerint"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} szám"
msgstr[1] "{0} szám"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Zenemappa"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Kedvencek"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Négy és öt csillagra értékelt számok"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Legutóbbi kedvencek"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "A múlt héten gyakran hallgatott számok"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Legutóbb hozzáadott"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Az elmúlt héten importált számok"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Legutóbb lejátszott"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Legutóbb lejátszott számok"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "Nem hallgatott"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Le nem játszott vagy kihagyott számok"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Mellőzött kedvencek"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Több mint két hónapja le nem játszott kedvencek"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Legkevésbé kedvelt"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr "Egy vagy két csillagra értékelt, vagy gyakran kihagyott számok"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "700 MB kedvenc"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Egy adat CD-nyi kedvenc szám"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "80 percnyi kedvenc"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Egy hang CD-nyi kedvenc szám"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "Nem értékelt"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Még nem értékelt számok"
@@ -1960,8 +1955,8 @@ msgstr "Lejátszólista törlése"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Új lejátszólista"
@@ -2565,7 +2560,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
msgid "Unknown"
msgstr "Ismeretlen"
@@ -2592,7 +2587,7 @@ msgid "Delete Smart Playlist"
msgstr "Okos lejátszólista törlése"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Minden műfaj ({0})"
@@ -2645,7 +2640,7 @@ msgstr "Hiba"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Részletek"
@@ -2744,12 +2739,12 @@ msgid "Show:"
msgstr "Megjelenítés:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Mind"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Engedélyezett"
@@ -2785,8 +2780,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{1}/{0}"
@@ -2847,20 +2842,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bit"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "A kontextus ablaktábla átméretezése"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Kontextus ablaktábla elrejtése"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Várakozás a lejátszás elkezdésére…"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Betöltés…"
@@ -2887,7 +2882,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Hangszínszabályzó"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Új alapbeállítás"
@@ -2922,12 +2917,16 @@ msgstr "Karbantartók"
msgid "Contributors"
msgstr "Közreműködők"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Kivételes multimédia-kezelés és -lejátszás"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
+#| msgid ""
+#| "Copyright © 2005–{0} Novell, Inc.\n"
+#| "Copyright © 2005–{0} Others\n"
+#| "Copyright © 2005 Aaron Bockover"
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
"Copyright © 2005–{1} Others\n"
@@ -2937,7 +2936,7 @@ msgstr ""
"Copyright © 2005–{1} mások\n"
"Copyright © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "A Banshee weboldala"
@@ -3042,106 +3041,93 @@ msgid "Import a playlist"
msgstr "Egy lejátszólista importálása"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Gyűjtemény ismételt vizsgálata"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "A Gyűjtemény mappájának ismételt vizsgálata"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "_Hely megnyitása…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Távoli hely megnyitása lejátszáshoz"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Kilépés"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Kilépés a Bansheeből"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Szerkesztés"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Beállítások"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Személyes beállítások módosítása"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Eszközök"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Gyűjtemény ismételt vizsgálata"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "A Gyűjtemény mappájának ismételt vizsgálata"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Az ismételt vizsgálati művelet el fog távolítani egy számot a zene "
-"könyvtárból."
-msgstr[1] ""
-"Az ismételt vizsgálati művelet el fog távolítani {0} számot a zene "
-"könyvtárból."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Súgó"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Tartalom"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Speciális keresés a gyűjteményben"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr ""
"A médiagyűjteményben keresésre szolgáló speciális módszerek megismerése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "A Banshee _honlapja"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "A Banshee weboldalának meglátogatása"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Közreműködés"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Járuljon hozzá a Banshee fejlesztéséhez"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Verzióinformációk"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Részletes verzió -és beállítási adatok megtekintése"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Lejátszólista importálása"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Lejátszólisták"
@@ -3463,7 +3449,7 @@ msgstr "Kijelölt elemek végleges törlése az adathordozóról"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3528,25 +3514,17 @@ msgstr[0] "Biztos, hogy véglegesen törölni kívánja ezt az elemet innen: {1}
msgstr[1] ""
"Biztos, hogy véglegesen törölni kívánja a kiválasztott {0} elemet innen: {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Biztos, hogy folytatni kívánja?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Számok eltávolítása"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "_Válogatásalbum előadója:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Jelölje be, ha ez a szám különböző előadók számait tartalmazó album része"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3613,19 +3591,19 @@ msgstr "Minden lemezszám és darabszám beállítása erre az értékre"
msgid "_Disc Number:"
msgstr "_Lemezszám:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Minden Év beállítása erre az értékre"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "É_v:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Minden Értékelés beállítása erre az értékre"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "É_rtékelés:"
@@ -3689,7 +3667,7 @@ msgstr "Minden Megjegyzés beállítása erre az értékre"
msgid "Co_mment:"
msgstr "Meg_jegyzés:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Súgó"
@@ -3697,7 +3675,7 @@ msgstr "Súgó"
msgid "Lyrics"
msgstr "Szöveg"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Továbblépés a következő számra és címének szerkesztése"
@@ -3820,39 +3798,39 @@ msgstr "Fájlméret:"
msgid "bytes"
msgstr "bájt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Számszerkesztő"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Szám tulajdonságai"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Az előző szám megjelenítése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "A következő szám megjelenítése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Cím:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Előadó:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Album:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Minden _mezőérték szinkronizálása"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3860,23 +3838,23 @@ msgstr ""
"Ezen számhoz beállított összes általános mező értékének alkalmazása a "
"szerkesztőben kiválasztott összes többi számra."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>{0}. elem szerkesztése, összesen {1}</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "Menti a megnyitott szám módosításait?"
msgstr[1] "Menti a megnyitott {1} közül {0} szám módosításait?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Bezárás mentés _nélkül"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "Ha nem ment, az elmúlt {0} módosításai végleg elvesznek."
@@ -3926,19 +3904,19 @@ msgstr[1] "Aktív feladatok futnak"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{2} {0}forrásból{1}, {0}közzétéve:{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}ezen:{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} – {1}"
@@ -3946,56 +3924,56 @@ msgstr "{0} – {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{2} {0}előadó{1} {3} {0}albumáról{1}"
#. 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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{2} {0}előadó{1}"
#. 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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}–{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Művelet leállítása"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "{0} leállítása"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Ez a művelet még dolgozik. Meg szeretné állítani?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "A(z) {0} művelet még dolgozik. Meg szeretné állítani?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Folytatás"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "{0} folytatása"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Leállítás…"
@@ -4068,7 +4046,7 @@ msgstr "Nincs profil"
msgid "Advanced"
msgstr "Haladó"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "{0} beállítása"
@@ -4133,80 +4111,80 @@ msgstr "Megnyitás szerkesztőben"
msgid "Create and save"
msgstr "Létrehozás és mentés"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Böngésző tartalma"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "A böngészőben elérhető szűrők beállítása"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Előadó szűrő megjelenítése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Az előadók listájának megjelenítése szűréshez"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Minden előadó megjelenítése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Minden előadó megjelenítése az előadó szűrőben"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Albumelőadók megjelenítése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Csak albumelőadók megjelenítése, az egyszámos előadóké nem"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Műfaj szűrő megjelenítése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "A műfajok listájának megjelenítése szűréshez"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Év szűrő megjelenítése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Az évek listájának megjelenítése szűréshez"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Nincs beállítva"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Böngésző a bal oldalon"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Az előadó/albumböngésző megjelenítése a számlista bal oldalán"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Böngésző felül"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Az előadó/albumböngésző megjelenítése a számlista fölött"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Böngésző megjelenítése"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Az előadó/albumböngésző megjelenítése vagy elrejtése"
@@ -4221,12 +4199,12 @@ msgstr "Ez az oldal blokkolva van, mert valószínűleg nem ezt keresi!"
msgid "The security certificate for {0} is invalid."
msgstr "{0} biztonsági tanúsítványa érvénytelen."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "{0} betöltése…"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4234,20 +4212,24 @@ msgstr ""
"Helyezzen\n"
"be lemezt"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Keresés törlése"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Tekerés"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Tétlen"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Kapcsolódás…"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Pufferelés"
@@ -4287,39 +4269,29 @@ msgstr "Támogatja a borítókat"
msgid "Supports photos"
msgstr "Támogatja a fényképeket"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "A szám időtartama nulla"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "iPod szinkronizálása"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Szinkronizálás előkészítése…"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "{1}/{0} szám hozzáadása"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Metaadatok frissítése a(z) {1}/{0} számban"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "{1}/{0} szám eltávolítása"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Tisztítás, {1}/{0} érvénytelen szám eltávolítása"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Média-adatbázis írása"
@@ -4328,7 +4300,7 @@ msgstr "Média-adatbázis írása"
msgid "Sync {0}"
msgstr "{0} szinkronizálása"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Eszközök"
@@ -4337,31 +4309,31 @@ msgstr "Eszközök"
msgid "Device Properties"
msgstr "Eszköztulajdonságok"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Termék"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Gyártó"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "{0} betöltése"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Igen"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Nem"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4370,11 +4342,11 @@ msgstr ""
"Az eszköz nem támogatja a(z) {0} formátumot és nem található átalakító az "
"átalakításához."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
msgid "File format conversion support is not available"
msgstr "A fájlformátum-átalakítás nem érhető el"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
msgid "Error converting file"
msgstr "Hiba a fájl átalakításakor"
@@ -4395,8 +4367,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Beállítások szinkronizálása"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Szinkronizálás"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4405,9 +4381,13 @@ msgstr[0] ""
msgstr[1] ""
"A szinkronizálási művelet el fog távolítani {0} számot az eszközről."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Szinkronizálás"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Biztos, hogy folytatni kívánja?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Számok eltávolítása"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4480,12 +4460,12 @@ msgstr "Megvásárolt zene importálása"
msgid "Disconnect"
msgstr "Bontás"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "{0} leválasztása…"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "A(z) {0} nem választható le: {1}"
@@ -4617,13 +4597,12 @@ msgstr "Egyesült Királyság (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Egyesült Államok (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Keresés az Amazon MP3-boltban"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Hogyan támogatja vásárlásával a GNOME-ot"
@@ -4727,15 +4706,15 @@ msgstr "_Felismerés"
msgid "T_ap"
msgstr "Üt_em"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "A Banshee próbálja meg automatikusan felismerni a szám BPM-ét"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Szám lejátszása"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"A szám BPM-ének saját kezű beállításához nyomja le ezt a gombot az ütem "
@@ -4848,11 +4827,11 @@ msgstr "Bejelentkezés"
msgid "Connecting to {0}"
msgstr "Kapcsolódás: {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Távoli DAAP-kiszolgáló hozzáadása"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Új távoli DAAP-kiszolgáló hozzáadása"
@@ -5108,10 +5087,6 @@ msgstr "Hiba az elem részleteinek lekérésekor az internetarchívumból"
msgid "Description"
msgstr "Leírás"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Létrehozó:"
@@ -5125,7 +5100,7 @@ msgid "Location:"
msgstr "Hely:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Dátum:"
@@ -5138,7 +5113,7 @@ msgid "Publisher:"
msgstr "Kiadó:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Kulcsszavak:"
@@ -5212,16 +5187,16 @@ msgstr "{0} ettől: {1}, ekkor: {2}"
msgid "Write your own review"
msgstr "Írjon saját értékelést"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Gyűjtemény:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Elhagyható lekérdezés"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Rendezés:"
@@ -5308,6 +5283,7 @@ msgid "Library of Congress"
msgstr "Kongresszusi könyvtár"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+#| msgid "Sample"
msgid "Examples:"
msgstr "Példák:"
@@ -5609,22 +5585,22 @@ msgstr "Állomás szerkesztése"
msgid "Station"
msgstr "Állomás"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} állomás"
msgstr[1] "{0} állomás"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Adja meg egy állomás érvényes URI-címét"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Adjon meg az állomás műfaját"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Adjon meg az állomás nevét"
@@ -5636,7 +5612,7 @@ msgstr "Új rádióállomás hozzáadása"
msgid "Edit radio station"
msgstr "Rádióállomás szerkesztése"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5644,80 +5620,85 @@ msgstr ""
"Adja meg a felvenni kívánt rádióállomás műfaját, nevét és URL-címét. A "
"leírás elhagyható."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Állomás műfaja:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Állomás neve:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "Műsor URL-címe:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Állomás létrehozója:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Leírás:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Értékelés:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "{1}/{0} szám feldolgozva"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Az Audioscrobbler bővítmény beállítása"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Felhasználói _profiloldal meglátogatása"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Saját last.fm profiloldal meglátogatása"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Banshee"
msgstr "Szá_mok jelentésének engedélyezése a Bansheeből"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Banshee"
msgstr "Számok jelentésének engedélyezése a Bansheeből"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Device"
msgstr "Szám_ok jelentésének engedélyezése az eszközről"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Device"
msgstr "Számok jelentésének engedélyezése az eszközről"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Továbbítás a Last.fm-be"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Beküldés az eszközről"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Beküldés az eszközről…"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Továbbítás a Last.fm-be…"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+#| msgid "Removing track {0} of {1}"
+msgid "Processing track {0} of {1} ..."
+msgstr "{1}/{0} szám feldolgozása…"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5775,28 +5756,28 @@ msgstr "A szám last.fm oldalának megjelenítése"
msgid "Recommend this track to someone"
msgstr "A szám ajánlása másoknak"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5848,19 +5829,19 @@ msgstr "Bejelentkezett a Last.fm-re mint <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Kijelentkezés a Last.fm-ből"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Nemrég kedvelt számok"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Nemrég játszott számok"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Kedvenc előadóim"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} lejátszás"
@@ -5950,17 +5931,17 @@ msgstr "Tiltás"
msgid "Mark current track as banned"
msgstr "Szám megjelölése tiltottként"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "{0} rajongói"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Hasonló ehhez: {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "Áll_omás hozzáadása"
@@ -5976,7 +5957,7 @@ msgstr "Lejátszások teljes száma"
msgid "New Station"
msgstr "Új állomás"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "Állomás _típusa:"
@@ -6129,15 +6110,15 @@ msgstr "Multimédia gyors elérése"
msgid "_Mini Mode"
msgstr "_Mini mód"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Teljes mód"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Vissza teljes módba"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Lejátszás ismétlési módjának módosítása"
@@ -6175,11 +6156,11 @@ msgstr "É_rtesítések megjelenítése"
msgid "Show notifications when item changes"
msgstr "Értesítések megjelenítése elemváltáskor"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Még fut"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6187,23 +6168,19 @@ msgstr ""
"A Banshee az értesítési területre került. A kilépéshez használja a "
"<i>Kilépés</i> menüpontot."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Előző"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Elem kihagyása"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Nem jeleníthető meg az értesítés"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6212,6 +6189,10 @@ msgstr ""
"{2} {0}előadó{1}\n"
"{3} {0}albumáról{1}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Egyszerűsítés"
@@ -6351,6 +6332,7 @@ msgstr "„{0}” importálása"
#. Translators: {0} is the type of disc, "Audio CD" or "DVD"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
#, csharp-format
+#| msgid "Disconnecting {0}..."
msgid "Ejecting {0}..."
msgstr "{0} kiadása…"
@@ -6618,16 +6600,16 @@ msgid_plural "{0} episodes"
msgstr[0] "{0} epizód"
msgstr[1] "{0} epizód"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Sosem frissített"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Frissítve: {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "{0} frissítve"
@@ -6710,18 +6692,18 @@ msgstr "Honlap felkeresése"
msgid "Add Podcast"
msgstr "Podcast hozzáadása"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
msgstr[0] "Fájl törlése"
msgstr[1] "Fájlok törlése"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "Érvénytelen URL"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "A podcast URL-címe érvénytelen."
@@ -6729,69 +6711,69 @@ msgstr "A podcast URL-címe érvénytelen."
msgid "Episode Details"
msgstr "Epizód részletei"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Új epizódok rendszeres keresése"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
msgstr "A Banshee óránként keresi a podcast új epizódjait"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Új epizódok letöltése"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Minden epizód archiválása a legújabb kivételével"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Nincs leírás"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Név:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Weboldal:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Felkeresés"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Feliratkozás beállításai"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "Forrás URL:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Utolsó frissítés:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Kategória:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Copyright:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6909,22 +6891,22 @@ msgstr "kattintson"
msgid "menu"
msgstr "menü"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "<i>{0}</i> elrejtése"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "{0} végzetes hibát észlelt"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Hiba részletei"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Kezeletlen kivétel történt: "
@@ -7076,15 +7058,15 @@ msgstr "ezzel kezdődik"
msgid "ends with"
msgstr "ezzel végződik"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Last.fm fiók bejelentkezés"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Adja meg a Last.fm-en használt hitelesítési adatait."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Mentés és bejelentkezés"
@@ -7156,6 +7138,7 @@ msgid "This user is not allowed to listen to radio during peak usage"
msgstr "Ez a felhasználó nem hallgathat rádiót csúcsidőben"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
+#| msgid "Stream location not found"
msgid "Radio station not found"
msgstr "A rádióállomás nem található"
@@ -7172,8 +7155,8 @@ msgid ""
"Your IP has made too many requests in a short period, exceeding our API "
"guidelines"
msgstr ""
-"Az IP-címe túl sok kérést küldött rövid idő alatt, meghaladva az API-"
-"irányelveket"
+"Az IP-címe túl sok kérést küldött rövid idő alatt, meghaladva az "
+"API-irányelveket"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
msgid "There was an unknown error."
@@ -7209,15 +7192,6 @@ msgstr "Kapcsolódva a last.fm-hez."
msgid "Unknown Podcast"
msgstr "Ismeretlen podcast"
-#~ msgid "Clear search"
-#~ msgstr "Keresés törlése"
-
-#~ msgid "Banshee"
-#~ msgstr "Banshee"
-
-#~ msgid "Scrobbling from device"
-#~ msgstr "Beküldés az eszközről"
-
#~ msgid "Volume"
#~ msgstr "Hangerő"
diff --git a/po/id.po b/po/id.po
index bf08c91..fce26a0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,15 +1,15 @@
# Indonesian translation of banshee
# Copyright (C) 2011 THE banshee'S COPYRIGHT HOLDER
# This file is distributed under the same license as the banshee package.
-# Andika Triwidada <andika at gmail.com>, 2011, 2012, 2013.
+# Andika Triwidada <andika at gmail.com>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: banshee master\n"
+"Project-Id-Version: banshee stable-2.6\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-03 18:04+0000\n"
-"PO-Revision-Date: 2013-10-04 23:06+0700\n"
+"POT-Creation-Date: 2012-09-30 17:36+0000\n"
+"PO-Revision-Date: 2012-10-11 23:03+0700\n"
"Last-Translator: Andika Triwidada <andika at gmail.com>\n"
"Language-Team: GNOME Indonesian Translation Team <gnome at i15n.org>\n"
"Language: id_ID\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.5.4\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
#: ../data/addin-xml-strings.cs:8
@@ -617,10 +617,10 @@ msgid "Media Player"
msgstr "Pemutar Media"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Banshee Pemutar Media"
@@ -628,33 +628,6 @@ msgstr "Banshee Pemutar Media"
msgid "Play and organize your media collection"
msgstr "Putar dan atur koleksi musik Anda"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"Video;Film;Klip;Flick;Seri;Media;Pemutar;DVD;Disc;Mp3;Audio;CD;MTP;Podcast;"
-"DAAP;Daftar Putar;Ipod;Multimedia;Koleksi;Musik;Radio;"
-
-#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
-#: ../data/banshee.appdata.xml.in.h:2
-msgid ""
-"Banshee is an open source multimedia management and playback application for "
-"GNOME, Mac and Windows."
-msgstr ""
-"Banshee adalah aplikasi manajemen dan pemutar multimedia yang sumbernya "
-"terbuka bagi GNOME, Mac, dan Windows."
-
-#: ../data/banshee.appdata.xml.in.h:3
-msgid ""
-"Play your music and videos. Stay entertained and up to date with podcasts "
-"and video podcasts. Sync your Android, iPod, and other devices. We think "
-"you'll love Banshee!"
-msgstr ""
-"Putar musik dan video Anda. Tetaplah terhibur dan mutakhir dengan podcast "
-"dan podcast video. Selaraskan Android, iPod, dan perangkat lain Anda. Kami "
-"rasa Anda akan mencintai Banshee!"
-
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
@@ -782,18 +755,18 @@ msgstr "Tak bisa membuat penggerak deteksi BPM."
msgid "Could not initialize GStreamer library"
msgstr "Tak bisa menginisiasi pustaka GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Galat Tak Dikenal"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "Aktifkan kor_eksi ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -801,11 +774,11 @@ msgstr ""
"Bagi trek yang memiliki data ReplayGain, otomatis skalakan (normalkan) "
"volume putar"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Aktifkan pemutaran tanpa _jeda"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -822,7 +795,7 @@ msgstr "Tak bisa membuat transcoder"
msgid "Could not create encoder pipeline : {0}"
msgstr "Tak bisa membuat pipeline enkoder : {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -901,61 +874,61 @@ msgstr "Pemutakhiran selesai diunduh"
msgid "Check for Updates"
msgstr "Periksa Pemutakhiran"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Opsi Bantuan"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Tampilkan pesan bantuan ini"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Tampilkan opsi untuk mengendalikan pemutaran"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Tampilkan opsi untuk mengkueri trek yang sedang diputar"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Tampilkan opsi untuk mengkueri mesin yang sedang memutar"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Tampilkan opsi bagi antar muka pengguna"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Tampilkan opsi bagi pengembang dan pengawakutuan"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Tampilkan semua grup opsi"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Tampilkan informasi versi"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Opsi Kendali Pemutaran"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Mainkan trek selanjutnya, mungkin dengan start ulang bila nilai 'restart' "
"ditata"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
"Mainkan trek sebelumnya, mungkin dengan start ulang bila nilai 'restart' "
"ditata"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -963,28 +936,28 @@ msgstr ""
"Bila lagu yang sedang diputar telah dimainkan lebih dari 4 detik maka "
"diputar ulang, bila tidak maka sama dengan --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Otomatis mulai memutar sebarang trek yang diantrikan pada baris perintah"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Mulai memutar"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Jeda memutar"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Jungkit memutar"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Berhenti memutar sepenuhnya"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -992,95 +965,95 @@ msgstr ""
"Fungsikan atau matikan pemutaran untuk berhenti setelah trek yang sedang "
"diputar (nilai mesti berupa 'true' atau 'false')"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr "Atur volume main (0-100), awali dengan +/- untuk nilai relatif"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Seek ke titik tertentu (detik, pecahan)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Tata peringkat trek yang kini dimainkan (0 sampai 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Opsi Query Mesin Pemutar"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Keadaan pemutar kini"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Keadaan pemutar terakhir"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Mengquery apakah pemutar dapat diistirahatkan"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Mengquery apakah pemutar dapat melakukan seek"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Volume pemutar"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Posisi pemutar dalam trek yang sedang diputar"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Opsi Query Metadata Trek Yang Diputar"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nama Artis"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Judul Album"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Judul Trek"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Durasi"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Nomor Trek"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Cacah Trek"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Nomor Cakram"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1091,7 +1064,7 @@ msgstr "Nomor Cakram"
msgid "Year"
msgstr "Tahun"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1099,82 +1072,82 @@ msgstr "Tahun"
msgid "Rating"
msgstr "Peringkat"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Nilai"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Laju Bit"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Opsi Antar Muka Pengguna"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Sajikan antar muka pengguna pada ruang kerja aktif"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Aktifkan mode layar penuh"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Sembunyikan antar muka pengguna"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Jangan sajikan antar muka pengguna, tak peduli opsi lain"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Sajikan kotak dialog impor media"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Sajikan dialog ikhwal"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Sajikan dialog buka lokasi"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Sajikan dialog preferensi"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Opsi Pengawakutuan dan Pengembangan"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Aktifkan fitur pengawakutuan umum"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Aktifkan keluaran pengawakutuan dari kueri SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Aktifkan keluaran pengawakutuan dari Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Nyatakan basis data alternatif untuk dipakai"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Paksa pengambilan gambar sampul yang hilang"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Nyatakan kunci alternatif, bakunya /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1182,34 +1155,29 @@ msgstr ""
"Optimasikan instansi untuk dijalankan tanpa dipasang; paling utama, ini akan "
"membuat basis data alternatif Mono.Addins pada direktori kerja"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Matikan dukungan DBus sepenuhnya"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr "Lewatkan memuat berkas gtk.css ubahan ({0}) bila ada"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Lewatkan memuat berkas gtkrc ubahan ({0}) bila ada"
-#: ../src/Clients/Booter/Booter/Entry.cs:230
-#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Muat ulang berkas ({0}) gtk.css ubahan setiap 5 detik."
-
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Argumen bantuan berikut tak valid: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Putar Album"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "_Antrikan"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1232,16 +1200,16 @@ msgstr "Putar _Album"
msgid "Add an album to the playlist"
msgstr "Tambahkan suatu album ke daftar main"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "{0} tersisa"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Putar Lagu"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1249,7 +1217,7 @@ msgid "Close"
msgstr "Tutup"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:492
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Cari"
@@ -1286,85 +1254,91 @@ msgstr "Aliran"
msgid "Comment"
msgstr "Komentar"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Album Tak Dikenal"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Artis Tak Dikenal"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Album Tak Dikenal"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Judul Tak Diketahui"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Berbagai Artis"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Lokasi stream tak ditemukan"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
msgid "File not found"
msgstr "Berkas tak ditemukan"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Kodek untuk memutar jenis media ini tak tersedia"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Berkas diproteksi oleh Digital Rights Management (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Galat tak dikenal"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "Sta_rt Ulang Podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "Sta_rt Ulang Buku Audio"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "Sta_rt Ulang Video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "Sta_rt Ulang Lagu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "Sta_rt Ulang Butir"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Lompat ke Podcast Yang Sedang Diputar"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Lompat ke Buku Audio Yang Sedang Diputar"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Lompat ke Video Yang Sedang Diputar"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Lompat ke Lagu Yang Sedang Diputar"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Lompat ke Butir Yang Sedang Diputar"
@@ -1384,7 +1358,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Semua Artis Album ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Semua Album ({0})"
@@ -1486,7 +1460,7 @@ msgid "Scanning for media"
msgstr "Memindai media"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Memindai..."
@@ -1511,7 +1485,7 @@ msgstr "Proses impor kini sedang berjalan. Apakah Anda hendak menghentikannya?"
msgid "Importing {0} of {1}"
msgstr "Mengimpor {0} dari {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Memindai ulang {0} dari {1}"
@@ -1526,7 +1500,7 @@ msgid ""
msgstr ""
"Harap tunggu ketika basis data Banshee lama Anda dimigrasi ke format baru."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Menyegarkan Metadata"
@@ -1602,29 +1576,29 @@ msgstr "Rock Lembut"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Hapus Dari Pustaka"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Organisasi Berkas"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
msgid "Co_py files to media folder when importing"
msgstr "Salin berkas ke folder media ketika mengim_por"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "M_utakhirkan nama berkas dan folder"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Ubah nama berkas dan folder menurut metadata media"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "{0} Folder"
@@ -1688,118 +1662,119 @@ msgstr "Cacah Cakram"
msgid "Grouping"
msgstr "Pengelompokan"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Musik"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Cari musik Anda"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Lain-lain"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "Urutkan album arti_s menurut tahun, bukan judul"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} lagu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Folder Musik"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Favorit"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Lagu dengan peringkat empat dan lima bintang"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Favorit Terkini"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "Lagu yang sering didengar minggu lalu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Baru Saja Ditambahkan"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Lagu yang diimpor dalam minggu lalu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Baru Saja Diputar"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Lagu-lagu yang baru-baru ini diputar"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "Belum didengarkan"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Lagu-lagu yang belum pernah diputar atau dilewati"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Favorit Yang Terabaikan"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Favorit yang tak dimainkan selama dua bulan ini"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Paling Tidak Favorit"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
"Lagu-lagu yang diberi nilai satu atau dua bintang atau yang sering Anda "
"lewati"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "Favorit sebanyak 700 MB"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Lagu-lagu favorit sebanyak suatu CD data"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "Favorit sebanyak 80 Menit"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Lagu-lagu favorit sebanyak suatu CD audio"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "Tanpa peringkat"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Lagu yang belum diberi peringkat"
@@ -1970,8 +1945,8 @@ msgstr "Hapus Daftar Putar"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Daftar Putar Baru"
@@ -2601,7 +2576,7 @@ msgid "Delete Smart Playlist"
msgstr "Hapus Daftar Putar Cerdas"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Semua Genre ({0})"
@@ -2650,7 +2625,7 @@ msgstr "Galat"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Rincian"
@@ -2748,12 +2723,12 @@ msgid "Show:"
msgstr "Tampilkan:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Semua"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Diaktifkan"
@@ -2789,8 +2764,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} dari {1}"
@@ -2851,20 +2826,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bits"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Buat panel konteks lebih besar atau kecil"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Sembunyikan panel konteks"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Menunggu pemutaran dimulai..."
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Memuat…"
@@ -2891,7 +2866,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Equalizer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Prasetel Baru"
@@ -2926,11 +2901,11 @@ msgstr "Pemelihara"
msgid "Contributors"
msgstr "Kontributor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Pemutar dan Manajemen Multimedia yang Luar Biasa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2941,7 +2916,7 @@ msgstr ""
"Hak Cipta © 2005–{1} Lainnya\n"
"Hak Cipta © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Situs Web Banshee"
@@ -3046,102 +3021,93 @@ msgid "Import a playlist"
msgstr "Mengimpor suatu daftar putar"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Pindai Ulang Pustaka Musik"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Pindai ulang folder Pustaka Musik"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Buka _Lokasi…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Buka suatu lokasi jauh untuk diputar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Keluar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Keluar Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Sunting"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Preferensi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Ubah preferensi pribadi Anda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Perkakas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Pindai Ulang Pustaka Musik"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Pindai ulang folder Pustaka Musik"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Operasi pemindaian ulang akan menghapus {0} trek dari perangkat Anda."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Ba_ntuan"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Isi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Pencarian Koleksi Tingkat Lanjut"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr ""
"Pelajari cara-cara tingkat lanjut untuk mencari pada koleksi media Anda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Laman Serambi Bans_hee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Kunjungi Laman Serambi Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Ikut Terlibat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Menjadi kontributor ke Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Informasi _Versi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Lihat informasi konfigurasi dan versi terrinci"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Impor Daftar Putar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Daftar Putar"
@@ -3463,7 +3429,7 @@ msgstr "Hapus secara permanen butir yang dipilih dari medium"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3525,26 +3491,18 @@ msgid_plural ""
"Are you sure you want to remove the selected {0} items from your {1}?"
msgstr[0] "Anda yakin ingin menghapus {0} butir yang dipilih dari {1} Anda?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Anda yakin ingin melanjutkan?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Hapus trek"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Artis Album Kom_pilasi:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Periksa apakah trek ini bagian dari suatu album dengan trek dari berbagai "
"artis"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3688,7 +3646,7 @@ msgstr "Tata semua komentar ke nilai ini"
msgid "Co_mment:"
msgstr "Ko_mentar:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Bantuan"
@@ -3696,7 +3654,7 @@ msgstr "Bantuan"
msgid "Lyrics"
msgstr "Lirik"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Maju ke trek selanjutnya dan sunting judulnya"
@@ -3819,39 +3777,39 @@ msgstr "Ukuran Berkas:"
msgid "bytes"
msgstr "byte"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Penyunting Trek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Properti Trek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Tampilkan trek sebelumnya"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Tampilkan trek berikutnya"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Judul:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Artis:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Album:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Selaraskan semua _nilai ruas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3859,22 +3817,22 @@ msgstr ""
"Terapkan nilai dari semua ruas umum yang ditata bagi trek ini ke semua trek "
"yang dipilih dalam penyunting ini"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Menyunting {0} dari {1} butir</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "Simpan perubahan yang dibuat ke {0} dari {1} trek yang terbuka?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Tutup _tanpa Menyimpan"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr ""
@@ -3924,19 +3882,19 @@ msgstr[0] "Tugas Aktif Yang Berjalan"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}dari{1} {2} {0}diterbitkan{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}pada{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3944,58 +3902,58 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}oleh{1} {2} {0}dari{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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}dari{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}oleh{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Hentikan Operasi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Hentikan {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr ""
"Operasi ini masih melakukan pekerjaan. Apakah Anda hendak menghentikannya?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr ""
"Operasi '{0}' masih melakukan pekerjaan. Apakah Anda hendak menghentikannya?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Lanjutkan"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Lanjutkan {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Menghentikan..."
@@ -4068,7 +4026,7 @@ msgstr "Tak ada profil tersedia"
msgid "Advanced"
msgstr "Tingkat lanjut"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Menata {0}"
@@ -4133,82 +4091,82 @@ msgstr "Buka dalam penyunting"
msgid "Create and save"
msgstr "Buat dan simpan"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Isi Peramban"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Mengkonfigurasi penyaring yang tersedia dalam peramban"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Tampilkan Penyaring Artis"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Tampilkan daftar artis untuk menyaring dengannya"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Tampilkan semua Artis"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Tampilkan semua artis dalam penyaring artis"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Tampilkan Artis Album"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr ""
"Hanya tampilkan artis dengan album, bukan artis yang hanya memiliki trek "
"tunggal"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Tampilkan Penyaring Aliran"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Tampilkan daftar aliran untuk menyaring dengannya"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Tampilkan Penyaring Tahun"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Tampilkan daftar tahun untuk menyaring"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Tak Ditata"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Peramban di Kiri"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Tampilkan peramban artis/album di kiri daftar trek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Peramban di Puncak"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Tampilkan peramban artis/album di atas daftar trek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Tampilkan Peramban"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Tampilkan atau sembunyikan peramban artis/album"
@@ -4223,12 +4181,12 @@ msgstr "Halaman ini diblokir karena mungkin bukan yang Anda cari!"
msgid "The security certificate for {0} is invalid."
msgstr "Sertifikat keamanan bagi {0} tak valid."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Memuat {0}..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4236,20 +4194,24 @@ msgstr ""
"Sisipkan\n"
"Cakram"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Bersihkan pencarian"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Seek"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Menganggur"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Menghubungi..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Menyangga"
@@ -4289,39 +4251,29 @@ msgstr "Mendukung gambar sampul"
msgid "Supports photos"
msgstr "Mendukung foto"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:462
msgid "Track duration is zero"
msgstr "Durasi trek nol"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
msgid "Syncing iPod"
msgstr "Menyelaraskan iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
msgid "Preparing to synchronize..."
msgstr "Bersiap menyelaraskan..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:589
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Menambah trek {0} dari {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Memutakhirkan metadata dalam trek {0} dari {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:632
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Menghapus trek {0} dari {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Membersihkan, menghapus trek {0} dari {1} yang tak valid"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:706
msgid "Writing media database"
msgstr "Menulis basis data media"
@@ -4330,7 +4282,7 @@ msgstr "Menulis basis data media"
msgid "Sync {0}"
msgstr "Selaraskan {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Perangkat"
@@ -4396,16 +4348,24 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Preferensi Penyelarasan"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Selaraskan"
+
#. 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.Gui/DapActions.cs:106
#, 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."
msgstr[0] "Operasi penyelarasan akan menghapus {0} trek dari perangkat Anda."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Selaraskan"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Anda yakin ingin melanjutkan?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+msgid "Remove tracks"
+msgstr "Hapus trek"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4478,12 +4438,12 @@ msgstr "Impor Musik Yang Dibeli"
msgid "Disconnect"
msgstr "Putuskan"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Memutus {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Tak bisa memutus {0}: {1}"
@@ -4613,13 +4573,12 @@ msgstr "Inggris (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Amerika Serikat (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Cari Toko MP3 Amazon"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Bagaimana Pembelian Anda Mendukung GNOME"
@@ -4721,15 +4680,15 @@ msgstr "D_eteksi"
msgid "T_ap"
msgstr "_Sentuh"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Biarkan Banshee mencoba mendeteksi otomatis BPM lagu ini"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Putar lagu ini"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Sentuh tombol ini seirama ketukan untuk menata BPM bagi lagu ini secara "
@@ -5100,10 +5059,6 @@ msgstr "Galat saat mengambil rincian butir dari Internet Archive"
msgid "Description"
msgstr "Deskripsi"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Pembuat:"
@@ -5117,7 +5072,7 @@ msgid "Location:"
msgstr "Lokasi:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Tanggal:"
@@ -5130,7 +5085,7 @@ msgid "Publisher:"
msgstr "Penerbit:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Kata Kunci:"
@@ -5203,16 +5158,16 @@ msgstr "{0} oleh {1} pada {2}"
msgid "Write your own review"
msgstr "Tulis ulasan Anda"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Koleksi"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Kuiri Opsional"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Urut menurut:"
@@ -5598,21 +5553,21 @@ msgstr "Sunting Stasiun"
msgid "Station"
msgstr "Stasiun"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} stasiun"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Mohon masukkan URI stasiun yang valid"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Mohon masukkan aliran stasiun"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Mohon masukkan judul stasiun"
@@ -5624,7 +5579,7 @@ msgstr "Tambah stasiun radio baru"
msgid "Edit radio station"
msgstr "Sunting stasiun radio"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5632,80 +5587,80 @@ msgstr ""
"Masukkan Aliran, Judul, dan URL dari stasiun radio yang ingin Anda "
"tambahkan. Keterangan tak mesti diisi."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Aliran Stasiun:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Nama Stasiun:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "URL Stream:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Pembuat Stasiun:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Keterangan:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Peringkat:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Terproses trek {0} dari {1}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Mengkonfigurasi plugin Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Kunjungi Halaman Profil Pengg_una"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Kunjungi Halaman Profil Last.fm Anda"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "Aktifkan P_elaporan Lagu Dari Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Aktifkan pelaporan lagu dari Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "Aktifkan P_elaporan Lagu Dari Perangkat"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Aktifkan pelaporan lagu dari perangkat"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Scrobbling ke Last.FM"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Scrobbling dari perangkat"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Scrobbling ke Last.FM..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Scrobbling dari perangkat…"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Memroses trek {0} dari {1} ..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5763,28 +5718,28 @@ msgstr "Tilik halaman Last.fm trek ini"
msgid "Recommend this track to someone"
msgstr "Sarankan trek ini ke seseorang"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5836,19 +5791,19 @@ msgstr "Anda masuk ke Last.fm sebagai pengguna <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Log keluar dari Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Trek Yang Terkini Disukai"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Trek Yang Terkini Diputar"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Artis Topku"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} kali main"
@@ -5938,17 +5893,17 @@ msgstr "Larang Trek"
msgid "Mark current track as banned"
msgstr "Tandai trek ini sebagai dilarang"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "Penggemar {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Mirip dengan {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "T_ambahkan Stasiun"
@@ -5964,7 +5919,7 @@ msgstr "Cacah Putar Total"
msgid "New Station"
msgstr "Stasiun Baru"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "Jenis Stasiun"
@@ -6116,15 +6071,15 @@ msgstr "Panel akses cepat bagi media Anda"
msgid "_Mini Mode"
msgstr "_Moda Mini"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Moda Penuh"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Kembali ke moda penuh"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Ubah moda pengulangan memutar"
@@ -6161,11 +6116,11 @@ msgstr "_Tampilkan Pemberitahuan"
msgid "Show notifications when item changes"
msgstr "Tampilkan pemberitahuan ketika butir berubah"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Masih Berjalan"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6173,23 +6128,19 @@ msgstr ""
"Banshee diminimalkan ke area pemberitahuan. Gunakan opsi <i>Keluar</i> untuk "
"mengakhiri sesi Anda."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Sebelumnya"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Lewati butir ini"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Tak bisa menampilkan pemberitahuan"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6198,6 +6149,10 @@ msgstr ""
"{0}oleh{1} {2}\n"
"{0}dari{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Sederhanakan"
@@ -6598,16 +6553,16 @@ msgid "{0} episode"
msgid_plural "{0} episodes"
msgstr[0] "{0} episoda"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Tak pernah diperbarui"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Diperbarui pada {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Diperbarui {0}"
@@ -6690,17 +6645,17 @@ msgstr "Kunjungi Situs Web"
msgid "Add Podcast"
msgstr "Tambahkan Podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
msgstr[0] "Hapus Berkas"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "URL Tak Valid"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "URL podcast tak valid."
@@ -6708,11 +6663,11 @@ msgstr "URL podcast tak valid."
msgid "Episode Details"
msgstr "Rincian Episoda"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Periksa secara berkala untuk episoda baru"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
@@ -6720,59 +6675,59 @@ msgstr ""
"Bila dicontreng, Banshee akan memeriksa setiap jam apakah podcast ini punya "
"episoda baru"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Unduh episoda baru"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Arsipkan semua episoda kecuali yang terbaru"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Keterangan tak tersedia"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Nama:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Situs web:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Kunjungi"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Opsi Berlangganan"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "URL Asupan:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Terakhir Disegarkan:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Kategori:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Hak Cipta:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6890,22 +6845,22 @@ msgstr "klik"
msgid "menu"
msgstr "menu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Sembunyikan <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "{0} Menemui Galat Fatal"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Rincian Galat"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Terjadi eksepsi yang tak tertangani:"
@@ -7055,15 +7010,15 @@ msgstr "diawali dengan"
msgid "ends with"
msgstr "diakhiri dengan"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Login Akun Last.fm"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Silakan masukkan kredensial akun Last.fm."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Simpan dan Log Masuk"
@@ -7186,3 +7141,4 @@ msgstr "Tersambung ke Last.fm."
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:103
msgid "Unknown Podcast"
msgstr "Podcast tak dikenal"
+
diff --git a/po/ja.po b/po/ja.po
index fc476df..be5271c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,15 +8,15 @@
# Jiro Matsuzawa <jmatsuzawa at src.gnome.org>, 2011.
# OKANO Takayoshi <kano at na.rim.or.jp>, 2010.
# Takayuki KUSANO <AE5T-KSN at asahi-net.or.jp>, 2010.
-# Hajime Taira <htaira at redhat.com>, 2011-2013.
+# Hajime Taira <htaira at redhat.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: banshee master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-05-27 11:35+0000\n"
-"PO-Revision-Date: 2013-06-08 09:37+0900\n"
-"Last-Translator: Hajime Taira <htaira at redhat.com>\n"
+"POT-Creation-Date: 2012-08-07 19:49+0000\n"
+"PO-Revision-Date: 2012-08-08 21:01+0900\n"
+"Last-Translator: Kentaro KAZUHAMA <kazken3 at gmail.com>\n"
"Language-Team: Japanese <gnome-translation at gnome.gr.jp>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
@@ -572,7 +572,7 @@ msgid "Audio Quality"
msgstr "音質"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "メディアプレイヤー"
@@ -715,26 +715,26 @@ msgstr "BPM検出ドライバーを生成できませんでした。"
msgid "Could not initialize GStreamer library"
msgstr "GStreamerライブラリを初期化できませんでした"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "未知のエラー"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "ReplayGain補正を有効にする(_E)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
msgstr "ReplayGainデータを持つトラック向けに、自動的に再生音量を(標準に)調整します"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "ギャップレス再生を有効にする(_G)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
msgstr "トラック変更時の無音部分を取り除きます。コンセプトアルバムやクラシック音楽などに役に立ちます"
@@ -747,7 +747,7 @@ msgstr "エンコーダーを生成できませんでした"
msgid "Could not create encoder pipeline : {0}"
msgstr "エンコーダー用のパイプラインを生成できませんでした : {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -756,11 +756,6 @@ msgstr "GStreamer# 0.10"
msgid "Could not create encoding pipeline : {0}"
msgstr "エンコード用のパイプラインを生成できませんでしたi : {0}"
-#. Translators: verb
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
-msgid "Import"
-msgstr "インポート"
-
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
msgid "Can't check for updates"
msgstr "アップデートを確認できません"
@@ -1134,7 +1129,7 @@ msgstr "残り {0}"
msgid "Play Song"
msgstr "曲を再生"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:262
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1142,7 +1137,7 @@ msgid "Close"
msgstr "閉じる"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:483
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Search"
@@ -1157,7 +1152,7 @@ msgstr "アーティスト、アルバム、タイトル"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
msgid "Album Artist"
-msgstr "アルバムアーティスト"
+msgstr "アーティスト"
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
@@ -1179,87 +1174,91 @@ msgstr "ジャンル"
msgid "Comment"
msgstr "コメント"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "不明なアルバム"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "不明なアーティスト"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "不明なアルバム"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "不明なタイトル"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "さまざまなアーティスト"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "ストリームの場所が見つかりませんでした"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
msgid "File not found"
msgstr "ファイルが見つかりません"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "このメディアを再生するコーデックがありません"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "ファイルはデジタル著作権管理(DRM)で保護されています"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "未知のエラー"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "ポッドキャストのリスタート(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "オーディオブックのリスタート(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "ビデオのリスタート(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "先頭へ戻る(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "アイテムのリスタート(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "再生中のポッドキャストへジャンプ(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "再生中のオーディオブックへジャンプ(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "再生中のビデオへジャンプ(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "再生中の曲へジャンプ(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "再生中のアイテムへジャンプ(_J)"
@@ -1279,7 +1278,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "すべてのアルバムアーティスト ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "すべてのアルバム({0})"
@@ -1381,7 +1380,7 @@ msgid "Scanning for media"
msgstr "メディアをスキャンしています"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "スキャン中..."
@@ -1406,7 +1405,7 @@ msgstr "インポート処理が実行中です。停止しますか?"
msgid "Importing {0} of {1}"
msgstr "{1}曲中{0}曲目をインポートしています"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "{1}曲中{0}曲目を再スキャンしています"
@@ -1419,7 +1418,7 @@ msgstr "Bansheeデータベースをアップグレードしています"
msgid "Please wait while your old Banshee database is migrated to the new format."
msgstr "古いBansheeデータベースが新しいフォーマットに移るまでの間お待ちください。"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "メタデータの更新"
@@ -1838,7 +1837,7 @@ msgstr "プレイリストの削除"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "新しいプレイリスト"
@@ -2442,7 +2441,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
msgid "Unknown"
msgstr "Unknown"
@@ -2469,7 +2468,7 @@ msgid "Delete Smart Playlist"
msgstr "スマートプレイリストを削除"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "すべてのジャンル ({0})"
@@ -2543,12 +2542,12 @@ msgstr "フォルダー階層(_R)"
msgid "File _name"
msgstr "ファイル名(_N)"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:703
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "{2}に{1}の{0}を追加しています"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:722
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "{2}から{1}の{0}を削除しています"
@@ -2654,7 +2653,7 @@ msgstr "プレイリストを手動のソートモードにするには、ソー
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} / {1}"
@@ -2844,7 +2843,7 @@ msgid "Make Banshee the Default"
msgstr "Bansheeをデフォルトにする"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "インポート(_M)"
@@ -2902,99 +2901,92 @@ msgid "Import a playlist"
msgstr "プレイリストのインポート"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "音楽ライブラリを再スキャン"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "音楽ライブラリフォルダーを再スキャン"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "ファイルを開く(_L)..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "他の場所にあるファイルを開きます"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "終了(_Q)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Bansheeの終了"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "編集(_E)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "設定(_P)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "個人設定を修正"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "ツール(_T)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "音楽ライブラリを再スキャン"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "音楽ライブラリフォルダーを再スキャン"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural "The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "再スキャンを行うと音楽ライブラリから {0} トラックを削除します。"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "ヘルプ(_H)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "コンテンツ(_C)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "コレクションの詳細検索"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "メディアコレクションを検索する高度な方法を習う"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Bansheeホームページ(_H)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Bansheeのホームページにアクセス"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "参加する(_G)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Bansheeの協力者になる"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "バージョン情報(_V)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "詳細なバージョン情報と設定情報を表示します"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "プレイリストのインポート"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "プレイリスト"
@@ -3374,14 +3366,6 @@ msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
msgstr[0] "本当に {1} から選択した {0} アイテムを削除しますか?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "本当に続けますか?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "トラックを削除"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "コンピレーションアルバムのアーティスト(_P):"
@@ -3453,19 +3437,19 @@ msgstr "これらの値ですべてのディスク数と番号を設定する"
msgid "_Disc Number:"
msgstr "ディスク番号(_D):"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "この値ですべての年を設定する"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "年(_Y):"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "評価をすべてこの値にする"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "評価(_R):"
@@ -4083,6 +4067,18 @@ msgstr "接続中です..."
msgid "Buffering"
msgstr "バッファリング"
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+msgid "Volume"
+msgstr "音量"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+msgid "Muted"
+msgstr "ミュート"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+msgid "Full Volume"
+msgstr "最大"
+
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
msgid "Device"
msgstr "デバイス"
@@ -4119,39 +4115,29 @@ msgstr "カバーアートをサポート"
msgid "Supports photos"
msgstr "写真のサポート"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "トラックの時間が0です"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "iPodとの同期"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "同期の準備中..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
-msgstr "{1}曲中{0}曲目を追加しています"
+msgstr "追加中 {1} 曲中 {0} 曲目"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "{1}曲中{0}曲目のメタデータを更新しています"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "{1}曲中{0}曲目を削除しています"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "クリーニング作業中。{1}曲中{0}曲目の無効なトラックを削除しています。"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "メディアデータベースを書き込み中"
@@ -4160,7 +4146,7 @@ msgstr "メディアデータベースを書き込み中"
msgid "Sync {0}"
msgstr "{0} と同期"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "デバイス"
@@ -4169,40 +4155,40 @@ msgstr "デバイス"
msgid "Device Properties"
msgstr "デバイスのプロパティ"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Product"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "ベンダー"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "ロード中 {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "はい"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "いいえ"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
#, csharp-format
msgid "The {0} format is not supported by the device, and no converter was found to convert it"
msgstr "{0} フォーマットはそのデバイスではサポートしていません。またこのフォーマットを変換するコンバーターも見つかりません。"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
msgid "File format conversion support is not available"
msgstr "ファイルフォーマット変換サポートは利用できません"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
msgid "Error converting file"
msgstr "ファイルの変換エラー"
@@ -4218,16 +4204,24 @@ msgstr "デバイスが差し込まれるかライブラリが変更されたら
msgid "Sync Preferences"
msgstr "設定の同期"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+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.Gui/DapActions.cs:106
#, 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."
msgstr[0] "同期操作でデバイスから {0} トラックを削除します。"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "同期"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "本当に続けますか?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "トラックを削除"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4300,12 +4294,12 @@ msgstr "購入した曲のインポート"
msgid "Disconnect"
msgstr "切断"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "{0} を切断中..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "切断できません {0}: {1}"
@@ -4649,11 +4643,11 @@ msgstr "ログイン"
msgid "Connecting to {0}"
msgstr "{0}に接続中"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "リモートのDAAPサーバーを追加"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "新しいリモートのDAAPサーバーを追加"
@@ -5377,21 +5371,21 @@ msgstr "ステーションを編集"
msgid "Station"
msgstr "ステーション"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} ステーション"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../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:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "ステーションジャンルを提供してください"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "ステーション名を入力してください"
@@ -5434,53 +5428,53 @@ msgstr "説明:"
msgid "Rating:"
msgstr "評価:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "{1}曲中{0}曲目を処理しました"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Audioscrobblerプラグインの設定"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "ユーザーのプロフィールページにアクセス(_U)"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Last.fmのプロフィールページにアクセス"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "Bansheeで再生した曲の情報送信を有効にする(_E)"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Bansheeで再生した曲の情報送信を有効にする"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "デバイスで再生した曲の情報送信を有効にする(_E)"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "デバイスで再生した曲の情報送信を有効にする"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Last.FMへScrobblingしています"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "デバイスからScrobblingしています"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Last.FMへScrobblingしています..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "デバイスからScrobblingしています..."
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "{1}曲中{0}曲目を処理しています..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5607,19 +5601,19 @@ msgstr "ユーザー<i>{0}</i>でLast.fmにログインしました。"
msgid "Log out of Last.fm"
msgstr "Last.fmのログアウト"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "最近好きなトラック"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "最近再生したトラック"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "私のトップアーティスト"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0}回再生"
@@ -6257,11 +6251,11 @@ msgstr "終了時に再生キューをクリアする"
msgid "Remove From Play Queue"
msgstr "再生キューから削除"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
msgid "Number of _played songs to show"
msgstr "再生した曲の表示数(_P)"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:971
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
msgid "Number of _upcoming songs to show"
msgstr "これから再生する曲の表示数(_U)"
@@ -6915,18 +6909,6 @@ msgstr "Last.fmへ接続しました。"
msgid "Unknown Podcast"
msgstr "不明なポッドキャスト"
-#~ msgid "Scrobbling from device"
-#~ msgstr "デバイスからScrobblingしています"
-
-#~ msgid "Volume"
-#~ msgstr "音量"
-
-#~ msgid "Muted"
-#~ msgstr "ミュート"
-
-#~ msgid "Full Volume"
-#~ msgstr "最大"
-
#~ msgid "Dvd"
#~ msgstr "Dvd"
diff --git a/po/lt.po b/po/lt.po
index 94c3a34..b5411c4 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,24 +3,20 @@
# This file is distributed under the same license as the Banshee package.
# Gintautas Miliauskas <gintas at akl.lt>, 2006.
# Žygimantas Beručka <zygis at gnome.org>, 2005-2009, 2010, 2011, 2012.
-# Aurimas Černius <aurisc4 at gmail.com>, 2013.
-#
msgid ""
msgstr ""
"Project-Id-Version: master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-03 18:04+0000\n"
-"PO-Revision-Date: 2013-10-06 20:40+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-04 17:57+0000\n"
+"PO-Revision-Date: 2012-09-15 14:11+0300\n"
"Last-Translator: Aurimas Černius <aurisc4 at gmail.com>\n"
-"Language-Team: Lietuvių <gnome-lt at lists.akl.lt>\n"
+"Language-Team: Lithuanian\n"
"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.0\n"
"X-Project-Style: gnome\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
@@ -32,8 +28,10 @@ msgstr "Apple įrenginių palaikymas"
msgid "Support for most iPod/iPhone/iPad devices."
msgstr "Daugumos iPod/iPhone/iPad įrenginių palaikymas."
-#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15
-#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25
+#: ../data/addin-xml-strings.cs:10
+#: ../data/addin-xml-strings.cs:15
+#: ../data/addin-xml-strings.cs:20
+#: ../data/addin-xml-strings.cs:25
msgid "Device Support"
msgstr "Įrenginių palaikymas"
@@ -52,12 +50,8 @@ msgid "Mass Storage Media Player Support"
msgstr "Didelės talpos medijos leistuvų palaikymas"
#: ../data/addin-xml-strings.cs:19
-msgid ""
-"Support for USB-drive based devices, including many iAudio devices and "
-"Android, Pre, and Galaxy phones."
-msgstr ""
-"USB diskais paremtų įrenginių, įskaitant daugelį iAudio įrenginių ir "
-"Android, Pre ir Galaxy telefonų, palaikymas."
+msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones."
+msgstr "USB diskais paremtų įrenginių, įskaitant daugelį iAudio įrenginių ir Android, Pre ir Galaxy telefonų, palaikymas."
#. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
#: ../data/addin-xml-strings.cs:23
@@ -77,10 +71,14 @@ msgstr "Amazon MP3 parduotuvės šaltinis"
msgid "Browse, search, and purchase music from the Amazon MP3 store."
msgstr "Naršykite, ieškokite ir įsigykite muzikos iš Amazon MP3 parduotuvės."
-#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
-#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
-#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
-#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+#: ../data/addin-xml-strings.cs:30
+#: ../data/addin-xml-strings.cs:35
+#: ../data/addin-xml-strings.cs:65
+#: ../data/addin-xml-strings.cs:70
+#: ../data/addin-xml-strings.cs:85
+#: ../data/addin-xml-strings.cs:95
+#: ../data/addin-xml-strings.cs:100
+#: ../data/addin-xml-strings.cs:115
#: ../data/addin-xml-strings.cs:165
msgid "Online Sources"
msgstr "Internetiniai šaltiniai"
@@ -103,9 +101,12 @@ msgstr "Garso knygų fonoteka"
msgid "Organize audiobooks, lectures, etc."
msgstr "Tvarkykite garso knygas, paskaitas ir t. t."
-#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
-#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
-#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
+#: ../data/addin-xml-strings.cs:40
+#: ../data/addin-xml-strings.cs:75
+#: ../data/addin-xml-strings.cs:90
+#: ../data/addin-xml-strings.cs:135
+#: ../data/addin-xml-strings.cs:145
+#: ../data/addin-xml-strings.cs:150
msgid "Core"
msgstr "Pagrindas"
@@ -118,13 +119,20 @@ msgstr "Boo scenarijai"
msgid "Customize and extend Banshee with Boo-language scripts."
msgstr "Adaptuokite ir išplėskite „Banshee“ programą Boo kalbos scenarijais."
-#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
-#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
-#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
-#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
-#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
-#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
-#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+#: ../data/addin-xml-strings.cs:45
+#: ../data/addin-xml-strings.cs:50
+#: ../data/addin-xml-strings.cs:55
+#: ../data/addin-xml-strings.cs:60
+#: ../data/addin-xml-strings.cs:80
+#: ../data/addin-xml-strings.cs:105
+#: ../data/addin-xml-strings.cs:110
+#: ../data/addin-xml-strings.cs:120
+#: ../data/addin-xml-strings.cs:125
+#: ../data/addin-xml-strings.cs:130
+#: ../data/addin-xml-strings.cs:140
+#: ../data/addin-xml-strings.cs:155
+#: ../data/addin-xml-strings.cs:160
+#: ../data/addin-xml-strings.cs:170
msgid "Utilities"
msgstr "Reikmenys"
@@ -162,9 +170,7 @@ msgstr "„eMusic“ parduotuvė"
#: ../data/addin-xml-strings.cs:64
msgid "Browse, search, and purchase music and audiobooks from eMusic"
-msgstr ""
-"Naršykite, ieškokite ir įsigykite muzikos bei garso knygų iš „eMusic“ "
-"parduotuvės"
+msgstr "Naršykite, ieškokite ir įsigykite muzikos bei garso knygų iš „eMusic“ parduotuvės"
#. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
#: ../data/addin-xml-strings.cs:68
@@ -191,9 +197,7 @@ msgstr "Metaduomenų taisymas"
#: ../data/addin-xml-strings.cs:79
msgid "Fix broken and missing metadata using bulk operations."
-msgstr ""
-"Taisyti sugadintus ir trūkstamus metaduomenis naudojant masinio apdorojimo "
-"veiksmus."
+msgstr "Taisyti sugadintus ir trūkstamus metaduomenis naudojant masinio apdorojimo veiksmus."
#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
#: ../data/addin-xml-strings.cs:83
@@ -221,9 +225,7 @@ msgstr "Last.fm klausomų kūrinių statistika"
#: ../data/addin-xml-strings.cs:94
msgid "Last.fm scrobbling and context pane recommendations."
-msgstr ""
-"Last.fm klausomų kūrinių statistikos vedimas ir rekomendacijos "
-"kontekstiniame polangyje."
+msgstr "Last.fm klausomų kūrinių statistikos vedimas ir rekomendacijos kontekstiniame polangyje."
#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
#: ../data/addin-xml-strings.cs:98
@@ -249,12 +251,8 @@ msgid "Mini Mode"
msgstr "Mini veiksena"
#: ../data/addin-xml-strings.cs:109
-msgid ""
-"Control Banshee through a small window with only playback controls and track "
-"information."
-msgstr ""
-"Valdykite „Banshee“ mažame lange, kuriame rodoma tik perklausos valdikliai "
-"ir takelio informacija."
+msgid "Control Banshee through a small window with only playback controls and track information."
+msgstr "Valdykite „Banshee“ mažame lange, kuriame rodoma tik perklausos valdikliai ir takelio informacija."
#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
#: ../data/addin-xml-strings.cs:113
@@ -319,9 +317,7 @@ msgstr "Paleidimo eilė"
#: ../data/addin-xml-strings.cs:144
msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
-msgstr ""
-"Išrikiuokite takelius specialiame grojaraštyje eilėje arba užleiskite vietą "
-"automatiniam DJ."
+msgstr "Išrikiuokite takelius specialiame grojaraštyje eilėje arba užleiskite vietą automatiniam DJ."
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
#: ../data/addin-xml-strings.cs:148
@@ -363,12 +359,8 @@ msgid "Ubuntu One Music Store"
msgstr "Ubuntu One muzikos parduotuvė"
#: ../data/addin-xml-strings.cs:164
-msgid ""
-"This extension grants access to the Ubuntu One Music Store, powered by "
-"7digital."
-msgstr ""
-"Šis plėtinys suteikia prieigą prie 7digital valdomos Ubuntu One muzikos "
-"parduotuvės."
+msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+msgstr "Šis plėtinys suteikia prieigą prie 7digital valdomos Ubuntu One muzikos parduotuvės."
#. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
#: ../data/addin-xml-strings.cs:168
@@ -376,11 +368,8 @@ msgid "UPnP Client"
msgstr "UPnP klientas"
#: ../data/addin-xml-strings.cs:169
-msgid ""
-"Browse and play music and videos shared over your local network using UPnP."
-msgstr ""
-"Naršykite ir klausykitės muzikos bei vaizdo įrašų, bendrinamų jūsų "
-"vietiniame tinkle naudojant UPnP."
+msgid "Browse and play music and videos shared over your local network using UPnP."
+msgstr "Naršykite ir klausykitės muzikos bei vaizdo įrašų, bendrinamų jūsų vietiniame tinkle naudojant UPnP."
#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
#: ../data/addin-xml-strings.cs:173
@@ -392,7 +381,8 @@ msgstr "Vikipedija"
msgid "View artist information from Wikipedia in the context pane."
msgstr "Žiūrėkite konteksto polangyje atlikėjo informaciją iš Vikipedijos."
-#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+#: ../data/addin-xml-strings.cs:175
+#: ../data/addin-xml-strings.cs:180
msgid "Context Pane"
msgstr "Konteksto polangis"
@@ -411,12 +401,8 @@ msgid "AAC (Novell Encoder)"
msgstr "AAC (Novell enkoderis)"
#: ../data/audio-profiles/aac-novell.xml.in.h:2
-msgid ""
-"Designed to be the successor of the MP3 format, AAC generally achieves "
-"better sound quality than MP3 at many bit rates."
-msgstr ""
-"Sukurtas kaip įpėdinis MP3 formatui, AAC formatas leidžia pasiekti geresnės "
-"garso kokybės nei MP3 daugelyje bitų dažnių."
+msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates."
+msgstr "Sukurtas kaip įpėdinis MP3 formatui, AAC formatas leidžia pasiekti geresnės garso kokybės nei MP3 daugelyje bitų dažnių."
#: ../data/audio-profiles/aac-novell.xml.in.h:3
#: ../data/audio-profiles/mp3-lame.xml.in.h:9
@@ -467,12 +453,8 @@ msgid "Free Lossless Audio Codec"
msgstr "Free Lossless Audio Codec"
#: ../data/audio-profiles/flac.xml.in.h:2
-msgid ""
-"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but "
-"does not degrade audio quality."
-msgstr ""
-"Free Lossless Audio Codec (FLAC) yra atvirojo kodo kodekas, glaudinantis, "
-"tačiau nemažinantis garso kokybės."
+msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality."
+msgstr "Free Lossless Audio Codec (FLAC) yra atvirojo kodo kodekas, glaudinantis, tačiau nemažinantis garso kokybės."
#: ../data/audio-profiles/mp3-lame.xml.in.h:1
msgid "MP3 (LAME Encoder)"
@@ -480,12 +462,8 @@ msgstr "MP3 (LAME Encoder)"
#: ../data/audio-profiles/mp3-lame.xml.in.h:2
#: ../data/audio-profiles/mp3-xing.xml.in.h:2
-msgid ""
-"A proprietary and older, but also popular, lossy audio format that produces "
-"larger files at lower bitrates."
-msgstr ""
-"Nuosavybinis ir senesnis, tačiau taip pat populiarus, nuostolingas garso "
-"formatas, sukuriantis didesnius mažesnių bitų dažnių failus."
+msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates."
+msgstr "Nuosavybinis ir senesnis, tačiau taip pat populiarus, nuostolingas garso formatas, sukuriantis didesnius mažesnių bitų dažnių failus."
#: ../data/audio-profiles/mp3-lame.xml.in.h:3
msgid "Encoding Mode"
@@ -526,12 +504,8 @@ msgid "Ogg Vorbis"
msgstr "Ogg Vorbis"
#: ../data/audio-profiles/vorbis.xml.in.h:2
-msgid ""
-"Vorbis is an open source, lossy audio codec with high quality output at a "
-"lower file size than MP3."
-msgstr ""
-"Vorbis yra atvirojo kodo, nuostolingas garso kodekas, sukuriantis aukštos "
-"kokybės garsą mažesnio dydžio faile, negu MP3."
+msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3."
+msgstr "Vorbis yra atvirojo kodo, nuostolingas garso kodekas, sukuriantis aukštos kokybės garsą mažesnio dydžio faile, negu MP3."
#: ../data/audio-profiles/vorbis.xml.in.h:3
msgid "Audio quality"
@@ -542,12 +516,8 @@ msgid "Wavpack"
msgstr "Wavpack"
#: ../data/audio-profiles/wavpack.xml.in.h:2
-msgid ""
-"A fast and efficient open source audio format offering lossless and high-"
-"quality lossy encoding with great dynamic range."
-msgstr ""
-"Greitas ir efektyvus atvirojo kodo garso formatas, siūlantis nenuostolingą "
-"ir aukštos kokybišką kodavimą, turintį didelį dinaminį diapazoną."
+msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range."
+msgstr "Greitas ir efektyvus atvirojo kodo garso formatas, siūlantis nenuostolingą ir aukštos kokybišką kodavimą, turintį didelį dinaminį diapazoną."
#: ../data/audio-profiles/wavpack.xml.in.h:3
msgid "Mode"
@@ -594,24 +564,16 @@ msgid "Waveform PCM"
msgstr "Waveform PCM"
#: ../data/audio-profiles/wav.xml.in.h:2
-msgid ""
-"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
-"modulated (PCM) audio."
-msgstr ""
-"WAV+PCM yra nenuostolingas formatas, saugantis neglaudintą, neapdorotą "
-"vibracijų kodu moduliuotą (PCM) garsą. "
+msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+msgstr "WAV+PCM yra nenuostolingas formatas, saugantis neglaudintą, neapdorotą vibracijų kodu moduliuotą (PCM) garsą. "
#: ../data/audio-profiles/wma.xml.in.h:1
msgid "Windows Media Audio"
msgstr "Windows Media Audio"
#: ../data/audio-profiles/wma.xml.in.h:2
-msgid ""
-"A proprietary lossy audio format with high quality output at a lower file "
-"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
-msgstr ""
-"Nuosavybinis, nuostolingas garso formatas, sukuriantis aukštos kokybės "
-"išvestį mažesniame už MP3 faile. 96 kbps WMA yra lygus 128 kbps MP3."
+msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+msgstr "Nuosavybinis, nuostolingas garso formatas, sukuriantis aukštos kokybės išvestį mažesniame už MP3 faile. 96 kbps WMA yra lygus 128 kbps MP3."
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Use a variable bitrate"
@@ -622,15 +584,15 @@ msgid "Audio Quality"
msgstr "Garso kokybė"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Medijos leistuvas"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Medijos leistuvas „Banshee“"
@@ -638,34 +600,8 @@ msgstr "Medijos leistuvas „Banshee“"
msgid "Play and organize your media collection"
msgstr "Leisti ir tvarkyti mediją"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"Vaizdo įrašas;Filmas;Klipas;Serialas;Grotuvas;DVD;Diskas;Mp3;Garsas;CD;"
-"Tinklalaidė;DAAP;Grojaraštis;Ipod;Daugialypė terpė;Kolekcija;Muzika;Radijas;"
-
-#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
-#: ../data/banshee.appdata.xml.in.h:2
-msgid ""
-"Banshee is an open source multimedia management and playback application for "
-"GNOME, Mac and Windows."
-msgstr ""
-"Banshee yra atviro kodo daugialypės terpės tvarkymo ir grojimo programa "
-"GNOME, Mac ir Windows aplinkoms."
-
-#: ../data/banshee.appdata.xml.in.h:3
-msgid ""
-"Play your music and videos. Stay entertained and up to date with podcasts "
-"and video podcasts. Sync your Android, iPod, and other devices. We think "
-"you'll love Banshee!"
-msgstr ""
-"Grokite muziką ir filmus. Linksminkitės bei žinokite naujienas iš "
-"tinklalaidžių. Sinchronizuokite su Android, iPod ir kitais įrenginiais. Mes "
-"manome, kad jums patiks Banshee!"
-
-#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+#: ../libbanshee/banshee-bpmdetector.c:202
+#: ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
msgstr "Nepavyko sukurti konvejerio"
@@ -695,7 +631,8 @@ msgid "Could not create fakesink plugin"
msgstr "Nepavyko sukurti fakesink įskiepio"
#: ../libbanshee/banshee-bpmdetector.c:241
-#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+#: ../libbanshee/banshee-bpmdetector.c:250
+#: ../libbanshee/banshee-ripper.c:311
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281
msgid "Could not link pipeline elements"
msgstr "Nepavyko susieti konvejerio elementų"
@@ -792,36 +729,28 @@ msgstr "Nepavyko sukurti BPM aptikimo tvarkyklės."
msgid "Could not initialize GStreamer library"
msgstr "Nepavyko inicijuoti GStreamer bibliotekos"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Nežinoma klaida"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "Į_jungti ReplayGain korekciją"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
-msgid ""
-"For tracks that have ReplayGain data, automatically scale (normalize) "
-"playback volume"
-msgstr ""
-"Automatiškai normalizuoti takelių, kuriuose yra ReplayGain duomenų, "
-"perklausos garsumą."
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
+msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
+msgstr "Automatiškai normalizuoti takelių, kuriuose yra ReplayGain duomenų, perklausos garsumą."
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Įjungti _betarpę perklausą"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
-msgid ""
-"Eliminate the small playback gap on track change. Useful for concept albums "
-"and classical music"
-msgstr ""
-"Pašalinti nedidelį tarpelį, girdimą keičiantis takeliams. Naudinga "
-"klausantis koncepcinių albumų bei klasikinės muzikos"
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
+msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
+msgstr "Pašalinti nedidelį tarpelį, girdimą keičiantis takeliams. Naudinga klausantis koncepcinių albumų bei klasikinės muzikos"
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
msgid "Could not create transcoder"
@@ -832,7 +761,7 @@ msgstr "Nepavyko sukurti transkoderio"
msgid "Could not create encoder pipeline : {0}"
msgstr "Nepavyko sukurti koderio konvejerio: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -843,6 +772,7 @@ msgstr "Nepavyko sukurti kodavimo konvejerio: {0}"
#. Translators: verb
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+#| msgid "_Import"
msgid "Import"
msgstr "Importuoti"
@@ -851,12 +781,8 @@ msgid "Can't check for updates"
msgstr "Nepavyko patikrinti, ar yra atnaujinimų"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
-msgid ""
-"We're currently not able to check if there's a new version available. Please "
-"try again later."
-msgstr ""
-"Šiuo metu negalima patikrinti, ar yra prieinama nauja versija. Pabandykite "
-"vėliau."
+msgid "We're currently not able to check if there's a new version available. Please try again later."
+msgstr "Šiuo metu negalima patikrinti, ar yra prieinama nauja versija. Pabandykite vėliau."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
msgid "No update available"
@@ -896,12 +822,8 @@ msgstr "Atsiųsti nepavyko, bandykite vėliau dar kartą."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165
#, csharp-format
-msgid ""
-"The update finished downloading.{0}Do you want to shutdown Banshee and run "
-"the installer?"
-msgstr ""
-"Atnaujinimas atsiųstas.{0}Ar pageidaujate išjungti „Banshee“ ir paleisti "
-"diegyklę?"
+msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?"
+msgstr "Atnaujinimas atsiųstas.{0}Ar pageidaujate išjungti „Banshee“ ir paleisti diegyklę?"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
msgid "Update finished downloading"
@@ -911,185 +833,171 @@ msgstr "Atnaujinimas atsiųstas"
msgid "Check for Updates"
msgstr "Ieškoti atnaujinimų"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Žinyno parinktys"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Rodyti šį žinyną"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Rodyti grojimo valdymo parinktis"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Rodyti grojamo takelio užklausimo parinktis"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Rodyti atkūrimo posistemės užklausimo parinktis"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Rodyti naudotojo sąsajos parinktis"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Rodyti parinktis, skirtas programuotojams ir derinimui"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Rodyti visas parinkčių grupes"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Rodyti versijos informacija"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Grojimo valdymo parinktys"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
-msgid ""
-"Play the next track, optionally restarting if the 'restart' value is set"
+#: ../src/Clients/Booter/Booter/Entry.cs:164
+msgid "Play the next track, optionally restarting if the 'restart' value is set"
msgstr "Groti kitą takelį ir kartoti, jei nurodyta reikšmė „restart“"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
-msgid ""
-"Play the previous track, optionally restarting if the 'restart' value is set"
-msgstr ""
-"Groti ankstesnį takelį ir paleisti iš naujo, jei nustatyta reikšmė „restart“"
+#: ../src/Clients/Booter/Booter/Entry.cs:165
+msgid "Play the previous track, optionally restarting if the 'restart' value is set"
+msgstr "Groti ankstesnį takelį ir paleisti iš naujo, jei nustatyta reikšmė „restart“"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
-msgid ""
-"If the current song has been played longer than 4 seconds then restart it, "
-"otherwise the same as --previous"
-msgstr ""
-"Jeigu dabartinė daina grojo ilgiau nei 4 sekundes, paleisti ją iš naujo. "
-"Priešingu atveju, tas pats kaip --previous"
+#: ../src/Clients/Booter/Booter/Entry.cs:166
+msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous"
+msgstr "Jeigu dabartinė daina grojo ilgiau nei 4 sekundes, paleisti ją iš naujo. Priešingu atveju, tas pats kaip --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
-msgstr ""
-"Automatiškai pradėti groti bet kokius komandų eilutėje nurodytus takelius"
+msgstr "Automatiškai pradėti groti bet kokius komandų eilutėje nurodytus takelius"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Pradėti grojimą"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Sulaikyti grojimą"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Pradėti / stabdyti grojimą"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Visiškai sustabdyti grojimą"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
-msgid ""
-"Enable or disable playback stopping after the currently playing track (value "
-"should be either 'true' or 'false')"
-msgstr ""
-"Po šiuo metu grojančio takelio įjungti arba išjungti grojimą (reikšmė turėtų "
-"būti „true“ arba „false“)"
+#: ../src/Clients/Booter/Booter/Entry.cs:173
+msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')"
+msgstr "Po šiuo metu grojančio takelio įjungti arba išjungti grojimą (reikšmė turėtų būti „true“ arba „false“)"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
-msgstr ""
-"Nustatyti grojimo garsumą (0-100), norėdami nurodyti santykines reikšmes, "
-"galite priekyje naudoti ženklus + ir -"
+msgstr "Nustatyti grojimo garsumą (0-100), norėdami nurodyti santykines reikšmes, galite priekyje naudoti ženklus + ir -"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Peršokti į tam tikrą vietą (sekundės, sl. kabl. skaičius)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Nustatyti dabar atkuriamo takelio įvertinimą (nuo 0 iki 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Leistuvo posistemės užklausos parinktys"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Dabartinė leistuvo būsena"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Paskutinioji leistuvo būsena"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Užklausti, ar leistuvas gali būti pristabdytas"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Užklausti, ar leistuvas gali peršokti į kitą vietą"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Leistuvo garsumas"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Leistuvo padėtis dabar leidžiamame takelyje"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Grojamo takelio metaduomenų užklausimo parinktys"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Atlikėjas"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Albumo pavadinimas"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Takelio pavadinimas"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Trukmė"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Takelio numeris"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Takelių skaičius"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Disko numeris"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1100,7 +1008,7 @@ msgstr "Disko numeris"
msgid "Year"
msgstr "Metai"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1108,118 +1016,108 @@ msgstr "Metai"
msgid "Rating"
msgstr "Įvertinimas"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Taškai"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Bitų dažnis"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Naudotojo sąsajos parinktys"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Rodyti naudotojo sąsają aktyviajame darbalaukyje"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Įjungti viso ekrano veiksena"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Paslėpti naudotojo sąsają"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Nerodyti naudotojo sąsajos, nepaisant bet kokių kitų parinkčių"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Rodyti medijos importavimo dialogą"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Rodyti „Apie“ dialogą"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Rodyti vietos atvėrimo dialogą"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Rodyti nustatymų dialogą"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Derinimo ir programavimo parinktys"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Įjungti bendrąsias derinimo funkcijas"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Įjungti SQL užklausų derinimo išvestį"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Įjungti Mono.Addins derinimo išvestį"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Nurodytkite alternatyvią naudotiną duomenų bazę"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Priverstinai atsiųsti trūkstamus albumų viršelius"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Nurodykite alternatyvų raktą, numatytasis – /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
-msgid ""
-"Optimize instance for running uninstalled; most notably, this will create an "
-"alternate Mono.Addins database in the working directory"
-msgstr ""
-"Optimizuoti naudojimui neįdiegus. Pastebimiausias skirtumas yra tai, kad "
-"darbiniame aplanke bus sukurta alternatyvi Mono.Addins duomenų bazė"
+#: ../src/Clients/Booter/Booter/Entry.cs:221
+msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory"
+msgstr "Optimizuoti naudojimui neįdiegus. Pastebimiausias skirtumas yra tai, kad darbiniame aplanke bus sukurta alternatyvi Mono.Addins duomenų bazė"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Visiškai išjungti DBus palaikymą"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
-#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr ""
-"Praleisti pasirinktinio gtk.css failo ({0}) įkėlimą, jei šis egzistuoja"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:230
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Iš naujo įkelti pasirinktinį gtk.css failą ({0}) kas 5 sekundes"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Neįkelti pasirinktinio gtkrc failo ({0}), jei šis egzistuoja"
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Šie žinyno parametrai yra netinkami: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Groti albumą"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "Į_traukti į eilę"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1242,16 +1140,16 @@ msgstr "Leisti _albumą"
msgid "Add an album to the playlist"
msgstr "Į grojaraštį įtraukti albumą"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "liko {0}"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Leisti dainą"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1259,7 +1157,7 @@ msgid "Close"
msgstr "Užverti"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:492
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Ieškoti"
@@ -1296,85 +1194,91 @@ msgstr "Žanras"
msgid "Comment"
msgstr "Komentaras"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Nežinomas albumas"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Nežinomas atlikėjas"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Nežinomas albumas"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Nežinomas pavadinimas"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Įvairūs atlikėjai"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Srauto vieta nerasta"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
msgid "File not found"
msgstr "Failas nerastas"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Šio tipo medijos atkūrimui reikiamo kodeko nėra"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Failą saugo skaitmeninių teisių valdymo (DRM) technologija"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Nežinoma klaida"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Leisti Podcast iš naujo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Leisti garso knygą iš naujo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Leisti vaizdo įrašą iš naujo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Leisti dainą iš naujo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Leisti elementą iš naujo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Peršokti prie leidžiamos tinklalaidės"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Peršokti prie leidžiamos garso knygos"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Peršokti prie leidžiamo vaizdo įrašo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Peršokti prie leidžiamos dainos"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Peršokti prie leidžiamo elemento"
@@ -1394,7 +1298,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Visi albumo atlikėjai ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Visi albumai ({0})"
@@ -1496,7 +1400,7 @@ msgid "Scanning for media"
msgstr "Ieškoma įvairialypės terpės"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Skenuojama..."
@@ -1521,7 +1425,7 @@ msgstr "Šiuo metu dar importuojama. Ar norite sustabdyti šį procesą?"
msgid "Importing {0} of {1}"
msgstr "Importuojama {0} iš {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Perskenuojama {0} iš {1}"
@@ -1531,13 +1435,10 @@ msgid "Upgrading your Banshee Database"
msgstr "Atnaujinama jūsų „Banshee“ programos duomenų bazė"
#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
-msgid ""
-"Please wait while your old Banshee database is migrated to the new format."
-msgstr ""
-"Luktelėkite, kol bus atnaujintas jūsų senosios „Banshee“ duomenų bazės "
-"formatas."
+msgid "Please wait while your old Banshee database is migrated to the new format."
+msgstr "Luktelėkite, kol bus atnaujintas jūsų senosios „Banshee“ duomenų bazės formatas."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Atnaujinami metaduomenys"
@@ -1613,29 +1514,29 @@ msgstr "Ramus rokas"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Pašalinti iš fonotekos"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Failų tvarkymas"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
msgid "Co_py files to media folder when importing"
msgstr "Im_portuojant kopijuoti failus į medijos aplanką"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "_Atnaujinti failų ir aplankų vardus"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Pervadinti failus ir aplankus pagal medijos metaduomenis"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "{0} aplankas"
@@ -1699,28 +1600,29 @@ msgstr "Diskų skaičius"
msgid "Grouping"
msgstr "Grupavimas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Muzika"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Ieškokite savo muzikos"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Įvairūs"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "_Rikiuoti atlikėjo albumus pagal metus, ne pavadinimą"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1728,90 +1630,89 @@ msgstr[0] "{0} daina"
msgstr[1] "{0} dainos"
msgstr[2] "{0} dainų"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Muzikos aplankas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Mėgiama"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Keturiomis ir penkiomis žvaigždutėmis įvertinti kūriniai"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Neseniai pamėgta"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "Pastarąją savaitę dažnai klausyti kūriniai"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Neseniai pridėta"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Pastarąją savaitę importuoti kūriniai"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Neseniai klausyta"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Neseniai klausyti kūriniai"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "Negirdėta"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Neklausyti arba praleisti kūriniai"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Pamiršta mėgiama"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Mėgiama, tačiau neklausyta pastaruosius du mėnesius"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Mažiausiai mėgiama"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
-msgstr ""
-"Viena ir dviem žvaigždutėmis įvertinti arba dažnai praleidžiami kūriniai"
+msgstr "Viena ir dviem žvaigždutėmis įvertinti arba dažnai praleidžiami kūriniai"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "700 MB mėgiamų kūrinių"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Duomenų CD, pilnas mėgiamų kūrinių"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "80 minučių mėgiamų kūrinių"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Garso CD, pilnas mėgiamų kūrinių"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "Neįvertinta"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Kūriniai be įvertinimo"
@@ -1869,12 +1770,8 @@ msgid "Default player engine"
msgstr "Numatytoji grojimo posistemė"
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
-msgid ""
-"No player engines were found. Please ensure Banshee has been cleanly "
-"installed."
-msgstr ""
-"Nerasta grojimo posistemių. Įsitikinkite, kad „Banshee“ programa įdiegta "
-"tinkamai."
+msgid "No player engines were found. Please ensure Banshee has been cleanly installed."
+msgstr "Nerasta grojimo posistemių. Įsitikinkite, kad „Banshee“ programa įdiegta tinkamai."
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
msgid "Problem with Player Engine"
@@ -1890,11 +1787,8 @@ msgid "Initializing"
msgstr "Inicijuojama"
#: ../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 ""
-"Failai šiuo metu konvertuojami į kitą formatą. Ar norite tai sustabdyti?"
+msgid "Files are currently being converted to another format. Would you like to stop this?"
+msgstr "Failai šiuo metu konvertuojami į kitą formatą. Ar norite tai sustabdyti?"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
msgid "Saving Metadata to File"
@@ -1905,36 +1799,24 @@ msgid "Sync _metadata between library and files"
msgstr "Sinchronizuoti _metaduomenis tarp bibliotekos ir failų"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
-msgid ""
-"Enable this option to have metadata in sync between your library and "
-"supported media files"
-msgstr ""
-"Įjunkite šią parinktį, jei norite, kad būtų sinchronizuojami metaduomenys "
-"tarp jūsų fonotekos ir palaikomų daugialypės terpės failų"
+msgid "Enable this option to have metadata in sync between your library and supported media files"
+msgstr "Įjunkite šią parinktį, jei norite, kad būtų sinchronizuojami metaduomenys tarp jūsų fonotekos ir palaikomų daugialypės terpės failų"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
msgid "Sync _ratings between library and files"
msgstr "Sinchronizuoti į_vertinimus tarp fonotekos ir failų"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
-msgid ""
-"Enable this option to have rating metadata synced between your library and "
-"supported audio files"
-msgstr ""
-"Įjunkite šią parinktį, jei norite, kad būtų sinchronizuojami įvertinimų "
-"metaduomenys tarp jūsų fonotekos ir palaikomų garso įrašų failų"
+msgid "Enable this option to have rating metadata synced between your library and supported audio files"
+msgstr "Įjunkite šią parinktį, jei norite, kad būtų sinchronizuojami įvertinimų metaduomenys tarp jūsų fonotekos ir palaikomų garso įrašų failų"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
msgid "Sync play counts between library and files"
msgstr "Sinchronizuoti perklausų skaičių tarp fonotekos ir failų"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
-msgid ""
-"Enable this option to have playcount metadata synced between your library "
-"and supported audio files"
-msgstr ""
-"Įjunkite šią parinktį, jei norite, kad būtų sinchronizuojami perklausų "
-"metaduomenys tarp jūsų fonotekos ir palaikomų garso įrašų failų"
+msgid "Enable this option to have playcount metadata synced between your library and supported audio files"
+msgstr "Įjunkite šią parinktį, jei norite, kad būtų sinchronizuojami perklausų metaduomenys tarp jūsų fonotekos ir palaikomų garso įrašų failų"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
@@ -1953,12 +1835,8 @@ msgid "_Disable features requiring Internet access"
msgstr "_Išjungti funkcijas, kurioms reikia interneto prieigos"
#: ../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 ""
-"Kai kurioms funkcijoms reikalinga prieiga prie interneto, pvz., Last.fm arba "
-"albumų paveikslėlių atsiuntimo funkcijoms"
+msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching"
+msgstr "Kai kurioms funkcijoms reikalinga prieiga prie interneto, pvz., Last.fm arba albumų paveikslėlių atsiuntimo funkcijoms"
#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
msgid "Search this playlist"
@@ -1983,8 +1861,8 @@ msgstr "Ištrinti grojaraštį"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Naujas grojaraštis"
@@ -2587,7 +2465,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
msgid "Unknown"
msgstr "Nežinoma"
@@ -2614,7 +2492,7 @@ msgid "Delete Smart Playlist"
msgstr "Ištrinti išmanųjį grojaraštį"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Visi žanrai ({0})"
@@ -2671,7 +2549,7 @@ msgstr "Klaida"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Informacija"
@@ -2771,12 +2649,12 @@ msgid "Show:"
msgstr "Rodyti:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Visus"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Įjungta"
@@ -2801,19 +2679,15 @@ msgid "Cannot Reorder While Sorted"
msgstr "Negalima keisti tvarkos, kai surikiuota"
#: ../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."
-msgstr ""
-"Norėdami įjungti rankinio grojaraščio rikiavimo veikseną, spustelėkite "
-"dabartinio surikiuoto stulpelio antraštę, kol nebus rodoma rikiavimo rodyklė."
+msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away."
+msgstr "Norėdami įjungti rankinio grojaraščio rikiavimo veikseną, spustelėkite dabartinio surikiuoto stulpelio antraštę, kol nebus rodoma rikiavimo rodyklė."
#. Translators: this is {disc number} of {disc count}
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} iš {1}"
@@ -2874,20 +2748,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bitai (-ų)"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Padidinti arba sumažinti konteksto polangį"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Paslėpti konkteksto polangį"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Laukiama, kol prasidės grojimas..."
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Įkeliama..."
@@ -2914,7 +2788,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Glodintuvas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Naujas šablonas"
@@ -2949,11 +2823,11 @@ msgstr "Prižiūrėtojai"
msgid "Contributors"
msgstr "Pagalbininkai"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Multimedijos tvarkymo ir perklausos programa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2964,7 +2838,7 @@ msgstr ""
"Autoriaus teisės © 2005–{1} Kiti\n"
"Autoriaus teisės © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "„Banshee“ programos tinklalapis"
@@ -2973,13 +2847,8 @@ msgid "Important tasks are running"
msgstr "Vykdomos svarbios užduotys"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
-msgid ""
-"Closing Banshee now will cancel any currently running tasks. They cannot be "
-"resumed automatically the next time Banshee is run."
-msgstr ""
-"Jeigu dabar užversite „Banshee“ programą, bus nutrauktos visos šiuo metu "
-"vykdomos užduotys. Jų negalima automatiškai pratęsti kitą kartą paleidus "
-"„Banshee“."
+msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run."
+msgstr "Jeigu dabar užversite „Banshee“ programą, bus nutrauktos visos šiuo metu vykdomos užduotys. Jų negalima automatiškai pratęsti kitą kartą paleidus „Banshee“."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
msgid "Quit Anyway"
@@ -2994,12 +2863,8 @@ msgid "Make Banshee the default media player?"
msgstr "Padaryti „Banshee“ programą numatytuoju medijos leistuvu?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
-msgid ""
-"Currently another program is configured as the default media player. Would "
-"you prefer Banshee to be the default?"
-msgstr ""
-"Šiuo metu numatytuoju medijos leistuvu nustatyta kita programa. Ar "
-"norėtumėte, kad numatytoji būtų „Banshee“?"
+msgid "Currently another program is configured as the default media player. Would you prefer Banshee to be the default?"
+msgstr "Šiuo metu numatytuoju medijos leistuvu nustatyta kita programa. Ar norėtumėte, kad numatytoji būtų „Banshee“?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
@@ -3070,107 +2935,92 @@ msgid "Import a playlist"
msgstr "Importuoti grojaraštį"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Iš naujo skenuoti fonoteką"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Iš naujo skenuoti fonotekos aplanką"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Atverti _vietą..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Atverti grojimui nutolusią vietą"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "Iš_eiti"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Baigti „Banshee“ programos darbą"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Taisa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Nustatymai"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Keisti asmeninius nustatymus"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "Įr_ankiai"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Iš naujo skenuoti fonoteką"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Iš naujo skenuoti fonotekos aplanką"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Pakartotinio skaitymo veiksmas pašalins {0} takelį iš jūsų muzikos fonotekos."
-msgstr[1] ""
-"Pakartotinio skaitymo veiksmas pašalins {0} takelius iš jūsų muzikos "
-"fonotekos."
-msgstr[2] ""
-"Pakartotinio skaitymo veiksmas pašalins {0} takelių iš jūsų muzikos "
-"fonotekos."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Žinynas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Turinys"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Sudėtingesnė kolekcijos paieška"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Išmokite sudėtingesnių ieškojimo savo medijos kolekcijoje būdų"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "„Banshee“ programos _tinklalapis"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Aplankyti „Banshee“ programos tinklalapį"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Prisidėkite"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Tapkite vienu iš „Banshee“ programos tobulintojų"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Versijos informacija"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Žiūrėti išsamią versijos ir konfigūracijos informaciją"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importuoti grojaraštį"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Grojaraščiai"
@@ -3450,9 +3300,7 @@ msgstr "Įdėti į _grojaraštį"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
-msgstr ""
-"Pridėti pasirinktus elementus prie grojaraščio arba sukurti naują grojaraštį "
-"iš pasirinktų elementų"
+msgstr "Pridėti pasirinktus elementus prie grojaraščio arba sukurti naują grojaraštį iš pasirinktų elementų"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
@@ -3492,7 +3340,7 @@ msgstr "Negrįžtamai ištrinti pasirinktą (-us) elementą (-us) iš laikmenos"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3529,14 +3377,12 @@ msgstr "Nepavyko rasti aplanko."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:536
msgid "Please check that the track's location is accessible by the system."
-msgstr ""
-"Įsitikinkite, kad sistema turi prieigą prie vietos, kurioje yra šis takelis."
+msgstr "Įsitikinkite, kad sistema turi prieigą prie vietos, kurioje yra šis takelis."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the selected {0} items?"
+msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
msgstr[0] "Ar tikrai norite negrįžtamai ištrinti šį {0} elementą?"
msgstr[1] "Ar tikrai norite negrįžtamai ištrinti {0} pasirinktus elementus?"
msgstr[2] "Ar tikrai norite negrįžtamai ištrinti {0} pasirinktų elementų?"
@@ -3553,38 +3399,22 @@ msgstr "Pašalinti pasirinktus elementus iš {0}?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
-msgid_plural ""
-"Are you sure you want to remove the selected {0} items from your {1}?"
+msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
msgstr[0] "Ar tikrai norite iš {1} pašalinti {0} pasirinktą elementą?"
msgstr[1] "Ar tikrai norite iš {1} pašalinti {0} pasirinktus elementus?"
msgstr[2] "Ar tikrai norite iš {1} pašalinti {0} pasirinktų elementų?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Ar tikrai norite tęsti?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Pašalinti takelius"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "_Rinkinio albumo atlikėjas:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
-msgid ""
-"Check this if this track is part of an album with tracks by various artists"
-msgstr ""
-"Pažymėkite, jei šis takelis priklauso albumui, kuriame yra įvairių atlikėjų "
-"takeliai"
+#: ../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 "Pažymėkite, jei šis takelis priklauso albumui, kuriame yra įvairių atlikėjų takeliai"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
-msgid ""
-"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 ""
-"Ši reikšmė įtakos šio albumo rikiavimą; jeigu įvesite „Įvairūs atlikėjai“, "
-"tuomet albumas bus rodomas su kitais albumai, prasidedančiais raide „Į“."
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
+msgid "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 "Ši reikšmė įtakos šio albumo rikiavimą; jeigu įvesite „Įvairūs atlikėjai“, tuomet albumas bus rodomas su kitais albumai, prasidedančiais raide „Į“."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
msgid "Basic Details"
@@ -3645,19 +3475,19 @@ msgstr "Nustatyti visus disko numerius ir skaičius į šias reikšmes"
msgid "_Disc Number:"
msgstr "_Disko numeris:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Nustatyti visus metus į šią reikšmę"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Metai:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Nustatyti visus įvertinimus į šią reikšmę"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "Į_vertinimas:"
@@ -3721,7 +3551,7 @@ msgstr "Nustatyti visus komentarus į šią reikšmę"
msgid "Co_mment:"
msgstr "_Komentaras:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Žinynas"
@@ -3729,7 +3559,7 @@ msgstr "Žinynas"
msgid "Lyrics"
msgstr "Dainų žodžiai"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Pereiti prie kito takelio ir taisyti jo pavadinimą"
@@ -3852,52 +3682,48 @@ msgstr "Failo dydis:"
msgid "bytes"
msgstr "baitai"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Takelių rengyklė"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Takelio savybės"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Rodyti ankstesnį takelį"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Rodyti kitą takelį"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Pavadinimas:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Atlikėjas:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Albumas:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Sinchronizuoti visų laukelių _reikšmes"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
-msgid ""
-"Apply the values of all common fields set for this track to all of the "
-"tracks selected in this editor"
-msgstr ""
-"Pritaikyti visų šio takelio bendrų laukelių reikšmes visiems šioje "
-"rengyklėje parinkties takeliams"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
+msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
+msgstr "Pritaikyti visų šio takelio bendrų laukelių reikšmes visiems šioje rengyklėje parinkties takeliams"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Taisomas {0} iš {1} elementų</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3905,15 +3731,14 @@ msgstr[0] "Įrašyti {0} iš {1} atverto takelio pakeitimus?"
msgstr[1] "Įrašyti {0} iš {1} atvertų takelių pakeitimus?"
msgstr[2] "Įrašyti {0} iš {1} atvertų takelių pakeitimus?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Užverti _neįrašant"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
-msgstr ""
-"Jeigu neįrašysite, pakeitimai, atlikti per {0}, bus visam laikui prarasti."
+msgstr "Jeigu neįrašysite, pakeitimai, atlikti per {0}, bus visam laikui prarasti."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62
msgid "_View"
@@ -3961,19 +3786,19 @@ msgstr[2] "Vykdomos aktyvios užduotys"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}iš{1} {2}, {0}publikuota{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}stotyje{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3981,56 +3806,55 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}atlieka{1} {2} {0}iš{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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}iš{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}atlieka{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Sustabdyti operaciją"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Sustabdyti {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Ši operacija dar vykdoma. Ar norite ją sustabdyti?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
-msgid ""
-"The '{0}' operation is still performing work. Would you like to stop it?"
+msgid "The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "Operacija „{0}“ dar vykdoma. Ar norite ją sustabdyti?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Tęsti"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Tęsti {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Stabdoma..."
@@ -4075,12 +3899,8 @@ msgid "<big><b>Import Media to Library</b></big>"
msgstr "<big><b>Importuoti mediją į fonoteką</b></big>"
#: ../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."
-msgstr ""
-"Jūsų fonoteka yra tuščia. Galite importuoti naujus muzikos ir vaizdo įrašų "
-"failus į fonoteką dabar arba pasirinkti tai padaryti vėliau."
+msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later."
+msgstr "Jūsų fonoteka yra tuščia. Galite importuoti naujus muzikos ir vaizdo įrašų failus į fonoteką dabar arba pasirinkti tai padaryti vėliau."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
msgid "Import _from:"
@@ -4103,7 +3923,7 @@ msgstr "Nėra prieinamų profilių"
msgid "Advanced"
msgstr "Išsamiau"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Konfigūruojama {0}"
@@ -4168,89 +3988,86 @@ msgstr "Atverti rengyklėje"
msgid "Create and save"
msgstr "Sukurti ir įrašyti"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Naršyklės turinys"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Konfigūruoti naršyklėje prieinamus filtrus"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Rodyti atlikėjų filtrą"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Rodyti atlikėjų, pagal kuriuos filtruoti, sąrašą"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Rodyti visus atlikėjus"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Rodyti visus atlikėjus atlikėjų filtre"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Rodyti albumų atlikėjus"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Rodyti tik albumų atlikėjus, ne pavienių takelių atlikėjus"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Rodyti žanrų filtrą"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Rodyti žanrų, pagal kuriuos filtruoti, sąrašą"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Rodyti metų filtrą"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Rodyti metų, pagal kuriuos filtruoti, sąrašą"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Nenustatyta"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Naršyklė kairėje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Rodyti atlikėjų / albumų naršyklę takelių sąrašo kairėje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Naršyklė viršuje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Rodyti atlikėjų / albumų naršyklę virš takelių sąrašo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Rodyti naršyklę"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Rodyti arba slėpti atlikėjų / albumų naršyklę"
#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
-msgid ""
-"This page is blocked because it is probably not the one you are looking for!"
-msgstr ""
-"Šis puslapis yra užblokuotas, kadangi jis veikiausiai nėra tas, kurio "
-"ieškojote!"
+msgid "This page is blocked because it is probably not the one you are looking for!"
+msgstr "Šis puslapis yra užblokuotas, kadangi jis veikiausiai nėra tas, kurio ieškojote!"
#. Translators: {0} is the URL of the web page that was requested
#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
@@ -4258,12 +4075,12 @@ msgstr ""
msgid "The security certificate for {0} is invalid."
msgstr "{0} saugos liudijimas yra netinkamas."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Įkeliama {0}..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4271,20 +4088,24 @@ msgstr ""
"Įdėkite\n"
"diską"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Išvalyti paiešką"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Prasukti"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Negrojama"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Jungiamasi..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Kuriamas buferis"
@@ -4324,39 +4145,29 @@ msgstr "Palaiko albumų viršelius"
msgid "Supports photos"
msgstr "Palaiko nuotraukas"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "Takelio trukmė lygi nuliui"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "Sinchronizuojamas iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Ruošiamasi sinchronizuoti..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Pridedamas {0} takelis iš {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Atnaujinami metaduomenys {0} takelyje iš {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Šalinamas {0} takelis iš {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Išvaloma, šalinamas {0} netinkamas takelis iš {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Įrašoma medijos duomenų bazė"
@@ -4365,7 +4176,7 @@ msgstr "Įrašoma medijos duomenų bazė"
msgid "Sync {0}"
msgstr "Sinchronizuoti {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Įrenginiai"
@@ -4374,44 +4185,40 @@ msgstr "Įrenginiai"
msgid "Device Properties"
msgstr "Įrenginio savybės"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Produktas"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Pardavėjas"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Įkeliama {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Taip"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Ne"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
#, csharp-format
-msgid ""
-"The {0} format is not supported by the device, and no converter was found to "
-"convert it"
-msgstr ""
-"Įrenginys nepalaiko formato {0}, taip pat nerasta jį konvertuoti galinti "
-"programa."
+msgid "The {0} format is not supported by the device, and no converter was found to convert it"
+msgstr "Įrenginys nepalaiko formato {0}, taip pat nerasta jį konvertuoti galinti programa."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
msgid "File format conversion support is not available"
msgstr "Šio formato konvertavimas nepalaikomas"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
msgid "Error converting file"
msgstr "Klaida konvertuojant failą"
@@ -4420,19 +4227,19 @@ msgid "Sync when first plugged in and when the libraries change"
msgstr "Sinchronizuoti pirmą kartą prijungus arba pasikeitus fonotekai"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
-msgid ""
-"Begin synchronizing the device as soon as the device is plugged in or the "
-"libraries change."
-msgstr ""
-"Pradėti sinchronizuoti įrenginį, vos tik prijungiamas įrenginys arba pakinta "
-"fonoteka."
+msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change."
+msgstr "Pradėti sinchronizuoti įrenginį, vos tik prijungiamas įrenginys arba pakinta fonoteka."
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
msgid "Sync Preferences"
msgstr "Sinchronizuoti nustatymus"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Sinchronizuoti"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4440,9 +4247,13 @@ msgstr[0] "Sinchronizuojant bus pašalintas {0} takelis iš jūsų įrenginio."
msgstr[1] "Sinchronizuojant bus pašalinti {0} takeliai iš jūsų įrenginio."
msgstr[2] "Sinchronizuojant bus pašalinta {0} takelių iš jūsų įrenginio."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Sinchronizuoti"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Ar tikrai norite tęsti?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Pašalinti takelius"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4515,12 +4326,12 @@ msgstr "Importuoti įsigytą muziką"
msgid "Disconnect"
msgstr "Atsijungti"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Atjungiama {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Nepavyko atjungti {0}: {1}"
@@ -4654,13 +4465,12 @@ msgstr "Jungtinė Karalystė (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Jungtinės Valstijos (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Ieškoti „Amazon“ MP3 parduotuvėje"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Kaip jūsų pirkiniai prisideda prie GNOME"
@@ -4695,13 +4505,8 @@ msgstr[1] "Sujungti {0} pasirinktus diskus į vieną knygą?"
msgstr[2] "Sujungti {0} pasirinktų diskų į vieną knygą?"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
-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 ""
-"Bus užtikrinta, kad visi diskų numeriai nustatyti tinkamai, tuomet bus "
-"nustatytos visų šiame diske esančių takelių autoriaus ir pavadinimų reikšmės "
-"į nurodytąsias žemiau"
+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 "Bus užtikrinta, kad visi diskų numeriai nustatyti tinkamai, tuomet bus nustatytos visų šiame diske esančių takelių autoriaus ir pavadinimų reikšmės į nurodytąsias žemiau"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:153
msgid "Author:"
@@ -4767,31 +4572,25 @@ msgstr "_Aptikti"
msgid "T_ap"
msgstr "_Stuksenti"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Leisti „Banshee“ bandyti automatiškai aptikti šios dainos BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Groti šią dainą"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
-msgstr ""
-"Spaudykite šį mygtuką pagal ritmą, jeigu norite nustatyti šios dainos BPM "
-"rankiniu būdu"
+msgstr "Spaudykite šį mygtuką pagal ritmą, jeigu norite nustatyti šios dainos BPM rankiniu būdu"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
msgstr "_Automatiškai aptikti visų dainų BPM"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
-msgid ""
-"Detect beats per minute (BPM) for all songs that don't already have a value "
-"set"
-msgstr ""
-"Aptikti visų dainų, kurios neturi nustatytos šios reikšmės, dūžių per minutę "
-"(BPM) skaičių"
+msgid "Detect beats per minute (BPM) for all songs that don't already have a value set"
+msgstr "Aptikti visų dainų, kurios neturi nustatytos šios reikšmės, dūžių per minutę (BPM) skaičių"
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
msgid "Downloading Cover Art"
@@ -4820,19 +4619,13 @@ msgstr "Atgal"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
msgid ""
-"iTunes® 7 introduced new compatibility issues and currently only works with "
-"other iTunes® 7 clients.\n"
+"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n"
"\n"
-"No third-party clients can connect to iTunes® music shares anymore. This is "
-"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
-"the unfortunate inconvenience."
+"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience."
msgstr ""
-"Išleidus „iTunes® 7“ versiją, atsirado naujų suderinamumo problemų ir šiuo "
-"metu ji veikia tik su kitais „iTunes® 7“ klientais.\n"
+"Išleidus „iTunes® 7“ versiją, atsirado naujų suderinamumo problemų ir šiuo metu ji veikia tik su kitais „iTunes® 7“ klientais.\n"
"\n"
-"Jokie kiti klientai prisijungti prie „iTunes®“ muzikos viešinių nebegali. "
-"„Apple“ tyčia „iTunes® 7“ įdiegė šį apribojimą ir mums belieka tik "
-"atsiprašyti dėl šių nepatogumų."
+"Jokie kiti klientai prisijungti prie „iTunes®“ muzikos viešinių nebegali. „Apple“ tyčia „iTunes® 7“ įdiegė šį apribojimą ir mums belieka tik atsiprašyti dėl šių nepatogumų."
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
msgid "Common reasons for connection failures:"
@@ -4890,11 +4683,11 @@ msgstr "Prisijungti"
msgid "Connecting to {0}"
msgstr "Jungiamasi prie {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Pridėti nutolusį DAAP serverį"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Pridėti naują nutolusį DAAP serverį"
@@ -5021,26 +4814,16 @@ msgid "Duplicate Albums"
msgstr "Besidubliuojantys albumai"
#: ../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 ""
-"Rodomi albumai, kurie veikiausiai turėtų būti sujungti. Kiekvienoje eilutėje "
-"spustelėkite pageidaujamą pavadinimą, taip jį išryškindami, arba pašalinkite "
-"pažymėjimą, jei nenorite nieko daryti."
+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 "Rodomi albumai, kurie veikiausiai turėtų būti sujungti. Kiekvienoje eilutėje spustelėkite pageidaujamą pavadinimą, taip jį išryškindami, arba pašalinkite pažymėjimą, jei nenorite nieko daryti."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
msgid "Duplicate Artists"
msgstr "Besidubliuojantys atlikėjai"
#: ../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 ""
-"Rodomi atlikėjai, kurie veikiausiai turėtų būti sujungti. Kiekvienoje "
-"eilutėje spustelėkite pageidaujamą vardą, taip jį išryškindami, arba "
-"pašalinkite pažymėjimą, jei nenorite nieko daryti."
+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 "Rodomi atlikėjai, kurie veikiausiai turėtų būti sujungti. Kiekvienoje eilutėje spustelėkite pageidaujamą vardą, taip jį išryškindami, arba pašalinkite pažymėjimą, jei nenorite nieko daryti."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
msgid "Fix Music Metadata..."
@@ -5063,13 +4846,8 @@ msgid "Duplicate Genres"
msgstr "Besidubliuojantys žanrai"
#: ../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 ""
-"Rodomi žanrai, kurie veikiausiai turėtų būti sujungti. Kiekvienoje eilutėje "
-"spustelėkite pageidaujamą žanrą, taip jį išryškindami, arba pašalinkite "
-"pažymėjimą, jei nenorite nieko daryti."
+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 "Rodomi žanrai, kurie veikiausiai turėtų būti sujungti. Kiekvienoje eilutėje spustelėkite pageidaujamą žanrą, taip jį išryškindami, arba pašalinkite pažymėjimą, jei nenorite nieko daryti."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
msgid " and "
@@ -5151,10 +4929,6 @@ msgstr "Klaida gaunant elemento informaciją iš interneto archyvo"
msgid "Description"
msgstr "Aprašymas"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Kūrėjas:"
@@ -5168,7 +4942,7 @@ msgid "Location:"
msgstr "Vieta:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Data:"
@@ -5181,7 +4955,7 @@ msgid "Publisher:"
msgstr "Leidėjas:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Reikšminiai žodžiai:"
@@ -5256,16 +5030,16 @@ msgstr "{0} skyrė {1} {2}"
msgid "Write your own review"
msgstr "Parašyti savo apžvalgą"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Kolekcija:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Neprivaloma užklausa"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Rikiuoti pagal:"
@@ -5356,16 +5130,8 @@ msgid "Examples:"
msgstr "Pavyzdžiai:"
#: ../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 "
-"library, we provide free access to researchers, historians, scholars, and "
-"the general public."
-msgstr ""
-"Interneto archyvas, 501(c)(3) ne pelno siekianti organizacija, kuria "
-"žiniatinklio svetainių ir kitų skaitmeninės formos kultūros kūrinių "
-"skaitmeninę biblioteką. Kaip ir tradicinė biblioteka, mes suteikiame laisvą "
-"prieigą tyrinėtojams, istorikams, humanitarams ir visuomenei apskritai."
+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 library, we provide free access to researchers, historians, scholars, and the general public."
+msgstr "Interneto archyvas, 501(c)(3) ne pelno siekianti organizacija, kuria žiniatinklio svetainių ir kitų skaitmeninės formos kultūros kūrinių skaitmeninę biblioteką. Kaip ir tradicinė biblioteka, mes suteikiame laisvą prieigą tyrinėtojams, istorikams, humanitarams ir visuomenei apskritai."
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
msgid "Visit the Internet Archive online at archive.org"
@@ -5653,7 +5419,7 @@ msgstr "Taisyti stotį"
msgid "Station"
msgstr "Stotis"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5661,15 +5427,15 @@ msgstr[0] "{0} stotis"
msgstr[1] "{0} stotys"
msgstr[2] "{0} stočių"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Nurodykite tinkamą stoties URI"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Nurodykite stoties žanrą"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Nurodykite stoties pavadinimą"
@@ -5681,88 +5447,84 @@ msgstr "Pridėti naują radijo stotį"
msgid "Edit radio station"
msgstr "Taisyti radijo stotį"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
-msgid ""
-"Enter the Genre, Title and URL of the radio station you wish to add. A "
-"description is optional."
-msgstr ""
-"Įveskite norimos pridėti radijo stoties žanrą, pavadinimą ir URL. Nurodyti "
-"aprašymą nebūtina."
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
+msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional."
+msgstr "Įveskite norimos pridėti radijo stoties žanrą, pavadinimą ir URL. Nurodyti aprašymą nebūtina."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Stoties žanras:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Stoties pavadinimas:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "Srauto URL:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Stoties kūrėjas:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Aprašymas:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Įvertinimas:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Apdorotas {0} takelis iš {1}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Konfigūruoti Audioscrobbler įskiepį"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Aplankyti _naudotojo profilio puslapį"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Aplankyti savo Last.fm profilio puslapį"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "_Pranešti apie kūrinius, perklausytus naudojant „Banshee“ programą"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Pranešti apie kūrinius, perklausytus naudojant „Banshee“ programą"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "_Pranešti apie kūrinius, perklausytus naudojant grotuvą"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Pranešti apie kūrinius, perklausytus naudojant grotuvą"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Pasufleruoti Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Pranešimas apie kūrinius, perklausytus naudojant grotuvą"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Sufleruojama Last.FM..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Pranešama apie kūrinius, perklausytus naudojant grotuvą..."
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Apdorojamas {0} takelis iš {1}..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5820,28 +5582,28 @@ msgstr "Žiūrėti šio takelio Last.fm puslapį"
msgid "Recommend this track to someone"
msgstr "Kam nors rekomenduoti šį takelį"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5862,12 +5624,8 @@ msgid "Sign up for Last.fm"
msgstr "Registruotis Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
-msgid ""
-"Open Last.fm in a browser, giving you the option to authorize Banshee to "
-"work with your account"
-msgstr ""
-"Atverti Last.fm naršyklėje, tokiu būdu suteikiant galimybę „Banshee“ dirbti "
-"su jūsų paskyra"
+msgid "Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account"
+msgstr "Atverti Last.fm naršyklėje, tokiu būdu suteikiant galimybę „Banshee“ dirbti su jūsų paskyra"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
@@ -5893,19 +5651,19 @@ msgstr "Esate prisijungę prie Last.fm kaip naudojas <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Atsijungti nuo Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Paskutinieji patinkantys takeliai"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Paskutinieji klausyti takeliai"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Mano populiariausi atlikėjai"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} grojimų"
@@ -5995,17 +5753,17 @@ msgstr "Uždrausti takelį"
msgid "Mark current track as banned"
msgstr "Pažymėti dabartinį takelį kaip uždraustą"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "{0} gerbėjai"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Panašu į {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "_Pridėti stotį"
@@ -6021,7 +5779,7 @@ msgstr "Bendras grojimų skaičius"
msgid "New Station"
msgstr "Nauja stotis"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "Stoties _tipas:"
@@ -6175,15 +5933,15 @@ msgstr "Greitos prieigos prie jūsų medijos skydelis"
msgid "_Mini Mode"
msgstr "_Mažoji veiksena"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Visa veiksena"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Perjungti atgal į standartinę veikseną"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Pakeisti grojimo kartojimo veikseną"
@@ -6220,35 +5978,27 @@ msgstr "_Rodyti pranešimus"
msgid "Show notifications when item changes"
msgstr "Pasikeitus elementui, rodyti pranešimą"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Vis dar veikia"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
-msgid ""
-"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
-"end your session."
-msgstr ""
-"„Banshee“ programa buvo paslėpta pranešimų srityje. Norėdami užbaigti "
-"seansą, pasirinkite parinktį <i>Išeiti</i>."
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Ankstesnė"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
+msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session."
+msgstr "„Banshee“ programa buvo paslėpta pranešimų srityje. Norėdami užbaigti seansą, pasirinkite parinktį <i>Išeiti</i>."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Praleisti šį elementą"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Nepavyko parodyti pranešimo"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6257,6 +6007,10 @@ msgstr ""
"{0}atlieka{1} {2}\n"
"{0}iš{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Supaprastinti"
@@ -6285,9 +6039,7 @@ msgstr "Inicijuojamas įrenginys"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
#, csharp-format
-msgid ""
-"<i>{0}</i> is still being imported into the music library. Would you like to "
-"stop it?"
+msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?"
msgstr "<i>{0}</i> vis dar importuojama į fonoteką. Ar norite sustabdyti?"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
@@ -6311,12 +6063,8 @@ msgid "_Automatically import audio CDs when inserted"
msgstr "Įdėjus garso CD, _automatiškai juos importuoti"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
-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 ""
-"Įdėjus garso CD, automatiškai pradėti jį importuoti, jei jo nėra "
-"bibliotekoje ir jei galima rasti jo metaduomenis."
+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 "Įdėjus garso CD, automatiškai pradėti jį importuoti, jei jo nėra bibliotekoje ir jei galima rasti jo metaduomenis."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
msgid "_Eject when done importing"
@@ -6331,12 +6079,8 @@ msgid "Use error correction when importing"
msgstr "Importuojant naudoti klaidų ištaisymą"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
-msgid ""
-"Error correction tries to work around problem areas on a disc, such as "
-"surface scratches, but will slow down importing substantially."
-msgstr ""
-"Klaidų taisymu bandoma išvengti problematiškų vietų diske, pvz., paviršiaus "
-"įbrėžimų, tačiau tai gerokai sulėtins importavimą."
+msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+msgstr "Klaidų taisymu bandoma išvengti problematiškų vietų diske, pvz., paviršiaus įbrėžimų, tačiau tai gerokai sulėtins importavimą."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
@@ -6365,8 +6109,7 @@ msgstr "Nepavyko rasti takelių informacijos"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
msgid "Automatic import off since this album is already in the Music Library."
-msgstr ""
-"Automatinis importavimas išjungtas, kadangi šis albumas jau yra fonotekoje."
+msgstr "Automatinis importavimas išjungtas, kadangi šis albumas jau yra fonotekoje."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
msgid "Could not import CD"
@@ -6464,26 +6207,16 @@ msgstr "Nurodykite „iTunes“ muzikos direktoriją"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
#, csharp-format
-msgid ""
-"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
-"not able to infer the location of this directory. Please locate it."
-msgstr ""
-"„iTunes“ fonoteka nurodo jūsų muzikos aplanką kaip „{0}“, tačiau „Banshee“ "
-"nepavyko nustatyti šio aplanko buvimo vietos. Prašome jį nurodyti."
+msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it."
+msgstr "„iTunes“ fonoteka nurodo jūsų muzikos aplanką kaip „{0}“, tačiau „Banshee“ nepavyko nustatyti šio aplanko buvimo vietos. Prašome jį nurodyti."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
msgid "iTunes Media Player"
msgstr "„iTunes“ medijos leistuvas"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
-msgid ""
-"Banshee is not familiar with this version of the iTunes library format. "
-"Importing may or may not work as expected, or at all. Would you like to "
-"attempt to import anyway?"
-msgstr ""
-"„Banshee“ neatpažįsta šios „iTunes“ fonotekos formato versijos. Importuojant "
-"gali kilti nesklandumų. Žinoma, jei importavimas apskritai veiks. Ar vis "
-"tiek pageidaujate bandyti importuoti?"
+msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?"
+msgstr "„Banshee“ neatpažįsta šios „iTunes“ fonotekos formato versijos. Importuojant gali kilti nesklandumų. Žinoma, jei importavimas apskritai veiks. Ar vis tiek pageidaujate bandyti importuoti?"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
@@ -6516,8 +6249,7 @@ msgstr "Leisti po"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
msgid "Add selected songs after the currently playing track, album, or artist"
-msgstr ""
-"Pridėti pasirinktas dainas po šiuo metu leidžiamo takelio, albumo ar atlikėjo"
+msgstr "Pridėti pasirinktas dainas po šiuo metu leidžiamo takelio, albumo ar atlikėjo"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
msgid "Current Track"
@@ -6533,8 +6265,7 @@ msgstr "Dabartinio albumo"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
msgid "Add selected songs to the play queue after the currently playing album"
-msgstr ""
-"Įtraukti pasirinktas dainas į paleidimo eilę po šiuo metu leidžiamo albumo"
+msgstr "Įtraukti pasirinktas dainas į paleidimo eilę po šiuo metu leidžiamo albumo"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
msgid "Current Artist"
@@ -6542,8 +6273,7 @@ msgstr "Dabartinio atlikėjo"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
msgid "Add selected songs to the play queue after the currently playing artist"
-msgstr ""
-"Įtraukti pasirinktas dainas į paleidimo eilę po šiuo metu grojančio atlikėjo"
+msgstr "Įtraukti pasirinktas dainas į paleidimo eilę po šiuo metu grojančio atlikėjo"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
@@ -6655,16 +6385,16 @@ msgstr[0] "{0} epizodas"
msgstr[1] "{0} epizodai"
msgstr[2] "{0} epizodų"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Niekada neatnaujinta"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Atnaujinta {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Atnaujinta {0}"
@@ -6747,7 +6477,7 @@ msgstr "Aplankyti tinklalapį"
msgid "Add Podcast"
msgstr "Pridėti tinklalaidę"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
@@ -6755,11 +6485,11 @@ msgstr[0] "Ištrinti failą"
msgstr[1] "Ištrinti failus"
msgstr[2] "Ištrinti failus"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "Netinkamas URL"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "Netinkamas tinklalaidės URL."
@@ -6767,69 +6497,67 @@ msgstr "Netinkamas tinklalaidės URL."
msgid "Episode Details"
msgstr "Epizodo informacija"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Periodiškai ieškoti naujų epizodų"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
-msgid ""
-"If checked, Banshee will check every hour to see if this podcast has new "
-"episodes"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
+msgid "If checked, Banshee will check every hour to see if this podcast has new episodes"
msgstr "Jei pažymėta, „Banshee“ kas valandą ieškos naujų epizodų"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Atsiųsti naujus epizodus"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Archyvuoti visus epizodus, išskyrus naujausiąjį"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Aprašymo nėra"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Pavadinimas:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Tinklalapis:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Aplankyti"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Prenumeratos parinktys"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "Sklaidos kanalo URL:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Paskutinįkart atnaujinta:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Kategorija:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Autoriaus teisės:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Tinklalaidė:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6839,8 +6567,7 @@ msgid "Subscribe to New Podcast"
msgstr "Užsisakyti naują tinklalaidę"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
-msgid ""
-"Please enter the URL of the podcast to which you would like to subscribe."
+msgid "Please enter the URL of the podcast to which you would like to subscribe."
msgstr "Įveskite pageidaujamos užsisakyti tinklalaidės URL."
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
@@ -6947,22 +6674,22 @@ msgstr "spustelėti"
msgid "menu"
msgstr "meniu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Paslėpti <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "{0} aptiko kritinę klaidą"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Klaidos informacija"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Buvo išvesta neapdorota išimtis: "
@@ -7116,15 +6843,15 @@ msgstr "prasideda"
msgid "ends with"
msgstr "baigiasi"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Prisijungimas prie Last.fm paskyros"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Įveskite savo Last.fm paskyros informaciją."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Įrašyti ir prisijungti"
@@ -7165,8 +6892,7 @@ msgid "The API key used by this application is invalid."
msgstr "Šios programos naudojamas API raktas yra netinkamas."
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
-msgid ""
-"The streaming system is offline for maintenance, please try again later."
+msgid "The streaming system is offline for maintenance, please try again later."
msgstr "Transliavimo sistema dėl profilaktikos išjungta, bandykite vėliau."
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
@@ -7206,12 +6932,8 @@ msgid "This type of request is no longer supported"
msgstr "Šio tipo užklausa nebepalaikoma"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
-msgid ""
-"Your IP has made too many requests in a short period, exceeding our API "
-"guidelines"
-msgstr ""
-"Iš jūsų IP adreso per trumpą laiko tarpą įvykdyta per daug užklausų; "
-"daugiau, nei numato mūsų API rekomendacijos"
+msgid "Your IP has made too many requests in a short period, exceeding our API guidelines"
+msgstr "Iš jūsų IP adreso per trumpą laiko tarpą įvykdyta per daug užklausų; daugiau, nei numato mūsų API rekomendacijos"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
msgid "There was an unknown error."
@@ -7246,3 +6968,4 @@ msgstr "Prisijungta prie Last.fm"
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:103
msgid "Unknown Podcast"
msgstr "Nežinoma tinklalaidė"
+
diff --git a/po/lv.po b/po/lv.po
index 09ba40a..20f9456 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2,25 +2,25 @@
# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
-#
# Raivis Dejus <orvils at gmail.com>, 2007.
-# Rūdolfs Mazurs <rudolfs.mazurs at gmail.com>, 2011, 2012, 2013.
+# Rūdolfs Mazurs <rudolfs.mazurs at gmail.com>, 2011, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: lv\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-16 09:51+0000\n"
-"PO-Revision-Date: 2013-09-21 23:59+0300\n"
+"POT-Creation-Date: 2012-05-01 12:53+0000\n"
+"PO-Revision-Date: 2012-05-27 15:22+0300\n"
"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs at gmail.com>\n"
-"Language-Team: Latvian <lata-l10n at googlegroups.com>\n"
-"Language: lv\n"
+"Language-Team: Latviešu <lata-l10n at googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
"2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.2\n"
+"Language: lv\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
#: ../data/addin-xml-strings.cs:8
@@ -175,11 +175,11 @@ msgstr "Lejupielādēt un importēt eMusic pirktu mūziku."
#. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
#: ../data/addin-xml-strings.cs:73
msgid "File System Preview Queue"
-msgstr "Datņu sistēmas priekšskatīšanas rinda"
+msgstr "Failu sistēmas priekšskatīšanas rinda"
#: ../data/addin-xml-strings.cs:74
msgid "Preview files without importing to your library."
-msgstr "Priekšskatīt datnes, neimportējot tos fonotēkā."
+msgstr "Priekšskatīt failus, neimportējot tos fonotēkā."
#. ../src/Extensions/Banshee.Fixup/Banshee.Fixup.addin.xml
#: ../data/addin-xml-strings.cs:78
@@ -346,7 +346,7 @@ msgstr "Torrent lejupielādētājs"
#: ../data/addin-xml-strings.cs:159
msgid "Support downloading BitTorrent files from podcasts."
-msgstr "Atbalstīt BitTorrent datņu un podraižu lejupielādēšanu."
+msgstr "Atbalstīt BitTorrent failu un podraižu lejupielādēšanu."
#. ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
#: ../data/addin-xml-strings.cs:163
@@ -479,7 +479,7 @@ msgid ""
"larger files at lower bitrates."
msgstr ""
"Īpašnieka un vecāks, bet arī populārs ar zudumiem audio formāts, kurš veido "
-"lielākas datnes ar mazāku bitu ātrumu."
+"lielākus failus ar mazāku bitu ātrumu."
#: ../data/audio-profiles/mp3-lame.xml.in.h:3
msgid "Encoding Mode"
@@ -525,7 +525,7 @@ msgid ""
"lower file size than MP3."
msgstr ""
"Vorbis ir atvērtā pirmkoda, ar zudumiem audio kodeks ar augstas kvalitātes "
-"izvadu un mazākiem datņu izmēriem kā MP3."
+"izvadu un mazākiem failu izmēriem kā MP3."
#: ../data/audio-profiles/vorbis.xml.in.h:3
msgid "Audio quality"
@@ -569,7 +569,7 @@ msgstr "Zudumradošs režīms"
#: ../data/audio-profiles/wavpack.xml.in.h:9
msgid "Store MD5 sum in the file"
-msgstr "Saglabāt MD5 summu datnē"
+msgstr "Saglabāt MD5 summu failā"
#: ../data/audio-profiles/wavpack.xml.in.h:10
msgid "Extra processing"
@@ -605,7 +605,7 @@ msgid ""
"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
msgstr ""
"Īpašnieka zudumradošs audio formāts ar augstas kvalitātes izvadi ar mazāku "
-"datnes izmēru kā MP3. 96 kbps WMA ir līdzvērtīgs 128 kbps MP3."
+"faila izmēru kā MP3. 96 kbps WMA ir līdzvērtīgs 128 kbps MP3."
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Use a variable bitrate"
@@ -616,15 +616,15 @@ msgid "Audio Quality"
msgstr "Audio kvalitāte"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:193
msgid "Media Player"
msgstr "Mediju atskaņotājs"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Banshee mūzikas atskaņotājs"
@@ -632,14 +632,6 @@ msgstr "Banshee mūzikas atskaņotājs"
msgid "Play and organize your media collection"
msgstr "Atskaņo un organizē mediju kolekciju"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"Video;Filma;Klips;Sērijas;Mediji;Atskaņotājs;DVD;Disks;Mp3;Audio;CD;MTP;Podrai"
-"de;DAAP;Repertuārs;Ipod;Multimediji;Kolekcija;Mūzika;Radio;"
-
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
@@ -767,18 +759,18 @@ msgstr "Neizdevās izveidot sitienu minūtē noteikšanas spraudni"
msgid "Could not initialize GStreamer library"
msgstr "Nevar inicializēt GStreamer bibliotēku"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
msgid "Unknown Error"
msgstr "Nezināma kļūda"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
msgid "_Enable ReplayGain correction"
msgstr "Aktivēt R_eplayGain kļūdu labošanu"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -786,11 +778,11 @@ msgstr ""
"Celiņiem, kuriem ir ReplayGain dati, automātiski mainīt (normalizēt) "
"atskaņošanas skaļumu"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
msgid "Enable _gapless playback"
msgstr "_Aktivēt atskaņošanu bez pauzēm"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -807,7 +799,7 @@ msgstr "Nevar izveidot transkodētāju"
msgid "Could not create encoder pipeline : {0}"
msgstr "Nevarēja izveidot iekodētāja konveijeru: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -816,10 +808,19 @@ msgstr "GStreamer# 0.10"
msgid "Could not create encoding pipeline : {0}"
msgstr "Nevarēja izveidot iekodēšanas konveijeru: {0}"
-#. Translators: verb
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
-msgid "Import"
-msgstr "Importēt"
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+msgid "_Close"
+msgstr "_Aizvērt"
+
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+msgid "Close"
+msgstr "Aizvērt"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
msgid "Can't check for updates"
@@ -886,61 +887,61 @@ msgstr "Atjauninājums ir lejupielādēts"
msgid "Check for Updates"
msgstr "Pārbaudīt atjauninājumus"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Palīdzības opcijas"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Rādīt šo palīdzību"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Rāda opcijas atskaņošanas vadīšanai"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Rādīt atskaņotā celiņa opcijas ievietošanai rindā"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Rādīt atskaņotā dziņa opcijas ievietošanai rindā"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Rādīt lietotāja saskarnes opcijas"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Rādīt opcijas izstrādātājiem un atkļūdošanai"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Rādīt visas opciju grupas"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Rādīt versijas informāciju"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Atskaņošanas vadības opcijas"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Atskaņot nākamo celiņu, ar iespēju to pārstartēt, ja ir iestatīta vērtība "
"'restart'"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
"Atskaņot iepriekšējo celiņu, ar iespēju to pārstartēt, ja ir iestatīta "
"vērtība 'restart'"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -948,27 +949,27 @@ msgstr ""
"Ja šī dziesma tiek atskaņota ilgāk kā 4 sekundes, tā tiek pārstartēta, "
"citādi – tāpat ka --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr "Automātiski sākt atskaņot jebkuru celiņu, kas ir ierindoti komandrindā"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Sākt atskaņošanu"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pauzēt atskaņošanu"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Pārslēgt atskaņošanu"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Pilnībā apturēt atskaņošanu"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -976,97 +977,97 @@ msgstr ""
"Aktivēt vai deaktivēt atskaņošanas pārtraukšanu pēc pašreizējā celiņa "
"(vērtībai jābūt 'true' vai 'false')"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Iestatiet atskaņošanas skaļumu (0-100), pielieciet priekšā +/- relatīvām "
"vērtībām"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Iet uz noteiktu vietu (sekundes, peldošs)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Pašlaik atskaņotā celiņa vērtējums (0 līdz 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Atskaņošanas dziņa vaicājuma Opcijas"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Pašreizējais atskaņotāja stāvoklis"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Pēdējais atskaņotāja stāvoklis"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Vaicāt, vai atskaņotāju var pauzēt"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Vaicāt, vai atskaņotāju var meklēt"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Atskaņotāja skaļums"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Atskaņotāja novietojums pašlaik atskaņojošā celiņā"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Atskaņotā celiņa metadatu vaicāšanas opcijas"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Izpildītāja nosaukums"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Albuma nosaukums"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Celiņa nosaukums"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Ilgums"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Celiņa numurs"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Celiņu skaits"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Diska numurs"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1077,7 +1078,7 @@ msgstr "Diska numurs"
msgid "Year"
msgstr "Gads"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1085,82 +1086,82 @@ msgstr "Gads"
msgid "Rating"
msgstr "Vērtējums"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Punkti"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Bitu ātrums"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Lietotāja saskarnes opcijas"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Esošā lietotāja saskarne aktīvajā darbvirsmā"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Ieiet pilnekrāna režīmā"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Slēpt lietotāja saskarni"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Nerādīt lietotāja saskarnē, neskatoties uz citām opcijām"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Rādīt 'importēt mediju' dialoglodziņu"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Rādīt 'par' dialoglodziņu"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Rādīt 'atvērt vietu' dialoglodziņu"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Rādīt 'iestatījumi' dialoglodziņu"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Atkļūdošanas un izstrādes opcijas"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Aktivēt vispārējas atkļūdošanas iespējas"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Aktivēt atkļūdošanas izvadi SQL vaicājumiem"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Aktivēt atkļūdošanas izvadi Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Norādīt alternatīvu datu bāzi, ko izmantot"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Forsēt saņemt trūkstošos albumu vāciņus"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Norādīt alternatīvo atslēgu, noklusēta ir /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1168,36 +1169,29 @@ msgstr ""
"Optimizēt instances, lai palaistu izņemtas; tas izveidos alternatīvu Mono."
"Addins datubāzi darba mapē"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Pilnībā deaktivēt DBus atbalstu"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
-#, csharp-format
-#| msgid "Skip loading a custom gtkrc file ({0}) if it exists"
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr "Izlaist pielāgota gtk.css datnes ({0}) ielādēšanu, ja tā eksistē"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:230
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-#| msgid "Skip loading a custom gtkrc file ({0}) if it exists"
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Pārlādēt pielāgotu gtk.css datni ({0}) katras 5 sekundes"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Izlaist pielāgota gtkrc faila ({0}) ielādēšanu, ja iespējams"
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Sekojošie palīdzības parametri nav derīgi: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Atskaņot albumu"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "Pie_vienot"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1220,24 +1214,17 @@ msgstr "Atskaņot _albumu"
msgid "Add an album to the playlist"
msgstr "Pievienot albumu repertuāram"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "atlicis {0}"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Atskaņot dziesmu"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
-msgid "Close"
-msgstr "Aizvērt"
-
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:497
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Meklēt"
@@ -1274,85 +1261,91 @@ msgstr "Žanrs"
msgid "Comment"
msgstr "Komentārs"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Nezināms albums"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Nezināms izpildītājs"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Nezināms albums"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Nezināms nosaukums"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Dažādi izpildītāji"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Straumes vieta nav atrasta"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
-msgstr "Datne nav atrasta"
+msgstr "Fails nav atrasts"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Nav atrasts kodeks, lai atskaņotu šo mediju"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
-msgstr "Datni aizsargā cipariska satura tiesību pārvaldība (DRM)"
+msgstr "Failu aizsargā cipariska satura tiesību pārvaldība (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Nezināma kļūda"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "Pā_rstartēt podraidi"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "Pā_rstartēt audio grāmatu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "Pā_rstartēt video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "Pā_rstartēt dziesmu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "Pā_rstartēt vienumu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Lēkt uz atskaņoto podraidi"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Lēkt uz atskaņoto audio grāmatu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Lēkt uz atskaņoto video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Lēkt uz atskaņoto dziesmu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Lēkt uz atskaņoto vienumu"
@@ -1372,7 +1365,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Visi albuma izpildītāji ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Visi albumi {0}"
@@ -1385,7 +1378,7 @@ msgstr "Visi izpildītāji ({0})"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs:173
#, csharp-format
msgid "File is empty so it could not be imported: {0}"
-msgstr "Datne ir tukša, tāpēc to nevar importēt — {0}"
+msgstr "Fails ir tukšs, tāpēc to nevar importēt: {0}"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:96
@@ -1477,14 +1470,14 @@ msgid "Scanning for media"
msgstr "Skenē datu nesēju"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Skenē..."
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204
#, csharp-format
msgid "Scanning ({0} files)..."
-msgstr "Skenē ({0} datnes)..."
+msgstr "Skenē ({0} failus)..."
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
msgid "Importing Media"
@@ -1502,7 +1495,7 @@ msgstr "Notiek importēšana. Vai jūs vēlaties to pārtraukt?"
msgid "Importing {0} of {1}"
msgstr "Importē {0} no {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Pārskenē {0} no {1}"
@@ -1516,7 +1509,7 @@ msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr "Uzgaidiet, kamēr vecā Banshee datubāze tiek pārnesta uz jauno formātu."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Atsvaidzina metadatus"
@@ -1592,29 +1585,12 @@ msgstr "Vieglais roks"
msgid "Techno"
msgstr "Tehno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Izņemt no fonotēkas"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
-msgid "File Organization"
-msgstr "Datņu organizēšana"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
-msgid "Co_py files to media folder when importing"
-msgstr "Im_portējot kopēt datnes uz datu nesēja mapi"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
-msgid "_Update file and folder names"
-msgstr "Atja_unināt datņu un mapju nosaukumus"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
-msgid "Rename files and folders according to media metadata"
-msgstr "Pārsaukt datnes un mapes atbilstoši metadatiem"
-
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
#, csharp-format
msgid "{0} Folder"
msgstr "{0} mape"
@@ -1678,28 +1654,29 @@ msgstr "Disku skaits"
msgid "Grouping"
msgstr "Grupējums"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Mūzika"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Meklēt mūziku"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
msgid "Miscellaneous"
msgstr "Dažādi"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "_Kārtot izpildītāja albumus pēc gada, nevis nosaukuma"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1707,91 +1684,91 @@ msgstr[0] "{0} dziesma"
msgstr[1] "{0} dziesmas"
msgstr[2] "{0} dziesmas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
msgid "Music Folder"
msgstr "Mūzikas mape"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Iecienītās"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "Dziesmas ar četrām un piecām zvaigznēm"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "Nesen iecienītās"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "Dziesmas, kas pēdējā nedēļā dzirdētas pārāk bieži"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Nesen pievienotās"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "Dziesmas, kas importētas pēdējā nedēļā"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
msgid "Recently Played"
msgstr "Nesen atskaņotās"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
msgid "Recently played songs"
msgstr "Nesen atskaņotās dziesmas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "Nenoklausīts"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "Dziesmas, kuras nav atskaņotas, vai ir izlaistas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Novārtā atstāts iecienītās"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "Iecienītās, kas nav atskaņotas jau divus mēnešus"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "Mazāk iecienītās"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
"Dziesmas, kas ir vērtētas ar vienu vai divām zvaigznēm kuras jūs bieži "
"izlaižat"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 MB ar iecienītajām"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "Datu CD ar iecienītajām dziesmām"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 minūtes ar iecienītajām"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "Audio CD ar iecienītajām dziesmām"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "Nenovērtētas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr "Dziesmas, kas nav novērtētas"
@@ -1805,22 +1782,22 @@ msgid "Importing From {0}"
msgstr "Importē no {0}"
#. Catalog.GetString ("Video Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
#: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
msgid "Videos"
msgstr "Video"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
msgid "Search your videos"
msgstr "Meklēt video"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
msgid "Produced By"
msgstr "Producējis"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
#, csharp-format
msgid "{0} video"
msgid_plural "{0} videos"
@@ -1828,19 +1805,19 @@ msgstr[0] "{0} video"
msgstr[1] "{0} video"
msgstr[2] "{0} video"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
msgid "Videos Folder"
msgstr "Video mape"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr "Video, kas novērtēti ar četrām un piecām zvaigznēm"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "Nenoskatīts"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr "Video, kuri vēl nav atskaņoti"
@@ -1873,48 +1850,55 @@ msgstr "Inicializē"
msgid ""
"Files are currently being converted to another format. Would you like to "
"stop this?"
-msgstr ""
-"Datnes šobrīd tiek konvertētas uz citu formātu. Vai vēlaties to apturēt?"
+msgstr "Faili šobrīd tiek konvertēti uz citu formātu. Vai vēlaties to apturēt?"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
msgid "Saving Metadata to File"
-msgstr "Saglabā metadatus datnēs"
+msgstr "Saglabā metadatus failos"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
msgid "Sync _metadata between library and files"
-msgstr "Sinhronizēt _metadatus starp fonotēku un datnēm"
+msgstr "Sinhronizēt _metadatus starp fonotēku un failiem"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
msgid ""
"Enable this option to have metadata in sync between your library and "
"supported media files"
msgstr ""
-"Aktivēt šo opciju, lai metadati starp fonotēku un atbalstītajām multimediju "
-"datnēm būtu sinhroni."
+"Aktivēt šo opciju, lai metadati starp fonotēku un atbalstītajiem multimediju "
+"failiem būtu sinhroni."
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
msgid "Sync _ratings between library and files"
-msgstr "Sinhronizēt _reitingus starp fonotēku un datnēm"
+msgstr "Sinhronizēt _reitingus starp fonotēku un failiem"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
msgid ""
"Enable this option to have rating metadata synced between your library and "
"supported audio files"
msgstr ""
-"Aktivēt šo opciju, lai reitingi starp fonotēku un atbalstītajām audio datnēm "
-"būtu sinhroni."
+"Aktivēt šo opciju, lai reitingi starp fonotēku un atbalstītajiem audio "
+"failiem būtu sinhroni."
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
msgid "Sync play counts between library and files"
-msgstr "Sinhronizēt atskaņojumu skaitu starp fonotēku un datnēm"
+msgstr "Sinhronizēt atskaņojumu skaitu starp fonotēku un failiem"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
msgid ""
"Enable this option to have playcount metadata synced between your library "
"and supported audio files"
msgstr ""
-"Aktivēt šo opciju, lai atskaņojumu skaiti starp fonotēku un atbalstītajām "
-"audio datnēm būtu sinhroni."
+"Aktivēt šo opciju, lai atskaņojumu skaiti starp fonotēku un atbalstītajiem "
+"audio failiem būtu sinhroni."
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67
+msgid "_Update file and folder names"
+msgstr "Atja_unināt failu un mapju nosaukumus"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68
+msgid "Rename files and folders according to media metadata"
+msgstr "Pārsaukt failus un mapes atbilstoši metadatiem"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
@@ -1963,8 +1947,8 @@ msgstr "Dzēst repertuāru"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Jauns repertuārs"
@@ -2004,9 +1988,13 @@ msgstr "Paplašinājumi"
#. General policies
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:55
msgid "File Policies"
-msgstr "Datnes politikas"
+msgstr "Faila politikas"
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+msgid "Co_py files to media folders when importing"
+msgstr "Im_portējot kopēt failus uz datu nesēja mapēm"
+
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70
msgid "Improve Banshee by sending anonymous usage data"
msgstr "Uzlabojiet Banshee, anonīmi sūtīt izmantošanas datus"
@@ -2302,7 +2290,7 @@ msgstr "izlaišanu_skaits"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
msgid "File Size"
-msgstr "Datnes izmērs"
+msgstr "Faila izmērs"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:258
@@ -2311,11 +2299,11 @@ msgstr "izmērs"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:258
msgid "filesize"
-msgstr "datnesizmers"
+msgstr "failaizmers"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
msgid "File Location"
-msgstr "Datnes atrašanās vieta"
+msgstr "Faila atrašanās vieta"
#. 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:266
@@ -2328,7 +2316,7 @@ msgstr "ceļš"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:266
msgid "file"
-msgstr "datne"
+msgstr "fails"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:266
msgid "location"
@@ -2567,7 +2555,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Nezināms"
@@ -2594,7 +2582,7 @@ msgid "Delete Smart Playlist"
msgstr "Dzēst gudro repertuāru"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Visi žanri ({0})"
@@ -2651,37 +2639,41 @@ msgstr "Kļūda"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Sīkāka informācija"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:156
msgid "Errors"
msgstr "Kļūdas"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:215
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:213
msgid "Sort Playlists By"
msgstr "Kārtot repertuāru pēc"
#. Translators: this is a noun, referring to the harddisk
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:225
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:223
msgid "Drive"
msgstr "Dzinis"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:247
+msgid "File Organization"
+msgstr "Failu organizēšana"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:248
msgid "Folder hie_rarchy"
msgstr "Mapes hie_rarhija"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File _name"
-msgstr "Datnes _nosaukums"
+msgstr "Faila _nosaukums"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:701
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "Pievieno {0} no {1} pie {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:720
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "Dzēš {0} no {1} no {2}"
@@ -2751,12 +2743,12 @@ msgid "Show:"
msgstr "Rādīt:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Visi"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Aktivēts"
@@ -2792,8 +2784,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} no {1}"
@@ -2854,20 +2846,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} biti"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Padarīt konteksta rūtī lielāku vai mazāku"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Slēpt konteksta rūti"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Gaida uz atskaņošanas sākumu..."
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Ielādē..."
@@ -2894,7 +2886,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Izlīdzinātājs"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Jauns regulējums"
@@ -2929,12 +2921,16 @@ msgstr "Uzturētāji"
msgid "Contributors"
msgstr "Veidotāji"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Īpaša multimediju pārvaldība un atskaņošana"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
+#| msgid ""
+#| "Copyright © 2005–{0} Novell, Inc.\n"
+#| "Copyright © 2005–{0} Others\n"
+#| "Copyright © 2005 Aaron Bockover"
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
"Copyright © 2005–{1} Others\n"
@@ -2944,7 +2940,7 @@ msgstr ""
"Autortiesības © 2005–{1} citi\n"
"Autortiesības © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Banshee vietne"
@@ -2991,7 +2987,7 @@ msgid "Make Banshee the Default"
msgstr "Padarīt Banshee par noklusēto"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "I_mportēt"
@@ -3001,15 +2997,15 @@ msgstr "Izvēlieties albuma vāciņa attēlu"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:47
msgid "All image files"
-msgstr "Visas attēlu datnes"
+msgstr "Visi attēlu faili"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:54
msgid "JPEG image files"
-msgstr "JPEG attēlu datnes"
+msgstr "JPEG attēlu faili"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:59
msgid "PNG image files"
-msgstr "PNG attēlu datnes"
+msgstr "PNG attēlu faili"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:45
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:103
@@ -3022,7 +3018,7 @@ msgstr "Pārlūkot..."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:64
msgid "Enter the address of the file you would like to open:"
-msgstr "Ievadiet adresi (URI) datnei, ko vēlaties atvērt:"
+msgstr "Ievadiet adresi (URI) failam, ko vēlaties atvērt:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/SeekDialog.cs:41
msgid "Seek to Position"
@@ -3049,104 +3045,92 @@ msgid "Import a playlist"
msgstr "Importēt repertuāru"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Pārskanēt fonotēku"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Pārskanēt fonotēkas mapi"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Atvērt _vietu..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Atvērt attālinātu vietni atskaņošanai"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Iziet"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Iziet no Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "R_ediģēt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Iestatījumi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Mainīt personīgos iestatījums"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Rīki"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Pārskanēt fonotēku"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Pārskanēt fonotēkas mapi"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, 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."
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "Pārsinhronizēšanas darbība no fonotēkas izņems {0} celiņu."
-msgstr[1] "Pārsinhronizēšanas darbība no fonotēkas izņems {0} celiņus."
-msgstr[2] "Pārsinhronizēšanas darbība no fonotēkas izņems {0} celiņus."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Palīdzība"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Saturs"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Paplašinātā kolekcijas meklēšanas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Apgūstiet papildus veidus, kā meklēt multimediju kolekcijā"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Bans_hee mājas lapa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Apmeklēt Banshee mājas lapu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Piedalīties"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Kļūsti par Banshee veidotāju"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Versijas informācija"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Skatīt detalizētu versijas un konfigurācijas informāciju"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importēt repertuāru"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Repertuāri"
@@ -3253,15 +3237,15 @@ msgstr "Subtitri"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
msgid "Load File..."
-msgstr "Ielādēt datni..."
+msgstr "Ielādēt failu..."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
msgid "Load subtitle file"
-msgstr "Ielādēt subtitru datni"
+msgstr "Ielādēt subtitru failu"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:79
msgid "Load Subtitle File"
-msgstr "Ielādēt subtitru datni"
+msgstr "Ielādēt subtitru failu"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:88
msgid "L_oad"
@@ -3269,7 +3253,7 @@ msgstr "I_elādēt"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:97
msgid "Subtitle files"
-msgstr "Subtitru datnes"
+msgstr "Subtitru fails"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:128
#, csharp-format
@@ -3468,7 +3452,7 @@ msgstr "Pilnībā izdzēst izvēlētos vienumus no uzglabāšanas vietas"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3534,25 +3518,17 @@ msgstr[0] "Vai tiešām vēlaties izņemt izvēlēto vienumu no {1}?"
msgstr[1] "Vai tiešām vēlaties izņemt izvēlētos {0} vienumus no {1}?"
msgstr[2] "Vai tiešām vēlaties izņemt izvēlētos {0} vienumus no {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Vai tiešām vēlaties turpināt?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Izņemt celiņus"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Kom_pilācijas albuma izpildītājs:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Pārbaudiet, vai šis celiņš ir daļa no albuma, kuru izpilda dažādi izpildītāji"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3619,19 +3595,19 @@ msgstr "Iestatīt visu disku numuru un skaitu uz šīm vērtībām"
msgid "_Disc Number:"
msgstr "_Diska nosaukums:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Iestatīt visus gadus uz šo vērtību"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Gads:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Iestatīt visus vērtējumus uz šo vērtību"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "Vē_rtējums:"
@@ -3695,7 +3671,7 @@ msgstr "Iestatīt visus komentārus uz šo vērtību"
msgid "Co_mment:"
msgstr "Ko_mentārs:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Palīdzība"
@@ -3703,7 +3679,7 @@ msgstr "Palīdzība"
msgid "Lyrics"
msgstr "Dziesmas vārdi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Doties uz nākamo celiņu un rediģēt tā nosaukumu"
@@ -3745,7 +3721,7 @@ msgstr "Kārtošanas albuma nosaukums:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:185
msgid "File Name:"
-msgstr "Datnes nosaukums:"
+msgstr "Faila nosaukums:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:186
msgid "Directory:"
@@ -3819,46 +3795,46 @@ msgstr "Punkti:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:247
msgid "File Size:"
-msgstr "Datnes izmērs:"
+msgstr "Faila izmērs:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:248
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61
msgid "bytes"
msgstr "baiti"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Celiņa redaktors"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Celiņa īpašības"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Rādīt iepriekšējo celiņu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Rādīt nākamo celiņu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Nosaukums:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Izpildītājs:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Albums:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Sinhronizēt visas lauka _vērtības"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3866,12 +3842,12 @@ msgstr ""
"Pielietot vērtības visiem kopīgiem laukiem, kas iestatīti šim celiņam, "
"visiem celiņiem, kas ir atlasīti šajā redaktorā"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Rediģē vienumu {0} no {1}</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3879,11 +3855,11 @@ msgstr[0] "Saglabāt izmaiņas, kas veiktas {0} ar {1} atvērta celiņa?"
msgstr[1] "Saglabāt izmaiņas, kas veiktas ar {0} no {1} atvērtajiem celiņiem?"
msgstr[2] "Saglabāt izmaiņas, kas veiktas ar {0} no {1} atvērtajiem celiņiem?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Aiz_vērt bez saglabāšanas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr ""
@@ -3936,19 +3912,19 @@ msgstr[2] "Darbojas aktīvi uzdevumi"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}no{1} {2} {0}publicēts{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}radio{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3956,78 +3932,78 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}izpilda{1} {2} {0}no{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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}no{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}izpilda{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Apturēt darbību"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Apturēt {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Šī darbība vēl joprojām tiek izpildīta. Vai vēlaties to apturēt?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "Darbība {0} vēl joprojām tiek izpildīta. Vai vēlaties to apturēt?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Turpināt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Turpināt {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Aptur..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:45
msgid "Import Files to Library"
-msgstr "Importēt datnes fonotēkā"
+msgstr "Importēt failus fonotēkā"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:48
msgid "Media Files"
-msgstr "Multimediju datnes"
+msgstr "Multimediju faili"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:59
msgid "Local Files"
-msgstr "Lokālās datnes"
+msgstr "Lokālie faili"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:59
msgid "Files"
-msgstr "Datnes"
+msgstr "Faili"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
msgid "C_hoose Files..."
-msgstr "Iz_vēlieties datnes..."
+msgstr "Iz_vēlēties failus..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:43
msgid "Import Folders to Library"
@@ -4078,7 +4054,7 @@ msgstr "Nav pieejams neviens profils"
msgid "Advanced"
msgstr "Paplašināti"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Konfigurē {0}"
@@ -4143,80 +4119,80 @@ msgstr "Atvērt redaktorā"
msgid "Create and save"
msgstr "Izveidot un saglabāt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Pārlūka saturs"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Konfigurēt pieejamos filtrus pārlūkā"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Rādīt izpildītāju filtru"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Rādīt sarakstu ar izpildītājiem, pēc kuriem filtrēt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Rādīt visus izpildītājus"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Rādīt visus izpildītājus izpildītāju sarakstā"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Rādīt albumu izpildītājus"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Rādīt tikai albuma izpildītājus, nevis izpildītājus katram celiņam"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Rādīt žanru filtru"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Rādīt sarakstu ar žanriem, pēc kuriem filtrēt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Rādīt gadu filtru"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Rādīt sarakstu ar gadiem, pēc kuriem filtrēt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Nav iestatīts"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Pārlūkot pa kreisi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Rādīt izpildītāju/albumu pārlūku pa kreisi no celiņu saraksta"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Pārlūks augšā"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Rādīt izpildītāju/albuma pārlūku virs celiņu saraksta"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Rādīt pārlūku"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Rādīt vai slēpt izpildītāju/albuma pārlūku"
@@ -4228,15 +4204,16 @@ msgstr "Šī lapa ir bloķēta, jo tā visdrīzāk nav tā, ko jūs meklējat."
#. Translators: {0} is the URL of the web page that was requested
#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
#, csharp-format
+#| msgid "The specified resource is invalid."
msgid "The security certificate for {0} is invalid."
msgstr "{0} drošības sertifikāts nav derīgs."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Ielādē {0}..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4244,23 +4221,39 @@ msgstr ""
"Ievietot\n"
"Disku"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Attīrīt meklēšanu"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Meklēt"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Dīkstāvē"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Sazinās ar..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Buferē"
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+msgid "Volume"
+msgstr "Skaļums"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+msgid "Muted"
+msgstr "Apklusināts"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+msgid "Full Volume"
+msgstr "Pilns skaļums"
+
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
msgid "Device"
msgstr "Ierīce"
@@ -4297,39 +4290,29 @@ msgstr "Atbalsta albumu vāciņus"
msgid "Supports photos"
msgstr "Atbalsta fotogrāfijas"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463
msgid "Track duration is zero"
msgstr "Celiņa ilgums ir nulle"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
msgid "Syncing iPod"
msgstr "Sinhronizē iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
msgid "Preparing to synchronize..."
msgstr "Gatavojas sinhronizēšanai..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Pievieno celiņu {0} no {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Atjaunina metadatus celiņā {0} no {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:606
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Izņem celiņu {0} no {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Satīra, izņem nederīgos celiņus {0} no {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:659
msgid "Writing media database"
msgstr "Raksta multimediju datubāzē"
@@ -4338,40 +4321,40 @@ msgstr "Raksta multimediju datubāzē"
msgid "Sync {0}"
msgstr "Sinhronizē {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Ierīces"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:179
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
msgid "Device Properties"
msgstr "Ierīču īpašības"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
msgid "Product"
msgstr "Produkts"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
msgid "Vendor"
msgstr "Ražotājs"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Ielādē {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Jā"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Nē"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4380,13 +4363,13 @@ msgstr ""
"Šī ierīce neatbalsta formātu {0}, un netika atrasts konvertētājs, lai to "
"pārveidotu"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
-msgstr "Nav pieejama datņu formāta pārveidošana"
+msgstr "Nav pieejama failu formāta pārveidošana"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
-msgstr "Kļūda, pārveidojot datni"
+msgstr "Kļūda, pārveidojot failu"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:135
msgid "Sync when first plugged in and when the libraries change"
@@ -4405,8 +4388,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Sinhronizācijas iestatījumi"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Sinhronizēt"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4414,9 +4401,13 @@ msgstr[0] "Sinhronizēšanas darbība no ierīces izņems {0} celiņu."
msgstr[1] "Sinhronizēšanas darbība no ierīces izņems {0} celiņus."
msgstr[2] "Sinhronizēšanas darbība no ierīces izņems {0} celiņus."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Sinhronizēt"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Vai tiešām vēlaties turpināt?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Izņemt celiņus"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4489,12 +4480,12 @@ msgstr "Importēt iegādāto mūziku"
msgid "Disconnect"
msgstr "Atvienot"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Atvieno {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Neizdevās atvienot {0}: {1}"
@@ -4578,7 +4569,7 @@ msgstr "Lejupielādēt Amazon MP3 iegādāto"
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:42
msgid "Amazon MP3 Files"
-msgstr "Amazon MP3 datnes"
+msgstr "Amazon MP3 faili"
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:63
msgid "Amazon MP3 Purchase"
@@ -4587,7 +4578,7 @@ msgstr "Amazon MP3 iegādātais"
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:81
msgid "C_hoose Files"
-msgstr "Izvē_lēties datnes"
+msgstr "Izvē_lēties failus"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39
@@ -4628,13 +4619,12 @@ msgstr "Apvienotā karaliste (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Savienotās valsis (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Meklēt Amazon MP3 veikalā"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Kā iepirkumi atbalsta GNOME"
@@ -4741,15 +4731,15 @@ msgstr "Not_eikt"
msgid "T_ap"
msgstr "U_zsist"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Likt Banshee mēģināt automātiski noteikt dziesmas BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Atskaņot šo dziesmu"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Uzsitiet pa šo pogu pie uzsitiena dziesmā, lai iestatītu dziesmas BPM "
@@ -4863,11 +4853,11 @@ msgstr "Pieteikšanās"
msgid "Connecting to {0}"
msgstr "Savienojas ar {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Pievienot attālinātu DAAP serveri"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Pievienot jaunu attālinātu DAAP serveri"
@@ -4926,9 +4916,9 @@ msgstr "Atcelt visas eMusic lejupielādes?"
#, csharp-format
msgid "Transferring {0} file at {1} KB/s"
msgid_plural "Transferring {0} of {2} files at {1} KB/s"
-msgstr[0] "Pārsūta {0} no {2} datnes ar ātrumu {1} KB/s"
-msgstr[1] "Pārsūta {0} no {2} datnēm ar ātrumu {1} KB/s"
-msgstr[2] "Pārsūta {0} no {2} datņu ar ātrumu {1} KB/s"
+msgstr[0] "Pārsūta {0} no {2} faila ar ātrumu {1} KB/s"
+msgstr[1] "Pārsūta {0} no {2} failiem ar ātrumu {1} KB/s"
+msgstr[2] "Pārsūta {0} no {2} failiem ar ātrumu {1} KB/s"
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:133
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:133
@@ -4946,7 +4936,7 @@ msgstr "Importēt eMusic lejupielādes uz fonotēku"
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:61
msgid "eMusic Files"
-msgstr "eMusic datnes"
+msgstr "eMusic faili"
#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:77
msgid "eMusic Tracks"
@@ -4969,7 +4959,7 @@ msgstr "Izrakstīties no eMusic"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:57
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:58
msgid "File System Queue"
-msgstr "Datņu sistēmas rinda"
+msgstr "Failu sistēmas rinda"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
@@ -4978,7 +4968,7 @@ msgstr "Attīrīt"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:73
msgid "Remove all tracks from the file system queue"
-msgstr "Izņemt visus celiņus no datņu sistēmas rindas"
+msgstr "Izņemt visus celiņos no failu sistēmas rindas"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
@@ -4987,7 +4977,7 @@ msgstr "Attīrīt un iziet"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:80
msgid "Clear the file system queue when quitting"
-msgstr "Attīrīt datņu sistēmas rindu un iziet"
+msgstr "Attīrīt failu sistēmas rindu un iziet"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:46
msgid "Duplicate Albums"
@@ -5124,10 +5114,6 @@ msgstr "Kļūda, saņemot informāciju par vienumu no Interneta arhīva"
msgid "Description"
msgstr "Apraksts"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Veidotājs:"
@@ -5141,7 +5127,7 @@ msgid "Location:"
msgstr "Pilsēta:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Datums:"
@@ -5154,7 +5140,7 @@ msgid "Publisher:"
msgstr "Izdevējs:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Atslēgvārdi:"
@@ -5229,16 +5215,16 @@ msgstr "{0} no {1}, {2}"
msgid "Write your own review"
msgstr "Uzrakstiet savu atsauksmi"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Kolekcija:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Neobligāts vaicājums"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Kārtot pēc:"
@@ -5325,6 +5311,7 @@ msgid "Library of Congress"
msgstr "Kongresa bibliotēka"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+#| msgid "Sample"
msgid "Examples:"
msgstr "Piemēri:"
@@ -5626,7 +5613,7 @@ msgstr "Rediģēt staciju"
msgid "Station"
msgstr "Stacija"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5634,15 +5621,15 @@ msgstr[0] "{0} stacija"
msgstr[1] "{0} stacijas"
msgstr[2] "{0} stacijas"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Lūdzu, norādiet derīgu stacijas URI"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Lūdzu, norādiet stacija žanru"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Lūdzu, norādiet stacija nosaukumu"
@@ -5654,7 +5641,7 @@ msgstr "Pievienot jaunu radio staciju"
msgid "Edit radio station"
msgstr "Rediģēt radio staciju"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5662,83 +5649,86 @@ msgstr ""
"Ierakstiet žanru, virsrakstu un URL radio stacijai, ko vēlaties pievienot. "
"Apraksts nav obligāts."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Stacijas žanrs:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Stacijas nosaukums:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "Straumēšanas URL:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Stacijas izveidotājs:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Apraksts:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Vērtējums:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-#| msgid "Processing track {0} of {1} ..."
-msgid "Processed {0} of {1} tracks"
-msgstr "Apstrādāja {0} no {1} celiņiem"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Konfigurēt Audioscrobbler spraudni"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Apmeklēt lietotāja profila lap_u"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Apmeklēt savu Last.fm profila lapu"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Banshee"
msgstr "Aktivēt dzi_esmu ziņošanu no Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Banshee"
msgstr "Aktivēt dziesmu ziņošanu no Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Device"
msgstr "Aktivēt dzi_esmu ziņošanu no ierīces"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Device"
msgstr "Aktivēt dziesmu ziņošanu no ierīces"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-#| msgid "Log in to Last.fm"
-msgid "Scrobbling to Last.FM"
-msgstr "Scrobbling uz Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+#| msgid "Song Playing on Device"
+msgid "Scrobbling from device"
+msgstr "Skroblē no ierīces"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Skroblē no ierīces..."
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-#| msgid "Scrobbling from device..."
-msgid "Scrobbling to Last.FM..."
-msgstr "Scrobbling uz Last.fm..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+#| msgid "Removing track {0} of {1}"
+msgid "Processing track {0} of {1} ..."
+msgstr "Apstrādā celiņu {0} no {1} ..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5796,28 +5786,28 @@ msgstr "Skatīt šī celiņā Last.fm lapu"
msgid "Recommend this track to someone"
msgstr "Kādam ieteikt šo celiņu"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5851,8 +5841,8 @@ msgid "Log in to Last.fm"
msgstr "Pieteikties Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+#: ../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 "Jums vajadzēs atļaut Banshee darboties ar jūsu Last.fm kontu."
@@ -5869,19 +5859,19 @@ msgstr "Jūs esat pieteicies Last.fm kā lietotājs <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Atteikties no Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Nesen iemīļotās dziesmas"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Nesen atskaņotie celiņi"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Mani topa mākslinieki"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} atskaņojumi"
@@ -5971,17 +5961,17 @@ msgstr "Bloķēt celiņu"
msgid "Mark current track as banned"
msgstr "Atzīmēt tekošo celiņu kā bloķētu"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "{0} fani"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Līdzīgs {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "Pievienot st_aciju"
@@ -5997,7 +5987,7 @@ msgstr "Kopējais atskaņojumu skaits"
msgid "New Station"
msgstr "Jauna stacija"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "S_tacijas veids:"
@@ -6151,15 +6141,15 @@ msgstr "Ātrās pieejas panelis multimedijiem"
msgid "_Mini Mode"
msgstr "_Mini režīms"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Pilns režīms"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Pārslēgties atpakaļ uz pilno režīmu"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Mainīt atkārtojuma atskaņošanas režīmu"
@@ -6183,11 +6173,6 @@ msgstr "Meklēt podraides"
msgid "Search for video podcasts"
msgstr "Meklēt video podraides"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
-msgid "_Close"
-msgstr "_Aizvērt"
-
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
msgid "_Show Notifications"
msgstr "_Rādīt paziņojumus"
@@ -6196,11 +6181,11 @@ msgstr "_Rādīt paziņojumus"
msgid "Show notifications when item changes"
msgstr "Rādīt paziņojumus, kad mainās vienums"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Vēl joprojām darbojas"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6208,24 +6193,19 @@ msgstr ""
"Banshee tika aizvērts uz paziņojumu laukumu. Izmantot <i>Iziet</i> opciju, "
"lai to aizvērtu."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-#| msgid "Pre_vious"
-msgid "Previous"
-msgstr "Iepriekšējais"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Izlaist šo vienumu"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Nevar parādīt paziņojumu"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6234,6 +6214,10 @@ msgstr ""
"{0}izpilda{1} {2}\n"
"{0}no{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Vienkāršot"
@@ -6370,6 +6354,7 @@ msgstr "Importēt ‟{0}”"
#. Translators: {0} is the type of disc, "Audio CD" or "DVD"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
#, csharp-format
+#| msgid "Eject {0}"
msgid "Ejecting {0}..."
msgstr "Izgrūž {0}..."
@@ -6428,7 +6413,7 @@ msgstr "Importēt repertuārus"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
#, csharp-format
msgid "Locate your \"{0}\" file..."
-msgstr "Atrast \"{0}\" datni..."
+msgstr "Atrast \"{0}\" failu..."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
#, csharp-format
@@ -6636,16 +6621,16 @@ msgstr[0] "{0} sērija"
msgstr[1] "{0} sērijas"
msgstr[2] "{0} sērijas"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nekad nav atjaunināts"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Atjaunināts {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Atjaunināts {0}"
@@ -6728,19 +6713,19 @@ msgstr "Doties uz tīmekļa vietni"
msgid "Add Podcast"
msgstr "Pievienot podraidi"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
-msgstr[0] "Dzēst datni"
-msgstr[1] "Dzēst datnes"
-msgstr[2] "Dzēst datnes"
+msgstr[0] "Dzēst failu"
+msgstr[1] "Dzēst failus"
+msgstr[2] "Dzēst failus"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "Nederīgs URL"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "Podraides URL ir nederīgs."
@@ -6748,11 +6733,11 @@ msgstr "Podraides URL ir nederīgs."
msgid "Episode Details"
msgstr "Sērijas īpašības"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Periodiski pārbaudīt, vai ir jaunas sērijas"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
@@ -6760,59 +6745,59 @@ msgstr ""
"Ja atzīmēts, Banshee ik pēc stundas pārbaudīs šo podraidi, vai nav jaunas "
"sērijas"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Lejupielādēt jaunās sērijas"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Arhivēt visas sērijas, izņemot jaunākās"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Apraksts nav pieejams"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Nosaukums:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Tīmekļa vietne:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Apmeklēt"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Pierakstīšanās opcijas"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "Barotnes URL:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Pēdējo reizi atsvaidzināts:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Kategorija:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Autortiesības:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podraide:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6930,22 +6915,22 @@ msgstr "klikšķis"
msgid "menu"
msgstr "izvēlne"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Slēpt <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "{0} sastapa nāvīgu kļūdu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Sīkāka informācija par kļūdu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Tika mests nenovēršams izņēmums: "
@@ -7099,15 +7084,15 @@ msgstr "sākas ar"
msgid "ends with"
msgstr "beidzas ar"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Last.fm konta lietotājvārds"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Lūdzu, ievadiet savus Last.fm konta datus."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Saglabāt un pieteikties"
@@ -7115,116 +7100,99 @@ msgstr "Saglabāt un pieteikties"
msgid "Authorize for Last.fm"
msgstr "Autorizēties Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450
+msgid ""
+"Last.fm username is invalid or Banshee is not authorized to access your "
+"account."
+msgstr ""
+"Last.fm lietotājvārds ir nederīgs, vai arī Banshee nav autorizēts piekļūt "
+"jūsu kontam."
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
msgid "This service does not exist."
msgstr "Serviss neeksistē."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
msgid "Stations are only available to paying Last.fm subscribers."
msgstr "Stacijas ir pieejamas tikai maksājošiem Last.fm abonentiem."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
msgid "This station is not available."
msgstr "Stacija nav pieejama."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
msgid "The request is missing a required parameter."
msgstr "Pieprasījumam pietrūkst nepieciešama parametra."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
msgid "The specified resource is invalid."
msgstr "Norādītais resurss nav derīgs."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
msgid "Server error, please try again later."
msgstr "Servera kļūda, lūdzu, mēģiniet vēlāk."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
msgid "Invalid authentication information, please re-authenticate."
msgstr ""
"Nederīga autentifikācijas informācija, lūdzu, autentificējieties vēlreiz."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
msgid "The API key used by this application is invalid."
msgstr "API atslēga, ko izmanto šī lietotne, nav derīga."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
msgid ""
"The streaming system is offline for maintenance, please try again later."
msgstr ""
"Straumēšanas sistēma nav pieejama uzkopšanas dēļ, lūdzu, mēģiniet atkal "
"vēlāk."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
msgid "The method signature is invalid."
msgstr "Metodes paraksts ir nederīgs."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
msgid "There is not enough content to play this station."
msgstr "Nepietiek satura, lai atskaņotu šo staciju."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
msgid "This group does not have enough members for radio."
msgstr "Šai grupai nav pietiekami daudz dalībnieku, lai veidotu radio."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
msgid "This artist does not have enough fans for radio."
msgstr "Šim izpildītājam nav pietiekami daudz fanu, lai veidotu radio."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
msgid "There are not enough neighbours for this station."
msgstr "Nepietiek kaimiņu, lai veidotu šo staciju."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
-msgid "This user is not allowed to listen to radio during peak usage"
-msgstr ""
-"Šim lietotājam nav atļaujas klausīties radio, kad ir vislielākā izmantošana"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
-msgid "Radio station not found"
-msgstr "Radio stacija nav atrasta"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
-msgid "This application is not allowed to make requests to the web services"
-msgstr "Šai lietotnei nav atļauts veidot pieprasījumus tīmekļa servisiem"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
-msgid "This type of request is no longer supported"
-msgstr "Šāda veida pieprasījuma veids vairs nav atbalstīts"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
-msgid ""
-"Your IP has made too many requests in a short period, exceeding our API "
-"guidelines"
-msgstr ""
-"Jūsu IP adresei veica pārāk daudz pieprasījumu īsā periodā, pārsniedzot mūsu "
-"API vadlīnijas"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
msgid "There was an unknown error."
msgstr "Gadījās nezināma kļūda."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
msgid "Not connected to Last.fm."
msgstr "Nav savienojuma ar Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
msgid "Account details are needed before you can connect to Last.fm"
msgstr "Lai savienotos ar Last.fm, ir nepieciešami konta dati"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
msgid "No network connection detected."
msgstr "Nav atrasts tīkla savienojums."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
msgid "Last.fm username is invalid."
msgstr "Last.fm lietotājvārds ir nederīgs."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
msgid "Connecting to Last.fm."
msgstr "Savienojas ar Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
msgid "Connected to Last.fm."
msgstr "Savienojies ar Last.fm."
@@ -7234,31 +7202,6 @@ msgstr "Savienojies ar Last.fm."
msgid "Unknown Podcast"
msgstr "Nezināma podraide"
-#~ msgid "Clear search"
-#~ msgstr "Attīrīt meklēšanu"
-
-#~ msgid "Scrobbling from device"
-#~ msgstr "Skroblē no ierīces"
-
-#~ msgid "Banshee"
-#~ msgstr "Banshee"
-
-#~ msgid "Volume"
-#~ msgstr "Skaļums"
-
-#~ msgid "Muted"
-#~ msgstr "Apklusināts"
-
-#~ msgid "Full Volume"
-#~ msgstr "Pilns skaļums"
-
-#~ msgid ""
-#~ "Last.fm username is invalid or Banshee is not authorized to access your "
-#~ "account."
-#~ msgstr ""
-#~ "Last.fm lietotājvārds ir nederīgs, vai arī Banshee nav autorizēts piekļūt "
-#~ "jūsu kontam."
-
#~ msgid "Dvd"
#~ msgstr "DVD"
diff --git a/po/nb.po b/po/nb.po
index ae80d47..cbd27e7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@
# Copyright (C) 2005 Øivind Hoel and the GNOME Foundation
# This file is distributed under the same license as the banshee package.
# Øivind Hoel <oivind.hoel at gmail.com>, 2005.
-# Kjartan Maraas <kmaraas at gnome.org>, 2006-2013.
+# Kjartan Maraas <kmaraas at gnome.org>, 2006-2011.
#
# Navnekonvensjoner:
#
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: banshee\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-27 13:18+0200\n"
-"PO-Revision-Date: 2013-05-27 13:35+0200\n"
+"POT-Creation-Date: 2011-09-04 12:48+0200\n"
+"PO-Revision-Date: 2011-09-04 14:08+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas at gnome.org>\n"
"Language-Team: Norwegian <i18n-nb at lister.ping.uio.no>\n"
"Language: no\n"
@@ -62,9 +62,7 @@ msgstr "Banshee musikkavspiller"
msgid ""
"Support for USB-drive based devices, including many iAudio devices and "
"Android, Pre, and Galaxy phones."
-msgstr ""
-"Støtte for USB-baserte enheter, inklusive iAudio-enheter og Android-, Pre- "
-"og Galaxy-telefoner."
+msgstr "Støtte for USB-baserte enheter, inklusive iAudio-enheter og Android-, Pre- og Galaxy-telefoner."
#. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
#: ../data/addin-xml-strings.cs:23
@@ -85,9 +83,9 @@ msgid "Browse, search, and purchase music from the Amazon MP3 store."
msgstr "Bla gjennom og kjøp musikk fra Amazon's MP3-butikk."
#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
-#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
-#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
-#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+#: ../data/addin-xml-strings.cs:70 ../data/addin-xml-strings.cs:75
+#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:100
+#: ../data/addin-xml-strings.cs:105 ../data/addin-xml-strings.cs:120
#: ../data/addin-xml-strings.cs:165
msgid "Online Sources"
msgstr "Kilder på nettet"
@@ -110,197 +108,198 @@ msgstr "Lydbokbibliotek"
msgid "Organize audiobooks, lectures, etc."
msgstr "Organiser lydbøker, leksjoner, etc."
-#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
-#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
+#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:45
+#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:95
#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
msgid "Core"
msgstr "Kjerne"
-#. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
+#. ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml
#: ../data/addin-xml-strings.cs:43
+msgid "Audio CD Support"
+msgstr "Støtte for lyd-CD"
+
+#: ../data/addin-xml-strings.cs:44
+msgid "Listen to and rip Audio CDs."
+msgstr "Lytt til og hent ut spor fra lyd-CDer."
+
+#. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
+#: ../data/addin-xml-strings.cs:48
msgid "Boo Scripting"
msgstr ""
-#: ../data/addin-xml-strings.cs:44
+#: ../data/addin-xml-strings.cs:49
msgid "Customize and extend Banshee with Boo-language scripts."
msgstr ""
-#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
-#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
-#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
-#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
-#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
+#: ../data/addin-xml-strings.cs:50 ../data/addin-xml-strings.cs:55
+#: ../data/addin-xml-strings.cs:60 ../data/addin-xml-strings.cs:65
+#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:110
+#: ../data/addin-xml-strings.cs:115 ../data/addin-xml-strings.cs:125
+#: ../data/addin-xml-strings.cs:130 ../data/addin-xml-strings.cs:135
#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
-#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+#: ../data/addin-xml-strings.cs:160
msgid "Utilities"
msgstr "Verktøy"
#. ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml
-#: ../data/addin-xml-strings.cs:48
+#: ../data/addin-xml-strings.cs:53
msgid "BPM Detection"
msgstr "BPM-gjenkjenning"
-#: ../data/addin-xml-strings.cs:49
+#: ../data/addin-xml-strings.cs:54
msgid "Detect the beats per minute (BPM) of your music."
msgstr "Gjenkjenn slag i minuttet (BPM) i musikken du lytter til."
#. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
-#: ../data/addin-xml-strings.cs:53
+#: ../data/addin-xml-strings.cs:58
msgid "Cover Art Fetching"
msgstr "Henting av albumbilder"
-#: ../data/addin-xml-strings.cs:54
+#: ../data/addin-xml-strings.cs:59
msgid "Fetch cover art for all items in your library."
msgstr "Hent albumbilder for alle oppføringer i biblioteket."
#. ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml
-#: ../data/addin-xml-strings.cs:58
+#: ../data/addin-xml-strings.cs:63
msgid "DAAP Sharing"
msgstr "DAAP-deling"
-#: ../data/addin-xml-strings.cs:59
+#: ../data/addin-xml-strings.cs:64
msgid "Browse and listen to music shared over your local network."
msgstr "Bla gjennom og lytt til musikk som deles på det lokale nettverket."
#. ../src/Extensions/Banshee.Emusic.Store/Banshee.Emusic.Store.addin.xml
-#: ../data/addin-xml-strings.cs:63
+#: ../data/addin-xml-strings.cs:68
msgid "eMusic Store"
msgstr "eMusic-butikk"
-#: ../data/addin-xml-strings.cs:64
+#: ../data/addin-xml-strings.cs:69
msgid "Browse, search, and purchase music and audiobooks from eMusic"
msgstr "Bla gjennom, søk og kjøp musikk og lydbøker fra eMusic"
#. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
-#: ../data/addin-xml-strings.cs:68
+#: ../data/addin-xml-strings.cs:73
msgid "eMusic Import"
msgstr "eMusic import"
-#: ../data/addin-xml-strings.cs:69
+#: ../data/addin-xml-strings.cs:74
msgid "Download and import music purchased from eMusic."
msgstr "Last ned og import musikk kjøpt fra eMusic."
#. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
-#: ../data/addin-xml-strings.cs:73
+#: ../data/addin-xml-strings.cs:78
msgid "File System Preview Queue"
msgstr "Forhåndsvisningskø for filsystem"
-#: ../data/addin-xml-strings.cs:74
+#: ../data/addin-xml-strings.cs:79
msgid "Preview files without importing to your library."
msgstr "Forhåndsvis filer utne å importere dem i biblioteket."
#. ../src/Extensions/Banshee.Fixup/Banshee.Fixup.addin.xml
-#: ../data/addin-xml-strings.cs:78
+#: ../data/addin-xml-strings.cs:83
msgid "Metadata Fixup"
msgstr ""
-#: ../data/addin-xml-strings.cs:79
+#: ../data/addin-xml-strings.cs:84
msgid "Fix broken and missing metadata using bulk operations."
msgstr ""
#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
-#: ../data/addin-xml-strings.cs:83
+#: ../data/addin-xml-strings.cs:88
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:58
msgid "Internet Archive"
msgstr "Internett-arkiv"
-#: ../data/addin-xml-strings.cs:84
+#: ../data/addin-xml-strings.cs:89
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:88
+#: ../data/addin-xml-strings.cs:93
msgid "Internet Radio"
msgstr "Internett-radio"
-#: ../data/addin-xml-strings.cs:89
+#: ../data/addin-xml-strings.cs:94
msgid "Listen to and organize Internet Radio stations."
msgstr ""
#. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
-#: ../data/addin-xml-strings.cs:93
+#: ../data/addin-xml-strings.cs:98
#, fuzzy
msgid "Last.fm Scrobbling"
msgstr "Passord"
-#: ../data/addin-xml-strings.cs:94
+#: ../data/addin-xml-strings.cs:99
msgid "Last.fm scrobbling and context pane recommendations."
msgstr ""
#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
-#: ../data/addin-xml-strings.cs:98
+#: ../data/addin-xml-strings.cs:103
msgid "Last.fm Radio"
msgstr "Last.fm radio"
-#: ../data/addin-xml-strings.cs:99
+#: ../data/addin-xml-strings.cs:104
msgid "Last.fm streaming radio for paid subscribers."
msgstr ""
#. ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
-#: ../data/addin-xml-strings.cs:103
+#: ../data/addin-xml-strings.cs:108
msgid "Library Watcher"
msgstr ""
-#: ../data/addin-xml-strings.cs:104
+#: ../data/addin-xml-strings.cs:109
msgid "Automatically update music and video libraries."
msgstr ""
#. ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
-#: ../data/addin-xml-strings.cs:108
+#: ../data/addin-xml-strings.cs:113
msgid "Mini Mode"
msgstr "Minimodus"
-#: ../data/addin-xml-strings.cs:109
+#: ../data/addin-xml-strings.cs:114
msgid ""
"Control Banshee through a small window with only playback controls and track "
"information."
msgstr ""
#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
-#: ../data/addin-xml-strings.cs:113
+#: ../data/addin-xml-strings.cs:118
msgid "Miro Guide Podcast Directory"
msgstr ""
-#: ../data/addin-xml-strings.cs:114
+#: ../data/addin-xml-strings.cs:119
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:118
+#: ../data/addin-xml-strings.cs:123
msgid "MPRIS D-Bus interface"
msgstr ""
-#: ../data/addin-xml-strings.cs:119
+#: ../data/addin-xml-strings.cs:124
msgid "Control Banshee using the MPRIS D-Bus interface."
msgstr ""
#. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
-#: ../data/addin-xml-strings.cs:123
+#: ../data/addin-xml-strings.cs:128
+#, fuzzy
msgid "Multimedia Keys"
-msgstr "Multimedietaster"
+msgstr "Lokale filer"
-#: ../data/addin-xml-strings.cs:124
+#: ../data/addin-xml-strings.cs:129
msgid "Control playback via the multimedia keys on your keyboard."
msgstr ""
#. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
-#: ../data/addin-xml-strings.cs:128
+#: ../data/addin-xml-strings.cs:133
msgid "Notification Area Icon"
msgstr ""
-#: ../data/addin-xml-strings.cs:129
+#: ../data/addin-xml-strings.cs:134
msgid "Display an icon in the notification area for controlling Banshee."
msgstr ""
-#. ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.addin.xml
-#: ../data/addin-xml-strings.cs:133
-msgid "DVD and Audio CD Support"
-msgstr "Støtte for DVD og lyd-CD"
-
-#: ../data/addin-xml-strings.cs:134
-msgid "Watch DVDs, listen to and rip Audio CDs."
-msgstr "Se på DVDer, lytt til og hent ut spor fra lyd-CDer."
-
#. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
#: ../data/addin-xml-strings.cs:138
msgid "Importers for Amarok, Rhythmbox and iTunes"
@@ -323,10 +322,10 @@ msgstr ""
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
#: ../data/addin-xml-strings.cs:148
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:207
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:200
#: ../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:211
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:210
msgid "Podcasts"
msgstr "Podcaster"
@@ -357,7 +356,7 @@ msgstr ""
#: ../data/addin-xml-strings.cs:163
#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:52
#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:53
-#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:134
+#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:109
msgid "Ubuntu One Music Store"
msgstr ""
@@ -367,55 +366,42 @@ msgid ""
"7digital."
msgstr ""
-#. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
-#: ../data/addin-xml-strings.cs:168
-msgid "UPnP Client"
-msgstr "UPnP-klient"
-
-#: ../data/addin-xml-strings.cs:169
-#, fuzzy
-msgid ""
-"Browse and play music and videos shared over your local network using UPnP."
-msgstr "Bla gjennom og lytt til musikk som deles på det lokale nettverket."
-
#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
-#: ../data/addin-xml-strings.cs:173
+#: ../data/addin-xml-strings.cs:168
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44
msgid "Wikipedia"
msgstr "Wikipedia"
-#: ../data/addin-xml-strings.cs:174
+#: ../data/addin-xml-strings.cs:169
msgid "View artist information from Wikipedia in the context pane."
msgstr ""
-#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+#: ../data/addin-xml-strings.cs:170 ../data/addin-xml-strings.cs:175
msgid "Context Pane"
msgstr "Kontekstområde"
#. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml
-#: ../data/addin-xml-strings.cs:178
+#: ../data/addin-xml-strings.cs:173
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
msgid "YouTube"
msgstr "YouTube"
-#: ../data/addin-xml-strings.cs:179
+#: ../data/addin-xml-strings.cs:174
msgid "Show related YouTube videos in the context pane."
msgstr "Vis relaterte videoer fra YouTube i kontekstområdet."
#: ../data/audio-profiles/aac-novell.xml.in.h:1
-msgid "AAC (Novell Encoder)"
-msgstr "AAC (Novell-koder)"
+msgid "3GPP"
+msgstr "3GPP"
#: ../data/audio-profiles/aac-novell.xml.in.h:2
-msgid ""
-"Designed to be the successor of the MP3 format, AAC generally achieves "
-"better sound quality than MP3 at many bit rates."
-msgstr ""
+msgid "AAC (Novell Encoder)"
+msgstr "AAC (Novell-koder)"
#: ../data/audio-profiles/aac-novell.xml.in.h:3
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
-#: ../data/audio-profiles/mp3-xing.xml.in.h:3
-#: ../data/audio-profiles/wavpack.xml.in.h:13
+#: ../data/audio-profiles/mp3-lame.xml.in.h:3
+#: ../data/audio-profiles/mp3-xing.xml.in.h:2
+#: ../data/audio-profiles/wavpack.xml.in.h:3
#: ../data/audio-profiles/wma.xml.in.h:4
msgid "Bitrate"
msgstr "Bitrate"
@@ -425,33 +411,35 @@ msgid "Container"
msgstr "Kontainer"
#: ../data/audio-profiles/aac-novell.xml.in.h:5
-msgid "MPEG-4 ISO"
-msgstr "MPEG-4 ISO"
+msgid ""
+"Designed to be the successor of the MP3 format, AAC generally achieves "
+"better sound quality than MP3 at many bit rates."
+msgstr ""
#: ../data/audio-profiles/aac-novell.xml.in.h:6
-msgid "MPEG-4 QuickTime"
+msgid "Long Term Prediction"
msgstr ""
#: ../data/audio-profiles/aac-novell.xml.in.h:7
-msgid "3GPP"
-msgstr "3GPP"
+msgid "Low Complexity"
+msgstr "Lav kompleksitet"
#: ../data/audio-profiles/aac-novell.xml.in.h:8
-msgid "Profile"
-msgstr "Profil"
+msgid "MPEG-4 ISO"
+msgstr "MPEG-4 ISO"
#: ../data/audio-profiles/aac-novell.xml.in.h:9
-msgid "Low Complexity"
-msgstr "Lav kompleksitet"
-
-#: ../data/audio-profiles/aac-novell.xml.in.h:10
-msgid "Long Term Prediction"
+msgid "MPEG-4 QuickTime"
msgstr ""
-#: ../data/audio-profiles/aac-novell.xml.in.h:11
+#: ../data/audio-profiles/aac-novell.xml.in.h:10
msgid "Output Format"
msgstr "Utdataformat"
+#: ../data/audio-profiles/aac-novell.xml.in.h:11
+msgid "Profile"
+msgstr "Profil"
+
#: ../data/audio-profiles/base.xml.in.h:1
msgid "Channels"
msgstr "Kanaler"
@@ -467,156 +455,156 @@ msgid ""
msgstr ""
#: ../data/audio-profiles/mp3-lame.xml.in.h:1
-msgid "MP3 (LAME Encoder)"
-msgstr "MP3 (LAME-koding)"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:2
-#: ../data/audio-profiles/mp3-xing.xml.in.h:2
+#: ../data/audio-profiles/mp3-xing.xml.in.h:1
msgid ""
"A proprietary and older, but also popular, lossy audio format that produces "
"larger files at lower bitrates."
msgstr ""
-#: ../data/audio-profiles/mp3-lame.xml.in.h:3
-#, fuzzy
-msgid "Encoding Mode"
-msgstr "Synkroniserer iPod"
+#: ../data/audio-profiles/mp3-lame.xml.in.h:2
+#: ../data/audio-profiles/vorbis.xml.in.h:2
+#: ../data/audio-profiles/wavpack.xml.in.h:2
+#: ../data/audio-profiles/wma.xml.in.h:3
+msgid "Best"
+msgstr "Best"
#: ../data/audio-profiles/mp3-lame.xml.in.h:4
msgid "Constant Bitrate"
-msgstr "Konstant bitrate"
+msgstr ""
#: ../data/audio-profiles/mp3-lame.xml.in.h:5
-msgid "Variable Bitrate"
-msgstr "Variabel bitrate"
+#, fuzzy
+msgid "Encoding Mode"
+msgstr "Synkroniserer iPod"
#: ../data/audio-profiles/mp3-lame.xml.in.h:6
-msgid "VBR Quality"
-msgstr "VBR-kvalitet"
+msgid "MP3 (LAME Encoder)"
+msgstr ""
#: ../data/audio-profiles/mp3-lame.xml.in.h:7
-#: ../data/audio-profiles/vorbis.xml.in.h:4
-#: ../data/audio-profiles/wavpack.xml.in.h:14
-#: ../data/audio-profiles/wma.xml.in.h:6
-msgid "Worst"
-msgstr "Dårligst"
+msgid "VBR Quality"
+msgstr "VBR-kvalitet"
#: ../data/audio-profiles/mp3-lame.xml.in.h:8
+msgid "Variable Bitrate"
+msgstr ""
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
#: ../data/audio-profiles/vorbis.xml.in.h:5
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
-msgid "Best"
-msgstr "Best"
+msgid "Worst"
+msgstr "Dårligst"
-#: ../data/audio-profiles/mp3-xing.xml.in.h:1
+#: ../data/audio-profiles/mp3-xing.xml.in.h:3
msgid "MP3 (Xing Encoder)"
msgstr "MP3 (Xing-koding)"
#: ../data/audio-profiles/vorbis.xml.in.h:1
+msgid "Audio quality"
+msgstr "Lydkvalitet"
+
+#: ../data/audio-profiles/vorbis.xml.in.h:3
msgid "Ogg Vorbis"
msgstr "Ogg Vorbis"
-#: ../data/audio-profiles/vorbis.xml.in.h:2
+#: ../data/audio-profiles/vorbis.xml.in.h:4
msgid ""
"Vorbis is an open source, lossy audio codec with high quality output at a "
"lower file size than MP3."
msgstr ""
-#: ../data/audio-profiles/vorbis.xml.in.h:3
-msgid "Audio quality"
-msgstr "Lydkvalitet"
-
#: ../data/audio-profiles/wavpack.xml.in.h:1
-msgid "Wavpack"
-msgstr ""
-
-#: ../data/audio-profiles/wavpack.xml.in.h:2
msgid ""
"A fast and efficient open source audio format offering lossless and high-"
"quality lossy encoding with great dynamic range."
msgstr ""
-#: ../data/audio-profiles/wavpack.xml.in.h:3
-msgid "Mode"
-msgstr "Modus"
-
#: ../data/audio-profiles/wavpack.xml.in.h:4
-msgid "Fast Compression"
-msgstr "Rask komprimering"
+msgid "Default"
+msgstr "Forvalgt"
#: ../data/audio-profiles/wavpack.xml.in.h:5
msgid "Default Compression"
msgstr "Forvalgt komprimering"
#: ../data/audio-profiles/wavpack.xml.in.h:6
-msgid "High Compression"
-msgstr "Høy komprimering"
+msgid "Extra processing"
+msgstr ""
#: ../data/audio-profiles/wavpack.xml.in.h:7
-msgid "Very High Compression"
-msgstr "Meget høy komprimering"
+msgid "Fast Compression"
+msgstr "Rask komprimering"
#: ../data/audio-profiles/wavpack.xml.in.h:8
-msgid "Lossy mode"
-msgstr ""
+msgid "High Compression"
+msgstr "Høy komprimering"
#: ../data/audio-profiles/wavpack.xml.in.h:9
-msgid "Store MD5 sum in the file"
-msgstr ""
+msgid "Highest"
+msgstr "Høyest"
#: ../data/audio-profiles/wavpack.xml.in.h:10
-msgid "Extra processing"
+msgid "Lossy mode"
msgstr ""
#: ../data/audio-profiles/wavpack.xml.in.h:11
-msgid "Default"
-msgstr "Forvalgt"
+msgid "Mode"
+msgstr "Modus"
#: ../data/audio-profiles/wavpack.xml.in.h:12
-msgid "Highest"
-msgstr "Høyest"
+msgid "Store MD5 sum in the file"
+msgstr ""
-#: ../data/audio-profiles/wav.xml.in.h:1
-msgid "Waveform PCM"
+#: ../data/audio-profiles/wavpack.xml.in.h:13
+msgid "Very High Compression"
+msgstr "Meget høy komprimering"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:14
+msgid "Wavpack"
msgstr ""
-#: ../data/audio-profiles/wav.xml.in.h:2
+#: ../data/audio-profiles/wav.xml.in.h:1
msgid ""
"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
"modulated (PCM) audio."
msgstr ""
-#: ../data/audio-profiles/wma.xml.in.h:1
-msgid "Windows Media Audio"
+#: ../data/audio-profiles/wav.xml.in.h:2
+msgid "Waveform PCM"
msgstr ""
-#: ../data/audio-profiles/wma.xml.in.h:2
+#: ../data/audio-profiles/wma.xml.in.h:1
msgid ""
"A proprietary lossy audio format with high quality output at a lower file "
"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
msgstr ""
-#: ../data/audio-profiles/wma.xml.in.h:3
+#: ../data/audio-profiles/wma.xml.in.h:2
+msgid "Audio Quality"
+msgstr "Lydkvalitet"
+
+#: ../data/audio-profiles/wma.xml.in.h:5
msgid "Use a variable bitrate"
msgstr "Bruk variabel bitrate"
-#: ../data/audio-profiles/wma.xml.in.h:5
-msgid "Audio Quality"
-msgstr "Lydkvalitet"
+#: ../data/audio-profiles/wma.xml.in.h:6
+msgid "Windows Media Audio"
+msgstr ""
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
-msgid "Media Player"
-msgstr "Musikkavspiller"
-
-#: ../data/desktop-files/common.desktop.in.h:2
#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206
#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Banshee musikkavspiller"
+#: ../data/desktop-files/common.desktop.in.h:2
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:193
+msgid "Media Player"
+msgstr "Musikkavspiller"
+
#: ../data/desktop-files/common.desktop.in.h:3
msgid "Play and organize your media collection"
msgstr "Spill av og organiser din mediesamling"
@@ -632,15 +620,11 @@ msgid "Could not create filesrc element"
msgstr "Kunne ikke opprette «filesrc»-tillegg"
#: ../libbanshee/banshee-bpmdetector.c:214
-#: ../libbanshee/banshee-transcoder.c:246
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Transcoder.cs:187
#, fuzzy
msgid "Could not create decodebin2 plugin"
msgstr "Kunne ikke opprette «decodebin»-tillegget"
#: ../libbanshee/banshee-bpmdetector.c:220
-#: ../libbanshee/banshee-transcoder.c:264
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Transcoder.cs:68
#, fuzzy
msgid "Could not create audioconvert plugin"
msgstr "Kunne ikke opprette «audioconvert»-tillegget"
@@ -688,6 +672,12 @@ msgstr "Kunne ikke opprette filesink-tillegg"
msgid "Could not create source element"
msgstr "Kunne ikke opprette tillegg for avspillingskø"
+#: ../libbanshee/banshee-transcoder.c:246
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Transcoder.cs:187
+#, fuzzy
+msgid "Could not create 'decodebin2' plugin"
+msgstr "Kunne ikke opprette «decodebin»-tillegget"
+
#: ../libbanshee/banshee-transcoder.c:252
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Transcoder.cs:63
#, fuzzy
@@ -695,15 +685,18 @@ msgid "Could not create sink element"
msgstr "Kunne ikke opprette filesink-tillegg"
#: ../libbanshee/banshee-transcoder.c:258
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Transcoder.cs:198
-#, fuzzy
-msgid "Could not create sinkbin plugin"
+msgid "Could not create 'sinkben' plugin"
msgstr "Kunne ikke opprette «sinkben»-tillegget"
+#: ../libbanshee/banshee-transcoder.c:264
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Transcoder.cs:68
+msgid "Could not create 'audioconvert' plugin"
+msgstr "Kunne ikke opprette «audioconvert»-tillegget"
+
#: ../libbanshee/banshee-transcoder.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Transcoder.cs:73
#, fuzzy
-msgid "Could not create audioresample plugin"
+msgid "Could not create 'audioresample' plugin"
msgstr "Kunne ikke opprette «audioconvert»-tillegget"
#: ../libbanshee/banshee-transcoder.c:276
@@ -757,37 +750,44 @@ msgstr "Kunne ikke opprette CD-ripper"
msgid "Could not create BPM detection driver."
msgstr "Kunne ikke opprette CD-ripper"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:149
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:191
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:83
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:829
+msgid "Enable _gapless playback"
+msgstr ""
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:84
+msgid ""
+"Eliminate the small playback gap on track change. Useful for concept albums "
+"and classical music"
+msgstr ""
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:152
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:194
msgid "Could not initialize GStreamer library"
msgstr "Kunne ikke starte GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:451
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:547
msgid "Unknown Error"
msgstr "Ukjent feil"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:823
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:905
#, fuzzy
msgid "_Enable ReplayGain correction"
msgstr "Rapporter spor til Last.fm"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:824
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:906
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
msgstr ""
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
-msgid "Enable _gapless playback"
-msgstr ""
-
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:830
msgid ""
-"Eliminate the small playback gap on track change. Useful for concept albums "
-"and classical music"
+"Eliminate the small playback gap on track change. Useful for concept albums "
+"and classical music."
msgstr ""
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
@@ -799,7 +799,7 @@ msgstr "Kunne ikke starte konvertering"
msgid "Could not create encoder pipeline : {0}"
msgstr "Kunne ikke opprette innkodingspipeline"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:792
msgid "GStreamer# 0.10"
msgstr ""
@@ -808,10 +808,24 @@ msgstr ""
msgid "Could not create encoding pipeline : {0}"
msgstr "Kunne ikke opprette rør for koding"
-#. Translators: verb
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
-msgid "Import"
-msgstr "Importer"
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Transcoder.cs:198
+#, fuzzy
+msgid "Could not create 'sinkbin' plugin"
+msgstr "Kunne ikke opprette «sinkben»-tillegget"
+
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+msgid "_Close"
+msgstr "_Lukk"
+
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+msgid "Close"
+msgstr "Lukk"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
msgid "Can't check for updates"
@@ -846,11 +860,6 @@ msgstr "Oppdatering for Banshee tilgjengelig"
msgid "Downloading {0}"
msgstr "Laster ned {0}"
-#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:144
-#, csharp-format
-msgid "{0} MB / {1} MB ({2} KB/s)"
-msgstr "{0} MB / {1} MB ({2} KB/s)"
-
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:152
msgid "Update download failed"
msgstr "Nedlasting av oppdatering feilet"
@@ -895,8 +904,9 @@ msgid "Show options for querying the playing engine"
msgstr ""
#: ../src/Clients/Booter/Booter/Entry.cs:157
+#, fuzzy
msgid "Show options for the user interface"
-msgstr "Vis alternativer for brukergrensesnitt"
+msgstr "Laster brukergrensesnitt"
#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
@@ -921,7 +931,7 @@ msgstr ""
#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
-"Play the previous track, optionally restarting if the 'restart' value is set"
+"Play the previous track, optionally restarting if the 'restart value is set"
msgstr ""
#: ../src/Clients/Booter/Booter/Entry.cs:166
@@ -961,8 +971,9 @@ msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
#: ../src/Clients/Booter/Booter/Entry.cs:175
+#, fuzzy
msgid "Seek to a specific point (seconds, float)"
-msgstr "Søk til en gitt posisjon (sekunder, flyttall)"
+msgstr "Spol til en gitt posisjon i nåværende sang"
#: ../src/Clients/Booter/Booter/Entry.cs:176
#, fuzzy
@@ -991,8 +1002,9 @@ msgid "Query whether the player can seek"
msgstr ""
#: ../src/Clients/Booter/Booter/Entry.cs:184
+#, fuzzy
msgid "Player volume"
-msgstr "Volum for avspiller"
+msgstr "Antall avspillinger"
#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
@@ -1030,13 +1042,13 @@ msgstr "Varighet"
#. Translators: noun
#: ../src/Clients/Booter/Booter/Entry.cs:194
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
msgid "Track Number"
msgstr "Spornummer"
#. Translators: noun
#: ../src/Clients/Booter/Booter/Entry.cs:195
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
msgid "Track Count"
msgstr "Antall spor"
@@ -1047,9 +1059,9 @@ msgid "Disc Number"
msgstr "Platenummer"
#: ../src/Clients/Booter/Booter/Entry.cs:197
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
#: ../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
@@ -1058,7 +1070,7 @@ msgid "Year"
msgstr "År"
#: ../src/Clients/Booter/Booter/Entry.cs:198
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
+#: ../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
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:96
@@ -1066,13 +1078,13 @@ msgid "Rating"
msgstr "Poeng"
#: ../src/Clients/Booter/Booter/Entry.cs:199
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
msgid "Score"
msgstr "Poengsum"
#. Translators: noun
#: ../src/Clients/Booter/Booter/Entry.cs:200
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
msgid "Bit Rate"
msgstr "Bitrate"
@@ -1085,8 +1097,9 @@ msgid "Present the user interface on the active workspace"
msgstr ""
#: ../src/Clients/Booter/Booter/Entry.cs:205
+#, fuzzy
msgid "Enter the full-screen mode"
-msgstr "Gå til fullskjerm modus"
+msgstr "Veksle full skjerm"
#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
@@ -1164,11 +1177,11 @@ msgstr ""
msgid "Play Album"
msgstr "Spill album"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:83
msgid "En_queue"
msgstr "Legg i _kø"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1200,15 +1213,8 @@ msgstr "{0} gjenstår"
msgid "Play Song"
msgstr "Spill sang"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:262
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
-msgid "Close"
-msgstr "Lukk"
-
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:483
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Søk"
@@ -1221,123 +1227,117 @@ msgstr "Artist, album eller tittel"
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:139
#: ../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:84
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
msgid "Album Artist"
msgstr "Albumartist"
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:194
-msgid "Composer"
-msgstr "Komponist"
-
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:187
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:366
+#: ../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:91
msgid "Genre"
msgstr "Sjanger"
#. Translators: noun
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:144
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:216
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
msgid "Comment"
msgstr "Kommentar"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "Ukjent Album"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:102
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
msgid "Unknown Artist"
msgstr "Ukjent Artist"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:103
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:136
+msgid "Unknown Album"
+msgstr "Ukjent Album"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Ukjent Tittel"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Forskjellige artister"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr ""
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "Fant ikke filen"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr ""
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr ""
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Ukjent feil"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "Sta_rt podcast på nytt"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "Sta_rt lydbok på nytt"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "Sta_rt video på nytt"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "Sta_rt sang på nytt"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "Sta_rt oppføring på nytt"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
#, fuzzy
msgid "_Jump to Playing Podcast"
msgstr "_Hopp til sang som spilles av"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
#, fuzzy
msgid "_Jump to Playing Audiobook"
msgstr "_Hopp til sang som spilles av"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
#, fuzzy
msgid "_Jump to Playing Video"
msgstr "_Hopp til sang som spilles av"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
#, fuzzy
msgid "_Jump to Playing Song"
msgstr "_Hopp til sang som spilles av"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
#, fuzzy
msgid "_Jump to Playing Item"
msgstr "_Hopp til sang som spilles av"
-#: ../src/Core/Banshee.Core/Banshee.Collection/YearInfo.cs:38
-msgid "Unknown Year"
-msgstr "Ukjent år"
-
#. 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:172
@@ -1345,12 +1345,7 @@ msgstr "Ukjent år"
msgid "{0} ({1}:{2:00})"
msgstr "{0} ({1}):{2:00})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs:76
-#, csharp-format
-msgid "All Album Artists ({0})"
-msgstr "Alle artister på albumet ({0})"
-
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Alle album ({0})"
@@ -1360,43 +1355,33 @@ msgstr "Alle album ({0})"
msgid "All Artists ({0})"
msgstr "Alle artister ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs:173
-#, csharp-format
-msgid "File is empty so it could not be imported: {0}"
-msgstr ""
-
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:96
msgid "Value"
msgstr "Verdi"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs:66
-#, csharp-format
-msgid "All Years ({0})"
-msgstr "Alle år ({0})"
-
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:49
#, fuzzy
msgid "Shuffle by A_lbum"
msgstr "Veksle tilfeldig avspilling"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
msgid "by album"
msgstr "etter album"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
msgid "Play all songs from an album, then randomly choose another album"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:49
msgid "Shuffle by A_rtist"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50
msgid "by artist"
msgstr "etter artist"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:51
msgid "Play all songs by an artist, then randomly choose another artist"
msgstr ""
@@ -1414,30 +1399,30 @@ msgstr "manuelt"
msgid "Do not shuffle playlist"
msgstr "Ikke gjenta spilleliste"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:45
#, fuzzy
msgid "Shuffle by _Rating"
msgstr "Tilfeldig"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
msgid "by rating"
msgstr "etter poeng"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
#, fuzzy
msgid "Play songs randomly, prefer higher rated songs"
msgstr "Spill alle spor før gjentagelse av spilleliste"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:42
#, fuzzy
msgid "Shuffle by S_core"
msgstr "Tilfeldig"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:44
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43
msgid "by score"
-msgstr "etter poeng"
+msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:45
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:44
#, fuzzy
msgid "Play songs randomly, prefer higher scored songs"
msgstr "Spill alle spor før gjentagelse av spilleliste"
@@ -1462,7 +1447,7 @@ msgid "Scanning for media"
msgstr "Venter på media"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1395
msgid "Scanning..."
msgstr "Leter …"
@@ -1482,12 +1467,12 @@ msgstr "Importeringsprosessen er igang. Vil du stoppe den?"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:185
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:185
#, csharp-format
msgid "Importing {0} of {1}"
msgstr "Importerer {0} - {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
#, fuzzy, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Fjerner {0} av {1}"
@@ -1501,7 +1486,7 @@ msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1392
#, fuzzy
msgid "Refreshing Metadata"
msgstr "R_ediger metadata for sang"
@@ -1578,50 +1563,40 @@ msgstr "Myk rock"
msgid "Techno"
msgstr "Tekno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Fjern fra biblioteket"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
-msgid "File Organization"
-msgstr "Filorganisering"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
-msgid "Co_py files to media folder when importing"
-msgstr "Ko_pier filer til mediemappen ved import"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
-msgid "_Update file and folder names"
-msgstr "_Oppdater fil og mappenavn"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
-msgid "Rename files and folders according to media metadata"
-msgstr ""
-
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
#, csharp-format
msgid "{0} Folder"
msgstr "{0} mappe"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:67
+#, fuzzy
msgid "Track Artist"
-msgstr "Artist for spor"
+msgstr "Artist"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83
+#, fuzzy
msgid "Album Artist Initial"
-msgstr ""
+msgstr "Albumtittel"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:88
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:201
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:199
#, fuzzy
msgid "Conductor"
msgstr "Medhjelpere"
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:192
+msgid "Composer"
+msgstr "Komponist"
+
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:103
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:362
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:360
msgid "Album"
msgstr "Album"
@@ -1654,14 +1629,14 @@ msgid "Number (unsorted)"
msgstr "Nummer (usortert)"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:110
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:108
#, fuzzy
msgid "Disc Count"
msgstr "Koble fra"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:208
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:120
msgid "Grouping"
msgstr "Gruppering"
@@ -1669,117 +1644,115 @@ msgstr "Gruppering"
#. Catalog.GetString ("Music Library")
#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Musikk"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr ""
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
msgid "Miscellaneous"
msgstr "Forskjellig"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} sang"
msgstr[1] "{0} sanger"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
msgid "Music Folder"
msgstr "Musikkmappe"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
#, fuzzy
msgid "Recent Favorites"
msgstr "Oversette favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Sist lagt til"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
msgid "Recently Played"
msgstr "Sist spilt"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
msgid "Recently played songs"
msgstr "Sist spilte sanger"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "Ikke hørt"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Oversette favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
#, fuzzy
msgid "Least Favorite"
msgstr "Oversette favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 MB med favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 minutter med favoritter"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr ""
@@ -1793,49 +1766,47 @@ msgid "Importing From {0}"
msgstr "Importerer fra {0}"
#. Catalog.GetString ("Video Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
#: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
msgid "Videos"
msgstr "Videoer"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
msgid "Search your videos"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
msgid "Produced By"
msgstr "Produsert av"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
#, csharp-format
msgid "{0} video"
msgid_plural "{0} videos"
msgstr[0] "{0} video"
msgstr[1] "{0} videoer"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
msgid "Videos Folder"
msgstr "Videomappe"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "Ikke sett"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:101
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:99
msgid "Default player engine"
msgstr "Forvalgt avspillingskjerne"
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:106
msgid ""
"No player engines were found. Please ensure Banshee has been cleanly "
"installed."
@@ -1843,7 +1814,7 @@ msgstr ""
"Ingen avspillingsmotorer ble funnet. Vennligst sjekk at Banshee er korrekt "
"installert."
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:373
msgid "Problem with Player Engine"
msgstr "Problem med avspillingskjerne"
@@ -1870,41 +1841,55 @@ msgid "Saving Metadata to File"
msgstr "Lagrer metadata til fil"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
-msgid "Sync _metadata between library and files"
-msgstr ""
+msgid "Write _metadata to files"
+msgstr "Skriv _metadata til filer"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
#, fuzzy
-msgid ""
-"Enable this option to have metadata in sync between your library and "
-"supported media files"
+msgid "Save tags and other metadata inside supported media files"
msgstr ""
"Aktiver dette valget for å lagre tagger og andre metadata i støttede lydfiler"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
-msgid "Sync _ratings between library and files"
-msgstr ""
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:174
+#, fuzzy
+msgid "Write _ratings and play counts to files"
+msgstr "Skriv _metadata til filer"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
#, fuzzy
msgid ""
-"Enable this option to have rating metadata synced between your library and "
-"supported audio files"
+"Enable this option to save rating and playcount metadata inside supported "
+"audio files"
msgstr ""
"Aktiver dette valget for å lagre tagger og andre metadata i støttede lydfiler"
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60
+msgid "_Update file and folder names"
+msgstr ""
+
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
-msgid "Sync play counts between library and files"
+msgid "Rename files and folders according to media metadata"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:175
#, fuzzy
msgid ""
-"Enable this option to have playcount metadata synced between your library "
-"and supported audio files"
+"Enable this option to save rating and play count metadata inside supported "
+"audio files whenever the rating is changed."
msgstr ""
"Aktiver dette valget for å lagre tagger og andre metadata i støttede lydfiler"
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:176
+#, fuzzy
+msgid "Import _ratings"
+msgstr "Format for _utdata:"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:177
+#, fuzzy
+msgid "Import play _counts"
+msgstr "Smart spilleliste"
+
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
msgstr "Det finnes ingen tilgjengelig nettverkstilkobling"
@@ -1928,12 +1913,16 @@ msgid ""
"cover art fetching"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
msgid "Search this playlist"
msgstr "Søk i denne spillelisten"
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
+msgid "The track's rating was set differently on the device and in Banshee"
+msgstr ""
+
#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:311
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
msgid "Playlist"
msgstr "Spilleliste"
@@ -1946,12 +1935,12 @@ msgid "Delete Playlist"
msgstr "Slett spilleliste"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:397
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:403
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:591
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Ny spilleliste"
@@ -1960,11 +1949,11 @@ msgstr "Ny spilleliste"
msgid "Windows Media ASX"
msgstr "Windows Media ASX"
-#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs:46
msgid "Windows Media ASX (*.asx)"
msgstr "Windows Media ASX (*.asx)"
-#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs:45
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs:44
msgid "MPEG Version 3.0 Extended (*.m3u)"
msgstr "MPEG versjon 3.0 utvidet (*.m3u)"
@@ -1994,238 +1983,243 @@ msgstr "Utvidelser"
msgid "File Policies"
msgstr "Regler for filer"
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+#, fuzzy
+msgid "Co_py files to media folders when importing"
+msgstr "Ko_pier filer til musikkmappen ved import"
+
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:69
msgid "Improve Banshee by sending anonymous usage data"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
msgid "items"
msgstr "oppføringer"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
msgid "minutes"
msgstr "minutter"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
msgid "hours"
msgstr "timer"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
msgid "MB"
msgstr "MB"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
msgid "GB"
msgstr "GB"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:363
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:74
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:361
msgid "Artist"
msgstr "Artist"
#. Translators: These are unique search aliases for "artist". You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
msgid "artist"
msgstr "artist"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
msgid "by"
msgstr "av"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
msgid "artists"
msgstr "artister"
#. 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:86
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
msgid "albumartist"
msgstr "albumartist"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:86
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
msgid "compilationartist"
msgstr "samlealbumartist"
#. 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:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
msgid "album"
msgstr "album"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
msgid "on"
msgstr "på"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
msgid "from"
msgstr "fra"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:100
msgid "Disc"
msgstr "Plate"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
msgid "disc"
msgstr "plate"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
msgid "cd"
msgstr "cd"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
msgid "discnum"
msgstr "platenr"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:112
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:110
msgid "discs"
msgstr "plater"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:112
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:110
msgid "cds"
msgstr "cder"
#. 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:121
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "track"
msgstr "spor"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:121
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "trackno"
msgstr "spornr"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:121
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "tracknum"
msgstr "spornummer"
#. 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:130
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "tracks"
msgstr "spor"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:130
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "trackcount"
msgstr "antall spor"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:136
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:134
msgid "Beats per Minute"
msgstr "Slag i minuttet"
#. 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:138
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:136
msgid "bpm"
msgstr "bpm"
#. 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:147
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "bitrate"
msgstr "bitrate"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "kbs"
msgstr "kbs"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "kps"
msgstr "kps"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:152
#, fuzzy
msgid "Sample Rate"
msgstr "Lydformat"
#. 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:156
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
msgid "samplerate"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
msgid "Hz"
msgstr "Hz"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:161
msgid "Bits Per Sample"
msgstr "Biter per sample"
#. 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:165
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
msgid "bitspersample"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
msgid "bitdepth"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
msgid "quantization"
msgstr "kvantisering"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:365
+#: ../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:668
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:95
msgid "Name"
msgstr "Navn"
#. 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:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
msgid "title"
msgstr "tittel"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
msgid "titled"
msgstr "med tittel"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
msgid "name"
msgstr "navn"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
msgid "named"
msgstr "med navn"
#. 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:181
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
msgid "year"
msgstr "år"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
msgid "released"
msgstr "utgitt"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
msgid "yr"
msgstr "år"
#. 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:189
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:187
msgid "genre"
msgstr "sjanger"
#. 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:196
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:194
msgid "composer"
msgstr "komponist"
#. 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:203
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:201
msgid "conductor"
msgstr "dirigent"
#. 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:210
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:208
msgid "grouping"
msgstr "gruppering"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:218
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:216
msgid "comment"
msgstr "kommentar"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:222
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:135
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:71
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:72
@@ -2233,283 +2227,288 @@ msgid "License"
msgstr "Lisens"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:226
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
msgid "license"
msgstr "lisens"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:226
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
msgid "licensed"
msgstr "lisensiert"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:226
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
msgid "under"
msgstr "under"
#. , typeof(NullQueryValue)},
#. 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:234
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
msgid "rating"
msgstr "poeng"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
msgid "stars"
msgstr "stjerner"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:238
msgid "Play Count"
msgstr "Antall avspillinger"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
msgid "plays"
msgstr "avspillinger"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
msgid "playcount"
msgstr "antall avspillinger"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
msgid "listens"
msgstr "lyttinger"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:248
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:246
msgid "Skip Count"
msgstr "Antall ganger hoppet over"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:250
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:248
msgid "skips"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:250
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:248
msgid "skipcount"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:254
msgid "File Size"
msgstr "Filstørrelse"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:258
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
msgid "size"
msgstr "størrelse"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:258
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
msgid "filesize"
msgstr "filstørrelse"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:262
msgid "File Location"
msgstr "Filplassering"
#. 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:266
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
msgid "uri"
msgstr "uri"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:266
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
msgid "path"
msgstr "sti"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:266
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
msgid "file"
msgstr "fil"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:266
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
msgid "location"
msgstr "plassering"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:270
msgid "Time"
msgstr "Tid"
#. 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:274
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
msgid "duration"
msgstr "varighet"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:274
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
msgid "length"
msgstr "lengde"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:274
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
msgid "time"
msgstr "tid"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:278
msgid "Mime Type"
msgstr "MIME-type"
#. 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:282
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
msgid "type"
msgstr "type"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:282
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
msgid "mimetype"
msgstr "mimetype"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:282
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
msgid "format"
msgstr "format"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:282
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
msgid "ext"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:286
msgid "Last Played"
msgstr "Sist spilt"
#. 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:290
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
msgid "lastplayed"
msgstr "sist spilt"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:290
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
msgid "played"
msgstr "spilt"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:290
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
+#, fuzzy
msgid "playedon"
msgstr "spilt"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:294
#, fuzzy
msgid "Last Skipped"
msgstr "Sist oppdatert:"
#. 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:298
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
msgid "lastskipped"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:298
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
msgid "skipped"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:298
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
msgid "skippedon"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:302
msgid "Date Added"
msgstr "Lagt til dato"
#. 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:306
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
msgid "added"
msgstr "Lagt til"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:306
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
msgid "imported"
msgstr "importert"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:306
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
msgid "addedon"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:306
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
#, fuzzy
msgid "dateadded"
msgstr "Lagt til dato"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:306
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
+#, fuzzy
msgid "importedon"
-msgstr "importert"
+msgstr "Importerer"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:317
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:65
msgid "Smart Playlist"
msgstr "Smart spilleliste"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:326
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "score"
-msgstr "poeng"
+msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:332
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:330
msgid "Playback Error"
msgstr "Feil ved avspilling"
#. Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:334
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:332
+#, fuzzy
msgid "playbackerror"
-msgstr "avspillingsfeil"
+msgstr "_Avspilling"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:351
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:349
msgid "BPM"
msgstr "BPM"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:352
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:350
msgid "Skips"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:353
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:351
msgid "Plays"
msgstr "Avspillinger"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:368
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:356
+msgid "Random"
+msgstr "Tilfeldig"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:366
msgid "Highest Rating"
msgstr "Høyest poengsum"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:369
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:367
msgid "Lowest Rating"
msgstr "Lavest poengsum"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:371
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:369
+#, fuzzy
msgid "Highest Score"
-msgstr "Høyeste poengsum"
+msgstr "Høyest"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:372
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:370
msgid "Lowest Score"
msgstr "Lavest poengsum"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:374
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:372
msgid "Most Often Played"
msgstr "Mest spilt"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:375
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:373
msgid "Least Often Played"
msgstr "Minst spilt"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:377
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:375
msgid "Most Recently Played"
msgstr "Sist spilt"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:378
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:376
#, fuzzy
msgid "Least Recently Played"
msgstr "Sist spilt"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:380
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:378
msgid "Most Recently Added"
msgstr "Sist lagt til"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:381
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:379
msgid "Least Recently Added"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:529
-msgid "Random"
-msgstr "Tilfeldig"
-
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:44
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:146
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
+#, fuzzy
msgid "None"
-msgstr "Ingen"
+msgstr "Ferdig"
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
msgid "none"
-msgstr "ingen"
+msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
msgid "no"
-msgstr "nei"
+msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:49
msgid "Resource Not Found"
@@ -2522,11 +2521,11 @@ msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
msgid "missing"
-msgstr "mangler"
+msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
msgid "notfound"
-msgstr "ikkefunnet"
+msgstr ""
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:54
@@ -2535,33 +2534,35 @@ msgid "CodecNotFound"
msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:56
+#, fuzzy
msgid "nocodec"
-msgstr "ingenkodek"
+msgstr "Kod til"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:59
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:61
msgid "Drm"
-msgstr "Drm"
+msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:61
msgid "drm"
-msgstr "drm"
+msgstr ""
#. 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:363
+#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:367
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Ukjent"
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:66
+#, fuzzy
msgid "unknown"
-msgstr "ukjent"
+msgstr "Ukjent"
#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:78
#, fuzzy
@@ -2582,8 +2583,8 @@ msgstr "Rediger smart spilleliste"
msgid "Delete Smart Playlist"
msgstr "Slett smart spilleliste"
-#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:148
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr ""
@@ -2640,36 +2641,44 @@ msgstr "Feil"
msgid "Details"
msgstr "Detaljer"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:152
msgid "Errors"
msgstr "Feil"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:215
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:205
+#, fuzzy
msgid "Sort Playlists By"
-msgstr "Sorter spillelister etter"
+msgstr "Sorter spilleliste"
#. Translators: this is a noun, referring to the harddisk
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:225
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:214
msgid "Drive"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:238
+#, fuzzy
+msgid "File Organization"
+msgstr "<b>Organisering av filsystem</b>"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:239
+#, fuzzy
msgid "Folder hie_rarchy"
-msgstr "Mappehie_rarki"
+msgstr "Mappehie_rarki:"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:240
+#, fuzzy
msgid "File _name"
-msgstr "Fil_navn"
+msgstr "Fil_navn:"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
-#, csharp-format
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:671
+#, fuzzy, csharp-format
msgid "Adding {0} of {1} to {2}"
-msgstr "Legger til {0} av {1} i {2}"
+msgstr "Laster {0} av {1}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
-#, csharp-format
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:690
+#, fuzzy, csharp-format
msgid "Deleting {0} of {1} From {2}"
-msgstr "Sletter {0} av {1} fra {2}"
+msgstr "Fjerner {0} av {1}"
#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:673
msgid "Size Ascending"
@@ -2680,40 +2689,38 @@ msgid "Size Descending"
msgstr "Synkende størrelse"
#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:791
-#, csharp-format
+#, fuzzy, csharp-format
msgid "{0} item"
msgid_plural "{0} items"
-msgstr[0] "{0} oppføring"
-msgstr[1] "{0} oppføringer"
+msgstr[0] "{0} spor"
+msgstr[1] "{0} spor"
#. TODO should add library sources here, but requires changing quite a few
#. things that depend on being loaded before the music library is added.
#. AddSource (music_library = new MusicLibrarySource (), true);
#. AddSource (video_library = new VideoLibrarySource (), false);
-#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:85
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:86
msgid "Online Media"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:86
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:87
msgid "Libraries"
-msgstr "Biblioteker"
-
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:48
-msgid "Unknown Stream"
-msgstr "Ukjent strøm"
+msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:83
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:91
msgid "Error opening stream"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:84
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:83
+#, fuzzy
msgid "Could not open stream or playlist"
-msgstr "Ikke åpne strøm eller spilleliste"
+msgstr "Ikke gjenta spilleliste"
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:93
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:92
+#, fuzzy
msgid "Problem parsing playlist"
-msgstr "Problem med lesing av spilleliste"
+msgstr "Feil under skriving til plate"
#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:67
msgid "Could not launch URL"
@@ -2732,25 +2739,28 @@ msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:49
msgid "Show:"
-msgstr "Vis:"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
+#, fuzzy
msgid "All"
-msgstr "Alle"
+msgstr "alle"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
-msgstr "Slått på"
+msgstr "På"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:53
+#, fuzzy
msgid "Not Enabled"
-msgstr "Slått av"
+msgstr "På"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:56
+#, fuzzy
msgid "Search:"
-msgstr "Søk:"
+msgstr "_Søk:"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:76
msgid "Disable album grid"
@@ -2774,27 +2784,29 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:170
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} av {1}"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:220
+#, fuzzy
msgid "Playing"
-msgstr "Spiller"
+msgstr "Spilles nå"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:221
+#, fuzzy
msgid "Paused"
msgstr "Pause"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
msgid "Protected"
-msgstr "Beskyttet"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
msgid "External Document"
-msgstr "Eksternt dokument"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
msgid "Choose New Cover Art..."
@@ -2806,8 +2818,9 @@ msgid "Delete This Cover Art"
msgstr "Laster ned albumcover"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
+#, fuzzy
msgid "Track #"
-msgstr "Spor #"
+msgstr "Spor"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:128
#, fuzzy
@@ -2815,8 +2828,9 @@ msgid "Track & Count"
msgstr "Antall avspillinger"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132
+#, fuzzy
msgid "Disc #"
-msgstr "Plate #"
+msgstr "Platenavn:"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:133
#, fuzzy
@@ -2826,18 +2840,18 @@ msgstr "Koble fra"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:136
#, csharp-format
msgid "{0} kbps"
-msgstr "{0} kbps"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:123
-#, csharp-format
+#, fuzzy, csharp-format
msgid "{0} Hz"
-msgstr "{0} Hz"
+msgstr "{0} dag"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:142
-#, csharp-format
+#, fuzzy, csharp-format
msgid "{0} bits"
-msgstr "{0} biter"
+msgstr "{0} spor"
#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
@@ -2848,32 +2862,33 @@ msgid "Hide context pane"
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
+#, fuzzy
msgid "Waiting for playback to begin..."
-msgstr "Venter på at avspilling skal starte …"
+msgstr "Venter på media"
#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
+#, fuzzy
msgid "Loading..."
-msgstr "Laster …"
+msgstr "Kontakter..."
#: ../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
+#, fuzzy, csharp-format
msgid "+{0} dB"
-msgstr "+{0} dB"
+msgstr "{0} dag"
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:102
-#, csharp-format
+#, fuzzy, csharp-format
msgid "{0} dB"
-msgstr "{0} dB"
+msgstr "{0} dag"
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:124
#, csharp-format
msgid "{0} kHz"
-msgstr "{0} kHz"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:53
msgid "Equalizer"
@@ -2886,26 +2901,27 @@ msgstr "Ny spilleliste"
#. 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:205
-#, csharp-format
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:203
+#, fuzzy, csharp-format
msgid "{0} by {1}"
msgstr "{0} av {1}"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:86
msgid "_Bookmarks"
-msgstr "_Bokmerker"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
-msgstr "_Legg til bokmerke"
+msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
+#, fuzzy
msgid "_Remove Bookmark"
-msgstr "Fje_rn bokmerke"
+msgstr "Fje_rn"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:54
#, fuzzy
@@ -2917,23 +2933,24 @@ msgid "Contributors"
msgstr "Medhjelpere"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
+#, fuzzy
msgid "Extraordinary Multimedia Management and Playback"
-msgstr "Ekstraordinær mediebehandling- og avspilling"
+msgstr "Musikkbehandling og avspilling for GNOME."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
-#, csharp-format
+#, fuzzy, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
-"Copyright © 2005–{1} Others\n"
+"Copyright © 2005–{0} Others\n"
"Copyright © 2005 Aaron Bockover"
msgstr ""
-"Opphavsrett 2005-{0} Novell, Inc.\n"
-"Opphavsrett 2005-{1} Andre\n"
+"Opphavsrett 2005-2007 Novell, Inc.\n"
"Opphavsrett 2005 Aaron Bockover"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
+#, fuzzy
msgid "Banshee Website"
-msgstr "Banshee nettside"
+msgstr "Banshee-Wiki"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:50
msgid "Important tasks are running"
@@ -2946,12 +2963,14 @@ msgid ""
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
+#, fuzzy
msgid "Quit Anyway"
msgstr "Avslutt likevel"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:61
+#, fuzzy
msgid "Continue Running"
-msgstr "Fortsett kjøring"
+msgstr "Ikke avslutt"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:69
msgid "Make Banshee the default media player?"
@@ -2964,7 +2983,7 @@ msgid ""
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:435
#, csharp-format
msgid "Do not ask me this again"
msgstr "Ikke spør meg om dette igjen"
@@ -2974,9 +2993,10 @@ msgid "Make Banshee the Default"
msgstr ""
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
+#, fuzzy
msgid "I_mport"
-msgstr "I_mporter"
+msgstr "Importer"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39
msgid "Select album cover image"
@@ -3012,12 +3032,14 @@ msgid "Seek to Position"
msgstr "Spol til posisjon"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:50
+#, fuzzy
msgid "_Media"
-msgstr "_Medie"
+msgstr "Medium"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:53
+#, fuzzy
msgid "Import _Media..."
-msgstr "Importer _medie …"
+msgstr "Importer _musikk..."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:54
#, fuzzy
@@ -3025,113 +3047,110 @@ msgid "Import media from a variety of sources"
msgstr "Importer musikk fra forskjellige kilder"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:57
+#, fuzzy
msgid "Import _Playlist..."
-msgstr "Importer s_pilleliste …"
+msgstr "Smart spilleliste"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:58
+#, fuzzy
msgid "Import a playlist"
-msgstr "Importer en spilleliste"
+msgstr "Smart spilleliste"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
-msgid "Open _Location..."
-msgstr "Åpne _lokasjon …"
+#, fuzzy
+msgid "Rescan Music Library"
+msgstr "Musikkbibliotek"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr ""
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
+msgid "Open _Location..."
+msgstr "Åpne _lokasjon..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Åpne en fjernplassering for avspilling"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Avslutt"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Avslutt Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "R_ediger"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
+#, fuzzy
msgid "_Preferences"
-msgstr "_Brukervalg"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
-msgid "Modify your personal preferences"
-msgstr "Endre dine personlige brukervalg"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
-msgid "_Tools"
-msgstr "Verk_tøy"
+msgstr "Innstillinger"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-#, fuzzy
-msgid "Rescan Music Library"
-msgstr "Musikkbibliotek"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
+msgid "Modify your personal preferences"
+msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
+msgid "_Tools"
msgstr ""
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Hjelp"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
-msgstr "_Innhold"
+msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Hjemmeside for Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Besøk hjemmesiden for Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Engasjer deg"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Bli en medhjelper i Banshee-prosjektet"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#, fuzzy
msgid "_Version Information"
-msgstr "_Versjonsinformasjon"
+msgstr "_Versjonsinformasjon..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Vis detaljert versjons- og konfigurasjonsinformasjon"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
+#, fuzzy
msgid "Import Playlist"
-msgstr "Importer spilleliste"
+msgstr "Smart spilleliste"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
+#, fuzzy
msgid "Playlists"
-msgstr "Spillelister"
+msgstr "Spilleliste"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:69
#, fuzzy
@@ -3352,7 +3371,7 @@ msgstr ""
#: ../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:87
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:85
msgid "Preferences"
msgstr "Innstillinger"
@@ -3382,12 +3401,12 @@ msgstr ""
msgid "Could not export playlist"
msgstr "Ikke gjenta spilleliste"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:434
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:426
#, csharp-format
msgid "Are you sure you want to delete this {0}?"
msgstr "Er du sikker på at du vil slette {0}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:477
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:469
msgid "Separate by Type"
msgstr ""
@@ -3558,16 +3577,6 @@ msgstr[1] ""
"Er du sikker på at du vil fjerne de <b>{0}</b> valgte sporene fra "
"biblioteket?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-#, fuzzy
-msgid "Are you sure you want to continue?"
-msgstr "Er du sikker på at du vil slette {0}?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-#, fuzzy
-msgid "Remove tracks"
-msgstr "Spor"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
#, fuzzy
msgid "Com_pilation Album Artist:"
@@ -3655,20 +3664,20 @@ msgstr "Sett alle sjangre til denne verdien"
msgid "_Disc Number:"
msgstr "Platenavn:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Sett alle år til denne verdien"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
#, fuzzy
msgid "_Year:"
msgstr "År"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Sett alle poengsummer til denne verdien"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
#, fuzzy
msgid "_Rating:"
msgstr "Poeng"
@@ -4000,7 +4009,7 @@ msgstr "Vis _albumcover"
msgid "Toggle display of album cover art"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs:92
msgid "Active Task Running"
msgid_plural "Active Tasks Running"
msgstr[0] ""
@@ -4014,6 +4023,12 @@ msgstr[1] ""
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr ""
+#. simply: "Chicago Public Radio" or whatever the artist name is
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:543
+#, fuzzy
+msgid "Unknown Stream"
+msgstr "Ukjent Tittel"
+
#. 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:546
#, fuzzy, csharp-format
@@ -4037,7 +4052,7 @@ msgstr ""
#. 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:589
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:525
#, fuzzy, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}:{1:00} av {2}"
@@ -4045,7 +4060,7 @@ msgstr "{0}:{1:00} av {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:593
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:529
#, fuzzy, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}:{1:00} av {2}"
@@ -4108,6 +4123,20 @@ msgstr "Lokale filer"
msgid "C_hoose Files..."
msgstr ""
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
+msgid "_Files to import:"
+msgstr ""
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:82
+#, fuzzy
+msgid "Select Files"
+msgstr "Velg _alle"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:83
+#, fuzzy
+msgid "(none selected)"
+msgstr "valgt av"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:43
#, fuzzy
msgid "Import Folders to Library"
@@ -4128,6 +4157,16 @@ msgstr "Mappe"
msgid "C_hoose Folders..."
msgstr "Mappe"
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
+#, fuzzy
+msgid "_Folders to import:"
+msgstr "Kunne ikke importere spor"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:76
+#, fuzzy
+msgid "Select Folders"
+msgstr "Velg for bruk"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:73
#, fuzzy
msgid "<big><b>Import Media to Library</b></big>"
@@ -4153,6 +4192,7 @@ msgstr "Ikke vis denne dialogen igjen"
#: ../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:384
#, fuzzy
msgid "_Import"
msgstr "Importer"
@@ -4236,99 +4276,31 @@ msgstr "Åpne i redigering"
msgid "Create and save"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
-msgid "Browser Content"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
-msgid "Configure the filters available in the browser"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
-#, fuzzy
-msgid "Show Artist Filter"
-msgstr "Vis hjelp"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
-msgid "Show a list of artists to filter by"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
-#, fuzzy
-msgid "Show all Artists"
-msgstr "Artist"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
-#, fuzzy
-msgid "Show all artists in the artist filter"
-msgstr "Sett alle artister til denne verdien"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
-#, fuzzy
-msgid "Show Album Artists"
-msgstr "Albumtittel"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
-msgid "Show only album artists, not artists with only single tracks"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
-msgid "Show Genre Filter"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
-msgid "Show a list of genres to filter by"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
-msgid "Show Year Filter"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
-msgid "Show a list of years to filter by"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
-msgid "Not Set"
-msgstr ""
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Browser on Left"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
+#: ../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:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:114
msgid "Browser on Top"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
+#: ../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:115
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
#, fuzzy
msgid "Show Browser"
msgstr "Vis albumcover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
msgid "Show or hide the artist/album browser"
msgstr ""
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
-msgid ""
-"This page is blocked because it is probably not the one you are looking for!"
-msgstr ""
-
-#. Translators: {0} is the URL of the web page that was requested
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
-#, csharp-format
-msgid "The security certificate for {0} is invalid."
-msgstr ""
-
#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, fuzzy, csharp-format
msgid "Loading {0}..."
@@ -4351,39 +4323,54 @@ msgstr "Mappehie_rarki:"
msgid "Seek"
msgstr ""
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:146
msgid "Idle"
msgstr "Inaktiv"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:147
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Kontakter..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:157
msgid "Buffering"
msgstr "Forhåndslaster"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+#, fuzzy
+msgid "Volume"
+msgstr "Volum"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+#, fuzzy
+msgid "Muted"
+msgstr "Minutter"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+#, fuzzy
+msgid "Full Volume"
+msgstr "Volum"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108
msgid "Device"
msgstr "Spiller"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109
#, fuzzy
msgid "Generation"
msgstr "Varighet"
#. FIXME
#. AddDapProperty (Catalog.GetString ("Color"), "black");
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:121
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:114
msgid "Capacity"
msgstr ""
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:122
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
msgid "Available"
msgstr ""
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:123
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
msgid "Serial number"
msgstr ""
@@ -4393,50 +4380,40 @@ msgstr ""
#. 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:130
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:123
#, fuzzy
msgid "Supports cover art"
msgstr "Vis albumcover"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:131
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:124
msgid "Supports photos"
msgstr ""
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:453
msgid "Track duration is zero"
msgstr ""
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:556
#, fuzzy
msgid "Syncing iPod"
msgstr "Synkroniserer iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:557
#, fuzzy
msgid "Preparing to synchronize..."
msgstr "Forbereder skriving"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:560
#, fuzzy, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Laster {0} av {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, fuzzy, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Laster {0} av {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:596
#, fuzzy, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Importerer {0} - {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, fuzzy, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Importerer {0} - {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:649
#, fuzzy
msgid "Writing media database"
msgstr "Lagrer ny database..."
@@ -4446,83 +4423,99 @@ msgstr "Lagrer ny database..."
msgid "Sync {0}"
msgstr "Synkroniser {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. Note to translators: {0}, {1} and {2} will be replaced with numbers.
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:260
+#, csharp-format
+msgid "{0} to add, {1} to remove, {2} to update"
+msgstr ""
+
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
#, fuzzy
msgid "Devices"
msgstr "Spiller"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:179
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
#, fuzzy
msgid "Device Properties"
msgstr "Egenskaper"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
#, fuzzy
msgid "Product"
msgstr "Podcast"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
msgid "Vendor"
msgstr "Produsent"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:140
#, fuzzy, csharp-format
msgid "Loading {0}"
msgstr "Laster"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
#, fuzzy
msgid "Yes"
msgstr "År"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr ""
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
"convert it"
msgstr ""
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr ""
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
#, fuzzy
msgid "Error converting file"
msgstr "Konverterer filer"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:135
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:137
msgid "Sync when first plugged in and when the libraries change"
msgstr ""
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:138
msgid ""
"Begin synchronizing the device as soon as the device is plugged in or the "
"libraries change."
msgstr ""
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:141
#, fuzzy
msgid "Sync Preferences"
msgstr "Innstillinger"
#. 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."
msgstr[0] ""
msgstr[1] ""
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:369
+#, fuzzy
+msgid "Are you sure you want to continue?"
+msgstr "Er du sikker på at du vil slette {0}?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:377
+#, fuzzy
+msgid "Remove tracks"
+msgstr "Spor"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:52
#, fuzzy
msgid "Sync"
msgstr "Synkroniser {0}"
@@ -4533,7 +4526,6 @@ msgid "Audio"
msgstr "Vanlig lyd"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:69
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:49
msgid "Video"
msgstr "Video"
@@ -4598,12 +4590,12 @@ msgstr ""
msgid "Disconnect"
msgstr "Koble fra"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, fuzzy, csharp-format
msgid "Disconnecting {0}..."
msgstr "Løs ut {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, fuzzy, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Kunne ikke løse ut iPod"
@@ -4613,34 +4605,34 @@ msgstr "Kunne ikke løse ut iPod"
msgid "Purchased Music"
msgstr "Delt musikk"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:115
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:87
+#, fuzzy
+msgid "Rockbox Device"
+msgstr "Spiller"
+
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:114
#, csharp-format
msgid "Audio Folder"
msgid_plural "Audio Folders"
msgstr[0] "Lydmappe"
msgstr[1] "Lydmapper"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:122
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:121
#, fuzzy, csharp-format
msgid "Video Folder"
msgid_plural "Video Folders"
msgstr[0] "Lydmappe"
msgstr[1] "Lydmapper"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:128
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:127
msgid "Required Folder Depth"
msgstr ""
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:131
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:130
#, fuzzy
msgid "Supports Playlists"
msgstr "Sorter spilleliste"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs:41
-#, fuzzy
-msgid "Rockbox Device"
-msgstr "Spiller"
-
#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs:195
msgid "Ringtones"
msgstr ""
@@ -4652,7 +4644,7 @@ msgstr "Initierer støtte for lyd-CD"
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:83
#, fuzzy
-msgid "There was an error initializing MTP device support."
+msgid "There was an error intializing MTP device support."
msgstr "Initierer støtte for lyd-CD"
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142
@@ -4759,11 +4751,6 @@ msgstr "Åpne plassering"
msgid "Merge Discs..."
msgstr ""
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:57
-#, fuzzy
-msgid "Go to Audiobooks"
-msgstr "Vanlig lyd"
-
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65
msgid "Resume"
@@ -4774,77 +4761,220 @@ msgstr ""
msgid "Resume playback of this audiobook"
msgstr ""
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:139
+#: ../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] ""
msgstr[1] ""
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
+#: ../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:153
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:152
+#, fuzzy
+msgid "Author:"
+msgstr "Forfatter(e)"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:159
+#, fuzzy
+msgid "Book Title:"
+msgstr "Tittel:"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:57
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:92
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:87
+#, fuzzy
+msgid "Author"
+msgstr "Forfatter(e)"
+
+#. 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:68
+#, fuzzy
+msgid "Book Title"
+msgstr "Tittel på spor"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+#, fuzzy
+msgid "Audiobooks"
+msgstr "Vanlig lyd"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75
+msgid "Search your audiobooks"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:146
+#, fuzzy, csharp-format
+msgid "{0} book"
+msgid_plural "{0} books"
+msgstr[0] "{0} siden"
+msgstr[1] "{0} siden"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:150
+#, fuzzy
+msgid "Audiobooks Folder"
+msgstr "Lydmappe"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
+#, fuzzy
+msgid "Resume Playback"
+msgstr "Pause avspilling"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:120
+#, fuzzy
+msgid "No Bookmark Set"
+msgstr "Fje_rn"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:56
+msgid "Audio CD"
+msgstr "Lyd-CD"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:104
+#, csharp-format
+msgid "Track {0}"
+msgstr "Spor {0}"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:121
+msgid "Importing Audio CD"
+msgstr "Importerer Lyd-CD"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:122
+msgid "Initializing Drive"
+msgstr "Initierer stasjon"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:124
+#, csharp-format
+msgid ""
+"<i>{0}</i> is still being imported into the music library. Would you like to "
+"stop it?"
+msgstr ""
+"<i>{0}</i> er i ferd med å bli importert til biblioteket. Vil du avbryte "
+"dette?"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:254
+msgid "Cannot Import CD"
+msgstr "Kan ikke importere CD"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:237
+#, fuzzy
+msgid "Audio CDs"
+msgstr "Lyd-CD"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:239
+#, fuzzy
+msgid "Audio CD Importing"
+msgstr "Importerer"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:242
+#, fuzzy
+msgid "_Import format"
+msgstr "Format for _utdata:"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:246
+msgid "_Automatically import audio CDs when inserted"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:247
+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 ""
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:251
+msgid "_Eject when done importing"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:252
+msgid "When an audio CD has been imported, automatically eject it."
+msgstr ""
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:255
+msgid "Use error correction when importing"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:256
+msgid ""
+"Error correction tries to work around problem areas on a disc, such as "
+"surface scratches, but will slow down importing substantially."
+msgstr ""
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:324
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:441
+msgid "Import CD"
+msgstr "Importer CD"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:325
+#, fuzzy
+msgid "Import this audio CD to the library"
+msgstr "Legg CD inn i biblioteket"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:331
+#, fuzzy
+msgid "Duplicate CD"
+msgstr "Skriv CD"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:332
#, fuzzy
-msgid "Author:"
-msgstr "Forfatter(e)"
+msgid "Duplicate this audio CD"
+msgstr "Skriv valgte spor til CD"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:160
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:131
#, fuzzy
-msgid "Book Title:"
-msgstr "Tittel:"
+msgid "Searching for track information..."
+msgstr "Søker etter CD-metadata..."
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:57
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:89
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:87
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:164
#, fuzzy
-msgid "Author"
-msgstr "Forfatter(e)"
+msgid "Could not fetch track information"
+msgstr "Fant ikke CD-metadata"
-#. Translators: This means the first letter of the author's name
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:63
-msgid "Author Initial"
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:192
+msgid "Automatic import off since this album is already in the Music Library."
msgstr ""
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:68
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:215
#, fuzzy
-msgid "Book Title"
-msgstr "Tittel på spor"
+msgid "Could not import CD"
+msgstr "Kunne ikke importere spor"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:65
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:232
#, fuzzy
-msgid "Audiobooks"
-msgstr "Vanlig lyd"
+msgid "Could not duplicate audio CD"
+msgstr "Kunne ikke lese lyd-CD"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:72
-msgid "Search your audiobooks"
-msgstr ""
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:364
+#, fuzzy
+msgid "Ejecting audio CD..."
+msgstr "Importerer Lyd-CD"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:132
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:382
#, fuzzy, csharp-format
-msgid "{0} book"
-msgid_plural "{0} books"
-msgstr[0] "{0} siden"
-msgstr[1] "{0} siden"
+msgid "Could not eject audio CD: {0}"
+msgstr "Kunne ikke løse ut iPod"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:136
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
#, fuzzy
-msgid "Audiobooks Folder"
-msgstr "Lydmappe"
+msgid "Audio CD Preferences"
+msgstr "Innstillinger"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:416
#, fuzzy
-msgid "Resume Playback"
-msgstr "Pause avspilling"
+msgid "Eject Disc"
+msgstr "Løs ut CD"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:120
-#, fuzzy
-msgid "No Bookmark Set"
-msgstr "Fje_rn"
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
+#, csharp-format
+msgid "Import ‟{0}”"
+msgstr ""
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs:64
msgid "Detecting BPM"
@@ -4886,7 +5016,7 @@ msgstr ""
msgid "Downloading Cover Art"
msgstr "Laster ned albumcover"
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:129
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:128
#, fuzzy, csharp-format
msgid "{0} - {1}"
msgstr "{0} av {1}"
@@ -4913,8 +5043,8 @@ msgid ""
"other iTunes® 7 clients.\n"
"\n"
"No third-party clients can connect to iTunes® music shares anymore. This is "
-"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
-"the unfortunate inconvenience."
+"an intentional limitation by Apple in iTunes® 7 and we apologize for the "
+"unfortunate inconvenience."
msgstr ""
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
@@ -4942,7 +5072,7 @@ msgid "Try connecting again"
msgstr "Prøv å koble til på nytt"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:139
-msgid "The music share is hosted by iTunes® 7 or newer"
+msgid "The music share is hosted by iTunes® 7"
msgstr ""
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs:47
@@ -4973,11 +5103,11 @@ msgstr "Logg inn"
msgid "Connecting to {0}"
msgstr "Kobler til {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
msgstr ""
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
msgstr ""
@@ -5223,7 +5353,7 @@ msgstr ""
#: ../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:309
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:301
msgid "Try Again"
msgstr ""
@@ -5235,7 +5365,7 @@ msgstr ""
#: ../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:282
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:280
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
msgstr "Beskrivelse"
@@ -5452,10 +5582,6 @@ msgstr ""
msgid "Library of Congress"
msgstr ""
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
-msgid "Examples:"
-msgstr ""
-
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148
msgid ""
"The Internet Archive, a 501(c)(3) non-profit, is building a digital library "
@@ -5742,6 +5868,10 @@ msgstr ""
msgid "Oldest"
msgstr ""
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
+msgid "Not Set"
+msgstr ""
+
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:54
msgid "Radio"
msgstr "Radio"
@@ -5769,22 +5899,22 @@ msgstr "Rediger radiostasjon"
msgid "Station"
msgstr "Stasjon"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, fuzzy, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "Stasjon"
msgstr[1] "Stasjon"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr ""
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr ""
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr ""
@@ -5834,62 +5964,35 @@ msgstr "Beskrivelse:"
msgid "Rating:"
msgstr "Poeng"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr ""
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:125
msgid "_Last.fm"
msgstr ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126
msgid "Configure the Audioscrobbler plugin"
msgstr "Konfigurer Audioscrobbler-tillegget"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:129
#, fuzzy
msgid "Visit _User Profile Page"
msgstr "Besøk profilsiden"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:130
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:164
#, fuzzy
msgid "Visit Your Last.fm Profile Page"
msgstr "Besøk profilsiden"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
-#, fuzzy
-msgid "_Enable Song Reporting From Banshee"
-msgstr "Rapporter spor til Last.fm"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:135
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:91
#, fuzzy
-msgid "Enable song reporting From Banshee"
+msgid "_Enable Song Reporting"
msgstr "Rapporter spor til Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
-#, fuzzy
-msgid "_Enable Song Reporting From Device"
-msgstr "Rapporter spor til Last.fm"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
-#, fuzzy
-msgid "Enable song reporting From Device"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
+msgid "Enable song reporting"
msgstr "Rapporter spor til Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-#, fuzzy
-msgid "Scrobbling to Last.FM"
-msgstr "Logg inn på Last.fm"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-#, fuzzy
-msgid "Scrobbling to Last.FM..."
-msgstr "Kobler til Last.fm."
-
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
msgstr "Koble til"
@@ -5978,68 +6081,68 @@ msgstr ""
msgid "http://en.wikipedia.org/wiki/{0}"
msgstr ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:78
#, fuzzy
msgid "Account"
msgstr "<b>Antall s_por:</b>"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:82
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:278
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:270
#, fuzzy
msgid "_Username"
msgstr "Brukernavn:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:168
+#: ../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 ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
+#: ../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 ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273
+#: ../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 "Logg inn på Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+#: ../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 ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:296
msgid "Finish Logging In"
msgstr ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:318
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:310
#, csharp-format
msgid "You are logged in to Last.fm as the user <i>{0}</i>."
msgstr ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:321
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:313
#, fuzzy
msgid "Log out of Last.fm"
msgstr "Logg inn på Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr ""
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
#, fuzzy
msgid "Recently Played Tracks"
msgstr "Sist spilt"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
#, fuzzy
msgid "My Top Artists"
msgstr "Artist"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} avspillinger"
@@ -6315,12 +6418,12 @@ msgid "Now Playing"
msgstr "Spilles nå"
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60
-#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
#, fuzzy
msgid "media"
msgstr "Medium"
-#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
msgid "Quick access panel for your media"
msgstr ""
@@ -6361,11 +6464,6 @@ msgstr "Ikke hørt"
msgid "Search for video podcasts"
msgstr ""
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
-msgid "_Close"
-msgstr "_Lukk"
-
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
#, fuzzy
msgid "_Show Notifications"
@@ -6398,7 +6496,7 @@ msgstr "Kan ikke vise melding"
#. 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:514
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:521
#, fuzzy, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6414,172 +6512,9 @@ msgid "Simplify"
msgstr ""
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:60
-msgid "Hide/Show the source list, menu, toolbar, and status bar"
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:75
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:54
-msgid "Audio CD"
-msgstr "Lyd-CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:103
-#, csharp-format
-msgid "Track {0}"
-msgstr "Spor {0}"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:121
-msgid "Importing Audio CD"
-msgstr "Importerer Lyd-CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:122
-msgid "Initializing Drive"
-msgstr "Initierer stasjon"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
-#, csharp-format
-msgid ""
-"<i>{0}</i> is still being imported into the music library. Would you like to "
-"stop it?"
-msgstr ""
-"<i>{0}</i> er i ferd med å bli importert til biblioteket. Vil du avbryte "
-"dette?"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
-msgid "Cannot Import CD"
-msgstr "Kan ikke importere CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:105
-#, fuzzy
-msgid "Audio CDs"
-msgstr "Lyd-CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:107
-#, fuzzy
-msgid "Audio CD Importing"
-msgstr "Importerer"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:110
-#, fuzzy
-msgid "_Import format"
-msgstr "Format for _utdata:"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:114
-msgid "_Automatically import audio CDs when inserted"
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
-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 ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
-msgid "_Eject when done importing"
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:120
-msgid "When an audio CD has been imported, automatically eject it."
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:123
-msgid "Use error correction when importing"
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
-msgid ""
-"Error correction tries to work around problem areas on a disc, such as "
-"surface scratches, but will slow down importing substantially."
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
-msgid "Import CD"
-msgstr "Importer CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:193
-#, fuzzy
-msgid "Import this audio CD to the library"
-msgstr "Legg CD inn i biblioteket"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:199
-#, fuzzy
-msgid "Duplicate CD"
-msgstr "Skriv CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:200
-#, fuzzy
-msgid "Duplicate this audio CD"
-msgstr "Skriv valgte spor til CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:113
-#, fuzzy
-msgid "Searching for track information..."
-msgstr "Søker etter CD-metadata..."
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:146
-#, fuzzy
-msgid "Could not fetch track information"
-msgstr "Fant ikke CD-metadata"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
-msgid "Automatic import off since this album is already in the Music Library."
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
-#, fuzzy
-msgid "Could not import CD"
-msgstr "Kunne ikke importere spor"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:215
-#, fuzzy
-msgid "Could not duplicate audio CD"
-msgstr "Kunne ikke lese lyd-CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:285
-#, fuzzy
-msgid "Audio CD Preferences"
-msgstr "Innstillinger"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:286
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:64
-#, fuzzy
-msgid "Eject Disc"
-msgstr "Løs ut CD"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:310
-#, csharp-format
-msgid "Import ‟{0}”"
-msgstr ""
-
-#. Translators: {0} is the type of disc, "Audio CD" or "DVD"
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
-#, fuzzy, csharp-format
-msgid "Ejecting {0}..."
-msgstr "Løs ut {0}"
-
-#. Translators: {0} is the type of disc, "Audio CD" or "DVD". {1} is the error message.
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:173
-#, fuzzy, csharp-format
-msgid "Could not eject {0}: {1}"
-msgstr "Kunne ikke løse ut iPod"
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs:91
-msgid "Go to Menu"
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs:92
-msgid "Navigate to menu"
+msgid "Simplify the Now Playing interface by hiding the source list and more"
msgstr ""
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:38
-msgid "DVD"
-msgstr ""
-
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:63
-#, fuzzy
-msgid "DVD Preferences"
-msgstr "Innstillinger"
-
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
#, fuzzy, csharp-format
msgid "Unable to import track: {0}"
@@ -6595,6 +6530,7 @@ msgstr ""
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
#, fuzzy
msgid "iTunes Importer"
msgstr "Importer"
@@ -6614,20 +6550,24 @@ msgid "Import playlists"
msgstr "Smart spilleliste"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr ""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr ""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr ""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
@@ -6635,11 +6575,13 @@ msgid ""
msgstr ""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
#, fuzzy
msgid "iTunes Media Player"
msgstr "Musikkavspiller"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
msgid ""
"Banshee is not familiar with this version of the iTunes library format. "
"Importing may or may not work as expected, or at all. Would you like to "
@@ -6648,6 +6590,7 @@ msgstr ""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
#, fuzzy
msgid "Unable to import song."
msgstr "Kan ikke importere spor fra {0}"
@@ -6657,6 +6600,11 @@ msgstr "Kan ikke importere spor fra {0}"
msgid "Rhythmbox Music Player"
msgstr "Banshee musikkavspiller"
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+#, fuzzy
+msgid "Import _playlists"
+msgstr "Smart spilleliste"
+
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:61
msgid "_Fill"
msgstr ""
@@ -6752,7 +6700,7 @@ 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:281
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
msgid "Podcast"
@@ -6763,67 +6711,67 @@ msgstr "Podcast"
msgid "All Podcasts ({0})"
msgstr "Podcaster"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:103
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:102
#, fuzzy
msgid "Podcasts Folder"
msgstr "Mappe"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:130
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:129
#, fuzzy
msgid "Remove Podcast"
msgstr "Podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:135
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:134
msgid "Disable Auto Updates"
msgstr ""
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:152
#, csharp-format
msgid "Network error updating {0}"
msgstr ""
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:159
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
#, csharp-format
msgid "Parsing error updating {0}"
msgstr ""
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:162
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:161
#, fuzzy, csharp-format
msgid "Authentication error updating {0}"
msgstr "Autentisering kreves"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:164
#, fuzzy, csharp-format
msgid "Error updating {0}"
msgstr "Laster"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:222
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:220
#, fuzzy
msgid "Search your podcasts"
msgstr "Ikke hørt"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:224
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:222
#, fuzzy
msgid "Episode Properties"
msgstr "Kildeegenskaper"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:281
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
msgid "Published"
msgstr "Publisert"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:281
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#, fuzzy
msgid "New"
msgstr "Ny plate"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:282
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:280
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
#, fuzzy
msgid "Downloaded"
msgstr "Last ned"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:308
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:306
#, fuzzy, csharp-format
msgid "{0} episode"
msgid_plural "{0} episodes"
@@ -7094,20 +7042,11 @@ msgstr ""
msgid "Stop SQL Monitoring"
msgstr ""
-#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:133
+#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:108
#, fuzzy
msgid "Track Preview"
msgstr "Egenskaper"
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPContainerSource.cs:39
-#, fuzzy
-msgid "Shared Media"
-msgstr "Delt musikk"
-
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs:52
-msgid "UPnP Share"
-msgstr ""
-
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:136
msgid "Uploaded by"
msgstr ""
@@ -7144,115 +7083,99 @@ msgstr "Lagre og logg inn"
msgid "Authorize for Last.fm"
msgstr "Logg inn på Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:449
+msgid ""
+"Last.fm username is invalid or Banshee is not authorized to access your "
+"account."
+msgstr ""
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
msgid "This service does not exist."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
msgid "Stations are only available to paying Last.fm subscribers."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
msgid "This station is not available."
msgstr "Stasjonen er ikke tilgjengelig."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
msgid "The request is missing a required parameter."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
msgid "The specified resource is invalid."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
msgid "Server error, please try again later."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
msgid "Invalid authentication information, please re-authenticate."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
msgid "The API key used by this application is invalid."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
msgid ""
"The streaming system is offline for maintenance, please try again later."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
msgid "The method signature is invalid."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
msgid "There is not enough content to play this station."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
msgid "This group does not have enough members for radio."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
msgid "This artist does not have enough fans for radio."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
msgid "There are not enough neighbours for this station."
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
-msgid "This user is not allowed to listen to radio during peak usage"
-msgstr ""
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
-msgid "Radio station not found"
-msgstr ""
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
-msgid "This application is not allowed to make requests to the web services"
-msgstr ""
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
-msgid "This type of request is no longer supported"
-msgstr ""
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
-msgid ""
-"Your IP has made too many requests in a short period, exceeding our API "
-"guidelines"
-msgstr ""
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
msgid "There was an unknown error."
msgstr "Det oppsto en ukjent feil."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
msgid "Not connected to Last.fm."
msgstr "Ikke koblet til Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
msgid "Account details are needed before you can connect to Last.fm"
msgstr ""
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
msgid "No network connection detected."
msgstr "Ingen nettverkstilkobling funnet."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
msgid "Last.fm username is invalid."
msgstr "Last.fm brukernavn er ugyldig."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
msgid "Connecting to Last.fm."
msgstr "Kobler til Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
msgid "Connected to Last.fm."
msgstr "Koblet til Last.fm."
#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:151
+#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:97
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:100
-#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:103
msgid "Unknown Podcast"
msgstr "Ukjent Podcast"
diff --git a/po/pl.po b/po/pl.po
index e10d57f..6707926 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,14 +7,14 @@
# Artur Flinta <aflinta at gmail.com>, 2007, 2008.
# Wadim Dziedzic <wdziedzic at aviary.pl>, 2008, 2009.
# Tomasz Dominikowski <tdominikowski at aviary.pl>, 2007, 2008, 2009.
-# Piotr Drąg <piotrdrag at gmail.com>, 2009, 2010, 2012, 2013.
+# Piotr Drąg <piotrdrag at gmail.com>, 2009, 2010, 2012.
# Mateusz Kacprzak <mateusz.kacprzak at yandex.ru>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: banshee\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-03 17:40+0200\n"
-"PO-Revision-Date: 2013-10-03 17:41+0200\n"
+"POT-Creation-Date: 2012-08-25 21:05+0200\n"
+"PO-Revision-Date: 2012-08-25 21:28+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
"Language-Team: Polish <gnomepl at aviary.pl>\n"
"Language: pl\n"
@@ -95,7 +95,7 @@ msgstr "Import z Amazon MP3"
#: ../data/addin-xml-strings.cs:34
msgid "Download and import music purchased from Amazon.com."
-msgstr "Pobieranie i importowanie muzyki kupionej w serwisie Amazon.com."
+msgstr "Pobieranie i importowanie muzyki kupionej w serwisie Amazon.com"
#. ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml
#: ../data/addin-xml-strings.cs:38
@@ -221,7 +221,7 @@ msgstr "Słuchanie i organizowanie stacji radia internetowego."
#. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
#: ../data/addin-xml-strings.cs:93
msgid "Last.fm Scrobbling"
-msgstr "Scrobblowanie do serwisu Last.fm"
+msgstr "Scrobblowanie z serwisu Last.fm"
#: ../data/addin-xml-strings.cs:94
msgid "Last.fm scrobbling and context pane recommendations."
@@ -618,8 +618,8 @@ msgid ""
"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
msgstr ""
"Zamknięty, stratny format kompresji dźwięku. Wynikowe pliki zachowują wysoką "
-"jakość przy niższej gęstości bitowej. Plik 96 kb/s WMA odpowiada plikowi 128 "
-"kb/s MP3."
+"jakość przy niższej gęstości bitowej. Plik 96 kbps WMA odpowiada plikowi 128 "
+"kbps MP3."
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Use a variable bitrate"
@@ -630,15 +630,15 @@ msgid "Audio Quality"
msgstr "Jakość dźwięku"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Odtwarzacz multimediów"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Odtwarzacz multimediów Banshee"
@@ -646,34 +646,6 @@ msgstr "Odtwarzacz multimediów Banshee"
msgid "Play and organize your media collection"
msgstr "Odtwarzanie i organizowanie kolekcji multimediów"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"Wideo;Video;Movie;Film;Filmik;Klip;Serial;Media;Odtwarzacz;Player;DVD;Płyta;"
-"Dysk;Disc;Mp3;Dźwięk;Audio;CD;MTP;Podcast;Podkast;DAAP;Lista;odtwarzania;"
-"Playlist;Ipod;Ipad;Multimedia;Kolekcja;Biblioteka;Muzyka;Music;Radio;"
-
-#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
-#: ../data/banshee.appdata.xml.in.h:2
-msgid ""
-"Banshee is an open source multimedia management and playback application for "
-"GNOME, Mac and Windows."
-msgstr ""
-"Banshee to program open source do zarządzania i odtwarzania multimediów dla "
-"systemów GNOME, Mac i Windows."
-
-#: ../data/banshee.appdata.xml.in.h:3
-msgid ""
-"Play your music and videos. Stay entertained and up to date with podcasts "
-"and video podcasts. Sync your Android, iPod, and other devices. We think "
-"you'll love Banshee!"
-msgstr ""
-"Funkcje programu Banshee obejmują odtwarzanie muzyki i nagrań wideo, "
-"podcastów dźwiękowych i wideo oraz synchronizowanie kolekcji z urządzeniami "
-"Android, iPod i wieloma innymi."
-
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
@@ -801,18 +773,18 @@ msgstr "Nie można utworzyć sterownika wykrywania BPM."
msgid "Could not initialize GStreamer library"
msgstr "Nie można zainicjować biblioteki GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Nieznany błąd"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Korekcja ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -820,11 +792,11 @@ msgstr ""
"Automatyczne dopasowanie (normalizowanie) głośności odtwarzania dla ścieżek "
"zawierających dane ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Płynne _odtwarzanie"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -841,7 +813,7 @@ msgstr "Nie można utworzyć transkodera"
msgid "Could not create encoder pipeline : {0}"
msgstr "Nie można utworzyć potoku kodera: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -920,61 +892,61 @@ msgstr "Ukończono pobieranie aktualizacji"
msgid "Check for Updates"
msgstr "Sprawdź dostępność aktualizacji"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Opcje pomocy"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Wyświetlenie tej pomocy"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Wyświetlenie opcji do obsługi odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Wyświetlenie opcji do zapytania o bieżącą ścieżkę"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Wyświetlenie opcji do zapytania o moduł odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Wyświetlenie opcji dla interfejsu użytkownika"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Wyświetlenie opcji dla deweloperów i do debugowania"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Wyświetlenie wszystkich grup opcji"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Wyświetlenie informacji o wersji"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Opcje obsługi odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Odtworzenie następnej ścieżki, opcjonalnie ponowne uruchomienie, jeśli "
"wartość \"restart\" jest ustawiona"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
"Odtworzenie poprzedniej ścieżki, opcjonalnie ponowne uruchomienie, jeśli "
"wartość \"restart\" jest ustawiona"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -982,29 +954,29 @@ msgstr ""
"Ponownie odtworzenie, jeśli bieżąca ścieżka była odtwarzana dłużej niż 4 "
"sekundy, w innym przypadku to samo co --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Automatyczne rozpoczęcie odtwarzania dowolnej ścieżki w kolejce z wiersza "
"poleceń"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Uruchomienie odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Wstrzymanie odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Przełączanie odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Zatrzymanie odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1013,98 +985,98 @@ msgstr ""
"ścieżki (wartość powinna być \"true\" lub \"false\", odpowiednio włączone, "
"wyłączone)"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Ustawienie głośności odtwarzania (0-100), poprzedzenie +/- ustawia wartości "
"względne"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr ""
"Przewinięcie do określonego położenia (sekundy, liczba zmiennoprzecinkowa)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Ustawienie oceny odtwarzanego utworu (od 0 do 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Opcje zapytań mechanizmu odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Bieżący stan odtwarzacza"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Ostatni stan odtwarzacza"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Zapytanie o możliwość wstrzymania odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Zapytanie o możliwość przewijania"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Głośność odtwarzania"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Położenie odtwarzania w bieżącej ścieżce"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Opcje zapytań o metadane bieżącej ścieżki"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "Adres URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nazwa wykonawcy"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Tytuł albumu"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Tytuł ścieżki"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Długość"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Numer ścieżki"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Liczba ścieżek"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Numer płyty"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1115,7 +1087,7 @@ msgstr "Numer płyty"
msgid "Year"
msgstr "Rok"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1123,82 +1095,82 @@ msgstr "Rok"
msgid "Rating"
msgstr "Ocena"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Punkty"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Gęstość bitowa"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Opcje interfejsu użytkownika"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Wyświetlenie interfejsu użytkownika na aktywnym obszarze roboczym"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Przełącza do trybu pełnoekranowego"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Ukrycie interfejsu użytkownika"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Ukrywanie interfejsu użytkownika, niezależnie od innych opcji"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Wyświetla okno importu multimediów"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Wyświetla okno O programie"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Wyświetla okno otwarcia położenia"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Wyświetla okno preferencji"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Debugowanie i opcje dla programistów"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Włączenie ogólnych funkcji do debugowania"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Włączenie debugowania wyjścia zapytań SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Włączenie debugowania wyjścia Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Określenie alternatywnej bazy danych do użycia"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Wymuszenie pobierania brakujących okładek albumów"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Określenie alternatywnego klucza, domyślny to /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1207,34 +1179,29 @@ msgstr ""
"działaniem jest utworzenie alternatywnej bazy danych Mono.Addins w bieżącym "
"katalogu"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Całkowite wyłączenie obsługi D-Bus"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr "Pominięcie wczytywania własnego pliku gtk.css ({0}), jeśli istnieje"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Pominięcie wczytywania własnego pliku gtkrc ({0}), jeśli istnieje"
-#: ../src/Clients/Booter/Booter/Entry.cs:230
-#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Ponowne wczytywanie własnego pliku gtk.css ({0}) co pięć sekund"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Następujące parametry pomocy są nieprawidłowe: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Odtwórz album"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "_Dodaj do kolejki"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1257,16 +1224,16 @@ msgstr "Odtwórz _album"
msgid "Add an album to the playlist"
msgstr "Dodaje album do listy odtwarzania"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "{0} pozostało"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Odtwórz utwór"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1274,7 +1241,7 @@ msgid "Close"
msgstr "Zamknij"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:492
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Wyszukaj"
@@ -1311,85 +1278,91 @@ msgstr "Gatunek"
msgid "Comment"
msgstr "Komentarz"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Nieznany album"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Nieznany wykonawca"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Nieznany album"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Nieznany tytuł"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Różni wykonawcy"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Nie odnaleziono położenia strumienia"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
msgid "File not found"
msgstr "Nie odnaleziono pliku"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Kodek do odtwarzania tego typu multimediów jest niedostępny"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Plik jest chroniony przez DRM (Zarządzanie prawami cyfrowymi)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Nieznany błąd"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Odtwórz podcast ponownie"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Odtwórz audiobook ponownie"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Odtwórz nagranie wideo ponownie"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Odtwórz utwór ponownie"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Odtwórz element ponownie"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Przejdź do odtwarzanego podcastu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Przejdź do odtwarzanego audiobooka"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Przejdź do odtwarzanego nagrania wideo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Przejdź do odtwarzanego utworu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Przejdź do odtwarzanego elementu"
@@ -1409,7 +1382,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Wszyscy wykonawcy albumów ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Wszystkie albumy ({0})"
@@ -1515,7 +1488,7 @@ msgid "Scanning for media"
msgstr "Wyszukiwanie multimediów"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Wyszukiwanie..."
@@ -1540,7 +1513,7 @@ msgstr "Trwa proces importowania. Zatrzymać go?"
msgid "Importing {0} of {1}"
msgstr "Importowanie {0} z {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Ponowne skanowanie {0} z {1}"
@@ -1555,7 +1528,7 @@ msgid ""
msgstr ""
"Proszę czekać. Trwa konwersja bazy danych programu Banshee do nowego formatu."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Odświeżanie metadanych"
@@ -1631,30 +1604,30 @@ msgstr "Soft Rock"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Usuń z kolekcji"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Organizacja plików"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
msgid "Co_py files to media folder when importing"
msgstr "K_opiowanie plików do katalogu multimediów podczas importowania"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "_Aktualizowanie nazw plików i katalogów"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Zmienianie nazw plików i katalogów według metadanych multimediów"
# inaczej będzie "Kolekcja muzyki Katalog"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "{0}"
@@ -1718,28 +1691,29 @@ msgstr "Liczba płyt"
msgid "Grouping"
msgstr "Grupowanie"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Muzyka"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Przeszukaj kolekcję muzyki"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Różne"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "_Porządkowanie albumów wykonawcy według roku, a nie tytułu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1747,90 +1721,90 @@ msgstr[0] "{0} utwór"
msgstr[1] "{0} utwory"
msgstr[2] "{0} utworów"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Katalog z muzyką"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Ulubione"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Utwory ocenione na cztery lub pięć gwiazdek"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Najnowsze ulubione"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "Utwory często odsłuchiwane w ostatnim tygodniu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Ostatnio dodane"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Utwory zaimportowane w ciągu ostatniego tygodnia"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Ostatnio odtwarzane"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Ostatnio odtwarzane utwory"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "Nieprzesłuchane"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Utwory jeszcze nieodtworzone lub pominięte"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Zapomniane ulubione"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Ulubione nieodtwarzane przez ponad dwa miesiące"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Najmniej lubiane"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
"Utwory ocenione na jedną lub dwie gwiazdki lub które były często pomijane"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "700 MB ulubionych"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Ulubione utwory wypełniające całą płytę CD (skompresowane)"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "80 minut ulubionych"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Ulubione utwory wypełniające całą płytę CD-Audio"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "Bez oceny"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Utwory bez oceny"
@@ -2003,8 +1977,8 @@ msgstr "Usuń listę odtwarzania"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nowa lista odtwarzania"
@@ -2614,7 +2588,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
msgid "Unknown"
msgstr "Nieznana"
@@ -2641,7 +2615,7 @@ msgid "Delete Smart Playlist"
msgstr "Usuń inteligentną listę odtwarzania"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Wszystkie gatunki ({0})"
@@ -2698,7 +2672,7 @@ msgstr "Błąd"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Szczegóły"
@@ -2798,12 +2772,12 @@ msgid "Show:"
msgstr "Wyświetlanie:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Wszystko"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Włączone"
@@ -2840,8 +2814,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} z {1}"
@@ -2889,7 +2863,7 @@ msgstr "Liczba płyt"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:136
#, csharp-format
msgid "{0} kbps"
-msgstr "{0} kb/s"
+msgstr "{0} kbps"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:123
@@ -2902,20 +2876,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bitów"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Zmienia rozmiar panelu kontekstowego"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Ukrywa panel kontekstowy"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Oczekiwanie na rozpoczęcie odtwarzania..."
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Wczytywanie..."
@@ -2942,7 +2916,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Korektor graficzny"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Nowe ustawienie"
@@ -2959,7 +2933,7 @@ msgstr "_Zakładki"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
-msgstr "_Dodaj zakładkę"
+msgstr "Dod_aj zakładkę"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
@@ -2977,11 +2951,11 @@ msgstr "Opiekunowie"
msgid "Contributors"
msgstr "Współtwórcy"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Zarządzanie i odtwarzanie multimediów ponad standard"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2992,7 +2966,7 @@ msgstr ""
"Copyright © 2005–{1} Inni\n"
"Copyright © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Witryna programu Banshee"
@@ -3099,102 +3073,92 @@ msgid "Import a playlist"
msgstr "Importowanie listy odtwarzania"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Przeskanuj kolekcję muzyki ponownie"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Skanuje katalog kolekcji muzyki ponownie"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "_Otwórz położenie..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Otwiera zdalne położenie do odtwarzania"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "Za_kończ"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Kończy działanie programu Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Edycja"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Preferencje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Modyfikowanie ustawień osobistych"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Narzędzia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Przeskanuj kolekcję muzyki ponownie"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Skanuje katalog kolekcji muzyki ponownie"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "Ponowne skanowanie usunie jedną ścieżkę z kolekcji muzyki."
-msgstr[1] "Ponowne skanowanie usunie {0} ścieżki z kolekcji muzyki."
-msgstr[2] "Ponowne skanowanie usunie {0} ścieżek z kolekcji muzyki."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Pomo_c"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Zawartość"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Zaawansowane przeszukiwanie kolekcji"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Zaawansowane metody przeszukiwanie kolekcji mediów"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Witryna programu Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Otwiera witrynę programu Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "W_eź udział w projekcie Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Jak zostać współtwórcą programu Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "I_nformacje o wersji"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Wyświetla szczegółowe informacje o wersji i konfiguracji"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importowanie listy odtwarzania"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listy odtwarzania"
@@ -3516,7 +3480,7 @@ msgstr "Bezpowrotnie usuwa zaznaczone utwory z nośnika"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3582,26 +3546,18 @@ msgstr[0] "Na pewno usunąć zaznaczony element z {1}?"
msgstr[1] "Na pewno usunąć {0} zaznaczone elementy z {1}?"
msgstr[2] "Na pewno usunąć {0} zaznaczonych elementów z {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Na pewno kontynuować?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Usuń ścieżki"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Wykonawca _kompilacji:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Proszę zaznaczyć, czy ścieżka jest częścią albumu ze ścieżkami autorstwa "
"różnych wykonawców"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3669,19 +3625,19 @@ msgstr "Ustawia wszystkie pola numeru płyty i numerów ścieżek na tę wartoś
msgid "_Disc Number:"
msgstr "_Numer płyty:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Ustawia wszystkie pola lat na tę wartość"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Rok:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Ustawia wszystkie oceny na tę wartość"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Ocena:"
@@ -3745,7 +3701,7 @@ msgstr "Ustawia wszystkie pola komentarza na tę wartość"
msgid "Co_mment:"
msgstr "Ko_mentarz:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Pomoc"
@@ -3753,7 +3709,7 @@ msgstr "Pomoc"
msgid "Lyrics"
msgstr "Tekst utworu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Przechodzi do następnej ścieżki i modyfikuje jej tytuł"
@@ -3882,40 +3838,40 @@ msgstr "Rozmiar pliku:"
msgid "bytes"
msgstr "bajtów"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Edytor ścieżek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Właściwości ścieżki"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Wyświetla poprzednią ścieżkę"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Wyświetla następną ścieżkę"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Tytuł:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Wykonawca:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Album:"
# skrócone, ale i tak może wystawać poza obszar przycisku.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Z_synchr. wszystkie pola"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3923,12 +3879,12 @@ msgstr ""
"Kopiuje wartości ze wszystkich wspólnych pól z bieżącego utworu do "
"pozostałych zaznaczonych ścieżek zaznaczonych w tym edytorze"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Modyfikowanie elementu {0} z {1}</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3936,11 +3892,11 @@ msgstr[0] "Zapisać zmiany dokonane na otwartej ścieżce?"
msgstr[1] "Zapisać zmiany dokonane na {0} z {1} otwartych ścieżek?"
msgstr[2] "Zapisać zmiany dokonane na {0} z {1} otwartych ścieżek?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Zamknij _bez zapisywania"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr ""
@@ -3992,19 +3948,19 @@ msgstr[2] "Trwają aktywne zadania"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}z{1} {2} {0}opublikowany{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}w {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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -4012,56 +3968,56 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0} {1} {2} {0}z{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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}z{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0} {1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Zatrzymaj działanie"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Zatrzymaj {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Te działanie jest nadal w toku. Zatrzymać je?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "Działanie \"{0}\" jest nadal w toku. Zatrzymać je?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Kontynuuj"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Kontynuuj {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Zatrzymywanie..."
@@ -4134,7 +4090,7 @@ msgstr "Brak dostępnych profili"
msgid "Advanced"
msgstr "Zaawansowane"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Konfigurowanie {0}"
@@ -4200,81 +4156,81 @@ msgstr "Otwórz w edytorze"
msgid "Create and save"
msgstr "Utwórz i zapisz"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Zawartość przeglądarki"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Konfiguruje filtry dostępne w przeglądarce"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Wyświetlanie filtru wykonawców"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Wyświetlanie listy wykonawców do filtrowania"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Wyświetlanie wszystkich wykonawców"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Wyświetlanie wszystkich wykonawców w filtrze wykonawców"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Wyświetlanie wykonawców albumu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Wyświetlanie wykonawców albumów, a nie pojedynczych utworów"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Wyświetlanie filtru gatunków"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Wyświetlanie listy gatunków do filtrowania"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Wyświetlanie filtru lat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Wyświetlanie listy lat do filtrowania"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Nieustawiony"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Przeglądarka po lewej"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr ""
"Umieszcza przeglądarkę albumów/wykonawców po lewej stronie listy ścieżek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Przeglądarka u góry"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Umieszcza przeglądarkę albumów/wykonawców ponad listą ścieżek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Przeglądarka"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Wyświetla lub ukrywa przeglądarkę wykonawców/albumów"
@@ -4290,12 +4246,12 @@ msgstr ""
msgid "The security certificate for {0} is invalid."
msgstr "Certyfikat bezpieczeństwa dla {0} jest nieprawidłowy."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Wczytywanie {0}..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4303,20 +4259,24 @@ msgstr ""
"Wsuń\n"
"płytę"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Wyczyść"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Przewijanie"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Bezczynny"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Łączenie..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Buforowanie"
@@ -4356,39 +4316,29 @@ msgstr "Obsługuje okładki"
msgid "Supports photos"
msgstr "Obsługuje zdjęcia"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "Długość ścieżki wynosi zero"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "Synchronizowanie odtwarzacza iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Przygotowywanie do synchronizacji..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Dodawanie ścieżki {0} z {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Aktualizowanie metadanych ścieżki {0} z {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Usuwanie ścieżki {0} z {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Czyszczenie, usuwanie nieprawidłowej ścieżki {0} z {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Zapisywanie bazy danych multimediów"
@@ -4397,7 +4347,7 @@ msgstr "Zapisywanie bazy danych multimediów"
msgid "Sync {0}"
msgstr "Zsynchronizuj {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Urządzenia"
@@ -4406,31 +4356,31 @@ msgstr "Urządzenia"
msgid "Device Properties"
msgstr "Właściwości urządzenia"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Produkt"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Producent"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Wczytywanie {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Tak"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Nie"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4439,11 +4389,11 @@ msgstr ""
"Format {0} nie jest obsługiwany przez to urządzenie i nie odnaleziono "
"konwertera do konwersji tego formatu"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
msgid "File format conversion support is not available"
msgstr "Konwersja formatu plików nie jest obsługiwana"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
msgid "Error converting file"
msgstr "Błąd podczas konwertowania pliku"
@@ -4463,8 +4413,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Preferencje synchronizacji"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Zsynchronizuj"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4472,9 +4426,13 @@ msgstr[0] "Synchronizacja usunie jedną ścieżkę z urządzenia."
msgstr[1] "Synchronizacja usunie {0} ścieżki z urządzenia."
msgstr[2] "Synchronizacja usunie {0} ścieżek z urządzenia."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Zsynchronizuj"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Na pewno kontynuować?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Usuń ścieżki"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4547,12 +4505,12 @@ msgstr "Importowanie zakupionej muzyki"
msgid "Disconnect"
msgstr "Rozłącz"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Rozłączanie {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Nie można rozłączyć {0}: {1}"
@@ -4686,13 +4644,12 @@ msgstr "Wielka Brytania (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "USA (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Przeszukaj sklep Amazon MP3"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "W jaki sposób zakupy wspierają projekt GNOME"
@@ -4798,15 +4755,15 @@ msgstr "Wy_kryj"
msgid "T_ap"
msgstr "Wys_tukaj rytm"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Automatyczna próba wykrycia BPM tego utworu"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Odtwarza ten utwór"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Naciskanie tego przycisku do rytmu spowoduje ustawienie BPM tego utworu"
@@ -4919,11 +4876,11 @@ msgstr "Login"
msgid "Connecting to {0}"
msgstr "Łączenie z {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Dodaj zdalny serwer DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Dodaj nowy zdalny serwer DAAP"
@@ -5185,10 +5142,6 @@ msgstr "Błąd podczas pobierania szczegółów elementu z serwisu Internet Arch
msgid "Description"
msgstr "Opis"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Twórca:"
@@ -5202,7 +5155,7 @@ msgid "Location:"
msgstr "Położenie:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Data:"
@@ -5215,7 +5168,7 @@ msgid "Publisher:"
msgstr "Wydawca:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Słowa kluczowe:"
@@ -5290,16 +5243,16 @@ msgstr "{0} od {1} o {2}"
msgid "Write your own review"
msgstr "Napisz własną recenzję"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Kolekcja:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Opcjonalne zapytanie"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Porządkowanie według:"
@@ -5689,7 +5642,7 @@ msgstr "Modyfikowanie stacji"
msgid "Station"
msgstr "Stacja"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5697,15 +5650,15 @@ msgstr[0] "{0} stacja"
msgstr[1] "{0} stacje"
msgstr[2] "{0} stacji"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Proszę wprowadzić prawidłowy adres URI stacji"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Proszę wprowadzić gatunek stacji"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Proszę wprowadzić tytuł stacji"
@@ -5717,7 +5670,7 @@ msgstr "Dodanie nowej stacji radiowej"
msgid "Edit radio station"
msgstr "Modyfikowanie stacji radiowej"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5725,80 +5678,80 @@ msgstr ""
"Proszę wprowadzić gatunek, tytuł i adres URL stacji radiowej do dodania. "
"Opis jest opcjonalny."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Gatunek stacji:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Nazwa stacji:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "Adres URL strumienia:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Założyciel stacji:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Opis:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Ocena:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Przetworzono ścieżek: {0} z {1}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Skonfiguruj wtyczkę Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Otwórz stronę profilu _użytkownika"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Otwiera stronę profilu użytkownika Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "Raporto_wanie utworów z programu Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Włącza raportowanie utworów z programu Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "Raporto_wanie utworów z urządzenia"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Włącza raportowanie utworów z urządzenia"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Scrobblowanie do serwisu Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Scrobblowanie z urządzenia"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Scrobblowanie do serwisu Last.fm..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Scrobblowanie z urządzenia..."
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Przetwarzanie ścieżki {0} z {1}..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5856,28 +5809,28 @@ msgstr "Wyświetla stronę ścieżki na Last.fm"
msgid "Recommend this track to someone"
msgstr "Umożliwia polecenie komuś tej ścieżki"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:150
#, csharp-format
msgid "http://last.fm/music/{0}"
msgstr "http://lastfm.pl/music/{0}"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:160
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:158
#, csharp-format
msgid "http://last.fm/music/{0}/{1}"
msgstr "http://lastfm.pl/music/{0}/{1}"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:168
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:166
#, csharp-format
msgid "http://last.fm/music/{0}/_/{1}"
msgstr "http://lastfm.pl/music/{0}/_/{1}"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:176
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:174
#, csharp-format
msgid "http://www.last.fm/music/{0}/+videos"
msgstr "http://www.lastfm.pl/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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5927,19 +5880,19 @@ msgstr "Zalogowano w serwisie Last.fm jako <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Wyloguj z Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Ostatnie ulubione ścieżki"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Ostatnio odtwarzane ścieżki"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Moi ulubieni wykonawcy"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} odtworzeń"
@@ -6029,17 +5982,17 @@ msgstr "Oznacz jako zakazany"
msgid "Mark current track as banned"
msgstr "Oznacza bieżącą ścieżkę jako zakazaną"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "Fani {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Podobni do {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "_Dodaj stację"
@@ -6055,7 +6008,7 @@ msgstr "Liczba odtworzeń"
msgid "New Station"
msgstr "Nowa stacja"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "_Typ stacji:"
@@ -6169,7 +6122,7 @@ msgstr "Podobny"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:148
msgid "Similar to:"
-msgstr "Podobny do:"
+msgstr "Podobny do"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:156
msgid "lastfm:// URL"
@@ -6209,15 +6162,15 @@ msgstr "Panel szybkiego dostępu do multimediów"
msgid "_Mini Mode"
msgstr "Tryb _minimalny"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Widok pełny"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Powraca do trybu pełnego"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Zmień tryb powtarzania"
@@ -6254,11 +6207,11 @@ msgstr "Wyświetlanie _powiadomień"
msgid "Show notifications when item changes"
msgstr "Wyświetlanie powiadomień przy zmianie utworu"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Nadal uruchomiony"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6266,23 +6219,19 @@ msgstr ""
"Program Banshee został zwinięty do ikony w obszarze powiadamiania. Polecenie "
"<i>Zakończ</i> umożliwia zamknięcie programu."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Poprzedni"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Pomiń ten element"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Nie można wyświetlić powiadomień"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6291,6 +6240,10 @@ msgstr ""
"{0} {1} {2}\n"
"{0}z{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Uprość"
@@ -6585,7 +6538,7 @@ msgstr "Odświeża losowe ścieżki w kolejce odtwarzania"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
-msgstr "Odtwarza losowo utwory z kolejki odtwarzania"
+msgstr "Odtwarza losowo utwory z kolejki odtwarzania."
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
@@ -6689,16 +6642,16 @@ msgstr[0] "{0} odcinek"
msgstr[1] "{0} odcinki"
msgstr[2] "{0} odcinków"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nigdy nie aktualizowany"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Zaktualizowano o {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Zaktualizowano {0}"
@@ -6781,7 +6734,7 @@ msgstr "Otwórz stronę WWW"
msgid "Add Podcast"
msgstr "Dodaj podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
@@ -6789,11 +6742,11 @@ msgstr[0] "Usuń plik"
msgstr[1] "Usuń pliki"
msgstr[2] "Usuń plików"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "Nieprawidłowy adres URL"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "Adres URL podcastu jest nieprawidłowy."
@@ -6801,11 +6754,11 @@ msgstr "Adres URL podcastu jest nieprawidłowy."
msgid "Episode Details"
msgstr "Szczegóły odcinka"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Okresowe sprawdzanie dostępności nowych odcinków"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
@@ -6813,59 +6766,59 @@ msgstr ""
"Po zaznaczeniu, program Banshee co godzinę będzie sprawdzał dostępność "
"nowych odcinków"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Pobierz nowe odcinki"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Archiwizuj wszystkie odcinki poza najnowszymi"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Brak opisu"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Nazwa:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Strona WWW:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Odwiedź"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Opcje subskrypcji"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "Adres URL kanału:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Ostatnio odświeżone:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Kategoria:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Prawa autorskie:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "Adres URL:"
@@ -6919,7 +6872,7 @@ msgstr "z albumu {0}"
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:253
#, csharp-format
msgid "by '{0}'"
-msgstr " {0}"
+msgstr "'{0}'"
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:362
msgid "_Show Banshee in the sound menu"
@@ -6983,22 +6936,22 @@ msgstr "kliknięcie"
msgid "menu"
msgstr "menu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Ukryj <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "{0} - Napotkano krytyczny błąd"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Szczegóły błędu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Wystąpił nieobsługiwany wyjątek: "
@@ -7153,15 +7106,15 @@ msgstr "zaczyna się od"
msgid "ends with"
msgstr "kończy się na"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Dane konta serwisu Last.fm"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Proszę wprowadzić dane do logowania w serwisie Last.fm."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Zapisz i zaloguj"
@@ -7252,7 +7205,7 @@ msgid ""
"guidelines"
msgstr ""
"Adres IP wysłał za dużo żądań w krótkim okresie czasu, przekraczając "
-"wskazania API"
+"wskazania API."
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
msgid "There was an unknown error."
diff --git a/po/pt.po b/po/pt.po
index b2c8e8f..9ddcd7e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,22 +1,24 @@
# banshee's Portuguese translation.
# This file is distributed under the same license as the banshee package.
-# Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013 banshee
-# António Lima <amrlima at gmail.com>, 2009, 2010, 2011, 2012, 2013.
+# Copyright © 2007, 2008, 2009 banshee
+# António Lima <amrlima at gmail.com>, 2009, 2010, 2011, 2012.
# Filipe Gomes <filipefgomes at gmail.com>, 2007, 2008, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: banshee\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-17 12:00+0000\n"
-"PO-Revision-Date: 2013-03-16 23:44+0000\n"
-"Last-Translator: António Lima <amrlima at gmail.com>\n"
-"Language-Team: gnome_pt at yahoogroups.com\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=banshee&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-08-21 19:53+0000\n"
+"PO-Revision-Date: 2012-08-29 13:21+0100\n"
+"Last-Translator: Filipe Gomes <filipefgomes at gmail.com>\n"
+"Language-Team: Português <>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Gtranslator 2.91.5\n"
"X-Project-Style: gnome\n"
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: PORTUGAL\n"
@@ -130,11 +132,11 @@ msgstr "Utilitários"
#. ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml
#: ../data/addin-xml-strings.cs:48
msgid "BPM Detection"
-msgstr "Deteção de BPM"
+msgstr "Detecção de BPM"
#: ../data/addin-xml-strings.cs:49
msgid "Detect the beats per minute (BPM) of your music."
-msgstr "Detetar as batidas por minuto (BPM) da sua música."
+msgstr "Detectar as batidas por minuto (BPM) da sua música."
#. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
#: ../data/addin-xml-strings.cs:53
@@ -184,7 +186,7 @@ msgstr "Pré-visualizar ficheiros sem os importar para a sua biblioteca."
#. ../src/Extensions/Banshee.Fixup/Banshee.Fixup.addin.xml
#: ../data/addin-xml-strings.cs:78
msgid "Metadata Fixup"
-msgstr "Correção de Metadados"
+msgstr "Correcção de Metadados"
#: ../data/addin-xml-strings.cs:79
msgid "Fix broken and missing metadata using bulk operations."
@@ -198,7 +200,7 @@ msgstr "Arquivo da Internet"
#: ../data/addin-xml-strings.cs:84
msgid "Browse and search the Internet Archive's vast media collection."
-msgstr "Navegar e procurar na vasta coleção de media do Arquivo da Internet."
+msgstr "Navegar e procurar na vasta colecção de media do Arquivo da Internet."
#. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
#: ../data/addin-xml-strings.cs:88
@@ -234,7 +236,7 @@ msgstr "Observador de Biblioteca"
#: ../data/addin-xml-strings.cs:104
msgid "Automatically update music and video libraries."
-msgstr "Atualizar automaticamente bibliotecas de vídeo e áudio."
+msgstr "Actualizar automaticamente bibliotecas de vídeo e áudio."
#. ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
#: ../data/addin-xml-strings.cs:108
@@ -252,7 +254,7 @@ msgstr ""
#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
#: ../data/addin-xml-strings.cs:113
msgid "Miro Guide Podcast Directory"
-msgstr "Diretório de Podcast do Guia Miro"
+msgstr "Directório de Podcast do Guia Miro"
#: ../data/addin-xml-strings.cs:114
msgid "Browse and subscribe to thousands of audio and video podcasts."
@@ -617,7 +619,7 @@ msgid "Audio Quality"
msgstr "Qualidade de Áudio"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Reprodutor de Media"
@@ -631,7 +633,7 @@ msgstr "Reprodutor Multimédia Banshee"
#: ../data/desktop-files/common.desktop.in.h:3
msgid "Play and organize your media collection"
-msgstr "Reproduz e organiza a sua coleção de media"
+msgstr "Reproduz e organiza a sua colecção de media"
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
@@ -739,39 +741,39 @@ msgstr "Não foi possível iniciar o Brasero"
#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs:81
msgid "Fullscreen video playback active"
-msgstr "Reprodução de vídeo em ecrã completo ativa"
+msgstr "Reprodução de vídeo em ecrã completo activa"
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:89
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:96
msgid "Could not find an encoder for ripping."
-msgstr "Incapaz de encontrar um codificador para extração de áudio."
+msgstr "Incapaz de encontrar um codificador para extracção de áudio."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:108
msgid "Could not create CD ripping driver."
-msgstr "Incapaz de criar controlador de extração de áudio do CD."
+msgstr "Incapaz de criar controlador de extracção de áudio do CD."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs:71
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/BpmDetector.cs:107
msgid "Could not create BPM detection driver."
-msgstr "Incapaz de criar o controlador de deteção BPM."
+msgstr "Incapaz de criar o controlador de detecção BPM."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:149
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:191
msgid "Could not initialize GStreamer library"
msgstr "Incapaz de inicializar a biblioteca GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Erro Desconhecido"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
-msgstr "_Ativar correção ReplayGain"
+msgstr "_Activar correcção ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -779,11 +781,11 @@ msgstr ""
"Para faixas que possuem dados de ReplayGain, normalizar automaticamente o "
"volume de reprodução"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
-msgstr "Ativar reprodução sem _pausa"
+msgstr "Activar reprodução sem _pausa"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -800,7 +802,7 @@ msgstr "Incapaz de criar transcodificador"
msgid "Could not create encoder pipeline : {0}"
msgstr "Não foi possível criar linha de processamento de codificador: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -811,12 +813,13 @@ msgstr "Incapaz de criar linha de processamento de codificação: {0}"
#. Translators: verb
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+#| msgid "_Import"
msgid "Import"
msgstr "Importar"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
msgid "Can't check for updates"
-msgstr "Incapaz de verificar por atualizações"
+msgstr "Incapaz de verificar por actualizações"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
msgid ""
@@ -828,7 +831,7 @@ msgstr ""
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
msgid "No update available"
-msgstr "Nenhuma atualização disponível"
+msgstr "Nenhuma actualização disponível"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
msgid "You already have the latest version of Banshee installed."
@@ -837,11 +840,11 @@ msgstr "Já tem a versão mais recente do Banshee instalada."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106
#, csharp-format
msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?"
-msgstr "Está disponível uma nova versão do Banshee ({0}).{1}Deseja atualizar?"
+msgstr "Está disponível uma nova versão do Banshee ({0}).{1}Deseja actualizar?"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108
msgid "Banshee update available"
-msgstr "Atualização do Banshee disponível"
+msgstr "Actualização do Banshee disponível"
#. Translators: {0} is the filename, eg Banshee-1.9.5.msi
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:129
@@ -856,7 +859,7 @@ msgstr "{0} MB / {1} MB ({2} KB/s)"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:152
msgid "Update download failed"
-msgstr "A transferência de atualização falhou"
+msgstr "A transferência de actualização falhou"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:152
msgid "The download failed. Please try again later."
@@ -868,16 +871,16 @@ msgid ""
"The update finished downloading.{0}Do you want to shutdown Banshee and run "
"the installer?"
msgstr ""
-"Terminou a transferência da atualização.{0}Deseja fechar o Banshee e "
+"Terminou a transferência da actualização.{0}Deseja fechar o Banshee e "
"executar o instalador?"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
msgid "Update finished downloading"
-msgstr "Terminou a transferência da atualização"
+msgstr "Terminou a transferência da actualização"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/WindowsService.cs:109
msgid "Check for Updates"
-msgstr "Verificar por Atualizações"
+msgstr "Verificar por Actualizações"
#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
@@ -938,7 +941,7 @@ msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
msgstr ""
-"Se a música atual foi reproduzida por mais de 4 segundos então reinicia-la, "
+"Se a música actual foi reproduzida por mais de 4 segundos então reinicia-la, "
"caso contrário a mesma que --previous"
#: ../src/Clients/Booter/Booter/Entry.cs:167
@@ -968,8 +971,8 @@ msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
msgstr ""
-"Ativar ou desativar parar a reprodução depois da faixa atual (o valor deve "
-"ser 'true' ou 'false')"
+"Activar ou desactivar parar a reprodução depois da faixa actual (o valor "
+"deve ser 'true' ou 'false')"
#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
@@ -978,11 +981,11 @@ msgstr ""
#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
-msgstr "Avançar para localização específica (segundos, fração)"
+msgstr "Avançar para localização específica (segundos, fracção)"
#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
-msgstr "Definir a avaliação da faixa atual em reprodução (0 a 5)"
+msgstr "Definir a avaliação da faixa actual em reprodução (0 a 5)"
#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
@@ -990,7 +993,7 @@ msgstr "Opções de Consulta do Motor de Reprodução"
#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
-msgstr "Estado atual do reprodutor"
+msgstr "Estado actual do reprodutor"
#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
@@ -1010,7 +1013,7 @@ msgstr "Volume de reprodução"
#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
-msgstr "Posição do reprodutor na faixa atual"
+msgstr "Posição do reprodutor na faixa actual"
#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
@@ -1096,7 +1099,7 @@ msgstr "Opções de Interface do Utilizador"
#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
-msgstr "Apresentar a interface do utilizador na área de trabalho ativa"
+msgstr "Apresentar a interface do utilizador na área de trabalho activa"
#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
@@ -1138,11 +1141,11 @@ msgstr "Habilitar funcionalidades gerais de depuração"
#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
-msgstr "Ativar depuração da saída de consultas SQL"
+msgstr "Activar depuração da saída de consultas SQL"
#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
-msgstr "Ativar depuração da saída de Mono.Addins"
+msgstr "Activar depuração da saída de Mono.Addins"
#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
@@ -1161,12 +1164,12 @@ msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
msgstr ""
-"Otimizar instância para executar desinstalada; particularmente, isso irá "
-"criar uma base de dados alternativa de Mono.Addins no diretório de trabalho"
+"Optimizar instância para executar desinstalada; particularmente, isso irá "
+"criar uma base de dados alternativa de Mono.Addins no directório de trabalho"
#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
-msgstr "Desativar completamente o suporte a DBus"
+msgstr "Desactivar completamente o suporte a DBus"
#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
@@ -1265,92 +1268,96 @@ msgstr "Género"
msgid "Comment"
msgstr "Comentário"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "Álbum Desconhecido"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Artista Desconhecido"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Álbum Desconhecido"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Título Desconhecido"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Vários Artistas"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Localização do fluxo não encontrada"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
msgid "File not found"
msgstr "Ficheiro não encontrado"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Codec para reproduzir este tipo de media indisponível"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Ficheiro protegido por Gestão de Direitos Digitais (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Erro desconhecido"
-# ../lisp/menus.jl
+# ../lisp/menus.jl
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Reiniciar Podcast"
-# ../lisp/menus.jl
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+# ../lisp/menus.jl
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Reiniciar Audiolivro"
-# ../lisp/menus.jl
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+# ../lisp/menus.jl
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Reiniciar Vídeo"
-# ../lisp/menus.jl
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+# ../lisp/menus.jl
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Reiniciar Música"
-# ../lisp/menus.jl
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+# ../lisp/menus.jl
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Reiniciar Item"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Saltar para o Podcast em Reprodução"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Saltar para o Audiolivro em Reprodução"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Saltar para o Vídeo em Reprodução"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Saltar para a Música em Reprodução"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Saltar para o Item em Reprodução"
@@ -1476,7 +1483,7 @@ msgid "Scanning for media"
msgstr "A procurar media"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "A analisar..."
@@ -1492,7 +1499,7 @@ msgstr "A Importar Media"
#: ../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 "O processo de importação está atualmente em execução. Deseja pará-lo?"
+msgstr "O processo de importação está actualmente em execução. Deseja pará-lo?"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
@@ -1501,14 +1508,14 @@ msgstr "O processo de importação está atualmente em execução. Deseja pará-
msgid "Importing {0} of {1}"
msgstr "A importar {0} de {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "A analisar novamente {0} de {1}"
#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:232
msgid "Upgrading your Banshee Database"
-msgstr "A Atualizar a sua Base de Dados do Banshee"
+msgstr "A Actualizar a sua Base de Dados do Banshee"
#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
msgid ""
@@ -1517,9 +1524,9 @@ msgstr ""
"Por favor aguarde enquanto sua base de dados antiga do Banshee é migrada "
"para o novo formato."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
-msgstr "A Atualizar Metadados"
+msgstr "A Actualizar Metadados"
#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:252
msgid "Classical"
@@ -1603,12 +1610,13 @@ msgid "File Organization"
msgstr "Organização de Ficheiros"
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
+#| msgid "Co_py files to media folders when importing"
msgid "Co_py files to media folder when importing"
msgstr "Co_piar ficheiros para a pasta de média ao importar"
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
-msgstr "_Atualizar nomes de ficheiros e pastas"
+msgstr "_Actualizar nomes de ficheiros e pastas"
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
@@ -1853,7 +1861,7 @@ msgid ""
"installed."
msgstr ""
"Nenhum motor de reprodução foi encontrado. Por favor certifique-se de que o "
-"Banshee foi corretamente instalado."
+"Banshee foi correctamente instalado."
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
msgid "Problem with Player Engine"
@@ -1887,8 +1895,8 @@ msgid ""
"Enable this option to have metadata in sync between your library and "
"supported media files"
msgstr ""
-"Ativar esta opção para sincronizar os meta-dados entre a sua biblioteca e os "
-"ficheiros de media suportados"
+"Activar esta opção para sincronizar os meta-dados entre a sua biblioteca e "
+"os ficheiros de media suportados"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
msgid "Sync _ratings between library and files"
@@ -1899,7 +1907,7 @@ msgid ""
"Enable this option to have rating metadata synced between your library and "
"supported audio files"
msgstr ""
-"Ativar esta opção para sincronizar os meta-dados de avaliações entre a sua "
+"Activar esta opção para sincronizar os meta-dados de avaliações entre a sua "
"biblioteca e os ficheiros de áudio suportados"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
@@ -1911,7 +1919,7 @@ msgid ""
"Enable this option to have playcount metadata synced between your library "
"and supported audio files"
msgstr ""
-"Ativar esta opção para sincronizar os meta-dados de contagens de reprodução "
+"Activar esta opção para sincronizar os meta-dados de contagens de reprodução "
"entre a sua biblioteca e os ficheiros de áudio suportados"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
@@ -1928,7 +1936,7 @@ msgstr "Será assumido que está disponível uma ligação de rede em funcioname
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159
msgid "_Disable features requiring Internet access"
-msgstr "_Desativar funcionalidades que requerem acesso à Internet"
+msgstr "_Desactivar funcionalidades que requerem acesso à Internet"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160
msgid ""
@@ -1961,7 +1969,7 @@ msgstr "Apagar Lista de Reprodução"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nova Lista de Reprodução"
@@ -2565,7 +2573,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
msgid "Unknown"
msgstr "Desconhecida"
@@ -2592,7 +2600,7 @@ msgid "Delete Smart Playlist"
msgstr "Eliminar Lista de Reprodução Inteligente"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Todos os géneros ({0})"
@@ -2751,11 +2759,11 @@ msgstr "Todas"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
-msgstr "Ativo"
+msgstr "Activo"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:53
msgid "Not Enabled"
-msgstr "Não Ativado"
+msgstr "Não Activado"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:56
msgid "Search:"
@@ -2763,11 +2771,11 @@ msgstr "Procurar:"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:76
msgid "Disable album grid"
-msgstr "Desativar grelha de álbum"
+msgstr "Desactivar grelha de álbum"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:77
msgid "Disable album grid and show the classic layout instead"
-msgstr "Desativar a grelha de álbum e apresentar a disposição clássica"
+msgstr "Desactivar a grelha de álbum e apresentar a disposição clássica"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:76
msgid "Cannot Reorder While Sorted"
@@ -2779,7 +2787,7 @@ msgid ""
"header until the sort arrow goes away."
msgstr ""
"Colocar a lista de reprodução em modo manual de ordenação, clique no "
-"cabeçalho da atual coluna ordenada até que a seta de ordenação desapareça."
+"cabeçalho da actual coluna ordenada até que a seta de ordenação desapareça."
#. Translators: this is {disc number} of {disc count}
#. Translators: this is {track number} of {track count}
@@ -2908,7 +2916,7 @@ msgstr "_Adicionar Marcador"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
-msgstr "Marcar a Posição na Faixa Atual"
+msgstr "Marcar a Posição na Faixa Actual"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
msgid "_Remove Bookmark"
@@ -2928,6 +2936,10 @@ msgstr "Gestão e Reprodução Extraordinária de Multimédia"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
+#| msgid ""
+#| "Copyright © 2005–{0} Novell, Inc.\n"
+#| "Copyright © 2005–{0} Others\n"
+#| "Copyright © 2005 Aaron Bockover"
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
"Copyright © 2005–{1} Others\n"
@@ -2950,9 +2962,9 @@ msgid ""
"Closing Banshee now will cancel any currently running tasks. They cannot be "
"resumed automatically the next time Banshee is run."
msgstr ""
-"Fechar o Banshee agora irá cancelar todas as tarefas atualmente em execução. "
-"Elas não podem ser retomadas automaticamente na próxima vez que o Banshee "
-"for executado."
+"Fechar o Banshee agora irá cancelar todas as tarefas actualmente em "
+"execução. Elas não podem ser retomadas automaticamente na próxima vez que o "
+"Banshee for executado."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
msgid "Quit Anyway"
@@ -2971,7 +2983,7 @@ msgid ""
"Currently another program is configured as the default media player. Would "
"you prefer Banshee to be the default?"
msgstr ""
-"Atualmente outra aplicação está configurada como reprodutor de música por "
+"Actualmente outra aplicação está configurada como reprodutor de música por "
"omissão. Prefere que o Banshee seja o reprodutor por omissão?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
@@ -2991,7 +3003,7 @@ msgstr "I_mportar"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39
msgid "Select album cover image"
-msgstr "Selecionar imagem de capa do álbum"
+msgstr "Seleccionar imagem de capa do álbum"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:47
msgid "All image files"
@@ -3043,108 +3055,99 @@ msgid "Import a playlist"
msgstr "Importar uma lista de reprodução"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Reanalisar Biblioteca de Música"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Reanalisar a pasta da Biblioteca de Música"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Abrir _Localização..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Abrir um local remoto para reprodução"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Sair"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Sair do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Editar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Preferências"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Modificar suas preferências pessoais"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "Ferramen_tas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Reanalisar Biblioteca de Música"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Reanalisar a pasta da Biblioteca de Música"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "A operação de reanálise irá remover uma faixa do seu dispositivo."
-msgstr[1] "A operação de reanálise irá remover {0} faixas do seu dispositivo."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Ajuda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Conteúdos"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
-msgstr "Procura Avançada na Coleção"
+msgstr "Procura Avançada na Colecção"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
-msgstr "Aprenda maneiras avançadas de procurar na sua coleção de multimédia"
+msgstr "Aprenda maneiras avançadas de procurar na sua colecção de multimédia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Página _Inicial do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Visite a Página Inicial do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Envolva-se"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Torne-se um colaborador do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Informação da _Versão"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Ver versão e informações de configuração detalhadas"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importar Lista de Reprodução"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listas de Reprodução"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:69
msgid "Play the current item"
-msgstr "Reproduzir o item atual"
+msgstr "Reproduzir o item actual"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:77
msgid "_Next"
@@ -3168,15 +3171,15 @@ msgstr "Avançar _Para..."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
msgid "Seek to a specific location in current item"
-msgstr "Avançar para uma localização específica no item atual"
+msgstr "Avançar para uma localização específica no item actual"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:90
msgid "Jump to the currently playing item"
-msgstr "Saltar para o item reproduzido atualmente"
+msgstr "Saltar para o item reproduzido actualmente"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:94
msgid "Restart the current item"
-msgstr "Reiniciar o item atual"
+msgstr "Reiniciar o item actual"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
msgid "_Stop When Finished"
@@ -3184,7 +3187,7 @@ msgstr "_Parar Quando Terminar"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
msgid "Stop playback after the current item finishes playing"
-msgstr "Parar reprodução após a música atual terminar"
+msgstr "Parar reprodução após a música actual terminar"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
msgid "_Playback"
@@ -3196,7 +3199,7 @@ msgstr "_Pausar"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:205
msgid "Pause the current item"
-msgstr "Pausar o item atual"
+msgstr "Pausar o item actual"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:217
msgid "Sto_p"
@@ -3229,7 +3232,7 @@ msgstr "Rep_etir Uma"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:89
msgid "Repeat the current playing song"
-msgstr "Repetir a música atualmente em reprodução"
+msgstr "Repetir a música actualmente em reprodução"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
@@ -3270,7 +3273,7 @@ msgstr "Legendas {0}"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:132
#, csharp-format
msgid "Activate embedded subtitle {0}"
-msgstr "Ativar legendas embutidas {0}"
+msgstr "Activar legendas embutidas {0}"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:147
msgid "Hide subtitles"
@@ -3352,11 +3355,12 @@ msgstr "Nova Lista de Reprodução _Inteligente"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
msgid "Refresh"
-msgstr "Atualizar"
+msgstr "Actualizar"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:130
msgid "Refresh this randomly sorted smart playlist"
-msgstr "Atualizar esta lista de reprodução inteligente ordenada aleatoriamente"
+msgstr ""
+"Actualizar esta lista de reprodução inteligente ordenada aleatoriamente"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:297
msgid "Could not export playlist"
@@ -3377,11 +3381,11 @@ msgstr "Seleccion_ar Tudo"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:111
msgid "Select all tracks"
-msgstr "Selecionar todas as músicas"
+msgstr "Seleccionar todas as músicas"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
msgid "Select _None"
-msgstr "Selecionar _Nenhuma"
+msgstr "Seleccionar _Nenhuma"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
msgid "Unselect all tracks"
@@ -3394,7 +3398,7 @@ msgstr "_Editar Informações de Faixa"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
msgid "Edit information on selected tracks"
-msgstr "Editar informações das faixas selecionadas"
+msgstr "Editar informações das faixas seleccionadas"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:283
@@ -3405,11 +3409,11 @@ msgstr "Propriedades"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
msgid "View information on selected tracks"
-msgstr "Ver informações das faixas selecionadas"
+msgstr "Ver informações das faixas seleccionadas"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
msgid "Play the selected item"
-msgstr "Reproduzir o item selecionado"
+msgstr "Reproduzir o item seleccionado"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:130
msgid "Add _to Playlist"
@@ -3418,12 +3422,12 @@ msgstr "Adicionar à _Lista de Reprodução"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
msgstr ""
-"Acrescentar itens selecionados à lista de reprodução ou criar uma nova lista "
-"de reprodução a partir da seleção"
+"Acrescentar itens seleccionados à lista de reprodução ou criar uma nova "
+"lista de reprodução a partir da selecção"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
-msgstr "Criar uma nova lista de reprodução a partir das faixas selecionadas"
+msgstr "Criar uma nova lista de reprodução a partir das faixas seleccionadas"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:140
msgid "_Remove"
@@ -3431,7 +3435,7 @@ msgstr "_Remover"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
msgid "Remove selected track(s) from this source"
-msgstr "Remover faixas(s) selecionada(s) desta fonte"
+msgstr "Remover faixas(s) seleccionada(s) desta fonte"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
msgid "Remove From _Library"
@@ -3439,7 +3443,7 @@ msgstr "Remover da Bib_lioteca"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
msgid "Remove selected track(s) from library"
-msgstr "Remover faixas(s) selecionada(s) da biblioteca"
+msgstr "Remover faixas(s) seleccionada(s) da biblioteca"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
msgid "_Open Containing Folder"
@@ -3447,7 +3451,7 @@ msgstr "_Abrir Pasta Correspondente"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:149
msgid "Open the folder that contains the selected item"
-msgstr "Abrir a pasta que contem o item selecionado"
+msgstr "Abrir a pasta que contem o item seleccionado"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:152
msgid "_Delete From Drive"
@@ -3456,7 +3460,7 @@ msgstr "_Apagar da Unidade"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
msgid "Permanently delete selected item(s) from medium"
msgstr ""
-"Excluir permanentemente o(s) item(s) selecionado(s) do suporte de "
+"Excluir permanentemente o(s) item(s) seleccionado(s) do suporte de "
"armazenamento"
#. Translators: this is a verb (command), not a noun (things)
@@ -3508,32 +3512,25 @@ msgid_plural ""
"Are you sure you want to permanently delete the selected {0} items?"
msgstr[0] "Tem certeza que deseja apagar permanentemente este item?"
msgstr[1] ""
-"Tem certeza que deseja apagar permanentemente os {0} itens selecionados?"
+"Tem certeza que deseja apagar permanentemente os {0} itens seleccionados?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611
msgid "If you delete the selection, it will be permanently lost."
-msgstr "Se apagar a seleção, ela será perdida permanentemente."
+msgstr "Se apagar a selecção, ela será perdida permanentemente."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:614
#, csharp-format
msgid "Remove selection from {0}?"
-msgstr "Remover seleção de {0}?"
+msgstr "Remover selecção de {0}?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural ""
"Are you sure you want to remove the selected {0} items from your {1}?"
-msgstr[0] "Tem certeza que deseja remover o item selecionado do seu {1}?"
-msgstr[1] "Tem certeza que deseja remover os item selecionados {0} do seu {1}?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Tem a certeza de que deseja continuar?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Faixa faixas"
+msgstr[0] "Tem certeza que deseja remover o item seleccionado do seu {1}?"
+msgstr[1] ""
+"Tem certeza que deseja remover os item seleccionados {0} do seu {1}?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
@@ -3550,7 +3547,7 @@ msgid ""
"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 ""
-"Este valor irá afetar como este álbum é ordenado; se digitar 'Vários "
+"Este valor irá afectar como este álbum é ordenado; se digitar 'Vários "
"Artistas' então o álbum serão colocado com outros álbuns que começam por 'V'."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
@@ -3612,19 +3609,19 @@ msgstr "Definir todos os números de disco e contagem para este valor"
msgid "_Disc Number:"
msgstr "Número do _Disco:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Definir todos os anos para este valor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Ano:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Definir todas as avaliações para este valor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "A_valiação:"
@@ -3742,7 +3739,7 @@ msgstr "Nome de Ficheiro:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:186
msgid "Directory:"
-msgstr "Diretório:"
+msgstr "Directório:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:187
msgid "Full Path:"
@@ -3857,7 +3854,7 @@ msgid ""
"tracks selected in this editor"
msgstr ""
"Aplicar os valores de todos os campos comuns definidos para esta faixa a "
-"todas as faixas selecionadas neste editor"
+"todas as faixas seleccionadas neste editor"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
@@ -3868,8 +3865,8 @@ msgstr "<i>A editar {0} de {1} itens</i>"
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
-msgstr[0] "Gravar as alterações efetuadas à faixa aberta?"
-msgstr[1] "Gravar as alterações efetuadas a {0} de {1} faixas abertas?"
+msgstr[0] "Gravar as alterações efectuadas à faixa aberta?"
+msgstr[1] "Gravar as alterações efectuadas a {0} de {1} faixas abertas?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
@@ -3921,8 +3918,8 @@ msgstr "Alterar apresentação de arte de capa do álbum"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs:96
msgid "Active Task Running"
msgid_plural "Active Tasks Running"
-msgstr[0] "Tarefa Ativa em Execução"
-msgstr[1] "Tarefas Ativas em Execução"
+msgstr[0] "Tarefa Activa em Execução"
+msgstr[1] "Tarefas Activas em Execução"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Podcast Name and Published Date, respectively;
@@ -4084,11 +4081,11 @@ msgstr "Exportar"
#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:54
msgid "Select Format: "
-msgstr "Selecionar Formato:"
+msgstr "Seleccionar Formato:"
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:104
msgid "Select library location"
-msgstr "Selecionar localização da biblioteca"
+msgstr "Seleccionar localização da biblioteca"
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:117
msgid "Reset"
@@ -4220,6 +4217,7 @@ msgstr "Esta página está bloqueada porque provavelmente não é a que procura!
#. Translators: {0} is the URL of the web page that was requested
#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
#, csharp-format
+#| msgid "The specified resource is invalid."
msgid "The security certificate for {0} is invalid."
msgstr "O certificado de segurança para {0} é inválido."
@@ -4246,7 +4244,7 @@ msgstr "Avançar"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
-msgstr "Inativo"
+msgstr "Inactivo"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
@@ -4293,39 +4291,29 @@ msgstr "Suporta arte de capa"
msgid "Supports photos"
msgstr "Suporta fotos"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "A duração da faixa é zero"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "A sincronizar iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "A preparar para sincronizar..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "A adicionar faixa {0} de {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "A atualizar metadados na faixa {0} de {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "A remover faixa {0} de {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "A limpar, removendo faixa inválida {0} de {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "A gravar base de dados de media"
@@ -4334,7 +4322,7 @@ msgstr "A gravar base de dados de media"
msgid "Sync {0}"
msgstr "Sincronizar {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Dispositivos"
@@ -4343,31 +4331,31 @@ msgstr "Dispositivos"
msgid "Device Properties"
msgstr "Propriedades do Dispositivo"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Produto"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Fabricante"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "A Carregar {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Sim"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Não"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4376,12 +4364,12 @@ msgstr ""
"O formato {0} não é suportado pelo dispositivo e não foi encontrado nenhum "
"conversor para o converter"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
msgid "File format conversion support is not available"
msgstr ""
"O suporte para conversão de formatos de ficheiro não se encontra disponível"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
msgid "Error converting file"
msgstr "Erro ao converter ficheiro"
@@ -4402,8 +4390,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Preferências de Sincronização"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Sincronizar"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4412,9 +4404,13 @@ msgstr[0] ""
msgstr[1] ""
"A operação de sincronização irá remover {0} faixas do seu dispositivo."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Sincronizar"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Tem a certeza de que deseja continuar?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Faixa faixas"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4487,12 +4483,12 @@ msgstr "Importar Música Adquirida"
msgid "Disconnect"
msgstr "Desligar"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "A desligar {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Não foi possível desligar {0}: {1}"
@@ -4600,7 +4596,7 @@ msgstr "Qual a loja Amazon MP3 a utilizar por omissão."
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90
msgid "Automatic (Geo IP detection)"
-msgstr "Automático (deteção Geo IP)"
+msgstr "Automático (detecção Geo IP)"
#. TODO uncomment this after string-freeze
#. combo.Add (Catalog.GetString ("Canada (amazon.ca)"), "CA");
@@ -4659,15 +4655,15 @@ msgstr "Retomar a reprodução deste audiolivro"
#, csharp-format
msgid "Merge the {0} selected discs into one book?"
msgid_plural "Merge the {0} selected discs into one book?"
-msgstr[0] "Fundir os {0} discos selecionados num só livro?"
-msgstr[1] "Fundir os {0} discos selecionados num só livro?"
+msgstr[0] "Fundir os {0} discos seleccionados num só livro?"
+msgstr[1] "Fundir os {0} discos seleccionados num só livro?"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
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 ""
-"Isto garantirá que os números de disco são todos definidos corretamente e, "
+"Isto garantirá que os números de disco são todos definidos correctamente e, "
"em seguida, define o autor e título de livro para todas as faixas em todos "
"estes discos para os valores abaixo"
@@ -4724,7 +4720,7 @@ msgstr "Nenhum Marcador Definido"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs:64
msgid "Detecting BPM"
-msgstr "A detetar BPM"
+msgstr "A detectar BPM"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:92
msgid "D_etect"
@@ -4736,7 +4732,7 @@ msgstr "Toc_ar"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
-msgstr "Fazer o Banshee tentar a autodeteção das BPM desta música"
+msgstr "Fazer o Banshee tentar a auto-detecção das BPM desta música"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
@@ -4749,15 +4745,15 @@ msgstr ""
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
-msgstr "Detetar _automaticamente as BPM de todas as músicas"
+msgstr "Detectar _automaticamente as BPM de todas as músicas"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
msgid ""
"Detect beats per minute (BPM) for all songs that don't already have a value "
"set"
msgstr ""
-"Detetar as batidas por minuto (BPM) de todas as músicas que ainda não tenham "
-"um valor definido"
+"Detectar as batidas por minuto (BPM) de todas as músicas que ainda não "
+"tenham um valor definido"
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
msgid "Downloading Cover Art"
@@ -4793,7 +4789,7 @@ msgid ""
"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
"the unfortunate inconvenience."
msgstr ""
-"O iTunes® 7 introduziu novos problemas de compatibilidade e atualmente só "
+"O iTunes® 7 introduziu novos problemas de compatibilidade e actualmente só "
"funciona com outros clientes iTunes® 7.\n"
"\n"
"Nenhum cliente de terceiros se pode ligar à partilha de música iTunes®. Esta "
@@ -4856,11 +4852,11 @@ msgstr "Iniciar Sessão"
msgid "Connecting to {0}"
msgstr "A ligar a {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Adicionar um Servidor DAAP Remoto"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Adicionar um novo servidor DAAP remoto"
@@ -4991,7 +4987,7 @@ msgid ""
msgstr ""
"Estão apresentados os álbuns que provavelmente devem ser fundidos. Para cada "
"linha, clique no título desejado para que fique a negrito, ou desmarque para "
-"não realizar qualquer ação."
+"não realizar qualquer acção."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
msgid "Duplicate Artists"
@@ -5004,7 +5000,7 @@ msgid ""
msgstr ""
"Estão apresentados os artistas que provavelmente devem ser fundidos. Para "
"cada linha, clique no nome desejado para que fique a negrito, ou desmarque "
-"para não realizar qualquer ação."
+"para não realizar qualquer acção."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
msgid "Fix Music Metadata..."
@@ -5012,7 +5008,7 @@ msgstr "Corrigir Metadados de Música..."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48
msgid "Metadata Fixer"
-msgstr "Corretor de Metadados"
+msgstr "Corrector de Metadados"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:54
msgid "Problem Type:"
@@ -5033,7 +5029,7 @@ msgid ""
msgstr ""
"Apresentados estão os géneros que provavelmente devem ser fundidos. Para "
"cada linha, clique no género desejado para que fique a negrito, ou desmarque "
-"para não realizar qualquer ação."
+"para não realizar qualquer acção."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
msgid " and "
@@ -5175,7 +5171,7 @@ msgstr "Adicionado por:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:244
msgid "Collections:"
-msgstr "Coleções:"
+msgstr "Colecções:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:246
msgid "Contributor:"
@@ -5217,7 +5213,7 @@ msgstr "Escreva a sua própria análise"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
-msgstr "Coleção:"
+msgstr "Colecção:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
@@ -5311,6 +5307,7 @@ msgid "Library of Congress"
msgstr "Biblioteca do Congresso"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+#| msgid "Sample"
msgid "Examples:"
msgstr "Exemplos:"
@@ -5405,7 +5402,7 @@ msgstr "Adicionado"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:62
msgid "Collection"
-msgstr "Coleção"
+msgstr "Colecção"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:63
msgid "Contributor"
@@ -5516,7 +5513,7 @@ msgstr "Biblioteca Universal"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:92
msgid "Project Gutenberg"
-msgstr "Projeto Gutenberg"
+msgstr "Projecto Gutenberg"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:93
msgid "Children's Library"
@@ -5528,7 +5525,7 @@ msgstr "Biblioteca da Herança da Biodiversidade"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:95
msgid "Additional Collections"
-msgstr "Coleções Adicionais"
+msgstr "Colecções Adicionais"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:98
msgid "Audio Books & Poetry"
@@ -5611,22 +5608,22 @@ msgstr "Editar Estação"
msgid "Station"
msgstr "Estação"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} estação"
msgstr[1] "{0} estações"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Por favor forneça um URI de estação válido"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Por favor forneça um género para a estação"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Por favor forneça um título para estação"
@@ -5673,53 +5670,58 @@ msgstr "Descrição:"
msgid "Rating:"
msgstr "Avaliação:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "{0} de {1} faixas processadas"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Configurar o plugin Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Visitar Página de Perfil do _Utilizador"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Visitar o Seu Perfil no Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Banshee"
-msgstr "_Ativar relatório de música a partir do Banshee"
+msgstr "_Activar relatório de música a partir do Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Banshee"
-msgstr "Ativar relatório de música a partir do Banshee"
+msgstr "Activar relatório de música a partir do Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Device"
-msgstr "_Ativar relatórios de música a partir de dispositivo"
+msgstr "_Activar relatórios de música a partir de dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Device"
-msgstr "Ativar relatório de música de dispositivo"
+msgstr "Activar relatório de música de dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "A transmitir (scrobbling) para o Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Transmissão (scrobbling) a partir do dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "A transmitir (scrobbling) para o Last.fm..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Transmissão (scrobbling) a partir do dispositivo..."
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+#| msgid "Removing track {0} of {1}"
+msgid "Processing track {0} of {1} ..."
+msgstr "A processar faixa {0} de {1} ..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5850,19 +5852,19 @@ msgstr "Tem sessão iniciada no Last.fm como utilizador <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Terminar sessão no Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Faixas Marcadas como Preferidas Recentemente"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Faixas Reproduzidas Recentemente"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Meus Artistas Preferidos"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} reproduções"
@@ -5942,7 +5944,7 @@ msgstr "Faixa Preferida"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:95
msgid "Mark current track as loved"
-msgstr "Marcar faixa atual como preferida"
+msgstr "Marcar faixa actual como preferida"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:99
msgid "Ban Track"
@@ -5950,7 +5952,7 @@ msgstr "Banir Faixa"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:100
msgid "Mark current track as banned"
-msgstr "Marcar faixa atual como banida"
+msgstr "Marcar faixa actual como banida"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
@@ -6149,7 +6151,7 @@ msgstr "Guia Miro"
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:97
msgid "Discover interesting podcasts in the Miro Guide podcast directory!"
-msgstr "Descobrir podcasts interessantes no diretório de podcasts Miro Guide!"
+msgstr "Descobrir podcasts interessantes no directório de podcasts Miro Guide!"
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:100
msgid "Open Miro Guide"
@@ -6280,22 +6282,22 @@ msgstr ""
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
msgid "_Eject when done importing"
-msgstr "_Ejetar disco após importação"
+msgstr "_Ejectar disco após importação"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:120
msgid "When an audio CD has been imported, automatically eject it."
-msgstr "Quando um CD de áudio for importado, ejetar automaticamente."
+msgstr "Quando um CD de áudio for importado, ejectar automaticamente."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:123
msgid "Use error correction when importing"
-msgstr "Utilizar correção de erros ao importar"
+msgstr "Utilizar correcção de erros ao importar"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
msgid ""
"Error correction tries to work around problem areas on a disc, such as "
"surface scratches, but will slow down importing substantially."
msgstr ""
-"A correção de erros tenta solucionar áreas com problemas no disco, como "
+"A correcção de erros tenta solucionar áreas com problemas no disco, como "
"riscos na superfície, mas tornará substancialmente mais lenta a importação."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
@@ -6344,7 +6346,7 @@ msgstr "Preferências de CD de Áudio"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:286
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:64
msgid "Eject Disc"
-msgstr "Ejetar Disco"
+msgstr "Ejectar Disco"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:310
#, csharp-format
@@ -6354,14 +6356,15 @@ msgstr "Importar ‟{0}”"
#. Translators: {0} is the type of disc, "Audio CD" or "DVD"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
#, csharp-format
+#| msgid "Disconnecting {0}..."
msgid "Ejecting {0}..."
-msgstr "A ejetar {0}..."
+msgstr "A ejectar {0}..."
#. Translators: {0} is the type of disc, "Audio CD" or "DVD". {1} is the error message.
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:173
#, csharp-format
msgid "Could not eject {0}: {1}"
-msgstr "Não foi possível ejetar {0}: {1}"
+msgstr "Não foi possível ejectar {0}: {1}"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs:91
msgid "Go to Menu"
@@ -6421,7 +6424,7 @@ msgstr "Localizar \"{0}\""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
msgid "Locate iTunes Music Directory"
-msgstr "Localizar Diretório de Música do iTunes"
+msgstr "Localizar Directório de Música do iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
#, csharp-format
@@ -6429,8 +6432,8 @@ msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
"not able to infer the location of this directory. Please locate it."
msgstr ""
-"A biblioteca do iTunes refere o seu diretório de música como sendo \"{0}\" "
-"mas o banshee não foi capaz de inferir a localização deste diretório. Por "
+"A biblioteca do iTunes refere o seu directório de música como sendo \"{0}\" "
+"mas o banshee não foi capaz de inferir a localização deste directório. Por "
"favor, localize-o."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
@@ -6470,7 +6473,7 @@ msgstr "Adicionar à Fila de Reprodução"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:53
msgid "Append selected songs to the play queue"
-msgstr "Adicionar as músicas selecionadas à fila de reprodução"
+msgstr "Adicionar as músicas seleccionadas à fila de reprodução"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
msgid "Play After"
@@ -6479,42 +6482,42 @@ msgstr "Reproduzir Depois"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
msgid "Add selected songs after the currently playing track, album, or artist"
msgstr ""
-"Adicionar as músicas selecionadas após a faixa, álbum ou artista atualmente "
-"em reprodução"
+"Adicionar as músicas seleccionadas após a faixa, álbum ou artista "
+"actualmente em reprodução"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
msgid "Current Track"
-msgstr "Faixa Atual"
+msgstr "Faixa Actual"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
msgid "Add selected songs to the play queue after the currently playing song"
msgstr ""
-"Adicionar as músicas selecionadas à fila de reprodução após a música "
-"atualmente em reprodução"
+"Adicionar as músicas seleccionadas à fila de reprodução após a música "
+"actualmente em reprodução"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
msgid "Current Album"
-msgstr "Álbum Atual"
+msgstr "Álbum Actual"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
msgid "Add selected songs to the play queue after the currently playing album"
msgstr ""
-"Adicionar as músicas selecionadas à fila de reprodução após o álbum "
-"atualmente em reprodução"
+"Adicionar as músicas seleccionadas à fila de reprodução após o álbum "
+"actualmente em reprodução"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
msgid "Current Artist"
-msgstr "Artista Atual"
+msgstr "Artista Actual"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
msgid "Add selected songs to the play queue after the currently playing artist"
msgstr ""
-"Adicionar as músicas selecionadas à fila de reprodução após o artista "
-"atualmente em reprodução"
+"Adicionar as músicas seleccionadas à fila de reprodução após o artista "
+"actualmente em reprodução"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
-msgstr "Atualizar faixas aleatórias na fila de reprodução"
+msgstr "Actualizar faixas aleatórias na fila de reprodução"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
@@ -6526,7 +6529,7 @@ msgstr "Adicionar mais"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:90
msgid "Add more random tracks to the play queue"
-msgstr "Atualizar faixas aleatórias à fila de reprodução"
+msgstr "Actualizar faixas aleatórias à fila de reprodução"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:95
msgid "Remove all tracks from the play queue"
@@ -6570,27 +6573,27 @@ msgstr "Remover Podcast"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:135
msgid "Disable Auto Updates"
-msgstr "Desativar Atualizações Automáticas"
+msgstr "Desactivar Actualizações Automáticas"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:153
#, csharp-format
msgid "Network error updating {0}"
-msgstr "Erro de rede ao atualizar {0}"
+msgstr "Erro de rede ao actualizar {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:159
#, csharp-format
msgid "Parsing error updating {0}"
-msgstr "Erro de análise ao atualizar {0}"
+msgstr "Erro de análise ao actualizar {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:162
#, csharp-format
msgid "Authentication error updating {0}"
-msgstr "Erro de autenticação ao atualizar {0}"
+msgstr "Erro de autenticação ao actualizar {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
#, csharp-format
msgid "Error updating {0}"
-msgstr "Erro ao atualizar {0}"
+msgstr "Erro ao actualizar {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:222
msgid "Search your podcasts"
@@ -6623,17 +6626,17 @@ msgstr[1] "{0} episódios"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
-msgstr "Nunca atualizado"
+msgstr "Nunca actualizado"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
-msgstr "Atualizado em {0}"
+msgstr "Actualizado em {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
-msgstr "Atualizado {0}"
+msgstr "Actualizado {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:62
msgid "Downloading"
@@ -6752,7 +6755,7 @@ msgstr "Transferir novos episódios"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
-msgstr "Arquivar todos os episódios, exceto o mais recente"
+msgstr "Arquivar todos os episódios, excepto o mais recente"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
@@ -6782,7 +6785,7 @@ msgstr "URL da Fonte:"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
-msgstr "Última Atualização:"
+msgstr "Última Actualização:"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
@@ -6931,7 +6934,7 @@ msgstr "Detalhes do Erro"
#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
-msgstr "Uma exceção não manipulada foi lançada: "
+msgstr "Uma excepção não manipulada foi lançada: "
#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
msgid "Assembly Version Information"
@@ -6971,7 +6974,7 @@ msgstr "_Limitar a"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85
msgid "selected by"
-msgstr "selecionado por"
+msgstr "seleccionado por"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42
msgid "ago"
@@ -7162,12 +7165,13 @@ msgstr ""
"Este utilizador não está autorizado a ouvir rádio durante picos de utilização"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
+#| msgid "Stream location not found"
msgid "Radio station not found"
msgstr "Estação de rádio não encontrada"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
msgid "This application is not allowed to make requests to the web services"
-msgstr "Esta aplicação não está autorizada a efetuar pedidos aos serviços web"
+msgstr "Esta aplicação não está autorizada a efectuar pedidos aos serviços web"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
msgid "This type of request is no longer supported"
@@ -7179,7 +7183,7 @@ msgid ""
"guidelines"
msgstr ""
"O seu IP fez demasiados pedidos num curto período, excedendo as nossas "
-"diretrizes da API"
+"directrizes da API"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
msgid "There was an unknown error."
@@ -7196,7 +7200,7 @@ msgstr ""
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
msgid "No network connection detected."
-msgstr "Nenhuma ligação de rede detetada."
+msgstr "Nenhuma ligação de rede detectada."
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
msgid "Last.fm username is invalid."
@@ -7216,9 +7220,6 @@ msgstr "Ligado ao Last.fm."
msgid "Unknown Podcast"
msgstr "Podcast Desconhecido"
-#~ msgid "Scrobbling from device"
-#~ msgstr "Transmissão (scrobbling) a partir do dispositivo"
-
#~ msgid "Volume"
#~ msgstr "Volume"
@@ -7269,7 +7270,7 @@ msgstr "Podcast Desconhecido"
#~ "Enable this option to save rating and play count metadata inside "
#~ "supported audio files whenever the rating is changed."
#~ msgstr ""
-#~ "Ativar esta opção para gravar metadados de avaliações e contagens de "
+#~ "Activar esta opção para gravar metadados de avaliações e contagens de "
#~ "reprodução de dentro dos ficheiros de áudio que o suportam."
#~ msgid "Import _ratings"
@@ -7287,19 +7288,19 @@ msgstr "Podcast Desconhecido"
#~ msgstr "_Ficheiros a importar:"
#~ msgid "Select Files"
-#~ msgstr "Selecionar Ficheiros"
+#~ msgstr "Seleccionar Ficheiros"
#~ msgid "(none selected)"
-#~ msgstr "(nenhum selecionado)"
+#~ msgstr "(nenhum seleccionado)"
#~ msgid "_Folders to import:"
#~ msgstr "_Pastas a importar:"
#~ msgid "Select Folders"
-#~ msgstr "Selecionar Pastas"
+#~ msgstr "Seleccionar Pastas"
#~ msgid "{0} to add, {1} to remove, {2} to update"
-#~ msgstr "{0} a adicionar, {1} a remover, {2} a atualizar"
+#~ msgstr "{0} a adicionar, {1} a remover, {2} a actualizar"
#~ msgid ""
#~ "There was an error intializing MTP device support. See http://www."
@@ -7309,10 +7310,10 @@ msgstr "Podcast Desconhecido"
#~ "www.banshee-project.org/Guide/DAPs/MTP para mais informações."
#~ msgid "Ejecting audio CD..."
-#~ msgstr "A ejetar CD de áudio..."
+#~ msgstr "A ejectar CD de áudio..."
#~ msgid "Could not eject audio CD: {0}"
-#~ msgstr "Incapaz de ejetar CD: {0}"
+#~ msgstr "Incapaz de ejectar CD: {0}"
#~ msgid ""
#~ "Simplify the Now Playing interface by hiding the source list and more"
@@ -7366,7 +7367,7 @@ msgstr "Podcast Desconhecido"
#~ msgstr "Por favor remove algumas músicas manualmente"
#~ msgid "Updating..."
-#~ msgstr "A Atualizar..."
+#~ msgstr "A Actualizar..."
#~ msgid "Flushing to disk..."
#~ msgstr "A despejar para o disco..."
@@ -7460,7 +7461,7 @@ msgstr "Podcast Desconhecido"
#~ "Provides an X11 backend for video support, which enables proper "
#~ "fullscreen support."
#~ msgstr ""
-#~ "Disponibiliza um motor X11 para suporte de vídeo, o que ativa suporte "
+#~ "Disponibiliza um motor X11 para suporte de vídeo, o que activa suporte "
#~ "real a ecrã completo."
#~ msgid ""
@@ -7605,13 +7606,13 @@ msgstr "Podcast Desconhecido"
#~ msgstr "Remover o(s) Ficheiro(s) Transferido(s)"
#~ msgid "Last updated:"
-#~ msgstr "Última Atualização:"
+#~ msgstr "Última Actualização:"
#~ msgid "Podcast Name:"
#~ msgstr "Nome do Podcast:"
#~ msgid "When feed is updated:"
-#~ msgstr "Quando a fonte é atualizada:"
+#~ msgstr "Quando a fonte é actualizada:"
#~ msgid "When new episodes are available: "
#~ msgstr "Quando novos episódios estão disponíveis: "
@@ -7639,7 +7640,7 @@ msgstr "Podcast Desconhecido"
#~ msgid ""
#~ "An MTP device was detected, but Banshee was unable to load support for it."
#~ msgstr ""
-#~ "Foi detetado um dispositivo MTP, mas o Banshee foi incapaz de carregar o "
+#~ "Foi detectado um dispositivo MTP, mas o Banshee foi incapaz de carregar o "
#~ "suporte para este."
#~ msgid ", the"
@@ -7655,7 +7656,7 @@ msgstr "Podcast Desconhecido"
#~ msgstr "Procurar Podcast de Vídeo"
#~ msgid "Refresh All Podcasts"
-#~ msgstr "Atualizar Todos os Podcasts"
+#~ msgstr "Actualizar Todos os Podcasts"
#~ msgid "Subscribe to Podcast..."
#~ msgstr "Subscrever um Podcast..."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 448826e..663566b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -30,9 +30,9 @@ msgstr ""
"Project-Id-Version: banshee help\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-04 08:51+0000\n"
-"PO-Revision-Date: 2013-10-05 07:06-0300\n"
-"Last-Translator: Enrico Nicoletto <liverig at gmail.com>\n"
+"POT-Creation-Date: 2013-01-25 00:16+0000\n"
+"PO-Revision-Date: 2013-02-12 18:05-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1 at gmail.com>\n"
"Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Suporte a dispositivos"
#. ../src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml
#: ../data/addin-xml-strings.cs:13
msgid "Karma Support"
-msgstr "Suporte a Karma"
+msgstr "Suporte Karma"
#: ../data/addin-xml-strings.cs:14
msgid "Support for Rio Karma devices."
@@ -643,10 +643,10 @@ msgid "Media Player"
msgstr "Reprodutor de mídia"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Reprodutor de mídia Banshee"
@@ -654,33 +654,6 @@ msgstr "Reprodutor de mídia Banshee"
msgid "Play and organize your media collection"
msgstr "Reproduza e organize a sua coleção de mídia"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"Vídeo;Filme;Clipe;Flick;Séries;Reprodutor;Player;DVD;Disco;Mp3;Áudio;CD;MTP;"
-"Podcast;DAAP;Lista de reprodução;Ipod;Multimídia;Coleção;Música;Rádio;"
-
-#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
-#: ../data/banshee.appdata.xml.in.h:2
-msgid ""
-"Banshee is an open source multimedia management and playback application for "
-"GNOME, Mac and Windows."
-msgstr ""
-"Banshee é um gerenciador de multimídia de código aberto e aplicativo de "
-"reprodução para o GNOME, Mac e Windows."
-
-#: ../data/banshee.appdata.xml.in.h:3
-msgid ""
-"Play your music and videos. Stay entertained and up to date with podcasts "
-"and video podcasts. Sync your Android, iPod, and other devices. We think "
-"you'll love Banshee!"
-msgstr ""
-"Reproduza suas músicas e vídeos. Fique entretido e mantenha-se atualizado "
-"com podcasts de áudio e video. Sincronize seu Android, iPod, e outros "
-"dispositivos. Acreditamos que você irá amar o Banshee!"
-
#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
@@ -808,18 +781,18 @@ msgstr "Não foi possível criar o driver de detecção de BPM."
msgid "Could not initialize GStreamer library"
msgstr "Não foi possível iniciar a biblioteca do GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Erro desconhecido"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Habilitar correção ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -827,11 +800,11 @@ msgstr ""
"Para faixas que têm dados do ReplayGain, automaticamente adaptar "
"(normalizar) o volume da reprodução."
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Ativar _reprodução sem intervalos"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -848,7 +821,7 @@ msgstr "Não foi possível criar o transcodificador"
msgid "Could not create encoder pipeline : {0}"
msgstr "Não foi possível criar o codificador do pipeline : {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -927,54 +900,54 @@ msgstr "Download da atualização finalizado"
msgid "Check for Updates"
msgstr "Procurar por atualizações"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Opções de ajuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Mostra esta ajuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Mostra as opções para o controle de reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Mostra as opções de consulta da faixa em reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Mostra as opções de consulta do mecanismo de reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Mostra as opções para a interface do usuário"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Mostra as opções para desenvolvedores e para depuração"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Mostra todos os grupos de opções"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Mostra informações da versão"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Opções do controle de reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Reproduz a próxima faixa, reiniciando opcionalmente se o valor \"reiniciar\" "
"estiver definido"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart' value is set"
msgstr ""
@@ -982,7 +955,7 @@ msgstr ""
"\" estiver definido"
# "--previous" é opção de linha de comando.
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -990,29 +963,29 @@ msgstr ""
"Se a faixa atual foi reproduzida mais de 4 segundos então reinicie, caso "
"contrário o mesmo que --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Inicia automaticamente a reprodução de qualquer faixa enfileirada pela linha "
"de comando"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Inicia a reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pausa reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Alternar reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Pára completamente a reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1020,95 +993,95 @@ msgstr ""
"Habilita ou desabilita parar a reprodução depois da faixa atual (o valor "
"deveria ser \"true\" ou \"false\")"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr "Define o volume de reprodução (0-100)"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Procura por uma localização específica (segundos, real)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Define a classificação da faixa reproduzida atualmente (0 para 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Opções de consulta do mecanismo do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Estado atual do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Último estado do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Consulta se o reprodutor pode ser pausado"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Consulta se o reprodutor pode procurar"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Volume de reprodução"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Posição na faixa sendo reproduzida"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Opções de consulta dos metadados da faixa sendo reproduzida"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nome do artista"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Título do álbum"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Título da faixa"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Duração"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Número da faixa"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Número de faixas"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Número do disco"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1119,7 +1092,7 @@ msgstr "Número do disco"
msgid "Year"
msgstr "Ano"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1127,83 +1100,83 @@ msgstr "Ano"
msgid "Rating"
msgstr "Avaliação"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Pontuação"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Taxa de bits"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Opções de interface do usuário"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Mostra a interface do usuário no espaço de trabalho atual"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Entra ou deixa o modo de tela cheia"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Oculta a interface do usuário"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr ""
"Não mostra a interface do usuário, independente de quaisquer outras opções"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Apresenta a caixa de diálogo de importação de mídia"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Apresenta a caixa de diálogo \"sobre\""
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Apresenta a caixa de diálogo \"abrir localização\""
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Apresenta a caixa de diálogo de preferências"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Opções de depuração e desenvolvimento"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Habilita recursos gerais de depuração"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Habilita depuração da saída de consultas SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Habilita depuração da saída de Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Especifica um banco de dados alternativo para uso"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Força a busca das capas de álbuns faltantes"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Especifica uma chave alternativa, o padrão é /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
+#: ../src/Clients/Booter/Booter/Entry.cs:221
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1211,35 +1184,30 @@ msgstr ""
"Otimiza a instância para executar desinstalado; muito notavelmente, isso "
"criará um banco de dados alternativo do Mono.Addins no diretório de trabalho"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Desabilita completamente o suporte a DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
msgstr ""
-"Ignorar carregamento de um arquivo gtk.css ({0}) personalizado, caso exista"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:230
-#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Recarregar o arquivo gtk.css ({0}) personalizado, a cada 5 segundos"
+"Ignora o carregamento de um arquivo gtkrc ({0}) personalizado se ele existir"
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Os seguintes argumentos de ajuda são inválidos: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Reproduzir álbum"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "En_fileirar"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1262,16 +1230,16 @@ msgstr "Reproduzir ál_bum"
msgid "Add an album to the playlist"
msgstr "Adiciona um álbum à lista de reprodução"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "{0} restante"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Reproduzir música"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1279,7 +1247,7 @@ msgid "Close"
msgstr "Fechar"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:492
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Pesquisar"
@@ -1316,85 +1284,91 @@ msgstr "Gênero"
msgid "Comment"
msgstr "Comentário"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Álbum desconhecido"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Artista desconhecido"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Álbum desconhecido"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Título desconhecido"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Artistas diversos"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Local de transmissão não localizado"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
msgid "File not found"
msgstr "Arquivo não encontrado"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Codec para reproduzir este tipo de mídia não está disponível"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Arquivo protegido por Digital Rights (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Erro desconhecido"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Reiniciar podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Reiniciar livro falado"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Reiniciar vídeo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Reiniciar música"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Reiniciar item"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "Pul_ar para o podcast em reprodução"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Saltar para livro falado em reprodução"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Saltar para vídeo em reprodução"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "Pul_ar para música em reprodução"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "Pul_ar para o item em reprodução"
@@ -1414,7 +1388,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Todos os álbuns de artistas ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Todos os álbuns ({0})"
@@ -1521,7 +1495,7 @@ msgid "Scanning for media"
msgstr "Verificando mídias"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Verificando..."
@@ -1546,7 +1520,7 @@ msgstr "O processo de importação está em execução. Você gostaria de pará-
msgid "Importing {0} of {1}"
msgstr "Importando {0} de {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Verificando {0} de {1}"
@@ -1562,7 +1536,7 @@ msgstr ""
"Por favor, aguarde enquanto sua base de dados antiga do Banshee é migrada "
"para o novo formato."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Atualizando metadados"
@@ -1638,30 +1612,30 @@ msgstr "Rock Suave"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Remover da biblioteca"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Organização do sistema de arquivos"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
msgid "Co_py files to media folder when importing"
msgstr "Co_piar arquivos para pasta de mídia quando estiver importando"
# Definir atalho
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "At_ualizar arquivo e nomes de pasta"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Renomeia arquivos e pastas de acordo com metadados"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "{0} Pasta"
@@ -1725,118 +1699,119 @@ msgstr "Contagem de disco"
msgid "Grouping"
msgstr "Agrupamento"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Músicas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Pesquisar suas músicas"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Diversos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "_Ordenar os álbuns de um artista pelo ano, não pelo título"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} música"
msgstr[1] "{0} músicas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Pasta de músicas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Músicas avaliadas com quatro ou cinco estrelas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Favoritos recentes"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "Músicas ouvidas com mais frequência na última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Adicionadas recentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Músicas importadas na última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Reproduzidas recentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Músicas reproduzidas recentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "Não ouvidas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Músicas que não foram reproduzidas ou puladas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Favoritos esquecidos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Favoritos que não foram reproduzidos por mais de dois meses"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Menos favorita"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
"Músicas avaliadas com uma ou duas estrelas ou que você pulou com frequência"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "700 MB de favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Um CD de dados com músicas favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "80 minutos de favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Um CD de áudio com músicas favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "Sem avaliação"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Músicas que ainda não foram avaliadas"
@@ -2008,8 +1983,8 @@ msgstr "Excluir lista de reprodução"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nova lista de reprodução"
@@ -2640,7 +2615,7 @@ msgid "Delete Smart Playlist"
msgstr "Excluir lista de reprodução inteligente"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Todos os gêneros ({0})"
@@ -2693,7 +2668,7 @@ msgstr "Erro"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Detalhes"
@@ -2792,12 +2767,12 @@ msgid "Show:"
msgstr "Mostrar:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Todos"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Habilitado"
@@ -2833,8 +2808,8 @@ msgstr ""
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} de {1}"
@@ -2895,20 +2870,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bits"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Faça o painel de contexto maior ou menor"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Esconda o painel de contexto"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Esperando a reprodução começar..."
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Carregando..."
@@ -2935,7 +2910,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Equalizador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Nova predefinição"
@@ -2970,11 +2945,11 @@ msgstr "Mantenedores"
msgid "Contributors"
msgstr "Colaboradores"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Gerenciamento extraordinário de multimídia e reprodução"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2985,7 +2960,7 @@ msgstr ""
"Copyright © 2005–{1} Outros\n"
"Copyright © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Site do Banshee"
@@ -3091,46 +3066,45 @@ msgid "Import a playlist"
msgstr "Importar uma lista de reprodução"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Verificar novamente biblioteca de música"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Verificar novamente a pasta da biblioteca de música"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Abrir _localização..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Abre uma localização remota para reprodução"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Sair"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Sai do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Editar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Preferências"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Modifica as suas preferências pessoais"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "Ferrame_ntas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Verificar novamente biblioteca de música"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Verificar novamente a pasta da biblioteca de música"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
#, csharp-format
msgid "The rescan operation will remove one track from your music library."
@@ -3142,52 +3116,52 @@ msgstr[1] ""
"A operação de varredura removerá {0} faixas da sua biblioteca de músicas."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Aj_uda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "S_umário"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Pesquisa avançada na coleção"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Aprende maneiras avançadas de pesquisar em sua coleção de mídia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Página _inicial do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Visite a página inicial do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Participe"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Torne-se um colaborador do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Informação da _versão"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Vê versões e informações detalhadas"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Importar lista de reprodução"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listas de reprodução"
@@ -3510,7 +3484,7 @@ msgstr ""
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3579,25 +3553,17 @@ msgstr[1] ""
"Você tem certeza que quer remover os {0} itens selecionados do(a) seu(sua) "
"{1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Você tem certeza de que quer continuar?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Remover faixas"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Artista do álbum de com_pilação:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
+#: ../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 ""
"Marque isto se essa faixa é parte de um álbum com faixas de vários artistas."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
msgid ""
"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'."
@@ -3742,7 +3708,7 @@ msgstr "Definir todos os comentários para este valor"
msgid "Co_mment:"
msgstr "Co_mentário:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Ajuda"
@@ -3751,7 +3717,7 @@ msgstr "Ajuda"
msgid "Lyrics"
msgstr "Letras"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Avance para a próxima faixa e edite o título"
@@ -3874,39 +3840,39 @@ msgstr "Tamanho do arquivo:"
msgid "bytes"
msgstr "bytes"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Editor de propriedades da faixa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Propriedades da faixa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Mostrar a faixa anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Mostrar a próxima faixa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Título:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Artista:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Álbum:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Sincroni_zar os valores de todos os campos"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3914,12 +3880,12 @@ msgstr ""
"Aplicar os valores de todos os campos comuns definidos por esta faixa a "
"todas as outras faixas selecionadas neste editor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Editando {0} de {1} itens</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3927,11 +3893,11 @@ msgstr[0] "Salvar as alterações feitas à faixa aberta?"
msgstr[1] "Salvar as alterações feitas a {0} de {1} faixas abertas?"
# Definir atalho
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Fechar _sem salvar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr ""
@@ -3983,19 +3949,19 @@ msgstr[1] "Tarefas em execução:"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}de{1} {2} {0}publicado{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}de{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} - {1}"
@@ -4003,56 +3969,56 @@ msgstr "{0} - {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}por{1} {2} {0}de{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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0}de{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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}por{1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Parar operação"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Parar {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "A operação ainda não terminou. Você gostaria de pará-la?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
msgid ""
"The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "A operação '{0}' ainda não terminou. Você gostaria de pará-la?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Continuar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Continuar {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Parando..."
@@ -4125,7 +4091,7 @@ msgstr "Nenhum perfil disponível"
msgid "Advanced"
msgstr "Avançado"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Configurando {0}"
@@ -4190,80 +4156,80 @@ msgstr "Abrir em editor"
msgid "Create and save"
msgstr "Criar e salvar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Conteúdo do navegador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Configura os filtros habilitados no navegador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Mostrar filtro de artista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Exibir uma lista de artistas a serem filtrados"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Mostrar todos os artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Exibir todos os artistas no filtro de artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Exibe álbuns dos artistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
msgstr "Exibe apenas álbuns de artistas, não artistas com apenas uma faixa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Mostrar filtro de gênero"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Exibe a lista de gêneros a serem filtrados"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Mostrar filtro por ano"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Exibe uma lista de anos a serem filtrados"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Não definido"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Navegador à esquerda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Mostra o navegador de artista/álbum à esquerda da lista de faixas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Navegador no topo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Mostra o navegador de artista/álbum sobre a lista de faixas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Mostrar navegador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Mostra ou oculta o navegador de artista/álbum"
@@ -4280,12 +4246,12 @@ msgstr ""
msgid "The security certificate for {0} is invalid."
msgstr "O certificado de segurança para {0} é inválido."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Carregando {0}..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4293,20 +4259,24 @@ msgstr ""
"Inserir\n"
"disco"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Limpar pesquisa"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Buscar"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Inativo"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Contactando..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Preenchendo buffer"
@@ -4346,39 +4316,29 @@ msgstr "Suporta arte de capa"
msgid "Supports photos"
msgstr "Suporta fotos"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:462
msgid "Track duration is zero"
msgstr "A duração da faixa é zero"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
msgid "Syncing iPod"
msgstr "Sincronizando o iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
msgid "Preparing to synchronize..."
msgstr "Preparando para sincroniar..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:589
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Adicionando faixa {0} de {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Atualizando metadados na faixa {0} de {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:632
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Removendo faixa {0} de {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Limpando, removendo faixa inválida {0} de {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:706
msgid "Writing media database"
msgstr "Gravando o banco de dados de mídia"
@@ -4387,7 +4347,7 @@ msgstr "Gravando o banco de dados de mídia"
msgid "Sync {0}"
msgstr "Sincronizar {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Dispositivos"
@@ -4455,17 +4415,25 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Preferências de sincronização"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Sincronizar"
+
#. 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.Gui/DapActions.cs:106
#, 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."
msgstr[0] "A operação de sincronização removerá uma faixa de seu dispositivo."
msgstr[1] "A operação de sincronização removerá {0} faixas de seu dispositivo."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Sincronizar"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Você tem certeza de que quer continuar?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+msgid "Remove tracks"
+msgstr "Remover faixas"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4538,12 +4506,12 @@ msgstr "Importar música comprada"
msgid "Disconnect"
msgstr "Desconectar"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Desconectando {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Não foi possível desconectar {0}: {1}"
@@ -4675,13 +4643,12 @@ msgstr "Reino Unido (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Estados Unidos da América (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Pesquisar na loja de MP3 da Amazon"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Como suas compras ajudam o GNOME"
@@ -4786,17 +4753,17 @@ msgstr "D_etectar"
msgid "T_ap"
msgstr "Bat_ida"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr ""
"Permitir que o Banshee tente detectar automaticamente o número de BPM para "
"esta música"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Reproduzir esta música"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Acione repetidamente este botão para definir o número de BPM para esta "
@@ -5170,10 +5137,6 @@ msgstr "Erro ao obter detalhes do item do Internet Archive"
msgid "Description"
msgstr "Descrição"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Criador:"
@@ -5187,7 +5150,7 @@ msgid "Location:"
msgstr "Localização:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Data:"
@@ -5200,7 +5163,7 @@ msgid "Publisher:"
msgstr "Publicado por:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Palavras-chave:"
@@ -5274,16 +5237,16 @@ msgstr "{0} por {1} de {2}"
msgid "Write your own review"
msgstr "Escreva a sua própria resenha"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Coleção:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Consulta opcional"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Ordenado por:"
@@ -5670,22 +5633,22 @@ msgstr "Editar estação"
msgid "Station"
msgstr "Estação"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} estação"
msgstr[1] "{0} estações"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Por favor forneça um URI de estação válido"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Por favor forneça um gênero para a estação"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Por favor forneça um título para estação"
@@ -5697,7 +5660,7 @@ msgstr "Adicionar uma nova estação de rádio"
msgid "Edit radio station"
msgstr "Editar estação de rádio"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
msgid ""
"Enter the Genre, Title and URL of the radio station you wish to add. A "
"description is optional."
@@ -5705,81 +5668,82 @@ msgstr ""
"Digite o gênero, título e URL da estação de rádio que você deseja adicionar. "
"Uma descrição é opcional."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Gênero da estação:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Nome da estação:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "URL do fluxo:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Criador da estação:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Descrição:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Avaliação:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Processadas {0} de {1} faixas"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Configura o plug-in do Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Visitar página de perfil do _usuário"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Visita o seu perfil do Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "_Habilitar relatório de músicas do Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Habilitar relatório de músicas do Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "_Habilitar relatório de músicas do dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Habilitar relatório de músicas do dispositivo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Fazer \"scrobble\" para Last.FM"
+# Q: O que é scrobble? A: http://www.lastfm.com.br/help/faq?category=99
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Fazendo Scrobble do dispositivo"
# Q: O que é scrobble? A: http://www.lastfm.com.br/help/faq?category=99
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Realizando \"scrobble\" para o Last.FM..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Fazendo Scrobble do dispositivo..."
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Processando faixa {0} de {1}..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5837,28 +5801,28 @@ msgstr "Visita a página desta faixa no Last.fm"
msgid "Recommend this track to someone"
msgstr "Recomenda esta faixa a alguém"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5910,19 +5874,19 @@ msgstr "Você está conectado ao Last.fm com o usuário <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Desconectar do Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Faixas marcadas como preferidas recentemente"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Faixas reproduzidas recentemente"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Meus artistas preferidos"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} reproduções"
@@ -6012,17 +5976,17 @@ msgstr "Banir faixa"
msgid "Mark current track as banned"
msgstr "Marca a faixa atual como banida"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "Fãs de {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Semelhante a {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "_Adicionar estação"
@@ -6038,7 +6002,7 @@ msgstr "Contagem total de reprodução"
msgid "New Station"
msgstr "Nova estação"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "_Tipo da estação:"
@@ -6191,15 +6155,15 @@ msgstr "Painel de acesso rápido para sua mídia"
msgid "_Mini Mode"
msgstr "_Modo compacto"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Modo completo"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Retornar ao modo completo"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Alterar modo de repetição de reprodução"
@@ -6236,11 +6200,11 @@ msgstr "_Mostrar notificações"
msgid "Show notifications when item changes"
msgstr "Mostra notificações quando o item mudar"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Ainda executando"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
@@ -6248,23 +6212,19 @@ msgstr ""
"Banshee foi fechado para a área de notificação. Use a opção <i>Sair</i> para "
"fechar sua sessão."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Pular este item"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Não é possível mostrar notificação"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6273,6 +6233,10 @@ msgstr ""
"{0}por{1} {2}\n"
"{0}de{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Simplificar"
@@ -6677,16 +6641,16 @@ msgid_plural "{0} episodes"
msgstr[0] "{0} episódio"
msgstr[1] "{0} episódios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nunca atualizado"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Atualizado em {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Atualizado {0}"
@@ -6769,18 +6733,18 @@ msgstr "Visitar o website"
msgid "Add Podcast"
msgstr "Adicionar podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
msgstr[0] "Apagar arquivo"
msgstr[1] "Apagar arquivos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "URL inválida"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "A URL do podcast é inválida."
@@ -6788,11 +6752,11 @@ msgstr "A URL do podcast é inválida."
msgid "Episode Details"
msgstr "Detalhes do episódio"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Verifica periodicamente os novos episódios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
msgid ""
"If checked, Banshee will check every hour to see if this podcast has new "
"episodes"
@@ -6800,59 +6764,59 @@ msgstr ""
"Se marcados, Banshee irá verificar a cada hora para ver se este podcast tem "
"novos episódios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Baixar novos episódios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Arquivar todos os episódios, exceto o mais recente"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Nenhuma descrição disponível"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Nome:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Website:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Visitar"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Opções de inscrições"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "Feed URL:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Última atualização"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Categoria:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Copyright:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "URL:"
@@ -6970,22 +6934,22 @@ msgstr "clique"
msgid "menu"
msgstr "menu"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Ocultar <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
msgid "{0} Encountered a Fatal Error"
msgstr "{0} encontrou um erro fatal"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
msgid "Error Details"
msgstr "Detalhes do erro"
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Uma exceção inoperável foi lançada: "
@@ -7137,15 +7101,15 @@ msgstr "inicia com"
msgid "ends with"
msgstr "termina com"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Conectar à conta do Last.fm"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Por favor digite suas credenciais da conta do Last.fm."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Salvar e iniciar sessão"
@@ -7272,8 +7236,18 @@ msgstr "Conectado ao Last.fm."
msgid "Unknown Podcast"
msgstr "Podcast desconhecido"
-#~ msgid "Clear search"
-#~ msgstr "Limpar pesquisa"
+#~ msgid "Volume"
+#~ msgstr "Volume"
+
+#~ msgid "Muted"
+#~ msgstr "Mudo"
+
+#~ msgid "Full Volume"
+#~ msgstr "Volume máximo"
-#~ msgid "Banshee"
-#~ msgstr "Banshee"
+#~ msgid ""
+#~ "Last.fm username is invalid or Banshee is not authorized to access your "
+#~ "account."
+#~ msgstr ""
+#~ "Usuário do Last.fm inválido ou o Banshee não é autorizado a acessar a sua "
+#~ "conta."
diff --git a/po/ru.po b/po/ru.po
index 6dc1e3a..90eb1a3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,19 +13,16 @@
msgid ""
msgstr ""
"Project-Id-Version: banshee trunk\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-20 23:14+0000\n"
-"PO-Revision-Date: 2013-01-15 14:50+0400\n"
-"Last-Translator: Aleksej Kabanov <ak099 at mail.ru>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-21 19:14+0000\n"
+"PO-Revision-Date: 2011-12-26 20:08+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13 at yandex.ru>\n"
"Language-Team: Russian <gnome-cyr at gnome.org>\n"
-"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.5.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.4\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
#: ../data/addin-xml-strings.cs:8
@@ -36,8 +33,10 @@ msgstr "Поддержка устройств Apple"
msgid "Support for most iPod/iPhone/iPad devices."
msgstr "Поддержка большинства моделей iPod, iPhone и iPad."
-#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15
-#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25
+#: ../data/addin-xml-strings.cs:10
+#: ../data/addin-xml-strings.cs:15
+#: ../data/addin-xml-strings.cs:20
+#: ../data/addin-xml-strings.cs:25
msgid "Device Support"
msgstr "Поддержка устройств"
@@ -57,12 +56,8 @@ msgstr "Устройства-накопители"
# http://en.wikipedia.org/wiki/IAUDIO
#: ../data/addin-xml-strings.cs:19
-msgid ""
-"Support for USB-drive based devices, including many iAudio devices and "
-"Android, Pre, and Galaxy phones."
-msgstr ""
-"Поддержка устройств USB, включая медиаплееры iAUDIO и телефоны Android, Pre "
-"и Galaxy."
+msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones."
+msgstr "Поддержка устройств USB, включая медиаплееры iAUDIO и телефоны Android, Pre и Galaxy."
#. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
#: ../data/addin-xml-strings.cs:23
@@ -82,10 +77,14 @@ msgstr "Магазин Amazon MP3"
msgid "Browse, search, and purchase music from the Amazon MP3 store."
msgstr "Найти и приобрести музыку в магазине Amazon MP3"
-#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
-#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
-#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
-#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+#: ../data/addin-xml-strings.cs:30
+#: ../data/addin-xml-strings.cs:35
+#: ../data/addin-xml-strings.cs:65
+#: ../data/addin-xml-strings.cs:70
+#: ../data/addin-xml-strings.cs:85
+#: ../data/addin-xml-strings.cs:95
+#: ../data/addin-xml-strings.cs:100
+#: ../data/addin-xml-strings.cs:115
#: ../data/addin-xml-strings.cs:165
msgid "Online Sources"
msgstr "Интернет-сервисы"
@@ -108,9 +107,12 @@ msgstr "Библиотека аудиокниг"
msgid "Organize audiobooks, lectures, etc."
msgstr "Управление аудиокнигами, лекциями и т. п."
-#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
-#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
-#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
+#: ../data/addin-xml-strings.cs:40
+#: ../data/addin-xml-strings.cs:75
+#: ../data/addin-xml-strings.cs:90
+#: ../data/addin-xml-strings.cs:135
+#: ../data/addin-xml-strings.cs:145
+#: ../data/addin-xml-strings.cs:150
msgid "Core"
msgstr "Основные"
@@ -123,13 +125,19 @@ msgstr "Язык сценариев Boo"
msgid "Customize and extend Banshee with Boo-language scripts."
msgstr "Расширение возможностей Banshee с помощью скриптов на языке Boo."
-#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
-#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
-#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
-#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
-#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
-#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
-#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+#: ../data/addin-xml-strings.cs:45
+#: ../data/addin-xml-strings.cs:50
+#: ../data/addin-xml-strings.cs:55
+#: ../data/addin-xml-strings.cs:60
+#: ../data/addin-xml-strings.cs:80
+#: ../data/addin-xml-strings.cs:105
+#: ../data/addin-xml-strings.cs:110
+#: ../data/addin-xml-strings.cs:120
+#: ../data/addin-xml-strings.cs:125
+#: ../data/addin-xml-strings.cs:130
+#: ../data/addin-xml-strings.cs:140
+#: ../data/addin-xml-strings.cs:155
+#: ../data/addin-xml-strings.cs:160
msgid "Utilities"
msgstr "Дополнительные средства"
@@ -194,9 +202,7 @@ msgstr "Исправить метаданные"
#: ../data/addin-xml-strings.cs:79
msgid "Fix broken and missing metadata using bulk operations."
-msgstr ""
-"Исправить неправильные и отсутствующие метаданные, используя групповые "
-"операции."
+msgstr "Исправить неправильные и отсутствующие метаданные, используя групповые операции."
#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
#: ../data/addin-xml-strings.cs:83
@@ -252,12 +258,8 @@ msgid "Mini Mode"
msgstr "Компактный режим"
#: ../data/addin-xml-strings.cs:109
-msgid ""
-"Control Banshee through a small window with only playback controls and track "
-"information."
-msgstr ""
-"Управление Banshee при помощи небольшого окна с кнопками и текущей "
-"информацией."
+msgid "Control Banshee through a small window with only playback controls and track information."
+msgstr "Управление Banshee при помощи небольшого окна с кнопками и текущей информацией."
#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
#: ../data/addin-xml-strings.cs:113
@@ -284,8 +286,7 @@ msgstr "Мультимедийные клавиши"
#: ../data/addin-xml-strings.cs:124
msgid "Control playback via the multimedia keys on your keyboard."
-msgstr ""
-"Управление воспроизведением с помощью мультимедиа-клавиш на клавиатуре."
+msgstr "Управление воспроизведением с помощью мультимедиа-клавиш на клавиатуре."
#. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
#: ../data/addin-xml-strings.cs:128
@@ -323,12 +324,11 @@ msgstr "Очередь воспроизведения"
#: ../data/addin-xml-strings.cs:144
msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
-msgstr ""
-"Воспроизводить композиции в выбранном порядке или задействовать Auto DJ."
+msgstr "Воспроизводить композиции в выбранном порядке или задействовать Auto DJ."
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
#: ../data/addin-xml-strings.cs:148
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:207
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:200
#: ../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:211
@@ -366,64 +366,47 @@ msgid "Ubuntu One Music Store"
msgstr "Музыкальный магазин Ubuntu One"
#: ../data/addin-xml-strings.cs:164
-msgid ""
-"This extension grants access to the Ubuntu One Music Store, powered by "
-"7digital."
-msgstr ""
-"Это расширение предоставляет доступ к музыкальному магазину Ubuntu One."
-
-#. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
-#: ../data/addin-xml-strings.cs:168
-msgid "UPnP Client"
-msgstr "Клиент UPnP"
-
-#: ../data/addin-xml-strings.cs:169
-msgid ""
-"Browse and play music and videos shared over your local network using UPnP."
-msgstr "Воспроизведение музыки и видео через локальную сеть с помощью UPnP."
+msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+msgstr "Это расширение предоставляет доступ к музыкальному магазину Ubuntu One."
# Лучше здесь не трогать, а в описании перевести.
#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
-#: ../data/addin-xml-strings.cs:173
+#: ../data/addin-xml-strings.cs:168
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44
msgid "Wikipedia"
msgstr "Wikipedia"
-#: ../data/addin-xml-strings.cs:174
+#: ../data/addin-xml-strings.cs:169
msgid "View artist information from Wikipedia in the context pane."
-msgstr ""
-"Показывать в сводной панели информацию об исполнителях, имеющуюся в Википедии"
+msgstr "Показывать в сводной панели информацию об исполнителях, имеющуюся в Википедии"
-#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+#: ../data/addin-xml-strings.cs:170
+#: ../data/addin-xml-strings.cs:175
msgid "Context Pane"
msgstr "Сводная панель"
#. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml
-#: ../data/addin-xml-strings.cs:178
+#: ../data/addin-xml-strings.cs:173
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
msgid "YouTube"
msgstr "YouTube"
-#: ../data/addin-xml-strings.cs:179
+#: ../data/addin-xml-strings.cs:174
msgid "Show related YouTube videos in the context pane."
msgstr "Показывать похожие ролики с YouTube в сводной панели."
#: ../data/audio-profiles/aac-novell.xml.in.h:1
-msgid "AAC (Novell Encoder)"
-msgstr "AAC (кодировщик Novell)"
+msgid "3GPP"
+msgstr "3GPP"
#: ../data/audio-profiles/aac-novell.xml.in.h:2
-msgid ""
-"Designed to be the successor of the MP3 format, AAC generally achieves "
-"better sound quality than MP3 at many bit rates."
-msgstr ""
-"Созданный по подобию MP3, формат AAC в большинстве случаев обеспечивает "
-"лучшее звучание, чем MP3 при разных настройках"
+msgid "AAC (Novell Encoder)"
+msgstr "AAC (кодировщик Novell)"
#: ../data/audio-profiles/aac-novell.xml.in.h:3
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
-#: ../data/audio-profiles/mp3-xing.xml.in.h:3
-#: ../data/audio-profiles/wavpack.xml.in.h:13
+#: ../data/audio-profiles/mp3-lame.xml.in.h:3
+#: ../data/audio-profiles/mp3-xing.xml.in.h:2
+#: ../data/audio-profiles/wavpack.xml.in.h:3
#: ../data/audio-profiles/wma.xml.in.h:4
msgid "Bitrate"
msgstr "Скорость потока"
@@ -433,33 +416,33 @@ msgid "Container"
msgstr "Контейнер"
#: ../data/audio-profiles/aac-novell.xml.in.h:5
-msgid "MPEG-4 ISO"
-msgstr "Стандартный MPEG-4"
+msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates."
+msgstr "Созданный по подобию MP3, формат AAC в большинстве случаев обеспечивает лучшее звучание, чем MP3 при разных настройках"
#: ../data/audio-profiles/aac-novell.xml.in.h:6
-msgid "MPEG-4 QuickTime"
-msgstr "QuickTime MPEG-4"
+msgid "Long Term Prediction"
+msgstr "Длительное упреждение"
#: ../data/audio-profiles/aac-novell.xml.in.h:7
-msgid "3GPP"
-msgstr "3GPP"
+msgid "Low Complexity"
+msgstr "Низкий диапазон"
#: ../data/audio-profiles/aac-novell.xml.in.h:8
-msgid "Profile"
-msgstr "Профиль"
+msgid "MPEG-4 ISO"
+msgstr "Стандартный MPEG-4"
#: ../data/audio-profiles/aac-novell.xml.in.h:9
-msgid "Low Complexity"
-msgstr "Низкий диапазон"
+msgid "MPEG-4 QuickTime"
+msgstr "QuickTime MPEG-4"
#: ../data/audio-profiles/aac-novell.xml.in.h:10
-msgid "Long Term Prediction"
-msgstr "Длительное упреждение"
-
-#: ../data/audio-profiles/aac-novell.xml.in.h:11
msgid "Output Format"
msgstr "Выходной формат"
+#: ../data/audio-profiles/aac-novell.xml.in.h:11
+msgid "Profile"
+msgstr "Профиль"
+
#: ../data/audio-profiles/base.xml.in.h:1
msgid "Channels"
msgstr "Каналов"
@@ -469,180 +452,155 @@ msgid "Free Lossless Audio Codec"
msgstr "Free Lossless Audio Codec"
#: ../data/audio-profiles/flac.xml.in.h:2
-msgid ""
-"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but "
-"does not degrade audio quality."
-msgstr ""
-"Free Lossless Audio Codec (FLAC) — кодек с открытым исходным кодом, "
-"сжимающий звуковые данные без потери качества."
+msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality."
+msgstr "Free Lossless Audio Codec (FLAC) — кодек с открытым исходным кодом, сжимающий звуковые данные без потери качества."
#: ../data/audio-profiles/mp3-lame.xml.in.h:1
-msgid "MP3 (LAME Encoder)"
-msgstr "MP3 (кодировщик LAME)"
+#: ../data/audio-profiles/mp3-xing.xml.in.h:1
+msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates."
+msgstr "Несвободный и более старый, но в то же время популярный кодек сжатия звука. Сжатые им файлы имеют больший размер при низкой скорости потока."
#: ../data/audio-profiles/mp3-lame.xml.in.h:2
-#: ../data/audio-profiles/mp3-xing.xml.in.h:2
-msgid ""
-"A proprietary and older, but also popular, lossy audio format that produces "
-"larger files at lower bitrates."
-msgstr ""
-"Несвободный и более старый, но в то же время популярный кодек сжатия звука. "
-"Сжатые им файлы имеют больший размер при низкой скорости потока."
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:3
-msgid "Encoding Mode"
-msgstr "Режим кодирования"
+#: ../data/audio-profiles/vorbis.xml.in.h:2
+#: ../data/audio-profiles/wavpack.xml.in.h:2
+#: ../data/audio-profiles/wma.xml.in.h:3
+msgid "Best"
+msgstr "Наилучшее"
#: ../data/audio-profiles/mp3-lame.xml.in.h:4
msgid "Constant Bitrate"
msgstr "Постоянная скорость потока"
#: ../data/audio-profiles/mp3-lame.xml.in.h:5
-msgid "Variable Bitrate"
-msgstr "Переменная скорость потока"
+msgid "Encoding Mode"
+msgstr "Режим кодирования"
#: ../data/audio-profiles/mp3-lame.xml.in.h:6
-msgid "VBR Quality"
-msgstr "Качество VBR"
+msgid "MP3 (LAME Encoder)"
+msgstr "MP3 (кодировщик LAME)"
#: ../data/audio-profiles/mp3-lame.xml.in.h:7
-#: ../data/audio-profiles/vorbis.xml.in.h:4
-#: ../data/audio-profiles/wavpack.xml.in.h:14
-#: ../data/audio-profiles/wma.xml.in.h:6
-msgid "Worst"
-msgstr "Наихудшее"
+msgid "VBR Quality"
+msgstr "Качество VBR"
#: ../data/audio-profiles/mp3-lame.xml.in.h:8
+msgid "Variable Bitrate"
+msgstr "Переменная скорость потока"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
#: ../data/audio-profiles/vorbis.xml.in.h:5
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
-msgid "Best"
-msgstr "Наилучшее"
+msgid "Worst"
+msgstr "Наихудшее"
-#: ../data/audio-profiles/mp3-xing.xml.in.h:1
+#: ../data/audio-profiles/mp3-xing.xml.in.h:3
msgid "MP3 (Xing Encoder)"
msgstr "MP3 (кодировщик Xing)"
#: ../data/audio-profiles/vorbis.xml.in.h:1
-msgid "Ogg Vorbis"
-msgstr "Ogg Vorbis"
-
-#: ../data/audio-profiles/vorbis.xml.in.h:2
-msgid ""
-"Vorbis is an open source, lossy audio codec with high quality output at a "
-"lower file size than MP3."
-msgstr ""
-"Vorbis — кодек с открытым исходным кодом, обеспечивающий высокое качество "
-"звука при меньшем размере файлов по сравнению с MP3."
-
-#: ../data/audio-profiles/vorbis.xml.in.h:3
msgid "Audio quality"
msgstr "Качество звука"
-#: ../data/audio-profiles/wavpack.xml.in.h:1
-msgid "Wavpack"
-msgstr "Wavpack"
+#: ../data/audio-profiles/vorbis.xml.in.h:3
+msgid "Ogg Vorbis"
+msgstr "Ogg Vorbis"
-#: ../data/audio-profiles/wavpack.xml.in.h:2
-msgid ""
-"A fast and efficient open source audio format offering lossless and high-"
-"quality lossy encoding with great dynamic range."
-msgstr ""
-"Быстрый и эффективный формат с открытой спецификацией и реализацией, "
-"обеспечивающий сжатие данных без потерь и высококачественное кодирование с "
-"сохранением большого динамического диапазона."
+#: ../data/audio-profiles/vorbis.xml.in.h:4
+msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3."
+msgstr "Vorbis — кодек с открытым исходным кодом, обеспечивающий высокое качество звука при меньшем размере файлов по сравнению с MP3."
-#: ../data/audio-profiles/wavpack.xml.in.h:3
-msgid "Mode"
-msgstr "Режим"
+#: ../data/audio-profiles/wavpack.xml.in.h:1
+msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range."
+msgstr "Быстрый и эффективный формат с открытой спецификацией и реализацией, обеспечивающий сжатие данных без потерь и высококачественное кодирование с сохранением большого динамического диапазона."
#: ../data/audio-profiles/wavpack.xml.in.h:4
-msgid "Fast Compression"
-msgstr "Быстрое сжатие"
+msgid "Default"
+msgstr "По умолчанию"
#: ../data/audio-profiles/wavpack.xml.in.h:5
msgid "Default Compression"
msgstr "Сжатие по умолчанию"
#: ../data/audio-profiles/wavpack.xml.in.h:6
-msgid "High Compression"
-msgstr "Сильное сжатие"
+msgid "Extra processing"
+msgstr "Дополнительная обработка"
#: ../data/audio-profiles/wavpack.xml.in.h:7
-msgid "Very High Compression"
-msgstr "Очень сильное сжатие"
+msgid "Fast Compression"
+msgstr "Быстрое сжатие"
#: ../data/audio-profiles/wavpack.xml.in.h:8
-msgid "Lossy mode"
-msgstr "Режим с потерей качества"
+msgid "High Compression"
+msgstr "Сильное сжатие"
#: ../data/audio-profiles/wavpack.xml.in.h:9
-msgid "Store MD5 sum in the file"
-msgstr "Хранить контрольную сумму MD5 в файле"
+msgid "Highest"
+msgstr "Наилучший"
#: ../data/audio-profiles/wavpack.xml.in.h:10
-msgid "Extra processing"
-msgstr "Дополнительная обработка"
+msgid "Lossy mode"
+msgstr "Режим с потерей качества"
#: ../data/audio-profiles/wavpack.xml.in.h:11
-msgid "Default"
-msgstr "По умолчанию"
+msgid "Mode"
+msgstr "Режим"
#: ../data/audio-profiles/wavpack.xml.in.h:12
-msgid "Highest"
-msgstr "Наилучший"
+msgid "Store MD5 sum in the file"
+msgstr "Хранить контрольную сумму MD5 в файле"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:13
+msgid "Very High Compression"
+msgstr "Очень сильное сжатие"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:14
+msgid "Wavpack"
+msgstr "Wavpack"
#: ../data/audio-profiles/wav.xml.in.h:1
-msgid "Waveform PCM"
-msgstr "Waveform PCM"
+msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+msgstr "WAV+PCM — формат без потери качества, хранит данные без сжатия в импульсно-кодовой модуляции."
#: ../data/audio-profiles/wav.xml.in.h:2
-msgid ""
-"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
-"modulated (PCM) audio."
-msgstr ""
-"WAV+PCM — формат без потери качества, хранит данные без сжатия в импульсно-"
-"кодовой модуляции."
+msgid "Waveform PCM"
+msgstr "Waveform PCM"
#: ../data/audio-profiles/wma.xml.in.h:1
-msgid "Windows Media Audio"
-msgstr "Windows Media Audio"
+msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+msgstr "Несвободный формат сжатия с потерями, обеспечивающий высокое качество при меньшем размере файлов по сравнению с MP3. Файл WMA со скоростью потока 96 Кбит/с эквивалентен файлу в MP3 со скоростью потока 128 Кбит/с."
#: ../data/audio-profiles/wma.xml.in.h:2
-msgid ""
-"A proprietary lossy audio format with high quality output at a lower file "
-"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
-msgstr ""
-"Несвободный формат сжатия с потерями, обеспечивающий высокое качество при "
-"меньшем размере файлов по сравнению с MP3. Файл WMA со скоростью потока 96 "
-"Кбит/с эквивалентен файлу в MP3 со скоростью потока 128 Кбит/с."
+msgid "Audio Quality"
+msgstr "Качество звука"
-#: ../data/audio-profiles/wma.xml.in.h:3
+#: ../data/audio-profiles/wma.xml.in.h:5
msgid "Use a variable bitrate"
msgstr "Использовать переменную скорость потока"
-#: ../data/audio-profiles/wma.xml.in.h:5
-msgid "Audio Quality"
-msgstr "Качество звука"
+#: ../data/audio-profiles/wma.xml.in.h:6
+msgid "Windows Media Audio"
+msgstr "Windows Media Audio"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
-msgid "Media Player"
-msgstr "Медиапроигрыватель"
-
-#: ../data/desktop-files/common.desktop.in.h:2
#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
+#: ../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:193
+msgid "Media Player"
+msgstr "Медиапроигрыватель"
+
#: ../data/desktop-files/common.desktop.in.h:3
msgid "Play and organize your media collection"
msgstr "Слушайте музыку и управляйте своей коллекцией"
-#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+#: ../libbanshee/banshee-bpmdetector.c:202
+#: ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
msgstr "Не удалось создать конвейер"
@@ -672,7 +630,8 @@ msgid "Could not create fakesink plugin"
msgstr "Не удалось создать модуль fakesink"
#: ../libbanshee/banshee-bpmdetector.c:241
-#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+#: ../libbanshee/banshee-bpmdetector.c:250
+#: ../libbanshee/banshee-ripper.c:311
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281
msgid "Could not link pipeline elements"
msgstr "Не удалось связать элементы конвейера"
@@ -769,36 +728,28 @@ msgstr "Не удалось создать драйвер определения
msgid "Could not initialize GStreamer library"
msgstr "Не удалось инициализировать библиотеку GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
msgid "Unknown Error"
msgstr "Неизвестная ошибка"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
msgid "_Enable ReplayGain correction"
msgstr "_Включить выравнивание громкости"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
-msgid ""
-"For tracks that have ReplayGain data, automatically scale (normalize) "
-"playback volume"
-msgstr ""
-"Автоматически подстраивать громкость композиций, содержащих данные для "
-"выравнивания громкости"
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
+msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
+msgstr "Автоматически подстраивать громкость композиций, содержащих данные для выравнивания громкости"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
msgid "Enable _gapless playback"
msgstr "Воспроизводить _непрерывно"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
-msgid ""
-"Eliminate the small playback gap on track change. Useful for concept albums "
-"and classical music"
-msgstr ""
-"Исключить паузы между композициями. Это полезно при прослушивании альбомов "
-"без чёткого разделения дорожек, а также классической музыки."
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
+msgstr "Исключить паузы между композициями. Это полезно при прослушивании альбомов без чёткого разделения дорожек, а также классической музыки."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
msgid "Could not create transcoder"
@@ -809,7 +760,7 @@ msgstr "Не удалось создать преобразователь фор
msgid "Could not create encoder pipeline : {0}"
msgstr "Не удалось создать конвейер кодировщика: {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -818,19 +769,26 @@ msgstr "GStreamer# 0.10"
msgid "Could not create encoding pipeline : {0}"
msgstr "Не удалось создать конвейер кодирования: {0}"
-#. Translators: verb
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
-msgid "Import"
-msgstr "Импортировать"
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+msgid "_Close"
+msgstr "_Закрыть"
+
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+msgid "Close"
+msgstr "Закрыть"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
msgid "Can't check for updates"
msgstr "Не удалось проверить обновления"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
-msgid ""
-"We're currently not able to check if there's a new version available. Please "
-"try again later."
+msgid "We're currently not able to check if there's a new version available. Please try again later."
msgstr "Проверка на наличие новых версий пока что отсутствует."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
@@ -858,6 +816,7 @@ msgstr "Загрузка {0}"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:144
#, csharp-format
+#| msgid "{0} by {1} on {2}"
msgid "{0} MB / {1} MB ({2} KB/s)"
msgstr "{0} МБ / {1} МБ ({2} КБ/с)"
@@ -871,12 +830,8 @@ msgstr "Сбой при загрузке. Попробуйте позже."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165
#, csharp-format
-msgid ""
-"The update finished downloading.{0}Do you want to shutdown Banshee and run "
-"the installer?"
-msgstr ""
-"Загрузка обновления завершена.{0}Завершить работу Banshee и запустить "
-"программу установки?"
+msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?"
+msgstr "Загрузка обновления завершена.{0}Завершить работу Banshee и запустить программу установки?"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
msgid "Update finished downloading"
@@ -927,32 +882,20 @@ msgid "Playback Control Options"
msgstr "Параметры управления воспроизведением"
#: ../src/Clients/Booter/Booter/Entry.cs:164
-msgid ""
-"Play the next track, optionally restarting if the 'restart' value is set"
-msgstr ""
-"Воспроизвести следующую дорожку; с начала, если значение 'restart' "
-"установлено"
+msgid "Play the next track, optionally restarting if the 'restart' value is set"
+msgstr "Воспроизвести следующую дорожку; с начала, если значение 'restart' установлено"
#: ../src/Clients/Booter/Booter/Entry.cs:165
-msgid ""
-"Play the previous track, optionally restarting if the 'restart' value is set"
-msgstr ""
-"Воспроизвести предыдущую дорожку; с начала, если установлено значение "
-"«restart»"
+msgid "Play the previous track, optionally restarting if the 'restart value is set"
+msgstr "Воспроизвести предыдущую дорожку; с начала, если значение 'restart' установлено"
#: ../src/Clients/Booter/Booter/Entry.cs:166
-msgid ""
-"If the current song has been played longer than 4 seconds then restart it, "
-"otherwise the same as --previous"
-msgstr ""
-"Если прошло более 4 секунд от начала композиции, начать заново, иначе то же "
-"самое, что --previous"
+msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous"
+msgstr "Если прошло более 4 секунд от начала композиции, начать заново, иначе то же самое, что --previous"
#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
-msgstr ""
-"Автоматически начать воспроизведение всех файлов, указанных через командную "
-"строку"
+msgstr "Автоматически начать воспроизведение всех файлов, указанных через командную строку"
#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
@@ -971,17 +914,12 @@ msgid "Completely stop playback"
msgstr "Остановить полностью"
#: ../src/Clients/Booter/Booter/Entry.cs:173
-msgid ""
-"Enable or disable playback stopping after the currently playing track (value "
-"should be either 'true' or 'false')"
-msgstr ""
-"Включить или выключить остановку воспроизведения по окончании текущей "
-"дорожки (значение может быть равно 'true' или 'false')"
+msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')"
+msgstr "Включить или выключить остановку воспроизведения по окончании текущей дорожки (значение может быть равно 'true' или 'false')"
#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
-msgstr ""
-"Установить громкость воспроизведения (0-100) или изменить на +/-(значение)"
+msgstr "Установить громкость воспроизведения (0-100) или изменить на +/-(значение)"
#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
@@ -1068,7 +1006,7 @@ msgid "Disc Number"
msgstr "Номер диска"
#: ../src/Clients/Booter/Booter/Entry.cs:197
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78
@@ -1162,12 +1100,8 @@ msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Указать альтернативный ключ, /apps/banshee-1/ по умолчанию"
#: ../src/Clients/Booter/Booter/Entry.cs:221
-msgid ""
-"Optimize instance for running uninstalled; most notably, this will create an "
-"alternate Mono.Addins database in the working directory"
-msgstr ""
-"Настроить проигрыватель для работы без установки. Например, в рабочем "
-"каталоге будет создана отдельная база модулей Mono.Addins"
+msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory"
+msgstr "Настроить проигрыватель для работы без установки. Например, в рабочем каталоге будет создана отдельная база модулей Mono.Addins"
#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
@@ -1223,13 +1157,6 @@ msgstr "Осталось {0}"
msgid "Play Song"
msgstr "Воспроизвести композицию"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
-msgid "Close"
-msgstr "Закрыть"
-
# Ускорителя здесь нет.
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
@@ -1250,12 +1177,6 @@ msgid "Album Artist"
msgstr "Исполнитель альбома"
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:194
-msgid "Composer"
-msgstr "Композитор"
-
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:187
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:366
@@ -1264,92 +1185,96 @@ msgid "Genre"
msgstr "Жанр"
#. Translators: noun
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:144
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:216
msgid "Comment"
msgstr "Комментарий"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "Неизвестный альбом"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Неизвестный исполнитель"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Неизвестный альбом"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Неизвестная композиция"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Различные исполнители"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Местоположение потока не найдено"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "Файл не найден"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Для воспроизведения данных этого типа отсутствует нужный кодек"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Файл защищен техническими средствами (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Неизвестная ошибка"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Воспроизвести подкаст с начала"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Воспроизвести аудиокнигу с начала"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Воспроизвести видео с начала"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Воспроизвести композицию с начала"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Воспроизвести элемент с начала"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "П_ерейти к воспроизводимому подкасту"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "П_ерейти к воспроизводимой аудиокниге"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "П_ерейти к воспроизводимому видео"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "П_ерейти к воспроизводимой композиции"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "П_ерейти к воспроизводимому элементу"
@@ -1404,9 +1329,7 @@ msgstr "по альбому"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
msgid "Play all songs from an album, then randomly choose another album"
-msgstr ""
-"Воспроизвести все композиции из одного альбома, а затем случайно выбрать "
-"следующий"
+msgstr "Воспроизвести все композиции из одного альбома, а затем случайно выбрать следующий"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50
msgid "Shuffle by A_rtist"
@@ -1418,9 +1341,7 @@ msgstr "по исполнителю"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52
msgid "Play all songs by an artist, then randomly choose another artist"
-msgstr ""
-"Воспроизвести все композиции одного исполнителя, а затем случайно выбрать "
-"следующего"
+msgstr "Воспроизвести все композиции одного исполнителя, а затем случайно выбрать следующего"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
@@ -1444,9 +1365,7 @@ msgstr "по оценке"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
msgid "Play songs randomly, prefer higher rated songs"
-msgstr ""
-"Воспроизводить композиции в случайном порядке, отдавая предпочтение "
-"количеству звезд"
+msgstr "Воспроизводить композиции в случайном порядке, отдавая предпочтение количеству звезд"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43
msgid "Shuffle by S_core"
@@ -1458,9 +1377,7 @@ msgstr "по счётчику"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:45
msgid "Play songs randomly, prefer higher scored songs"
-msgstr ""
-"Воспроизводить композиции в случайном порядке, предпочитая наиболее часто "
-"слушаемые"
+msgstr "Воспроизводить композиции в случайном порядке, предпочитая наиболее часто слушаемые"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
msgid "Shuffle by _Song"
@@ -1472,15 +1389,14 @@ msgstr "по композициям"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
msgid "Play songs randomly from the playlist"
-msgstr ""
-"Воспроизводить композиции из списка воспроизведения в случайном порядке"
+msgstr "Воспроизводить композиции из списка воспроизведения в случайном порядке"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:138
msgid "Scanning for media"
msgstr "Производится поиск данных"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Сканирование…"
@@ -1505,7 +1421,7 @@ msgstr "Выполняется импортирование файлов. Хот
msgid "Importing {0} of {1}"
msgstr "Импортируется элемент {0} из {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Заново сканируется {0} из {1}"
@@ -1515,11 +1431,10 @@ msgid "Upgrading your Banshee Database"
msgstr "Обновление базы данных Banshee"
#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
-msgid ""
-"Please wait while your old Banshee database is migrated to the new format."
+msgid "Please wait while your old Banshee database is migrated to the new format."
msgstr "Подождите, старая база данных Banshee преобразуется в новый формат."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Обновление метаданных"
@@ -1595,29 +1510,12 @@ msgstr "Поп-рок"
msgid "Techno"
msgstr "Техно"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Удалить из коллекции"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
-msgid "File Organization"
-msgstr "Управление файлами"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
-msgid "Co_py files to media folder when importing"
-msgstr "_Копировать файлы в папку медиаданных при импортировании"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
-msgid "_Update file and folder names"
-msgstr "О_бновлять имена файлов и папок"
-
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
-msgid "Rename files and folders according to media metadata"
-msgstr "Переименовывать файлы в соответствии с метаданными"
-
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
#, csharp-format
msgid "{0} Folder"
msgstr "Папка «{0}»"
@@ -1635,6 +1533,11 @@ msgstr "Исполнитель альбома (первоначальный)"
msgid "Conductor"
msgstr "Дирижёр"
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:194
+msgid "Composer"
+msgstr "Композитор"
+
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:103
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:362
@@ -1684,26 +1587,24 @@ msgstr "Группирование"
#. Catalog.GetString ("Music Library")
#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Музыка"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Поиск музыки"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
msgid "Miscellaneous"
msgstr "Разное"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "Упорядочивать альбомы по _дате выхода, а не названию"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1711,91 +1612,89 @@ msgstr[0] "{0} композиция"
msgstr[1] "{0} композиции"
msgstr[2] "{0} композиций"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
msgid "Music Folder"
msgstr "Каталог для музыки"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Любимые"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "Композиции, которые вы отметили четырьмя или пятью звёздочками"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "Последние понравившиеся"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "Композиции, которые вы часто слушали в течение прошедшей недели"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Последние добавленные"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "Композиции, добавленные в течение последней недели назад"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
msgid "Recently Played"
msgstr "Недавно воспроизведённые"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
msgid "Recently played songs"
msgstr "Недавно воспроизведённые композиции"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "Непрослушанные"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "Ни разу не прослушанные, а также пропущенные композиции"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Забытые любимые"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "Любимые композиции, которые вы не слушали больше двух месяцев"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "Наименее любимые"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
-msgstr ""
-"Композиции, которые вы отметили одной или двумя звёздочками, или часто "
-"пропускали"
+msgstr "Композиции, которые вы отметили одной или двумя звёздочками, или часто пропускали"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 Мбайт любимых композиций"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "Диск с данными, целиком состоящий из любимых композиций"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 минут любимых композиций"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "Звуковой диск, состоящий из любимых композиций"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "Без оценки"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr "Композиции без оценок"
@@ -1809,22 +1708,20 @@ msgid "Importing From {0}"
msgstr "Импортирование данных из {0}"
#. Catalog.GetString ("Video Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
#: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
msgid "Videos"
msgstr "Видео"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
msgid "Search your videos"
msgstr "Поиск видео"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
msgid "Produced By"
msgstr "Автор видео"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
#, csharp-format
msgid "{0} video"
msgid_plural "{0} videos"
@@ -1832,19 +1729,19 @@ msgstr[0] "{0} видео"
msgstr[1] "{0} видео"
msgstr[2] "{0} видео"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
msgid "Videos Folder"
msgstr "Каталог для видео"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr "Видео, которые вы отметили четырьмя или пятью звёздочками"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "Непросмотренные"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr "Видео, которые вы ещё не смотрели"
@@ -1853,12 +1750,8 @@ msgid "Default player engine"
msgstr "«Движок» воспроизведения по умолчанию"
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
-msgid ""
-"No player engines were found. Please ensure Banshee has been cleanly "
-"installed."
-msgstr ""
-"Не удалось найти ни одного «движка» воспроизведения видео. Убедитесь в "
-"корректной установке Banshee."
+msgid "No player engines were found. Please ensure Banshee has been cleanly installed."
+msgstr "Не удалось найти ни одного «движка» воспроизведения видео. Убедитесь в корректной установке Banshee."
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
msgid "Problem with Player Engine"
@@ -1874,12 +1767,8 @@ msgid "Initializing"
msgstr "Инициализация"
#: ../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 ""
-"В настоящий момент файлы преобразовываются в другой формат. Хотите прервать "
-"эту операцию?"
+msgid "Files are currently being converted to another format. Would you like to stop this?"
+msgstr "В настоящий момент файлы преобразовываются в другой формат. Хотите прервать эту операцию?"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
msgid "Saving Metadata to File"
@@ -1890,36 +1779,38 @@ msgid "Sync _metadata between library and files"
msgstr "Синхронизировать _метаданные между коллекцией и файлами"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
-msgid ""
-"Enable this option to have metadata in sync between your library and "
-"supported media files"
-msgstr ""
-"Включите этот параметр, чтобы метаданные синхронизировались между коллекцией "
-"и поддерживаемыми звуковыми файлами"
+#| msgid ""
+#| "Enable this option to save rating metadata inside supported audio files"
+msgid "Enable this option to have metadata in sync between your library and supported media files"
+msgstr "Включите этот параметр, чтобы метаданные синхронизировались между коллекцией и поддерживаемыми звуковыми файлами"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
msgid "Sync _ratings between library and files"
msgstr "Синхронизировать о_ценки между коллекцией и файлами"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
-msgid ""
-"Enable this option to have rating metadata synced between your library and "
-"supported audio files"
-msgstr ""
-"Включите этот параметр, чтобы метаданные рейтинга синхронизировались между "
-"коллекцией и поддерживаемыми звуковыми файлами"
+#| msgid ""
+#| "Enable this option to save rating metadata inside supported audio files"
+msgid "Enable this option to have rating metadata synced between your library and supported audio files"
+msgstr "Включите этот параметр, чтобы метаданные рейтинга синхронизировались между коллекцией и поддерживаемыми звуковыми файлами"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
msgid "Sync play counts between library and files"
msgstr "Синхронизировать кол-во прослушиваний между коллекцией и файлами"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
-msgid ""
-"Enable this option to have playcount metadata synced between your library "
-"and supported audio files"
-msgstr ""
-"Включите этот параметр, чтобы метаданные о количестве прослушиваний "
-"синхронизировались между коллекцией и поддерживаемыми звуковыми файлами"
+#| msgid ""
+#| "Enable this option to save playcount metadata inside supported audio files"
+msgid "Enable this option to have playcount metadata synced between your library and supported audio files"
+msgstr "Включите этот параметр, чтобы метаданные о количестве прослушиваний синхронизировались между коллекцией и поддерживаемыми звуковыми файлами"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67
+msgid "_Update file and folder names"
+msgstr "О_бновлять имена файлов и папок"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68
+msgid "Rename files and folders according to media metadata"
+msgstr "Переименовывать файлы в соответствии с метаданными"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
@@ -1931,25 +1822,24 @@ msgstr "Не удалось соединиться с NetworkManager или Wicd
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:79
msgid "An available, working network connection will be assumed"
-msgstr ""
-"Будет использоваться уже установленное сетевое соединение, если такое есть"
+msgstr "Будет использоваться уже установленное сетевое соединение, если такое есть"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159
msgid "_Disable features requiring Internet access"
msgstr "От_ключить функции, требующие доступ в Интернет"
#: ../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 ""
-"Для некоторых функций вроде проигрывателя Last.fm или получения обложек "
-"нужен широкополосный канал доступа в Интернет"
+msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching"
+msgstr "Для некоторых функций вроде проигрывателя Last.fm или получения обложек нужен широкополосный канал доступа в Интернет"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
msgid "Search this playlist"
msgstr "Найти в этом списке воспроизведения"
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
+msgid "The track's rating was set differently on the device and in Banshee"
+msgstr "Оценка дорожки на устройстве отличается от той, что хранится в Banshee"
+
#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:311
msgid "Playlist"
@@ -1964,12 +1854,12 @@ msgid "Delete Playlist"
msgstr "Удалить список воспроизведения"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:397
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:403
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:591
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Новый список воспроизведения"
@@ -1982,7 +1872,7 @@ msgstr "Windows Media ASX"
msgid "Windows Media ASX (*.asx)"
msgstr "Windows Media ASX (*.asx)"
-#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs:45
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs:44
msgid "MPEG Version 3.0 Extended (*.m3u)"
msgstr "Расширенная версия MPEG 3.0 (*.m3u)"
@@ -2012,7 +1902,11 @@ msgstr "Расширения"
msgid "File Policies"
msgstr "Принципы работы с файлами"
-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+msgid "Co_py files to media folders when importing"
+msgstr "При импорте _копировать файлы в соответствующие папки"
+
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70
msgid "Improve Banshee by sending anonymous usage data"
msgstr "Отсылать статистику использования (поможет улучшить Banshee)"
@@ -2573,7 +2467,7 @@ msgstr "техз"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Неизвестно"
@@ -2600,7 +2494,7 @@ msgid "Delete Smart Playlist"
msgstr "Удалить динамический список воспроизведения"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Все жанры ({0})"
@@ -2661,33 +2555,37 @@ msgstr "Ошибка"
msgid "Details"
msgstr "Подробности"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:152
msgid "Errors"
msgstr "Ошибки"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:215
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:205
msgid "Sort Playlists By"
msgstr "Упорядочивать списки воспроизведения по"
#. Translators: this is a noun, referring to the harddisk
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:225
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:214
msgid "Drive"
msgstr "Диск"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:238
+msgid "File Organization"
+msgstr "Управление файлами"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:239
msgid "Folder hie_rarchy"
msgstr "Ие_рархия папок"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:240
msgid "File _name"
msgstr "_Имя файла"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:670
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "К {2} добавляется {0} из {1}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "Из {2} удаляется {0} из {1}"
@@ -2720,20 +2618,16 @@ msgstr "Сетевые источники"
msgid "Libraries"
msgstr "Коллекции"
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:48
-msgid "Unknown Stream"
-msgstr "Неизвестный поток"
-
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:83
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:91
msgid "Error opening stream"
msgstr "Ошибка открытия потока"
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:84
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:83
msgid "Could not open stream or playlist"
msgstr "Не удалось открыть поток или список воспроизведения"
-#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:93
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:92
msgid "Problem parsing playlist"
msgstr "Ошибка разбора списка воспроизведения"
@@ -2787,12 +2681,8 @@ msgid "Cannot Reorder While Sorted"
msgstr "Невозможно изменить порядок при включённой сортировке"
#: ../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."
-msgstr ""
-"Для того, чтобы изменить порядок вручную, щёлкните текущий столбец "
-"сортировки несколько раз до исчезновения стрелки-индикатора."
+msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away."
+msgstr "Для того, чтобы изменить порядок вручную, щёлкните текущий столбец сортировки несколько раз до исчезновения стрелки-индикатора."
#. Translators: this is {disc number} of {disc count}
#. Translators: this is {track number} of {track count}
@@ -2906,7 +2796,7 @@ msgstr "Новый профиль"
#. 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:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:203
#, csharp-format
msgid "{0} by {1}"
msgstr "{1} — {0}"
@@ -2943,12 +2833,12 @@ msgstr "Невероятная мощь в управлении коллекци
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
-"Copyright © 2005–{1} Others\n"
+"Copyright © 2005–{0} Others\n"
"Copyright © 2005 Aaron Bockover"
msgstr ""
"Авторские права © 2005–{0} Novell, Inc.\n"
-"Авторские права © 2005–{1} Другие\n"
-"Авторские права © 2005 Аарон Боковер (Aaron Bockover)"
+"Авторские права © 2005–{0} Others\n"
+"Авторские права © 2005 Aaron Bockover"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
@@ -2959,12 +2849,8 @@ msgid "Important tasks are running"
msgstr "Выполняются важные задачи"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
-msgid ""
-"Closing Banshee now will cancel any currently running tasks. They cannot be "
-"resumed automatically the next time Banshee is run."
-msgstr ""
-"Выход из Banshee приведёт к прекращению выполнения некоторых задач. Их "
-"возобновление при следующем запуске программы невозможно."
+msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run."
+msgstr "Выход из Banshee приведёт к прекращению выполнения некоторых задач. Их возобновление при следующем запуске программы невозможно."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
msgid "Quit Anyway"
@@ -2979,15 +2865,11 @@ msgid "Make Banshee the default media player?"
msgstr "Использовать Banshee медиапроигрывателем по умолчанию?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
-msgid ""
-"Currently another program is configured as the default media player. Would "
-"you prefer Banshee to be the default?"
-msgstr ""
-"В настоящий момент другая программа используется в качестве "
-"медиапроигрывателя по умолчанию. Хотите использовать вместо неё Banshee?"
+msgid "Currently another program is configured as the default media player. Would you prefer Banshee to be the default?"
+msgstr "В настоящий момент другая программа используется в качестве медиапроигрывателя по умолчанию. Хотите использовать вместо неё Banshee?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:435
#, csharp-format
msgid "Do not ask me this again"
msgstr "Больше не спрашивать об этом"
@@ -2997,7 +2879,7 @@ msgid "Make Banshee the Default"
msgstr "Да, хочу"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "_Импортировать"
@@ -3055,108 +2937,92 @@ msgid "Import a playlist"
msgstr "Импорт списка воспроизведения"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Заново просканировать коллекцию"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Заново просканировать папку с коллекцией музыки"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "_Открыть адрес…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Открыть удалённый адрес для воспроизведения"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "В_ыход"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Завершить работу с Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Правка"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Параметры"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Изменить параметры работы приложения"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Инструменты"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Заново просканировать коллекцию"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Заново просканировать папку с коллекцией музыки"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Операция повторного сканирования удалит {0} композицию из музыкальной "
-"коллекции."
-msgstr[1] ""
-"Операция повторного сканирования удалит {0} композиции из музыкальной "
-"коллекции."
-msgstr[2] ""
-"Операция повторного сканирования удалит {0} композиций из музыкальной "
-"коллекции."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Справка"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Содержание"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Расширенные поисковые возможности"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Узнайте о расширенных средствах поиска содержимого в коллекции"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Домашняя страница Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Зайти на веб-сайт Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Принять участие"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Примите участие в разработке Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Информация о версии…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Просмотреть подробности о версии и конфигурации приложения"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Импорт списка воспроизведения"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Списки воспроизведения"
@@ -3353,7 +3219,7 @@ msgstr "Переключиться на источник, введя его на
#: ../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:87
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:85
msgid "Preferences"
msgstr "Параметры"
@@ -3375,19 +3241,18 @@ msgstr "Обновить"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:130
msgid "Refresh this randomly sorted smart playlist"
-msgstr ""
-"Обновить этот случайно упорядочиваемый динамический список воспроизведения"
+msgstr "Обновить этот случайно упорядочиваемый динамический список воспроизведения"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:297
msgid "Could not export playlist"
msgstr "Не удалось экспортировать список воспроизведения"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:434
+#: ../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:477
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:469
msgid "Separate by Type"
msgstr "Разделить по типу"
@@ -3437,9 +3302,7 @@ msgstr "_Добавить в список воспроизведения"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
-msgstr ""
-"Добавить выбранные элементы в конец существующего списка воспроизведения или "
-"создать новый из них"
+msgstr "Добавить выбранные элементы в конец существующего списка воспроизведения или создать новый из них"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
@@ -3521,8 +3384,7 @@ msgstr "Убедитесь, что файл находится в месте, д
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the selected {0} items?"
+msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
msgstr[0] "Действительно хотите удалить {0} элемент безвозвратно?"
msgstr[1] "Действительно хотите безвозвратно удалить {0} выделенных элемента?"
msgstr[2] "Действительно хотите безвозвратно удалить {0} выделенных элементов?"
@@ -3539,41 +3401,22 @@ msgstr "Удалить выбранные элементы из списка «{
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
-msgid_plural ""
-"Are you sure you want to remove the selected {0} items from your {1}?"
+msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
msgstr[0] "Действительно хотите удалить {0} элемент из списка «{1}»?"
-msgstr[1] ""
-"Действительно хотите удалить {0} выделенных элемента из списка «{1}»?"
-msgstr[2] ""
-"Действительно хотите удалить {0} выделенных элементов из списка «{1}»?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Действительно желаете продолжить?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Удалить дорожки"
+msgstr[1] "Действительно хотите удалить {0} выделенных элемента из списка «{1}»?"
+msgstr[2] "Действительно хотите удалить {0} выделенных элементов из списка «{1}»?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
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 ""
-"Выберите, если эта дорожка входит в состав совместного альбома разных "
-"исполнителей"
+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
-msgid ""
-"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 ""
-"Это значение влияет на порядок альбомов в списке; если используется "
-"'Различные исполнители', альбом будет находиться с другими альбомами, "
-"начинающимися на 'Р'."
+msgid "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"
@@ -3634,19 +3477,19 @@ msgstr "Использовать эти значения в качестве н
msgid "_Disc Number:"
msgstr "Но_мер диска:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Использовать этот год для всех дорожек"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Год:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Дать эту оценку всем дорожкам"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "О_ценка:"
@@ -3876,12 +3719,8 @@ msgid "Sync all field _values"
msgstr "С_инхронизировать всё"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
-msgid ""
-"Apply the values of all common fields set for this track to all of the "
-"tracks selected in this editor"
-msgstr ""
-"Использовать значения основных полей этой дорожки для всех выбранных в "
-"редакторе дорожек"
+msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
+msgstr "Использовать значения основных полей этой дорожки для всех выбранных в редакторе дорожек"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
@@ -3956,6 +3795,11 @@ msgstr[2] "Выполняются задачи"
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:543
+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:546
#, csharp-format
@@ -4007,8 +3851,7 @@ msgstr "Операция ещё не завершилась. Прервать е
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
-msgid ""
-"The '{0}' operation is still performing work. Would you like to stop it?"
+msgid "The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "Операция «{0}» всё ещё продолжает выполняться. Хотите прервать её?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
@@ -4044,6 +3887,18 @@ msgstr "Файлы"
msgid "C_hoose Files..."
msgstr "_Выбрать файлы…"
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
+msgid "_Files to import:"
+msgstr "И_мпортируемые файлы:"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:82
+msgid "Select Files"
+msgstr "Выберите файлы"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:83
+msgid "(none selected)"
+msgstr "(не выбрано)"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:43
msgid "Import Folders to Library"
msgstr "Импортировать папки в коллекцию"
@@ -4061,17 +3916,21 @@ msgstr "Папки"
msgid "C_hoose Folders..."
msgstr "_Выбрать папки…"
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
+msgid "_Folders to import:"
+msgstr "Импортируемые _папки:"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:76
+msgid "Select Folders"
+msgstr "Выберите папки"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:73
msgid "<big><b>Import Media to Library</b></big>"
msgstr "<big><b>Импортировать содержимое в коллекцию</b></big>"
#: ../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."
-msgstr ""
-"Коллекция пуста. Вы можете импортировать в неё музыку или видео прямо сейчас "
-"или сделать это позже."
+msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later."
+msgstr "Коллекция пуста. Вы можете импортировать в неё музыку или видео прямо сейчас или сделать это позже."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
msgid "Import _from:"
@@ -4083,6 +3942,7 @@ msgstr "Больше не показывать этот диалог"
#: ../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:384
msgid "_Import"
msgstr "_Импортировать"
@@ -4159,56 +4019,47 @@ msgstr "Открыть в редакторе"
msgid "Create and save"
msgstr "Создать и сохранить"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:94
msgid "Browser Content"
msgstr "Содержимое браузера"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:95
msgid "Configure the filters available in the browser"
msgstr "Настроить фильтры, доступные в браузере"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
-msgid "Show Artist Filter"
-msgstr "Показывать фильтр по исполнителю"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
-msgid "Show a list of artists to filter by"
-msgstr "Показать список исполнителей для фильтрации"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:100
msgid "Show all Artists"
msgstr "Показывать всех исполнителей"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:101
msgid "Show all artists in the artist filter"
msgstr "Показывать всех исполнителей в фильтре"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:104
msgid "Show Album Artists"
msgstr "Показывать исполнителей альбомов"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:105
msgid "Show only album artists, not artists with only single tracks"
-msgstr ""
-"Показывать только исполнителей альбомов, а не исполнителей отдельных дорожек"
+msgstr "Показывать только исполнителей альбомов, а не исполнителей отдельных дорожек"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:110
msgid "Show Genre Filter"
msgstr "Показывать фильтр по жанрам"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show a list of genres to filter by"
msgstr "Показывать список жанров для фильтрации"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:115
msgid "Show Year Filter"
msgstr "Показывать фильтр по годам"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:116
msgid "Show a list of years to filter by"
msgstr "Показывать список по годам для фильтрации"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:197
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Не задано"
@@ -4237,18 +4088,6 @@ msgstr "Показывать мини-браузер"
msgid "Show or hide the artist/album browser"
msgstr "Показывать или скрывать мини-браузер"
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
-msgid ""
-"This page is blocked because it is probably not the one you are looking for!"
-msgstr ""
-"Эта страница заблокирована, потому что возможно это не то, что вы ищете!"
-
-#. Translators: {0} is the URL of the web page that was requested
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
-#, csharp-format
-msgid "The security certificate for {0} is invalid."
-msgstr "Сертификат безопасности для {0} неверен."
-
#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
@@ -4283,25 +4122,37 @@ msgstr "Соединение…"
msgid "Buffering"
msgstr "Буферизация"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+msgid "Volume"
+msgstr "Громкость"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+msgid "Muted"
+msgstr "Приглушено"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+msgid "Full Volume"
+msgstr "Полная громкость"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108
msgid "Device"
msgstr "Устройство"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109
msgid "Generation"
msgstr "Поколение"
#. FIXME
#. AddDapProperty (Catalog.GetString ("Color"), "black");
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:121
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:114
msgid "Capacity"
msgstr "Объём"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:122
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
msgid "Available"
msgstr "Доступно"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:123
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
msgid "Serial number"
msgstr "Заводской номер"
@@ -4311,47 +4162,37 @@ msgstr "Заводской номер"
#. 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:130
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:123
msgid "Supports cover art"
msgstr "Поддерживает отображение обложек"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:131
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:124
msgid "Supports photos"
msgstr "Поддерживает фото"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:453
msgid "Track duration is zero"
msgstr "Нулевая продолжительность дорожки"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:556
msgid "Syncing iPod"
msgstr "Выполняется синхронизация с iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:557
msgid "Preparing to synchronize..."
msgstr "Выполняется подготовка к синхронизации…"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:560
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Добавляется {0} дорожка из {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Обновление метаданных в дорожке {0} из {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:596
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Удаляется {0} дорожка из {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Очистка, удаляется {0} неверная дорожка из {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:649
msgid "Writing media database"
msgstr "Записывается база данных"
@@ -4360,75 +4201,76 @@ msgstr "Записывается база данных"
msgid "Sync {0}"
msgstr "Синхронизировать {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. Note to translators: {0}, {1} and {2} will be replaced with numbers.
+#: ../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} для обновления"
+
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Устройства"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:179
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
msgid "Device Properties"
msgstr "Свойства устройства"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
msgid "Product"
msgstr "Название"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
msgid "Vendor"
msgstr "Производитель"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Загрузка {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Да"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Нет"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
-msgid ""
-"The {0} format is not supported by the device, and no converter was found to "
-"convert it"
-msgstr ""
-"Формат {0} не поддерживается данным устройством, а подходящий конвертер "
-"найти не удалось."
+msgid "The {0} format is not supported by the device, and no converter was found to convert it"
+msgstr "Формат {0} не поддерживается данным устройством, а подходящий конвертер найти не удалось."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr "Поддержка преобразования формата файлов недоступна"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
msgstr "Ошибка при преобразовании файла"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:135
msgid "Sync when first plugged in and when the libraries change"
-msgstr ""
-"Автоматически синхронизировать при подключении или после изменений в "
-"коллекции"
+msgstr "Автоматически синхронизировать при подключении или после изменений в коллекции"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
-msgid ""
-"Begin synchronizing the device as soon as the device is plugged in or the "
-"libraries change."
-msgstr ""
-"Начать синхронизацию при подключении устройства или изменении в коллекции."
+msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change."
+msgstr "Начать синхронизацию при подключении устройства или изменении в коллекции."
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
msgid "Sync Preferences"
msgstr "Параметры синхронизации"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+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.Gui/DapActions.cs:106
#, 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."
@@ -4436,9 +4278,13 @@ msgstr[0] "При синхронизации с устройства будет
msgstr[1] "При синхронизации с устройства будет удалено {0} композиции."
msgstr[2] "При синхронизации с устройства будет удалено {0} композиций."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Синхронизировать"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Действительно желаете продолжить?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Удалить дорожки"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4446,7 +4292,6 @@ msgid "Audio"
msgstr "Аудио"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:69
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:49
msgid "Video"
msgstr "Видео"
@@ -4511,12 +4356,12 @@ msgstr "Импортировать купленную музыку"
msgid "Disconnect"
msgstr "Отсоединиться"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Отсоединение {0}…"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Не удалось отключить {0}: {1}"
@@ -4525,7 +4370,11 @@ msgstr "Не удалось отключить {0}: {1}"
msgid "Purchased Music"
msgstr "Купленная музыка"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:115
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:87
+msgid "Rockbox Device"
+msgstr "Устройство с Rockbox"
+
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:114
#, csharp-format
msgid "Audio Folder"
msgid_plural "Audio Folders"
@@ -4533,7 +4382,7 @@ msgstr[0] "Аудиокаталог"
msgstr[1] "Аудиокаталоги"
msgstr[2] "Аудиокаталоги"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:122
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:121
#, csharp-format
msgid "Video Folder"
msgid_plural "Video Folders"
@@ -4541,18 +4390,14 @@ msgstr[0] "Видеокаталог"
msgstr[1] "Видеокаталоги"
msgstr[2] "Видеокаталоги"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:128
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:127
msgid "Required Folder Depth"
msgstr "Необходимая глубина каталога"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:131
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:130
msgid "Supports Playlists"
msgstr "Поддерживает списки воспроизведения"
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs:41
-msgid "Rockbox Device"
-msgstr "Устройство с Rockbox"
-
#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs:195
msgid "Ringtones"
msgstr "Мелодии звонков"
@@ -4562,6 +4407,7 @@ msgid "Error Initializing MTP Device Support"
msgstr "Не удалось инициализировать модуль поддержки устройств MTP"
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:83
+#| msgid "There was an error intializing MTP device support."
msgid "There was an error initializing MTP device support."
msgstr "Во время инициализации поддержки устройств MTP произошла ошибка."
@@ -4668,6 +4514,7 @@ msgid "Merge Discs..."
msgstr "Объединить диски…"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:57
+#| msgid "Audiobooks"
msgid "Go to Audiobooks"
msgstr "Перейти к аудиокнигам"
@@ -4690,12 +4537,8 @@ msgstr[1] "Объединить {0} выделенных диска в одну
msgstr[2] "Объединить {0} выделенных дисков в одну книгу?"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
-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 ""
-"Это позволит убедиться, что все номера дисков установлены верно, а затем "
-"установить автора и название книги для всех дорожек на всех этих дисках"
+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:153
msgid "Author:"
@@ -4771,21 +4614,15 @@ msgstr "Воспроизвести эту композицию"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
-msgstr ""
-"Набивайте по этой кнопке нужный ритм, чтобы установить его для данной "
-"композиции"
+msgstr "Набивайте по этой кнопке нужный ритм, чтобы установить его для данной композиции"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
msgstr "_Автоматически определять ритм для всех композиций"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
-msgid ""
-"Detect beats per minute (BPM) for all songs that don't already have a value "
-"set"
-msgstr ""
-"Определять ритм (BPM) для всех композиций, у которых это значение ещё не "
-"установлено"
+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
msgid "Downloading Cover Art"
@@ -4814,19 +4651,13 @@ msgstr "Назад"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
msgid ""
-"iTunes® 7 introduced new compatibility issues and currently only works with "
-"other iTunes® 7 clients.\n"
+"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n"
"\n"
-"No third-party clients can connect to iTunes® music shares anymore. This is "
-"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
-"the unfortunate inconvenience."
+"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience."
msgstr ""
-"Изменения в iTunes® 7 стали источником несовместимостей, и, на настоящий "
-"момент, поддерживаются только клиенты iTunes® 7.\n"
+"Изменения в iTunes® 7 стали источником несовместимостей, и, на настоящий момент, поддерживаются только клиенты iTunes® 7.\n"
"\n"
-"Клиенты сторонних разработчиков больше не могут соединяться с iTunes®. Эти "
-"изменения были сделаны намеренно компанией Apple в iTunes® 7, и мы приносим "
-"за доставленные неудобства."
+"Клиенты сторонних разработчиков больше не могут соединяться с iTunes®. Эти изменения были сделаны намеренно компанией Apple в iTunes® 7, и мы приносим за доставленные неудобства."
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
msgid "Common reasons for connection failures:"
@@ -4842,9 +4673,7 @@ msgstr "Авторизация была отменена"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:119
msgid "Too many users are connected to this share"
-msgstr ""
-"Слишком много пользователей пытается подключиться к этому разделяемому "
-"каталогу"
+msgstr "Слишком много пользователей пытается подключиться к этому разделяемому каталогу"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:121
msgid "You are no longer connected to this music share"
@@ -4886,11 +4715,11 @@ msgstr "Войти"
msgid "Connecting to {0}"
msgstr "Идёт соединение с {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
msgstr "Добавить удалённый сервер DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
msgstr "Добавить новый удалённый сервер DAAP"
@@ -5017,24 +4846,16 @@ 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 ""
-"Альбомы, которые будут объединены. Щёлкните по заголовку, чтобы выделить его "
-"жирным текстом."
+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"
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 ""
-"Исполнители, которые будут объединены. Щёлкните по имени, чтобы выделить его "
-"жирным текстом."
+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..."
@@ -5057,12 +4878,8 @@ 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 ""
-"Жанры, которые будут объединены. Щёлкните по жанру, чтобы выделить его "
-"жирным текстом."
+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 "
@@ -5127,7 +4944,7 @@ msgstr "Время ожидания информации из «Архива И
#: ../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:309
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:301
msgid "Try Again"
msgstr "Попытаться снова"
@@ -5340,21 +5157,9 @@ msgstr "NASA"
msgid "Library of Congress"
msgstr "Библиотека конгресса США"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
-msgid "Examples:"
-msgstr "Примеры"
-
#: ../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 "
-"library, we provide free access to researchers, historians, scholars, and "
-"the general public."
-msgstr ""
-"«Архив Интернета» (Internet Archive) — некоммерческая электронная "
-"библиотека, которая собирает электронные копии культурно-исторических "
-"ценностей и, как обычная библиотека, предоставляет бесплатный доступ к своим "
-"базам данных исследователям, историкам, учёным и широкой публике."
+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 library, we provide free access to researchers, historians, scholars, and the general public."
+msgstr "«Архив Интернета» (Internet Archive) — некоммерческая электронная библиотека, которая собирает электронные копии культурно-исторических ценностей и, как обычная библиотека, предоставляет бесплатный доступ к своим базам данных исследователям, историкам, учёным и широкой публике."
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
msgid "Visit the Internet Archive online at archive.org"
@@ -5645,7 +5450,7 @@ msgstr "Изменить радиостанцию"
msgid "Station"
msgstr "Станция"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5653,15 +5458,15 @@ msgstr[0] "{0} радиостанция"
msgstr[1] "{0} радиостанции"
msgstr[2] "{0} радиостанций"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Укажите корректный адрес радиостанции"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Укажите жанр радиостанции"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Укажите название радиостанции"
@@ -5674,12 +5479,8 @@ msgid "Edit radio station"
msgstr "Изменить радиостанцию"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
-msgid ""
-"Enter the Genre, Title and URL of the radio station you wish to add. A "
-"description is optional."
-msgstr ""
-"Укажите жанр, название и адрес радиостанции, которую собираетесь добавить. "
-"Ввод описания необязателен."
+msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional."
+msgstr "Укажите жанр, название и адрес радиостанции, которую собираетесь добавить. Ввод описания необязателен."
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
@@ -5708,53 +5509,31 @@ msgstr "Описание:"
msgid "Rating:"
msgstr "Оценка:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
+#: ../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:137
+#: ../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:140
+#: ../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:141
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
+#: ../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:146
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
-msgid "_Enable Song Reporting From Banshee"
-msgstr "_Включить передачу отчётов от Banshee"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
-msgid "Enable song reporting From Banshee"
-msgstr "Включить передачу отчётов о композициях от Banshee"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
-msgid "_Enable Song Reporting From Device"
-msgstr "_Включить передачу отчётов от устройства"
+#: ../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:153
-msgid "Enable song reporting From Device"
-msgstr "Включить передачу отчётов о композициях от устройства"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
-msgid "Scrobbling from device"
-msgstr "Скробблинг устройства"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
-msgid "Scrobbling from device..."
-msgstr "Скробблинг устройства…"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
-#, csharp-format
-msgid "Processing track {0} of {1} ..."
-msgstr "Обрабатывается {0} дорожка из {1} ..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
+msgid "Enable song reporting"
+msgstr "Отправлять отчёты о прослушанных композициях"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5839,63 +5618,61 @@ msgstr "http://www.lastfm.ru/music/{0}/+videos"
msgid "http://en.wikipedia.org/wiki/{0}"
msgstr "http://ru.wikipedia.org/wiki/{0}"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:78
msgid "Account"
msgstr "Учётная запись"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:82
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:278
+#: ../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:168
+#: ../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:262
-msgid ""
-"Open Last.fm in a browser, giving you the option to authorize Banshee to "
-"work with your account"
+#: ../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:273
+#: ../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:294
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+#: ../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/LastfmPreferences.cs:304
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:296
msgid "Finish Logging In"
msgstr "Завершить вход"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:318
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:310
#, csharp-format
msgid "You are logged in to Last.fm as the user <i>{0}</i>."
msgstr "Вы вошли на Last.fm как пользователь <i>{0}</i>."
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:321
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:313
msgid "Log out of Last.fm"
msgstr "Выйти из Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Последние понравившиеся дорожки"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Недавно прослушанные дорожки"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Мои популярные исполнители"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} прослушиваний"
@@ -6153,11 +5930,11 @@ msgid "Now Playing"
msgstr "Сейчас воспроизводится"
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60
-#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
+#: ../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:2
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
msgid "Quick access panel for your media"
msgstr "Панель быстрого доступа к данным"
@@ -6198,11 +5975,6 @@ msgstr "Поиск подкастов"
msgid "Search for video podcasts"
msgstr "Поиск видеоподкастов"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
-msgid "_Close"
-msgstr "_Закрыть"
-
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
msgid "_Show Notifications"
msgstr "Показывать _уведомления"
@@ -6217,12 +5989,8 @@ msgstr "Работа продолжается"
# Не женщина же свернута.
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
-msgid ""
-"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
-"end your session."
-msgstr ""
-"Banshee свёрнут в область уведомлений. Используйте действие «Выйти», чтобы "
-"полностью завершить сеанс с приложением."
+msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session."
+msgstr "Banshee свёрнут в область уведомлений. Используйте действие «Выйти», чтобы полностью завершить сеанс с приложением."
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
@@ -6255,9 +6023,7 @@ msgstr "Упростить"
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:60
msgid "Hide/Show the source list, menu, toolbar, and status bar"
-msgstr ""
-"Показывать или нет список источников, меню, панель инструментов и панель "
-"состояния"
+msgstr "Показывать или нет список источников, меню, панель инструментов и панель состояния"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:75
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:54
@@ -6279,12 +6045,8 @@ msgstr "Инициализация привода"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
#, csharp-format
-msgid ""
-"<i>{0}</i> is still being imported into the music library. Would you like to "
-"stop it?"
-msgstr ""
-"<i>{0}</i> всё ещё импортируется в фонотеку. Хотите остановить "
-"импортирование?"
+msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?"
+msgstr "<i>{0}</i> всё ещё импортируется в фонотеку. Хотите остановить импортирование?"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
msgid "Cannot Import CD"
@@ -6307,13 +6069,8 @@ msgid "_Automatically import audio CDs when inserted"
msgstr "_Автоматически импортировать вставляемые звуковые диски"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
-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 ""
-"Каждый раз, когда вы вставляете звуковой диск в компьютер, автоматически "
-"начинается импорт музыки, если этого альбома еще нет в коллекции, а "
-"соответствующие метаданные удалось найти."
+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 "Каждый раз, когда вы вставляете звуковой диск в компьютер, автоматически начинается импорт музыки, если этого альбома еще нет в коллекции, а соответствующие метаданные удалось найти."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
msgid "_Eject when done importing"
@@ -6328,12 +6085,8 @@ msgid "Use error correction when importing"
msgstr "Выполнять коррекцию ошибок при импорте"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
-msgid ""
-"Error correction tries to work around problem areas on a disc, such as "
-"surface scratches, but will slow down importing substantially."
-msgstr ""
-"Проверка ошибок позволяет исправлять проблемы с диском, такие как царапины, "
-"но при этом существенно замедляет импорт записей."
+msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+msgstr "Проверка ошибок позволяет исправлять проблемы с диском, такие как царапины, но при этом существенно замедляет импорт записей."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
@@ -6362,9 +6115,7 @@ msgstr "Не удалось получить информацию о дорож
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
msgid "Automatic import off since this album is already in the Music Library."
-msgstr ""
-"Автоматическое импортирование было отключено, потому что этот альбом уже "
-"есть в коллекции."
+msgstr "Автоматическое импортирование было отключено, потому что этот альбом уже есть в коллекции."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
msgid "Could not import CD"
@@ -6388,14 +6139,7 @@ msgstr "Извлечь диск"
msgid "Import ‟{0}”"
msgstr "Импортировать «{0}»"
-#. Translators: {0} is the type of disc, "Audio CD" or "DVD"
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
-#, csharp-format
-msgid "Ejecting {0}..."
-msgstr "Извлечение {0}…"
-
-#. Translators: {0} is the type of disc, "Audio CD" or "DVD". {1} is the error message.
-#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:173
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:171
#, csharp-format
msgid "Could not eject {0}: {1}"
msgstr "Не удалось извлечь {0}: {1}"
@@ -6405,11 +6149,12 @@ msgid "Go to Menu"
msgstr "Перейти в меню"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs:92
+#| msgid "Naviguate to menu"
msgid "Navigate to menu"
msgstr "Перейти в меню"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:38
-msgid "DVD"
+msgid "Dvd"
msgstr "DVD"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:63
@@ -6431,6 +6176,7 @@ msgstr "Amarok"
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
msgid "iTunes Importer"
msgstr "Импорт из iTunes"
@@ -6447,43 +6193,41 @@ msgid "Import playlists"
msgstr "Импортировать _списки воспроизведения"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr "Местоположение файла «{0}»…"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr "Местоположение «{0}»"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr "Местоположение каталога с музыкой iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
-msgid ""
-"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
-"not able to infer the location of this directory. Please locate it."
-msgstr ""
-"Библиотека iTunes состоит в вашем музыкальном каталоге в качестве «{0}», но "
-"Banshee не удалось определить местоположение этого каталога. Укажите его."
+msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it."
+msgstr "Библиотека iTunes состоит в вашем музыкальном каталоге в качестве «{0}», но Banshee не удалось определить местоположение этого каталога. Укажите его."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
msgid "iTunes Media Player"
msgstr "Медиапроигрыватель iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
-msgid ""
-"Banshee is not familiar with this version of the iTunes library format. "
-"Importing may or may not work as expected, or at all. Would you like to "
-"attempt to import anyway?"
-msgstr ""
-"Данная версия библиотеки iTunes не поддерживается Banshee. Нет гарантий, что "
-"импортирование пройдёт успешно. Хотите попытаться импортировать?"
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
+msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?"
+msgstr "Данная версия библиотеки iTunes не поддерживается Banshee. Нет гарантий, что импортирование пройдёт успешно. Хотите попытаться импортировать?"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
msgid "Unable to import song."
msgstr "Не удалось импортировать композицию."
@@ -6491,6 +6235,10 @@ msgstr "Не удалось импортировать композицию."
msgid "Rhythmbox Music Player"
msgstr "Музыкальный проигрыватель Rhythmbox"
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+msgid "Import _playlists"
+msgstr "Импортировать _списки воспроизведения"
+
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:61
msgid "_Fill"
msgstr "З_аполнять"
@@ -6513,9 +6261,7 @@ msgstr "Вопроизвести после"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
msgid "Add selected songs after the currently playing track, album, or artist"
-msgstr ""
-"Добавить выбранные композиции после воспроизведения дорожки, альбома или "
-"исполнителя"
+msgstr "Добавить выбранные композиции после воспроизведения дорожки, альбома или исполнителя"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
msgid "Current Track"
@@ -6523,9 +6269,7 @@ msgstr "Текущая дорожка"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
msgid "Add selected songs to the play queue after the currently playing song"
-msgstr ""
-"Добавить выбранные песни в очередь воспроизведения после прослушивания "
-"текущей песни"
+msgstr "Добавить выбранные песни в очередь воспроизведения после прослушивания текущей песни"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
msgid "Current Album"
@@ -6533,9 +6277,7 @@ msgstr "Текущий альбом"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
msgid "Add selected songs to the play queue after the currently playing album"
-msgstr ""
-"Добавить выбранные песни в очередь воспроизведения после прослушивания "
-"текущего альбома"
+msgstr "Добавить выбранные песни в очередь воспроизведения после прослушивания текущего альбома"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
msgid "Current Artist"
@@ -6543,9 +6285,7 @@ msgstr "Текущий исполнитель"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
msgid "Add selected songs to the play queue after the currently playing artist"
-msgstr ""
-"Добавить выбранные песни в очередь воспроизведения после прослушивания "
-"текущего исполнителя"
+msgstr "Добавить выбранные песни в очередь воспроизведения после прослушивания текущего исполнителя"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
@@ -6774,11 +6514,8 @@ msgid "Check periodically for new episodes"
msgstr "Периодически проверять наличие новых выпусков"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
-msgid ""
-"If checked, Banshee will check every hour to see if this podcast has new "
-"episodes"
-msgstr ""
-"Если установлено, Banshee будет каждый час проверять наличие новых выпусков"
+msgid "If checked, Banshee will check every hour to see if this podcast has new episodes"
+msgstr "Если установлено, Banshee будет каждый час проверять наличие новых выпусков"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
@@ -6842,8 +6579,7 @@ msgid "Subscribe to New Podcast"
msgstr "Подписаться на новый подкаст"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
-msgid ""
-"Please enter the URL of the podcast to which you would like to subscribe."
+msgid "Please enter the URL of the podcast to which you would like to subscribe."
msgstr "Введите URL адрес подкаста, на который хотите подписаться."
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
@@ -6912,14 +6648,6 @@ msgstr "Прекратить отслеживание SQL-запросов"
msgid "Track Preview"
msgstr "Предварительное прослушивание"
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPContainerSource.cs:39
-msgid "Shared Media"
-msgstr "Общие медиаданные"
-
-#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs:52
-msgid "UPnP Share"
-msgstr "Ресурс UPnP"
-
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:136
msgid "Uploaded by"
msgstr "Загружено"
@@ -7135,115 +6863,91 @@ msgstr "Сохранить и войти"
msgid "Authorize for Last.fm"
msgstr "Получить доступ к Last.fm"
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:449
+msgid "Last.fm username is invalid or Banshee is not authorized to access your account."
+msgstr "Неверное имя пользователя Last.fm, или Banshee запрещено получать доступ к вашей учётной записи."
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
msgid "This service does not exist."
msgstr "Эта служба не существует."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
msgid "Stations are only available to paying Last.fm subscribers."
msgstr "Радиостанции доступны только для платных подписчиков Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
msgid "This station is not available."
msgstr "Эта радиостанция недоступна."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
msgid "The request is missing a required parameter."
msgstr "В запросе пропущен обязательный параметр."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
msgid "The specified resource is invalid."
msgstr "Указан неверный источник."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
msgid "Server error, please try again later."
msgstr "Сбой на сервере, повторите позже."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
msgid "Invalid authentication information, please re-authenticate."
msgstr "Неверные данные, авторизуйтесь заново."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
msgid "The API key used by this application is invalid."
msgstr "Приложением передан неверный параметр API."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
-msgid ""
-"The streaming system is offline for maintenance, please try again later."
-msgstr ""
-"Система потокового воспроизведения сейчас отключена по техническим причинам. "
-"Попробуйте соединиться позже."
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+msgid "The streaming system is offline for maintenance, please try again later."
+msgstr "Система потокового воспроизведения сейчас отключена по техническим причинам. Попробуйте соединиться позже."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
msgid "The method signature is invalid."
msgstr "Неверная подпись метода."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
msgid "There is not enough content to play this station."
msgstr "Недостаточно содержимого, чтобы воспроизвести эту радиостанцию."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
msgid "This group does not have enough members for radio."
msgstr "В этой группе слишком мало участников, чтобы иметь свою радиостанцию."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
msgid "This artist does not have enough fans for radio."
-msgstr ""
-"У этого исполнителя недостаточно слушателей, чтобы иметь свою радиостанцию."
+msgstr "У этого исполнителя недостаточно слушателей, чтобы иметь свою радиостанцию."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
msgid "There are not enough neighbours for this station."
msgstr "У этой радиостанции недостаточно соседей."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
-msgid "This user is not allowed to listen to radio during peak usage"
-msgstr "Этот пользователь не может слушать радио во время высокой загрузки"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
-msgid "Radio station not found"
-msgstr "Радиостанция не найдена"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
-msgid "This application is not allowed to make requests to the web services"
-msgstr "Этому приложению запрещено делать запросы к веб-службам"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
-msgid "This type of request is no longer supported"
-msgstr "Этот тип запросов больше не поддерживается"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
-msgid ""
-"Your IP has made too many requests in a short period, exceeding our API "
-"guidelines"
-msgstr ""
-"С вашего IP было сделано слишком много запросов за короткий промежуток "
-"времени"
-
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
msgid "There was an unknown error."
msgstr "Произошла неизвестная ошибка."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
msgid "Not connected to Last.fm."
msgstr "Нет соединения с Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
msgid "Account details are needed before you can connect to Last.fm"
msgstr "Для соединения с Last.fm необходимы данные вашей учётной записи."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
msgid "No network connection detected."
msgstr "Соединение с сетью не обнаружено."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
msgid "Last.fm username is invalid."
msgstr "Неверное имя пользователя на Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
msgid "Connecting to Last.fm."
msgstr "Устанавливается соединение с Last.fm."
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
msgid "Connected to Last.fm."
msgstr "Соединение с Last.fm установлено."
@@ -7253,49 +6957,5 @@ msgstr "Соединение с Last.fm установлено."
msgid "Unknown Podcast"
msgstr "Неизвестный подкаст"
-#~ msgid "The track's rating was set differently on the device and in Banshee"
-#~ msgstr ""
-#~ "Оценка дорожки на устройстве отличается от той, что хранится в Banshee"
-
-#~ msgid "_Files to import:"
-#~ msgstr "И_мпортируемые файлы:"
-
-#~ msgid "Select Files"
-#~ msgstr "Выберите файлы"
-
-#~ msgid "(none selected)"
-#~ msgstr "(не выбрано)"
-
-#~ msgid "_Folders to import:"
-#~ msgstr "Импортируемые _папки:"
-
-#~ msgid "Select Folders"
-#~ msgstr "Выберите папки"
-
-#~ msgid "Volume"
-#~ msgstr "Громкость"
-
-#~ msgid "Muted"
-#~ msgstr "Приглушено"
-
-#~ msgid "Full Volume"
-#~ msgstr "Полная громкость"
-
-#~ msgid "{0} to add, {1} to remove, {2} to update"
-#~ msgstr "{0} для добавления, {1} для удаления, {2} для обновления"
-
-#~ msgid "Dvd"
-#~ msgstr "DVD"
-
-#~ msgid "Import _playlists"
-#~ msgstr "Импортировать _списки воспроизведения"
-
-#~ msgid ""
-#~ "Last.fm username is invalid or Banshee is not authorized to access your "
-#~ "account."
-#~ msgstr ""
-#~ "Неверное имя пользователя Last.fm, или Banshee запрещено получать доступ "
-#~ "к вашей учётной записи."
-
#~ msgid "Write _metadata to files"
#~ msgstr "Записывать _метаданные в файлы"
diff --git a/po/sl.po b/po/sl.po
index f9cf799..f13a1e9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,26 +2,26 @@
# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the banshee package.
#
-# Andrej Žnidaršič <andrej.znidarsic at gmail.com>, 2009-2012.
-# Matej Urbančič <mateju at svn.gnome.org>, 2006-2013.
+# Matej Urbančič <mateju at svn.gnome.org>, 2006 - 2012.
+# Andrej Žnidaršič <andrej.znidarsic at gmail.com>, 2009 - 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: banshee master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-22 17:24+0000\n"
-"PO-Revision-Date: 2013-09-22 21:30+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-08-26 13:25+0000\n"
+"PO-Revision-Date: 2012-08-29 08:44+0100\n"
"Last-Translator: Matej Urbančič <mateju at svn.gnome.org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
-"Language: sl_SI\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
"X-Launchpad-Export-Date: 2011-04-11 06:24+0000\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Launchpad (build 12757)\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-Language: Slovenian\n"
"X-Poedit-SourceCharset: utf-8\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
@@ -33,8 +33,10 @@ msgstr "Podpora napravam Apple"
msgid "Support for most iPod/iPhone/iPad devices."
msgstr "Podpora napravam iPod/iPhone/iPad."
-#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15
-#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25
+#: ../data/addin-xml-strings.cs:10
+#: ../data/addin-xml-strings.cs:15
+#: ../data/addin-xml-strings.cs:20
+#: ../data/addin-xml-strings.cs:25
msgid "Device Support"
msgstr "Podpora napravam"
@@ -53,12 +55,8 @@ msgid "Mass Storage Media Player Support"
msgstr "Podpora shramb predstavnih datotek"
#: ../data/addin-xml-strings.cs:19
-msgid ""
-"Support for USB-drive based devices, including many iAudio devices and "
-"Android, Pre, and Galaxy phones."
-msgstr ""
-"Podpora napravam USB, vključno s številnimi napravami iAudio in telefoni "
-"Android, Pre in Galaxy."
+msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones."
+msgstr "Podpora napravam USB, vključno s številnimi napravami iAudio in telefoni Android, Pre in Galaxy."
#. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
#: ../data/addin-xml-strings.cs:23
@@ -78,10 +76,14 @@ msgstr "Trgovina Amazon MP3"
msgid "Browse, search, and purchase music from the Amazon MP3 store."
msgstr "Brskanje, iskanje in nakup glasbe v trgovini Amazon MP3."
-#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
-#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
-#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
-#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+#: ../data/addin-xml-strings.cs:30
+#: ../data/addin-xml-strings.cs:35
+#: ../data/addin-xml-strings.cs:65
+#: ../data/addin-xml-strings.cs:70
+#: ../data/addin-xml-strings.cs:85
+#: ../data/addin-xml-strings.cs:95
+#: ../data/addin-xml-strings.cs:100
+#: ../data/addin-xml-strings.cs:115
#: ../data/addin-xml-strings.cs:165
msgid "Online Sources"
msgstr "Spletni viri"
@@ -104,9 +106,12 @@ msgstr "Knjižnica zvočnih knjig"
msgid "Organize audiobooks, lectures, etc."
msgstr "Urejanje zvočnih knjig, predavanj in drugih vrst posnetkov."
-#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
-#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
-#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
+#: ../data/addin-xml-strings.cs:40
+#: ../data/addin-xml-strings.cs:75
+#: ../data/addin-xml-strings.cs:90
+#: ../data/addin-xml-strings.cs:135
+#: ../data/addin-xml-strings.cs:145
+#: ../data/addin-xml-strings.cs:150
msgid "Core"
msgstr "Jedro"
@@ -117,16 +122,22 @@ msgstr "Skriptni programi Boo"
#: ../data/addin-xml-strings.cs:44
msgid "Customize and extend Banshee with Boo-language scripts."
-msgstr ""
-"Prilagajanje in razširjanje predvajalnika Banshee s skriptami v jeziku Boo."
-
-#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
-#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
-#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
-#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
-#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
-#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
-#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+msgstr "Prilagajanje in razširjanje predvajalnika Banshee s skriptami v jeziku Boo."
+
+#: ../data/addin-xml-strings.cs:45
+#: ../data/addin-xml-strings.cs:50
+#: ../data/addin-xml-strings.cs:55
+#: ../data/addin-xml-strings.cs:60
+#: ../data/addin-xml-strings.cs:80
+#: ../data/addin-xml-strings.cs:105
+#: ../data/addin-xml-strings.cs:110
+#: ../data/addin-xml-strings.cs:120
+#: ../data/addin-xml-strings.cs:125
+#: ../data/addin-xml-strings.cs:130
+#: ../data/addin-xml-strings.cs:140
+#: ../data/addin-xml-strings.cs:155
+#: ../data/addin-xml-strings.cs:160
+#: ../data/addin-xml-strings.cs:170
msgid "Utilities"
msgstr "Pripomočki"
@@ -191,9 +202,7 @@ msgstr "Popravljanje metapodatkov"
#: ../data/addin-xml-strings.cs:79
msgid "Fix broken and missing metadata using bulk operations."
-msgstr ""
-"Popravljanje pokvarjenih in manjkajočih metapodatkov z uporabo paketnih "
-"opravil."
+msgstr "Popravljanje pokvarjenih in manjkajočih metapodatkov z uporabo paketnih opravil."
#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
#: ../data/addin-xml-strings.cs:83
@@ -221,9 +230,7 @@ msgstr "Pošiljanje seznama predvajane glasbe Last.fm"
#: ../data/addin-xml-strings.cs:94
msgid "Last.fm scrobbling and context pane recommendations."
-msgstr ""
-"Pošiljanje seznama predvajane glasbe Last.fm in priporočila vsebinskega "
-"pladnja."
+msgstr "Pošiljanje seznama predvajane glasbe Last.fm in priporočila vsebinskega pladnja."
#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
#: ../data/addin-xml-strings.cs:98
@@ -249,12 +256,8 @@ msgid "Mini Mode"
msgstr "Enostavni vmesni"
#: ../data/addin-xml-strings.cs:109
-msgid ""
-"Control Banshee through a small window with only playback controls and track "
-"information."
-msgstr ""
-"Nadzor predvajalnika Banshee preko enostavnega vmesnika z nadzornikom "
-"predvajanja in nekaterimi podrobnostmi skladbe."
+msgid "Control Banshee through a small window with only playback controls and track information."
+msgstr "Nadzor predvajalnika Banshee preko enostavnega vmesnika z nadzornikom predvajanja in nekaterimi podrobnostmi skladbe."
#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
#: ../data/addin-xml-strings.cs:113
@@ -299,8 +302,7 @@ msgstr "Podpora za DVD in zvočne nosilce CD"
#: ../data/addin-xml-strings.cs:134
msgid "Watch DVDs, listen to and rip Audio CDs."
-msgstr ""
-"Ogled vsebine nosilcev DVD in poslušanje ter zajemanje zvočnih nosilcev CD."
+msgstr "Ogled vsebine nosilcev DVD in poslušanje ter zajemanje zvočnih nosilcev CD."
#. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
#: ../data/addin-xml-strings.cs:138
@@ -333,8 +335,7 @@ msgstr "Podcasti"
#: ../data/addin-xml-strings.cs:149
msgid "Subscribe to podcasts and stream or download episodes."
-msgstr ""
-"Naročilo na podcaste in pretakanje oziroma prejemanje posnetkov epizod."
+msgstr "Naročilo na podcaste in pretakanje oziroma prejemanje posnetkov epizod."
#. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
#: ../data/addin-xml-strings.cs:153
@@ -363,11 +364,8 @@ msgid "Ubuntu One Music Store"
msgstr "Glasbena trgovina Ubuntu One"
#: ../data/addin-xml-strings.cs:164
-msgid ""
-"This extension grants access to the Ubuntu One Music Store, powered by "
-"7digital."
-msgstr ""
-"Podpora dostopa do glasbene trgovine Ubuntu One preko sistema 7digital."
+msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+msgstr "Podpora dostopa do glasbene trgovine Ubuntu One preko sistema 7digital."
#. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
#: ../data/addin-xml-strings.cs:168
@@ -375,11 +373,8 @@ msgid "UPnP Client"
msgstr "Odjemalec UPnp"
#: ../data/addin-xml-strings.cs:169
-msgid ""
-"Browse and play music and videos shared over your local network using UPnP."
-msgstr ""
-"Brskanje in poslušanje glasbe v souporabi preko krajevnega omrežja z uporabo "
-"UPnP."
+msgid "Browse and play music and videos shared over your local network using UPnP."
+msgstr "Brskanje in poslušanje glasbe v souporabi preko krajevnega omrežja z uporabo UPnP."
#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
#: ../data/addin-xml-strings.cs:173
@@ -391,7 +386,8 @@ msgstr "Wikipedia"
msgid "View artist information from Wikipedia in the context pane."
msgstr "Prikaz podrobnosti izvajalca iz Wikipedije v vsebinskem pladnju."
-#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+#: ../data/addin-xml-strings.cs:175
+#: ../data/addin-xml-strings.cs:180
msgid "Context Pane"
msgstr "Vsebinski pladenj"
@@ -403,20 +399,15 @@ msgstr "YouTube"
#: ../data/addin-xml-strings.cs:179
msgid "Show related YouTube videos in the context pane."
-msgstr ""
-"Podpora sorodnim videoposnetkom spletišča YouTube v vsebinskem pladnju."
+msgstr "Podpora sorodnim videoposnetkom spletišča YouTube v vsebinskem pladnju."
#: ../data/audio-profiles/aac-novell.xml.in.h:1
msgid "AAC (Novell Encoder)"
msgstr "AAC (Nov kodirnik)"
#: ../data/audio-profiles/aac-novell.xml.in.h:2
-msgid ""
-"Designed to be the successor of the MP3 format, AAC generally achieves "
-"better sound quality than MP3 at many bit rates."
-msgstr ""
-"Zasnovan kot naslednik zapisa MP3. AAC v splošnem dosega boljšo kakovost "
-"zvoka kot MP3 pri številnih bitnih hitrostih."
+msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates."
+msgstr "Zasnovan kot naslednik zapisa MP3. AAC v splošnem dosega boljšo kakovost zvoka kot MP3 pri številnih bitnih hitrostih."
#: ../data/audio-profiles/aac-novell.xml.in.h:3
#: ../data/audio-profiles/mp3-lame.xml.in.h:9
@@ -467,12 +458,8 @@ msgid "Free Lossless Audio Codec"
msgstr "Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC)"
#: ../data/audio-profiles/flac.xml.in.h:2
-msgid ""
-"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but "
-"does not degrade audio quality."
-msgstr ""
-"Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC) je odprtokodni "
-"kodek, ki zvok stisne, vendar ne poslabša njegove kakovosti."
+msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality."
+msgstr "Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC) je odprtokodni kodek, ki zvok stisne, vendar ne poslabša njegove kakovosti."
#: ../data/audio-profiles/mp3-lame.xml.in.h:1
msgid "MP3 (LAME Encoder)"
@@ -480,12 +467,8 @@ msgstr "MP3 (kodirnik LAME)"
#: ../data/audio-profiles/mp3-lame.xml.in.h:2
#: ../data/audio-profiles/mp3-xing.xml.in.h:2
-msgid ""
-"A proprietary and older, but also popular, lossy audio format that produces "
-"larger files at lower bitrates."
-msgstr ""
-"Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v "
-"večje datoteke s slabšo kakovostjo."
+msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates."
+msgstr "Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v večje datoteke s slabšo kakovostjo."
#: ../data/audio-profiles/mp3-lame.xml.in.h:3
msgid "Encoding Mode"
@@ -526,12 +509,8 @@ msgid "Ogg Vorbis"
msgstr "Ogg Vorbis"
#: ../data/audio-profiles/vorbis.xml.in.h:2
-msgid ""
-"Vorbis is an open source, lossy audio codec with high quality output at a "
-"lower file size than MP3."
-msgstr ""
-"Vorbis je odprtokodni kodek za kodiranje izgubami, z visoko kakovostnim "
-"izhodom pri manjši velikosti datoteke kot MP3."
+msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3."
+msgstr "Vorbis je odprtokodni kodek za kodiranje izgubami, z visoko kakovostnim izhodom pri manjši velikosti datoteke kot MP3."
#: ../data/audio-profiles/vorbis.xml.in.h:3
msgid "Audio quality"
@@ -542,13 +521,8 @@ msgid "Wavpack"
msgstr "Wavpack"
#: ../data/audio-profiles/wavpack.xml.in.h:2
-msgid ""
-"A fast and efficient open source audio format offering lossless and high-"
-"quality lossy encoding with great dynamic range."
-msgstr ""
-"Hiter in učinkovit odprtokodni zvočni zapis, ki ponuja kodiranje brez "
-"zvočnih izgub in visoko kakovostno kodiranje z izgubami z velikim zvočnim "
-"razponom."
+msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range."
+msgstr "Hiter in učinkovit odprtokodni zvočni zapis, ki ponuja kodiranje brez zvočnih izgub in visoko kakovostno kodiranje z izgubami z velikim zvočnim razponom."
#: ../data/audio-profiles/wavpack.xml.in.h:3
msgid "Mode"
@@ -595,25 +569,16 @@ msgid "Waveform PCM"
msgstr "Waveform PCM"
#: ../data/audio-profiles/wav.xml.in.h:2
-msgid ""
-"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
-"modulated (PCM) audio."
-msgstr ""
-"Oblika zapisa WAV+PCM je kodirana brez zvočnih izgub in vsebuje nestisnjen, "
-"surov pulzirajoče-kodno moduliran (PCM) zvok."
+msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+msgstr "Oblika zapisa WAV+PCM je kodirana brez zvočnih izgub in vsebuje nestisnjen, surov pulzirajoče-kodno moduliran (PCM) zvok."
#: ../data/audio-profiles/wma.xml.in.h:1
msgid "Windows Media Audio"
msgstr "Zvočna datoteka Windows Media"
#: ../data/audio-profiles/wma.xml.in.h:2
-msgid ""
-"A proprietary lossy audio format with high quality output at a lower file "
-"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
-msgstr ""
-"Zakonsko zaščiteni kodek za kodiranje z zvočnimi izgubami in z visoko "
-"kakovostnim izhod pri manjši velikosti datotek kot MP3. 96kbps WMA je "
-"enakovreden 128 kbps MP3."
+msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+msgstr "Zakonsko zaščiteni kodek za kodiranje z zvočnimi izgubami in z visoko kakovostnim izhod pri manjši velikosti datotek kot MP3. 96kbps WMA je enakovreden 128 kbps MP3."
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Use a variable bitrate"
@@ -624,15 +589,15 @@ msgid "Audio Quality"
msgstr "Kakovost zvoka"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Predstavni predvajalnik"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:86
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:115
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:199
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:68
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Predvajalnik Banshee"
@@ -640,16 +605,8 @@ msgstr "Predvajalnik Banshee"
msgid "Play and organize your media collection"
msgstr "Predvajanje in urejanje zbirke predstavnih datotek"
-#: ../data/desktop-files/common.desktop.in.h:4
-msgid ""
-"Video;Movie;Film;Clip;Flick;Series;Media;Player;DVD;Disc;Mp3;Audio;CD;MTP;"
-"Podcast;DAAP;Playlist;Ipod;Multimedia;Collection;Music;Radio;"
-msgstr ""
-"video;filmi;posnetki;nanizanke;serije;predvajalnik;DVD;disk;mp3;zvok;slika;"
-"CD;MTP;Podcast;poddaja;DAAP;playlist;ipod;multimedia;predstavnost;zbirka;"
-"glasba;radio;"
-
-#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+#: ../libbanshee/banshee-bpmdetector.c:202
+#: ../libbanshee/banshee-ripper.c:270
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
msgid "Could not create pipeline"
msgstr "Cevovoda ni mogoče ustvariti"
@@ -679,7 +636,8 @@ msgid "Could not create fakesink plugin"
msgstr "Vstavka lažnega korita ni mogoče ustvariti"
#: ../libbanshee/banshee-bpmdetector.c:241
-#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+#: ../libbanshee/banshee-bpmdetector.c:250
+#: ../libbanshee/banshee-ripper.c:311
#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281
msgid "Could not link pipeline elements"
msgstr "Predmetov cevovoda ni mogoče povezati"
@@ -776,34 +734,28 @@ msgstr "Gonilnika zaznavanja UNM ni mogoče ustvariti."
msgid "Could not initialize GStreamer library"
msgstr "Knjižnice GStreamer ni mogoče zagnati"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Neznana napaka"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Omogoči popravek ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
-msgid ""
-"For tracks that have ReplayGain data, automatically scale (normalize) "
-"playback volume"
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
+msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
msgstr "Samodejno izravnaj glasnost predvajanja skladb s podatki ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Omogoči predvajanje _brez premora"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
-msgid ""
-"Eliminate the small playback gap on track change. Useful for concept albums "
-"and classical music"
-msgstr ""
-"Odstrani premor predvajanja ob spremembi skladbe. Uporabno za tematske "
-"albume in pri poslušanju klasične glasbe."
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
+msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
+msgstr "Odstrani premor predvajanja ob spremembi skladbe. Uporabno za tematske albume in pri poslušanju klasične glasbe."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
msgid "Could not create transcoder"
@@ -814,7 +766,7 @@ msgstr "Prekodirnika ni mogoče ustvariti"
msgid "Could not create encoder pipeline : {0}"
msgstr "Cevovoda kodirnika ni mogoče ustvariti : {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "Uporabljen Gstreamer 0.10."
@@ -833,12 +785,8 @@ msgid "Can't check for updates"
msgstr "Ni mogoče preveriti za posodobitve."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
-msgid ""
-"We're currently not able to check if there's a new version available. Please "
-"try again later."
-msgstr ""
-"Trenutno ni mogoče preveriti, če je na voljo nova različica. Poskusite znova "
-"kasneje."
+msgid "We're currently not able to check if there's a new version available. Please try again later."
+msgstr "Trenutno ni mogoče preveriti, če je na voljo nova različica. Poskusite znova kasneje."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
msgid "No update available"
@@ -851,9 +799,7 @@ msgstr "Nameščena je zadnja različica predvajalnika Banshee."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106
#, csharp-format
msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?"
-msgstr ""
-"Na voljo je nova različica predvajalnika Banshee ({0}). {1}Ali želite "
-"program posodobiti?"
+msgstr "Na voljo je nova različica predvajalnika Banshee ({0}). {1}Ali želite program posodobiti?"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108
msgid "Banshee update available"
@@ -880,12 +826,8 @@ msgstr "Prejem je spodletel. Poskusite ponovno kasneje."
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165
#, csharp-format
-msgid ""
-"The update finished downloading.{0}Do you want to shutdown Banshee and run "
-"the installer?"
-msgstr ""
-"Prejemanje posodobitve je končano. {0} Ali želite izklopiti Banshee in "
-"zagnati namestilnik?"
+msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?"
+msgstr "Prejemanje posodobitve je končano. {0} Ali želite izklopiti Banshee in zagnati namestilnik?"
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
msgid "Update finished downloading"
@@ -895,186 +837,171 @@ msgstr "Prejemanje posodobitve je končano"
msgid "Check for Updates"
msgstr "Preveri za posodobitve"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Možnosti pomoči"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Pokaži to pomoč"
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Pokaži možnosti za nadzorovanje predvajanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Pokaži možnosti za poizvedbo o predvajajoči se skladbi"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Pokaži možnosti za poizvedbo o programniku predvajanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Pokaži možnosti za uporabniški vmesnik"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Pokaži možnosti za razvijalce in razhroščevanje"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Pokaži vse možnosti skupin"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Pokaži podrobnosti različice"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Možnosti nadzora predvajanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
-msgid ""
-"Play the next track, optionally restarting if the 'restart' value is set"
-msgstr ""
-"Predvajanje naslednje skladbe, oziroma ponovno predvajanje trenutne, če je "
-"nastavljena vrednost 'restart'"
+#: ../src/Clients/Booter/Booter/Entry.cs:164
+msgid "Play the next track, optionally restarting if the 'restart' value is set"
+msgstr "Predvajanje naslednje skladbe, oziroma ponovno predvajanje trenutne, če je nastavljena vrednost 'restart'"
-#: ../src/Clients/Booter/Booter/Entry.cs:168
-msgid ""
-"Play the previous track, optionally restarting if the 'restart' value is set"
-msgstr ""
-"Predvajanje predhodne skladbe, oziroma ponovno predvajanje, če je "
-"nastavljena vrednost 'restart'"
+#: ../src/Clients/Booter/Booter/Entry.cs:165
+msgid "Play the previous track, optionally restarting if the 'restart' value is set"
+msgstr "Predvajanje predhodne skladbe, oziroma ponovno predvajanje, če je nastavljena vrednost 'restart'"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
-msgid ""
-"If the current song has been played longer than 4 seconds then restart it, "
-"otherwise the same as --previous"
-msgstr ""
-"V primeru da je bila trenutna skladba predvajanja dlje kot 4 sekunde, "
-"ponovno predvajanje, drugače pa enako kot --previous"
+#: ../src/Clients/Booter/Booter/Entry.cs:166
+msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous"
+msgstr "V primeru da je bila trenutna skladba predvajanja dlje kot 4 sekunde, ponovno predvajanje, drugače pa enako kot --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr "Samodejno začni predvajanje skladbe v čakalni vrsti ukazne vrstice"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Začetek predvajanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Premor predvajanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Preklop predvajanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Popolna zaustavitev predvajanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
-msgid ""
-"Enable or disable playback stopping after the currently playing track (value "
-"should be either 'true' or 'false')"
-msgstr ""
-"Omogoči ali onemogoči zaustavitev predvajanja po končanem predvajanju "
-"trenutno predvajanega posnetka (vrednost mora biti 'prav' ali 'napak')"
+#: ../src/Clients/Booter/Booter/Entry.cs:173
+msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')"
+msgstr "Omogoči ali onemogoči zaustavitev predvajanja po končanem predvajanju trenutno predvajanega posnetka (vrednost mora biti 'prav' ali 'napak')"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
-msgstr ""
-"Nastavitev glasnosti predvajanja (0-100), predpona +/- za relativne vrednosti"
+msgstr "Nastavitev glasnosti predvajanja (0-100), predpona +/- za relativne vrednosti"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Iskanje določene točke (sekunde, število s plavajočo vejico)"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Ocenite trenutno predvajano skladbo (od 0 do 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Možnosti poizvedbe programnika predvajalnika"
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Trenutno stanje predvajalnika"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Zadnje stanje predvajalnika"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Poizvedba ali je mogoče narediti premor predvajanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Poizvedba ali je mogoče iskati po skladbi"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Glasnost predvajalnika"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Položaj predvajalnika v trenutno predvajani skladbi"
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Možnosti poizvedovanja o metapodatkih predvajane skladbe"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Ime izvajalca"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Naslov albuma"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Naslov skladbe"
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Trajanje"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
msgid "Track Number"
msgstr "Številka skladbe"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "Track Count"
msgstr "Število vseh skladb"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Številka diska"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -1085,7 +1012,7 @@ msgstr "Številka diska"
msgid "Year"
msgstr "Leto"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1093,117 +1020,108 @@ msgstr "Leto"
msgid "Rating"
msgstr "Ocena"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "Score"
msgstr "Rezultat"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "Bit Rate"
msgstr "Bitna hitrost"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Možnosti uporabniškega vmesnika"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Uporabniški vmesnik naj bo predstavljen na dejavni delovni površini"
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Vstopi v celozaslonski način"
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Skrij uporabniški vmesnik"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Ne predstavi uporabniškega vmesnika, ne glede na ostale možnosti"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Odpri pogovorno okno za uvoz predstavnih datotek"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Odpri pogovorno okno podatkov o programu"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Odpri pogovorno okno za odpiranje mesta"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Odpri pogovorno okno možnosti"
-#: ../src/Clients/Booter/Booter/Entry.cs:217
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Možnosti razhroščevalnika in razvoja"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Omogoči splošne zmožnosti razhroščevanja"
-#: ../src/Clients/Booter/Booter/Entry.cs:219
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Omogoči razhroščevalni izhod poizvedb SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Omogoči izhod razhroščevanja vstavkov Mono"
-#: ../src/Clients/Booter/Booter/Entry.cs:221
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Navedite dodatno zbirko podatkov za uporabo"
-#: ../src/Clients/Booter/Booter/Entry.cs:222
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Force fetching of missing cover artwork"
msgstr "Vsili pridobivanje manjkajočih naslovnic"
-#: ../src/Clients/Booter/Booter/Entry.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Navadite dodaten ključ, privzet je /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:224
-msgid ""
-"Optimize instance for running uninstalled; most notably, this will create an "
-"alternate Mono.Addins database in the working directory"
-msgstr ""
-"Optimiziraj program za nenameščeno delovanje; možnost ustvari dodatno "
-"podatkovno zbirko vstavka Mono v delovni mapi"
+#: ../src/Clients/Booter/Booter/Entry.cs:221
+msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory"
+msgstr "Optimiziraj program za nenameščeno delovanje; možnost ustvari dodatno podatkovno zbirko vstavka Mono v delovni mapi"
-#: ../src/Clients/Booter/Booter/Entry.cs:226
+#: ../src/Clients/Booter/Booter/Entry.cs:223
msgid "Disable DBus support completely"
msgstr "Popolno onemogočenje podpore DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:228
+#: ../src/Clients/Booter/Booter/Entry.cs:225
#, csharp-format
-msgid "Skip loading a custom gtk.css file ({0}) if it exists"
-msgstr "Preskoči nalaganje datoteke gtk.css ({0}), če ta obstaja"
+msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+msgstr "Preskoči nalaganje datoteke gtkrc po meri ({0}), če obstaja"
-#: ../src/Clients/Booter/Booter/Entry.cs:230
-#, csharp-format
-msgid "Reload the custom gtk.css file ({0}) every 5 seconds"
-msgstr "Vsakih 5 sekund ponovno naloži datoteko gtk.css ({0})"
-
-#: ../src/Clients/Booter/Booter/Entry.cs:259
+#: ../src/Clients/Booter/Booter/Entry.cs:256
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Naslednji argumenti pomoči so neveljavni: {0}"
-#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:89
+#: ../src/Clients/Muinshee/Muinshee/AlbumDialog.cs:77
msgid "Play Album"
msgstr "Predvajanje albuma"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:100
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:96
msgid "En_queue"
msgstr "_Razvrsti"
-#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:103
+#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:99
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
@@ -1226,16 +1144,16 @@ msgstr "Predvajaj _album"
msgid "Add an album to the playlist"
msgstr "Dodajanje albuma na seznam predvajanja"
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:281
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
#, csharp-format
msgid "{0} remaining"
msgstr "Še {0}"
-#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:61
+#: ../src/Clients/Muinshee/Muinshee/SongDialog.cs:53
msgid "Play Song"
msgstr "Predvajanje skladbe"
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:274
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
@@ -1243,7 +1161,7 @@ msgid "Close"
msgstr "Zapri"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:492
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
msgid "Search"
msgstr "Iskanje"
@@ -1280,85 +1198,91 @@ msgstr "Zvrst"
msgid "Comment"
msgstr "Opomba"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-msgid "Unknown Album"
-msgstr "Neznan album"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Neznan izvajalec"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Neznan album"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Neznan naslov"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../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:348
+#: ../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:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
msgid "File not found"
msgstr "Datoteke ni mogoče najti"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Kodek za predvajanje te vrste predstavnih datotek ni na voljo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../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:354
+#: ../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:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Ponovno predvajaj podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../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:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Ponovno predvajaj video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Ponovno predvajaj"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../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:443
+#: ../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:444
+#: ../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:445
+#: ../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:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Skoči na predvajano skladbo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Skoči na predvajan predmet"
@@ -1378,7 +1302,7 @@ msgstr "{0} ({1}:{2:00})"
msgid "All Album Artists ({0})"
msgstr "Vsi izvajalci albuma ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:75
#, csharp-format
msgid "All Albums ({0})"
msgstr "Vsi albumi ({0})"
@@ -1425,8 +1349,7 @@ msgstr "po izvajalcu"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52
msgid "Play all songs by an artist, then randomly choose another artist"
-msgstr ""
-"Predvaja vse skladbe izvajalca, nato naključno izbere drugega izvajalca"
+msgstr "Predvaja vse skladbe izvajalca, nato naključno izbere drugega izvajalca"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
@@ -1481,7 +1404,7 @@ msgid "Scanning for media"
msgstr "Preiskovanje predstavnih datotek"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Preiskovanje ..."
@@ -1506,7 +1429,7 @@ msgstr "Izvaja se postopek uvoza. Ali ga želite zaustaviti?"
msgid "Importing {0} of {1}"
msgstr "Uvažanje {0} od {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Ponovno preiskovanje {0} od {1}"
@@ -1516,13 +1439,10 @@ msgid "Upgrading your Banshee Database"
msgstr "Nadgrajevanje podatkovne zbirke predvajalnika Banshee"
#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
-msgid ""
-"Please wait while your old Banshee database is migrated to the new format."
-msgstr ""
-"Počakajte, da se stara podatkovna zbirka predvajalnika Banshee pretvori v "
-"novejšo različico."
+msgid "Please wait while your old Banshee database is migrated to the new format."
+msgstr "Počakajte, da se stara podatkovna zbirka predvajalnika Banshee pretvori v novejšo različico."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Osveževanje metapodatkov"
@@ -1598,29 +1518,29 @@ msgstr "Mehki rock"
msgid "Techno"
msgstr "Tehno"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
msgid "Remove From Library"
msgstr "Odstrani iz knjižnice"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
msgid "File Organization"
msgstr "Urejanje datotek"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
msgid "Co_py files to media folder when importing"
msgstr "Med uvažanjem _kopiraj datoteke v mape predstavnih vsebin"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
msgid "_Update file and folder names"
msgstr "_Posodobi imena datotek in map"
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:89
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
msgid "Rename files and folders according to media metadata"
msgstr "Preimenovanje datotek in map glede na metapodatke predstavnih datotek"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
#, csharp-format
msgid "{0} Folder"
msgstr "Mapa {0}"
@@ -1684,28 +1604,29 @@ msgstr "Število diskov"
msgid "Grouping"
msgstr "Združevanje"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#. Catalog.GetString ("Music Library")
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:49
msgid "Music"
msgstr "Glasba"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs:52
msgid "Search your music"
msgstr "Iskanje po zbirki posnetkov"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
msgid "Miscellaneous"
msgstr "Razno"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
msgid "_Sort an artist's albums by year, not title"
msgstr "_Razvrsti izvajalčeve albume po letu, ne naslovu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1714,91 +1635,89 @@ msgstr[1] "{0} skladba"
msgstr[2] "{0} skladbi"
msgstr[3] "{0} skladbe"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
msgid "Music Folder"
msgstr "Mapa glasbe"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
msgid "Favorites"
msgstr "Priljubljeno"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
msgid "Songs rated four and five stars"
msgstr "Skladbe ocenjene s štirimi in petimi zvezdicami"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
msgid "Recent Favorites"
msgstr "Nedavno priljubljeno"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:144
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
msgid "Songs listened to often in the past week"
msgstr "Pogosto poslušane skladbe v zadnjem tednu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Nedavno dodano"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:149
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Songs imported within the last week"
msgstr "Skladbe uvožene v zadnjem tednu"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
msgid "Recently Played"
msgstr "Nedavno predvajano"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Recently played songs"
msgstr "Nedavno predvajane skladbe"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
msgid "Unheard"
msgstr "Ne slišano"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "Songs that have not been played or skipped"
msgstr "Nikoli predvajane in nikoli preskočene skladbe"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "Neglected Favorites"
msgstr "Spregledane priljubljene"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:167
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
msgid "Favorites not played in over two months"
msgstr "Priljubljeno in nepredvajano v zadnjih 2 mesecih"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Least Favorite"
msgstr "Najmanj priljubljeno"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:172
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs rated one or two stars or that you have frequently skipped"
-msgstr ""
-"Skladbe, ki so bile ocenjene z eno ali dvema zvezdicama, ali pa ste jih "
-"pogosto preskočili"
+msgstr "Skladbe, ki so bile ocenjene z eno ali dvema zvezdicama, ali pa ste jih pogosto preskočili"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:176
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
msgid "700 MB of Favorites"
msgstr "700 MB priljubljenih"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
msgid "A data CD worth of favorite songs"
msgstr "Priljubljene skladbe v obsegu enega podatkovnega CD-ja"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
msgid "80 Minutes of Favorites"
msgstr "80 minut priljubljenih"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:183
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
msgid "An audio CD worth of favorite songs"
msgstr "Priljubljene skladbe v obsegu enega zvočnega CD-ja"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
msgid "Unrated"
msgstr "Neocenjeno"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:189
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
msgid "Songs that haven't been rated"
msgstr "Neocenjene skladbe"
@@ -1857,12 +1776,8 @@ msgid "Default player engine"
msgstr "Privzeti programnik predvajalnika"
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
-msgid ""
-"No player engines were found. Please ensure Banshee has been cleanly "
-"installed."
-msgstr ""
-"Programnikov predvajalnika ni mogoče najti. Prepričajte se, da je bil "
-"predvajalnik Banshee pravilno nameščen."
+msgid "No player engines were found. Please ensure Banshee has been cleanly installed."
+msgstr "Programnikov predvajalnika ni mogoče najti. Prepričajte se, da je bil predvajalnik Banshee pravilno nameščen."
#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
msgid "Problem with Player Engine"
@@ -1878,11 +1793,8 @@ msgid "Initializing"
msgstr "Začenjanje"
#: ../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 ""
-"Datoteke se trenutno pretvarjajo v drugo vrsto. Ali želite to zaustaviti?"
+msgid "Files are currently being converted to another format. Would you like to stop this?"
+msgstr "Datoteke se trenutno pretvarjajo v drugo vrsto. Ali želite to zaustaviti?"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
msgid "Saving Metadata to File"
@@ -1893,36 +1805,24 @@ msgid "Sync _metadata between library and files"
msgstr "Uskladi _metapodatke med knjižnico in datotekami"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
-msgid ""
-"Enable this option to have metadata in sync between your library and "
-"supported media files"
-msgstr ""
-"Izbrana možnost omogoča usklajevanje metapodatkov med knjižnico in podprtimi "
-"zvočnimi datotekami"
+msgid "Enable this option to have metadata in sync between your library and supported media files"
+msgstr "Izbrana možnost omogoča usklajevanje metapodatkov med knjižnico in podprtimi zvočnimi datotekami"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
msgid "Sync _ratings between library and files"
msgstr "Uskladi _ocene med knjižnico in datotekami"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
-msgid ""
-"Enable this option to have rating metadata synced between your library and "
-"supported audio files"
-msgstr ""
-"Izbrana možnost omogoča usklajevanje metapodatkov ocen med knjižnico in "
-"podprtimi zvočnimi datotekami"
+msgid "Enable this option to have rating metadata synced between your library and supported audio files"
+msgstr "Izbrana možnost omogoča usklajevanje metapodatkov ocen med knjižnico in podprtimi zvočnimi datotekami"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
msgid "Sync play counts between library and files"
msgstr "Uskladi _števec predvajanja med knjižnico in datotekami"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
-msgid ""
-"Enable this option to have playcount metadata synced between your library "
-"and supported audio files"
-msgstr ""
-"Izbrana možnost omogoča usklajevanje metapodatkov števca predvajanja med "
-"knjižnico in podprtimi zvočnimi datotekami"
+msgid "Enable this option to have playcount metadata synced between your library and supported audio files"
+msgstr "Izbrana možnost omogoča usklajevanje metapodatkov števca predvajanja med knjižnico in podprtimi zvočnimi datotekami"
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
@@ -1941,12 +1841,8 @@ msgid "_Disable features requiring Internet access"
msgstr "_Onemogoči zmožnosti, ki zahtevajo medmrežni dostop"
#: ../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"
+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"
#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
msgid "Search this playlist"
@@ -1971,8 +1867,8 @@ msgstr "Izbriši seznam predvajanja"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:601
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:212
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nov seznam predvajanja"
@@ -2016,8 +1912,7 @@ msgstr "Upravljanje datotek"
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
msgid "Improve Banshee by sending anonymous usage data"
-msgstr ""
-"Izboljšajte predvajalnik Banshee s pošiljanjem brezimnih podatkov o uporabi"
+msgstr "Izboljšajte predvajalnik Banshee s pošiljanjem brezimnih podatkov o uporabi"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
msgid "items"
@@ -2576,7 +2471,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
msgid "Unknown"
msgstr "Neznano"
@@ -2603,7 +2498,7 @@ msgid "Delete Smart Playlist"
msgstr "Izbriši pametni seznam predvajanja"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Vse zvrsti ({0})"
@@ -2664,7 +2559,7 @@ msgstr "Napaka"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:177
msgid "Details"
msgstr "Podrobnosti"
@@ -2765,12 +2660,12 @@ msgid "Show:"
msgstr "Pokaži:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Vse razširitve"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
msgid "Enabled"
msgstr "Omogočene razširitve"
@@ -2795,20 +2690,15 @@ msgid "Cannot Reorder While Sorted"
msgstr "Ni mogoče preurediti, medtem ko je razvrščeno"
#: ../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."
-msgstr ""
-"Za predstavitev seznama predvajanj v ročni način razvrščanja je treba "
-"klikniti glavo trenutno razvrščenega stolpca dokler puščica razvrščanja ne "
-"izgine."
+msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away."
+msgstr "Za predstavitev seznama predvajanj v ročni način razvrščanja je treba klikniti glavo trenutno razvrščenega stolpca dokler puščica razvrščanja ne izgine."
#. Translators: this is {disc number} of {disc count}
#. Translators: this is {track number} of {track count}
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:210
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
#, csharp-format
msgid "{0} of {1}"
msgstr "{0} od {1}"
@@ -2869,20 +2759,20 @@ msgstr "{0} Hz"
msgid "{0} bits"
msgstr "{0} bitov"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
msgid "Make the context pane larger or smaller"
msgstr "Naredi vsebinski pladenj večji ali manjši"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
msgid "Hide context pane"
msgstr "Skrij vsebinski pladenj"
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
msgstr "Čakanje na začetek predvajanja ..."
-#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:148
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:188
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
msgid "Loading..."
msgstr "Nalaganje ..."
@@ -2909,7 +2799,7 @@ msgstr "{0} kHz"
msgid "Equalizer"
msgstr "Uravnalnik zvoka"
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
msgid "New Preset"
msgstr "Novo nastavljeno"
@@ -2944,11 +2834,11 @@ msgstr "Vzdrževalci"
msgid "Contributors"
msgstr "Sodelavci"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
msgid "Extraordinary Multimedia Management and Playback"
msgstr "Izredno upravljanje in predvajanje predstavnih datotek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
@@ -2959,7 +2849,7 @@ msgstr ""
"Avtorske pravice © 2005-{1} Različni razvijalci\n"
"Avtorske pravice © 2005 Aaron Bockover"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
msgid "Banshee Website"
msgstr "Spletišče Banshee"
@@ -2968,12 +2858,8 @@ msgid "Important tasks are running"
msgstr "Izvajajo se pomembne naloge"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
-msgid ""
-"Closing Banshee now will cancel any currently running tasks. They cannot be "
-"resumed automatically the next time Banshee is run."
-msgstr ""
-"Izhod iz programa Banshee bo prekinil vse trenutno dejavne naloge. Nalog ni "
-"mogoče samodejno nadaljevati ob naslednjem zagonu."
+msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run."
+msgstr "Izhod iz programa Banshee bo prekinil vse trenutno dejavne naloge. Nalog ni mogoče samodejno nadaljevati ob naslednjem zagonu."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
msgid "Quit Anyway"
@@ -2988,12 +2874,8 @@ msgid "Make Banshee the default media player?"
msgstr "Ali naj bo Banshee privzeti predvajalnik predstavnih datotek?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
-msgid ""
-"Currently another program is configured as the default media player. Would "
-"you prefer Banshee to be the default?"
-msgstr ""
-"Trenutno je kot privzeti predvajalnik predstavnih datotek nastavljen drug "
-"program. Ali želite nastaviti predvajalnik Banshee kot privzeti program?"
+msgid "Currently another program is configured as the default media player. Would you prefer Banshee to be the default?"
+msgstr "Trenutno je kot privzeti predvajalnik predstavnih datotek nastavljen drug program. Ali želite nastaviti predvajalnik Banshee kot privzeti program?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
@@ -3064,107 +2946,92 @@ msgid "Import a playlist"
msgstr "Uvoz seznama predvajanja"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Ponovno preišči glasbeno knjižnico"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Ponovno preišči mape z glasbo"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Odpri _mesto ..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Odpri oddaljeno mesto za predvajanje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Končaj"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Končaj Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Uredi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Možnosti"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Urejanje osebnih nastavitev"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Orodja"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Ponovno preišči glasbeno knjižnico"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Ponovno preišči mape z glasbo"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Po ponovnem usklajevanju datotek bo odstranjenih {0} skladb iz knjižnice."
-msgstr[1] ""
-"Po ponovnem usklajevanju datotek bo odstranjena {0} skladba iz knjižnice."
-msgstr[2] ""
-"Po ponovnem usklajevanju datotek bosta odstranjeni {0} skladbi iz knjižnice."
-msgstr[3] ""
-"Po ponovnem usklajevanju datotek bodo odstranjene {0} skladbe iz knjižnice."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Pomo_č"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Vsebina"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Napredno iskanje po zbirki"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Učenje naprednih načinov iskanja po zbirki predstavnih datotek"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Domača stran Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Obiščite domačo stran programa Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Sodelujte"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Sodelujte pri projektu Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Podrobnosti različice"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Pogled podrobnosti različice in nastavitev"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Uvozi seznam predvajanja"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Seznami predvajanja"
@@ -3444,8 +3311,7 @@ msgstr "Dodaj na _seznam predvajanja"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
-msgstr ""
-"Pripenjanje izbranih predmetov seznamu predvajanja ali ustvarjanje novega"
+msgstr "Pripenjanje izbranih predmetov seznamu predvajanja ali ustvarjanje novega"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
@@ -3485,7 +3351,7 @@ msgstr "Trajno izbriši izbrane posnetke z nosilca"
#. Translators: this is a verb (command), not a noun (things)
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
@@ -3527,15 +3393,11 @@ msgstr "Preverite, če lahko sistem dostopa do mesta skladbe."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
-msgid_plural ""
-"Are you sure you want to permanently delete the selected {0} items?"
-msgstr[0] ""
-"Ali ste prepričani, da želite trajno izbrisati {0} izbranih predmetov?"
+msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
+msgstr[0] "Ali ste prepričani, da želite trajno izbrisati {0} izbranih predmetov?"
msgstr[1] "Ali ste prepričani, da želite trajno izbrisati {0} izbran predmet?"
-msgstr[2] ""
-"Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?"
-msgstr[3] ""
-"Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?"
+msgstr[2] "Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?"
+msgstr[3] "Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611
msgid "If you delete the selection, it will be permanently lost."
@@ -3549,40 +3411,23 @@ msgstr "Odstranitev izbora iz {0}?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
-msgid_plural ""
-"Are you sure you want to remove the selected {0} items from your {1}?"
-msgstr[0] ""
-"Ali ste prepričani, da želite odstraniti {0} izbranih predmetov iz {1}?"
+msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
+msgstr[0] "Ali ste prepričani, da želite odstraniti {0} izbranih predmetov iz {1}?"
msgstr[1] "Ali ste prepričani, da želite odstraniti {0} izbran predmet iz {1}?"
-msgstr[2] ""
-"Ali ste prepričani, da želite odstraniti {0} izbrana predmeta iz {1}?"
-msgstr[3] ""
-"Ali ste prepričani, da želite odstraniti {0} izbrane predmete iz {1}?"
+msgstr[2] "Ali ste prepričani, da želite odstraniti {0} izbrana predmeta iz {1}?"
+msgstr[3] "Ali ste prepričani, da želite odstraniti {0} izbrane predmete iz {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Ali ste prepričani, da želite nadaljevati?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Odstrani skladbe"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Izvajalec _mešanega albuma:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:56
-msgid ""
-"Check this if this track is part of an album with tracks by various artists"
+#: ../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 "Preveri, če je ta skladba del albuma s skladbami različnih izvajalcev"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:58
-msgid ""
-"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 ""
-"Ta vrednost bo vplivala na razvrščanje albuma; v primeru vnosa 'Različni "
-"izvajalci' se bo album nahajal skupaj z ostalimi albumi, ki se začnejo z 'R'."
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
+msgid "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 "Ta vrednost bo vplivala na razvrščanje albuma; v primeru vnosa 'Različni izvajalci' se bo album nahajal skupaj z ostalimi albumi, ki se začnejo z 'R'."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
msgid "Basic Details"
@@ -3643,19 +3488,19 @@ msgstr "Nastavi vse številke diskov in skupno število diskov na te vrednosti"
msgid "_Disc Number:"
msgstr "Številka _diska:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Nastavi vse letnice izida na to vrednost"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Leto:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Nastavi vse ocene na to vrednost"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Ocena:"
@@ -3719,7 +3564,7 @@ msgstr "Nastavi vse opombe na to vrednost"
msgid "Co_mment:"
msgstr "Opo_mba:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
msgid "Help"
msgstr "Pomoč"
@@ -3727,7 +3572,7 @@ msgstr "Pomoč"
msgid "Lyrics"
msgstr "Besedilo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
msgid "Advance to the next track and edit its title"
msgstr "Pomik na naslednjo skladbo in urejanje njenega naslova"
@@ -3850,52 +3695,48 @@ msgstr "Velikost datoteke:"
msgid "bytes"
msgstr "bajtov"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Urejevalnik skladb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Lastnosti skladbe"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Pokaži predhodno skladbo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:152
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Pokaži naslednjo skladbo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Naslov:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Izvajalec:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Album:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
msgid "Sync all field _values"
msgstr "Usklajevanje vseh vrednosti _polj"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
-msgid ""
-"Apply the values of all common fields set for this track to all of the "
-"tracks selected in this editor"
-msgstr ""
-"Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe "
-"izbrane v urejevalniku"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
+msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
+msgstr "Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe izbrane v urejevalniku"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Urejanje {0} od {1} predmetov</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:696
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:699
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3904,16 +3745,14 @@ msgstr[1] "Ali naj bodo spremembe {0} od {1} odprte skladbe shranjene?"
msgstr[2] "Ali naj bodo spremembe {0} od {1} odprtih skladb shranjene?"
msgstr[3] "Ali naj bodo spremembe {0} od {1} odprtih skladb shranjene?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:713
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:716
msgid "Close _without Saving"
msgstr "Zapri _brez shranjevanja"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:750
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
-msgstr ""
-"V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno "
-"izgubljenih."
+msgstr "V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno izgubljenih."
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62
msgid "_View"
@@ -3962,19 +3801,19 @@ msgstr[3] "V teku so dejavna opravila"
#. 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:520
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:530
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}od{1} {2} {0}objavljeno{1} {3}"
#. 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:536
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:546
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}na{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:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:549
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3982,56 +3821,55 @@ msgstr "{0} {1}"
#. 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:575
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:585
#, 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:579
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:554
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:589
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, 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:583
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:558
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:593
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0}> {1} {2}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:136
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:138
msgid "Stop Operation"
msgstr "Zaustavi opravilo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:137
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:139
#, csharp-format
msgid "Stop {0}"
msgstr "Zaustavi {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
msgid "This operation is still performing work. Would you like to stop it?"
msgstr "Opravilo se vedno izvaja. Ali ga želite zaustaviti?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
#, csharp-format
-msgid ""
-"The '{0}' operation is still performing work. Would you like to stop it?"
+msgid "The '{0}' operation is still performing work. Would you like to stop it?"
msgstr "Opravilo '{0}' je v teku. Ali ga želite zaustaviti?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
msgid "Continue"
msgstr "Nadaljuj"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:149
#, csharp-format
msgid "Continue {0}"
msgstr "Nadaljuj {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
msgid "Stopping..."
msgstr "Zaustavljanje ..."
@@ -4076,12 +3914,8 @@ msgid "<big><b>Import Media to Library</b></big>"
msgstr "<big><b>Uvoz predstavnih datotek v knjižnico</b></big>"
#: ../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."
-msgstr ""
-"Knjižnica predstavnih datotek je prazna. Novo glasbo in video lahko v "
-"knjižnico uvozite takoj ali pa pozneje."
+msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later."
+msgstr "Knjižnica predstavnih datotek je prazna. Novo glasbo in video lahko v knjižnico uvozite takoj ali pa pozneje."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
msgid "Import _from:"
@@ -4104,7 +3938,7 @@ msgstr "Profili niso na voljo"
msgid "Advanced"
msgstr "Napredno"
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
#, csharp-format
msgid "Configuring {0}"
msgstr "Nastavljanje {0}"
@@ -4169,87 +4003,85 @@ msgstr "Odpri v urejevalniku"
msgid "Create and save"
msgstr "Ustvari in shrani"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
msgid "Browser Content"
msgstr "Vsebina brskalnika"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
msgid "Configure the filters available in the browser"
msgstr "Nastavitev razpoložljivih filtrov brskalnika"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
msgid "Show Artist Filter"
msgstr "Pokaži filter izvajalcev"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
msgid "Show a list of artists to filter by"
msgstr "Pokaži seznam izvajalcev za filtriranje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
msgid "Show all Artists"
msgstr "Pokaže vse izvajalce"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
msgid "Show all artists in the artist filter"
msgstr "Pokaži vse izvajalce v filtru izvajalcev"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
msgid "Show Album Artists"
msgstr "Pokaži izvajalce albuma"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:129
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
msgid "Show only album artists, not artists with only single tracks"
-msgstr ""
-"Pokaži le izvajalce albuma in ne tudi izvajalcev le posameznih posnetkov"
+msgstr "Pokaži le izvajalce albuma in ne tudi izvajalcev le posameznih posnetkov"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:134
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
msgid "Show Genre Filter"
msgstr "Pokaži filter zvrsti"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
msgid "Show a list of genres to filter by"
msgstr "Pokaži seznam zvrsti za filtriranje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
msgid "Show Year Filter"
msgstr "Pokaži filter leta izdaje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
msgid "Show a list of years to filter by"
msgstr "Pokaži seznam let za filtriranje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:249
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
msgid "Not Set"
msgstr "Ni nastavljeno"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:105
msgid "Browser on Left"
msgstr "Brskalnik na levi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
msgid "Show the artist/album browser to the left of the track list"
msgstr "Prikaz brskalnika izvajalcev/albumov levo od seznama skladb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
msgid "Browser on Top"
msgstr "Brskalnik na vrhu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Show the artist/album browser above the track list"
msgstr "Prikaz brskalnika izvajalcev/albumov nad seznamom skladb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
msgid "Show Browser"
msgstr "Pokaži brskalnik"
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:116
msgid "Show or hide the artist/album browser"
msgstr "Prikaži ali skrij brskalnik izvajalcev/albumov"
#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
-msgid ""
-"This page is blocked because it is probably not the one you are looking for!"
+msgid "This page is blocked because it is probably not the one you are looking for!"
msgstr "Stran je blokirana, ker najverjetneje ni stran, ki jo iščete."
#. Translators: {0} is the URL of the web page that was requested
@@ -4258,12 +4090,12 @@ msgstr "Stran je blokirana, ker najverjetneje ni stran, ki jo iščete."
msgid "The security certificate for {0} is invalid."
msgstr "Varnostno potrdilo za {0} ni veljavno."
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:116
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "Nalaganje {0} ..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
msgid ""
"Insert\n"
"Disc"
@@ -4271,20 +4103,24 @@ msgstr ""
"Vstavite\n"
"Disk"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:57
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "Počisti iskanje"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "Išči"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:186
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:150
msgid "Idle"
msgstr "Nedejavno"
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:187
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Vzpostavljanje stika ..."
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:198
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
msgid "Buffering"
msgstr "Polnjenje medpomnilnika"
@@ -4324,39 +4160,29 @@ msgstr "Podpira ovitke"
msgid "Supports photos"
msgstr "Podpira fotografije"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "Trajanje skladbe je nič"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "Usklajevanje iPoda"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Pripravljanje na usklajevanje ..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Dodajanje skladbe {0} od {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Poteka posodabljanje metapodatkov posnetka {0} od {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Odstranjevanje skladbe {0} od {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Poteka odstranjevanje neveljavnega posnetka {0} od {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Zapisovanje podatkovne zbirke predstavnih datotek"
@@ -4365,7 +4191,7 @@ msgstr "Zapisovanje podatkovne zbirke predstavnih datotek"
msgid "Sync {0}"
msgstr "Uskladitev {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Naprave"
@@ -4374,44 +4200,40 @@ msgstr "Naprave"
msgid "Device Properties"
msgstr "Lastnosti naprave"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Izdelek"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Ponudnik"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Nalaganje {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Da"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Ne"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
#, csharp-format
-msgid ""
-"The {0} format is not supported by the device, and no converter was found to "
-"convert it"
-msgstr ""
-"Naprava ne podpira vrste zapisa {0}, in ni mogoče najti pretvornika za njeno "
-"pretvarjanje"
+msgid "The {0} format is not supported by the device, and no converter was found to convert it"
+msgstr "Naprava ne podpira vrste zapisa {0}, in ni mogoče najti pretvornika za njeno pretvarjanje"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
msgid "File format conversion support is not available"
msgstr "Podpora za pretvorbo vrste datoteke ni na voljo"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
msgid "Error converting file"
msgstr "Napaka med pretvarjanjem datoteke"
@@ -4420,19 +4242,19 @@ msgid "Sync when first plugged in and when the libraries change"
msgstr "Samodejno usklajevanje naprave ob prvem vklopu ali spremembi knjižnic"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
-msgid ""
-"Begin synchronizing the device as soon as the device is plugged in or the "
-"libraries change."
-msgstr ""
-"Začetek usklajevanja naprave takoj, ko je priklopljena ali se knjižnice "
-"spremenijo."
+msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change."
+msgstr "Začetek usklajevanja naprave takoj, ko je priklopljena ali se knjižnice spremenijo."
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
msgid "Sync Preferences"
msgstr "Možnosti usklajevanja"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Uskladi"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4441,9 +4263,13 @@ msgstr[1] "Opravilo usklajevanja bo odstranilo {0} skladbo z naprave."
msgstr[2] "Opravilo usklajevanja bo odstranilo {0} skladbi z naprave."
msgstr[3] "Opravilo usklajevanja bo odstranilo {0} skladbe z naprave."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Uskladi"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Ali ste prepričani, da želite nadaljevati?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Odstrani skladbe"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4516,12 +4342,12 @@ msgstr "Uvozi kupljeno glasbo"
msgid "Disconnect"
msgstr "Odklopi"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Odklapljanje {0} ..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "{0} ni bilo mogoče odklopiti: {1}"
@@ -4657,13 +4483,12 @@ msgstr "Združeno Kraljestvo (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Združene Države (amazon.com)"
-#. TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:44
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Iščite po trgovini Amazon MP3"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:46
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
msgstr "Kako z nakupom podpirate GNOME"
@@ -4699,12 +4524,8 @@ msgstr[2] "Združitev {0} izbranih diskov v eno knjigo?"
msgstr[3] "Združitev {0} izbranih diskov v eno knjigo?"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
-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 ""
-"To bo zagotovilo pravilno nastavitev vseh števil diskov in nato nastavilo "
-"avtorja in naslov knjige na vrednosti spodaj za vse skladbe na teh diskih"
+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 "To bo zagotovilo pravilno nastavitev vseh števil diskov in nato nastavilo avtorja in naslov knjige na vrednosti spodaj za vse skladbe na teh diskih"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:153
msgid "Author:"
@@ -4771,15 +4592,15 @@ msgstr "_Zaznaj"
msgid "T_ap"
msgstr "_Udarjaj"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:109
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Naj predvajalnik Banshee poskusi samodejno zaznati UNM te skladbe"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:110
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Predvajaj to skladbo"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr "Udarjajte gumb po ritmu za ročno določitev UNM skladbe"
@@ -4788,12 +4609,8 @@ msgid "_Automatically detect BPM for all songs"
msgstr "_Samodejno zaznaj UNM za vse skladbe"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
-msgid ""
-"Detect beats per minute (BPM) for all songs that don't already have a value "
-"set"
-msgstr ""
-"Zaznavanje ritma preko podatkov o udarcih na minuto (UNM) za vse skladbe "
-"brez že določene vrednosti"
+msgid "Detect beats per minute (BPM) for all songs that don't already have a value set"
+msgstr "Zaznavanje ritma preko podatkov o udarcih na minuto (UNM) za vse skladbe brez že določene vrednosti"
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
msgid "Downloading Cover Art"
@@ -4822,18 +4639,13 @@ msgstr "Nazaj"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
msgid ""
-"iTunes® 7 introduced new compatibility issues and currently only works with "
-"other iTunes® 7 clients.\n"
+"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n"
"\n"
-"No third-party clients can connect to iTunes® music shares anymore. This is "
-"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
-"the unfortunate inconvenience."
+"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience."
msgstr ""
-"Z iTunes® 7 so se pojavile težave združljivosti. Trenutno iTunes® 7 delujejo "
-"le z ostalimi odjemalci iTunes® 7.\n"
+"Z iTunes® 7 so se pojavile težave združljivosti. Trenutno iTunes® 7 delujejo le z ostalimi odjemalci iTunes® 7.\n"
"\n"
-"Odjemalci tretjih virov ne podpirajo povezav v iTunes® souporabo glasbe. To "
-"je namerna omejitev, ki jo je vpeljalo podjetje Apple v iTunes® 7."
+"Odjemalci tretjih virov ne podpirajo povezav v iTunes® souporabo glasbe. To je namerna omejitev, ki jo je vpeljalo podjetje Apple v iTunes® 7."
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
msgid "Common reasons for connection failures:"
@@ -4891,11 +4703,11 @@ msgstr "Prijava"
msgid "Connecting to {0}"
msgstr "Povezovanje z {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Dodaj oddaljen strežnik DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Doda nov oddaljen strežnik DAAP"
@@ -5024,26 +4836,16 @@ msgid "Duplicate Albums"
msgstr "Podvojeni albumi"
#: ../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 ""
-"Prikazani so albumi, ki jih je verjetno treba združiti. Za vsako vrstico "
-"kliknite na želeno ime da postane krepko ali odstranite oznako, če ne želite "
-"storiti ničesar."
+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 "Prikazani so albumi, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno ime da postane krepko ali odstranite oznako, če ne želite storiti ničesar."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
msgid "Duplicate Artists"
msgstr "Podvojeni izvajalci"
#: ../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 ""
-"Prikazani so izvajalci, ki jih je verjetno treba združiti. Za vsako vrstico "
-"kliknite na želeno ime, da postane krepko ali odstranite oznako, če ne "
-"želite storiti ničesar."
+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 "Prikazani so izvajalci, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno ime, da postane krepko ali odstranite oznako, če ne želite storiti ničesar."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
msgid "Fix Music Metadata..."
@@ -5066,13 +4868,8 @@ msgid "Duplicate Genres"
msgstr "Podvojene zvrsti"
#: ../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 ""
-"Prikazane so zvrsti, ki jih je verjetno treba združiti. Za vsako vrstico "
-"kliknite na želeno zvrst da postane krepka ali odstranite oznako, če ne "
-"želite storiti ničesar."
+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 "Prikazane so zvrsti, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno zvrst da postane krepka ali odstranite oznako, če ne želite storiti ničesar."
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
msgid " and "
@@ -5154,10 +4951,6 @@ msgstr "Napaka med pridobivanjem podrobnosti iz spletnega arhiva"
msgid "Description"
msgstr "Opis"
-#. Keep the table from needing to vertically scroll
-#. table.Child.SizeRequested += (o, a) => {
-#. table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
-#. };
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
msgid "Creator:"
msgstr "Ustvarjalec:"
@@ -5171,7 +4964,7 @@ msgid "Location:"
msgstr "Mesto:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:80
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
msgid "Date:"
msgstr "Datum:"
@@ -5184,7 +4977,7 @@ msgid "Publisher:"
msgstr "Založnik:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:174
msgid "Keywords:"
msgstr "Ključne besede:"
@@ -5260,16 +5053,16 @@ msgstr "{0} od {1} dne {2}"
msgid "Write your own review"
msgstr "Napišite mnenje"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Zbirka:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Izbirna poizvedba"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Razvrsti po:"
@@ -5360,16 +5153,8 @@ msgid "Examples:"
msgstr "Primeri:"
#: ../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 "
-"library, we provide free access to researchers, historians, scholars, and "
-"the general public."
-msgstr ""
-"Spletni arhiv, gradi digitalno knjižnico spletnih strani in drugih kulturnih "
-"značilnosti v digitalni obliki. Podobno kot papirnata knjižnica zagotavlja "
-"brezplačen dostop raziskovalcem, zgodovinarjem, učenjakom in splošni "
-"javnosti."
+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 library, we provide free access to researchers, historians, scholars, and the general public."
+msgstr "Spletni arhiv, gradi digitalno knjižnico spletnih strani in drugih kulturnih značilnosti v digitalni obliki. Podobno kot papirnata knjižnica zagotavlja brezplačen dostop raziskovalcem, zgodovinarjem, učenjakom in splošni javnosti."
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
msgid "Visit the Internet Archive online at archive.org"
@@ -5658,7 +5443,7 @@ msgstr "Uredi postajo"
msgid "Station"
msgstr "Postaja"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5667,15 +5452,15 @@ msgstr[1] "{0} postaja"
msgstr[2] "{0} postaji"
msgstr[3] "{0} postaje"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Vnesti je treba veljaven URI postaje"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Vnesti je treba zvrst postaje"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Vnesti je treba naslov postaje"
@@ -5687,87 +5472,84 @@ msgstr "Dodajanje nove radijske postaje"
msgid "Edit radio station"
msgstr "Urejanje radijske postaje"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:96
-msgid ""
-"Enter the Genre, Title and URL of the radio station you wish to add. A "
-"description is optional."
-msgstr ""
-"Vnesite zvrst, naslov in URL radijske postaje za dodajanje. Opis je poljuben."
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
+msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional."
+msgstr "Vnesite zvrst, naslov in URL radijske postaje za dodajanje. Opis je poljuben."
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:117
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
msgid "Station Genre:"
msgstr "Zvrst postaje:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:119
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
msgid "Station Name:"
msgstr "Ime postaje:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
msgid "Stream URL:"
msgstr "Naslov URL pretoka:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
msgid "Station Creator:"
msgstr "Ustvarjalec postaj:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:168
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:88
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:172
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
msgid "Description:"
msgstr "Opis:"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:127
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Ocena:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-msgid "Processed {0} of {1} tracks"
-msgstr "Obdelanih {0} posnetkov od {1}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Nastavitve vstavka Audioscrobbler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "Obišči spletno stran _uporabniškega profila"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Obisk strani profila Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "_Omogoči poročanje o skladbah s strani Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Omogočitev poročanja o skladbah s strani Banshee"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "_Omogoči poročanje o skladbah z naprave"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Omogočitev poročanja o skladbah z naprave"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-msgid "Scrobbling to Last.FM"
-msgstr "Pošiljanje seznama predvajane glasbe v Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Pridobivanje podatkov o predvajanju z naprave"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-msgid "Scrobbling to Last.FM..."
-msgstr "Pošiljanje seznama predvajane glasbe v Last.FM ..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Pridobivanje podatkov o predvajanju z naprave ..."
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Obdelovanje posnetka {0} od {1} ..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5825,28 +5607,28 @@ msgstr "Ogled strani te skladbe na Last.fm"
msgid "Recommend this track to someone"
msgstr "Priporoči to skladbo"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:152
+#: ../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/LastfmActions.cs:160
+#: ../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/LastfmActions.cs:168
+#: ../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/LastfmActions.cs:176
+#: ../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/LastfmActions.cs:184
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:49
#, csharp-format
msgid "http://en.wikipedia.org/wiki/{0}"
@@ -5867,12 +5649,8 @@ msgid "Sign up for Last.fm"
msgstr "Vpis v Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
-msgid ""
-"Open Last.fm in a browser, giving you the option to authorize Banshee to "
-"work with your account"
-msgstr ""
-"Odpre Last.fm v brskalniku in vam ponudi možnost pooblastitve predvajalnika "
-"Banshee za delo z računom"
+msgid "Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account"
+msgstr "Odpre Last.fm v brskalniku in vam ponudi možnost pooblastitve predvajalnika Banshee za delo z računom"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
@@ -5883,9 +5661,7 @@ msgstr "Prijava v Last.fm"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
msgid "You need to allow Banshee to access your Last.fm account."
-msgstr ""
-"Predvajalniku Banshee mora biti dodeljeno dovoljenje za dostop do računa "
-"Last.fm."
+msgstr "Predvajalniku Banshee mora biti dodeljeno dovoljenje za dostop do računa Last.fm."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304
msgid "Finish Logging In"
@@ -5900,19 +5676,19 @@ msgstr "V Last.fm ste prijavljeni kot uporabnik <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Odjava iz Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Nedavno priljubljene skladbe"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Nedavno predvajane skladbe"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Moji najljubši izvajalci"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} predvajanj"
@@ -6002,17 +5778,17 @@ msgstr "Izobči skladbo"
msgid "Mark current track as banned"
msgstr "Označi trenutno skladbo kot izobčeno"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:190
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
msgstr "Oboževalci {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:211
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
msgstr "Podobno {0}"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:242
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
msgstr "_Dodaj postajo"
@@ -6028,7 +5804,7 @@ msgstr "Število vseh predvajanj"
msgid "New Station"
msgstr "Nova postaja"
-#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:92
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
msgstr "_Vrsta postaje:"
@@ -6183,15 +5959,15 @@ msgstr "Pladenj hitrega dostopa do predstavnih datotek"
msgid "_Mini Mode"
msgstr "_Enostavni vmesnik"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:105
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:98
msgid "Full Mode"
msgstr "Polni način"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:128
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:121
msgid "Switch back to full mode"
msgstr "Preklop nazaj na polni način"
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:129
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:122
msgid "Change repeat playback mode"
msgstr "Spremeni način ponavljanja predvajanja"
@@ -6228,35 +6004,27 @@ msgstr "_Prikaži obvestila"
msgid "Show notifications when item changes"
msgstr "Prikaz obvestil ob spremembi predmeta"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:361
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:347
msgid "Still Running"
msgstr "Še vedno teče"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:362
-msgid ""
-"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
-"end your session."
-msgstr ""
-"Program Banshee je skrit v obvestilnem področju. Uporabite možnost "
-"<i>Končaj</i> za končanje programa."
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:500
-msgid "Previous"
-msgstr "Nazaj"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
+msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session."
+msgstr "Program Banshee je skrit v obvestilnem področju. Uporabite možnost <i>Končaj</i> za končanje programa."
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
msgid "Skip this item"
msgstr "Preskoči predmet"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:523
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:487
msgid "Cannot show notification"
msgstr "Obvestila ni mogoče prikazati"
#. 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:550
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:514
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6265,6 +6033,10 @@ msgstr ""
"{0}izvajalec{1} {2}\n"
"{0}album{1} {3}"
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
msgid "Simplify"
msgstr "Poenostavi"
@@ -6293,9 +6065,7 @@ msgstr "Zaganjanje pogona"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
#, csharp-format
-msgid ""
-"<i>{0}</i> is still being imported into the music library. Would you like to "
-"stop it?"
+msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?"
msgstr "<i>{0}</i> se uvaža v knjižnico. Ali želite postopek prekiniti?"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
@@ -6319,12 +6089,8 @@ msgid "_Automatically import audio CDs when inserted"
msgstr "_Samodejno uvažanje zvočnih CD-jev ob vstavitvi v pogon"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
-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 ""
-"Ob vstavitvi v pogon začne samodejno uvažanje CD-ja, če je mogoče najti "
-"metapodatke in CD še ni na voljo v knjižnici."
+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 "Ob vstavitvi v pogon začne samodejno uvažanje CD-ja, če je mogoče najti metapodatke in CD še ni na voljo v knjižnici."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
msgid "_Eject when done importing"
@@ -6339,12 +6105,8 @@ msgid "Use error correction when importing"
msgstr "Ob uvažanju uporabi popravljanje napak"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
-msgid ""
-"Error correction tries to work around problem areas on a disc, such as "
-"surface scratches, but will slow down importing substantially."
-msgstr ""
-"Popravljanje napak poskuša zaobiti območja diska, ki so poškodovana, vendar "
-"močno upočasni delovanje in uvoz glasbe."
+msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+msgstr "Popravljanje napak poskuša zaobiti območja diska, ki so poškodovana, vendar močno upočasni delovanje in uvoz glasbe."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
@@ -6373,8 +6135,7 @@ msgstr "Ni mogoče pridobiti podrobnosti skladbe"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
msgid "Automatic import off since this album is already in the Music Library."
-msgstr ""
-"Samodejno uvažanje je izključeno, ker je ta album že v glasbeni knjižnici."
+msgstr "Samodejno uvažanje je izključeno, ker je ta album že v glasbeni knjižnici."
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
msgid "Could not import CD"
@@ -6472,26 +6233,16 @@ msgstr "Poišči mapo glasbe iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
#, csharp-format
-msgid ""
-"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
-"not able to infer the location of this directory. Please locate it."
-msgstr ""
-"Knjižnica iTunes mapo z glasbo imenuje \"{0}\", vendar mesta te mape ni "
-"mogoče najti. Določiti jo je treba ročno."
+msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it."
+msgstr "Knjižnica iTunes mapo z glasbo imenuje \"{0}\", vendar mesta te mape ni mogoče najti. Določiti jo je treba ročno."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
msgid "iTunes Media Player"
msgstr "Predvajalnik iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
-msgid ""
-"Banshee is not familiar with this version of the iTunes library format. "
-"Importing may or may not work as expected, or at all. Would you like to "
-"attempt to import anyway?"
-msgstr ""
-"Predvajalnik Banshee ne pozna te različice zapisa knjižnice iTunes. Uvoz "
-"morda ne bo deloval po pričakovanjih ali pa sploh ne. Ali želite vseeno "
-"poskusiti z uvozom?"
+msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?"
+msgstr "Predvajalnik Banshee ne pozna te različice zapisa knjižnice iTunes. Uvoz morda ne bo deloval po pričakovanjih ali pa sploh ne. Ali želite vseeno poskusiti z uvozom?"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
@@ -6524,8 +6275,7 @@ msgstr "Predvajaj za"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
msgid "Add selected songs after the currently playing track, album, or artist"
-msgstr ""
-"Doda izbrane skladbe za trenutno predvajajočo se skladbo, album ali izvajalca"
+msgstr "Doda izbrane skladbe za trenutno predvajajočo se skladbo, album ali izvajalca"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
msgid "Current Track"
@@ -6533,9 +6283,7 @@ msgstr "Trenutna skladba"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
msgid "Add selected songs to the play queue after the currently playing song"
-msgstr ""
-"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajočo se "
-"skladbo"
+msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajočo se skladbo"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
msgid "Current Album"
@@ -6543,9 +6291,7 @@ msgstr "Trenutni album"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
msgid "Add selected songs to the play queue after the currently playing album"
-msgstr ""
-"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajoči se "
-"album"
+msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajoči se album"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
msgid "Current Artist"
@@ -6553,9 +6299,7 @@ msgstr "Trenutni izvajalec"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
msgid "Add selected songs to the play queue after the currently playing artist"
-msgstr ""
-"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajanega "
-"izvajalca"
+msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajanega izvajalca"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
@@ -6563,9 +6307,7 @@ msgstr "Osvežitev naključnih skladb v čakalni vrsti predvajanja"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
-msgstr ""
-"Naključno razporedi vrstni red predvajanja predmetov v čakalni vrsti "
-"predvajanja"
+msgstr "Naključno razporedi vrstni red predvajanja predmetov v čakalni vrsti predvajanja"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
@@ -6670,16 +6412,16 @@ msgstr[1] "{0} epizoda"
msgstr[2] "{0} epizodi"
msgstr[3] "{0} epizode"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:116
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nikoli posodobljeno"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:118
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:115
#, csharp-format
msgid "Updated at {0}"
msgstr "Posodobljeno ob {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:117
#, csharp-format
msgid "Updated {0}"
msgstr "Posodobljeno {0}"
@@ -6762,7 +6504,7 @@ msgstr "Obišči spletišče"
msgid "Add Podcast"
msgstr "Dodaj podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:268
#, csharp-format
msgid "Delete File"
msgid_plural "Delete Files"
@@ -6771,11 +6513,11 @@ msgstr[1] "Izbriši datoteko"
msgstr[2] "Izbriši datoteki"
msgstr[3] "Izbriši datoteke"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:352
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:350
msgid "Invalid URL"
msgstr "Neveljaven URL"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:353
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:351
msgid "Podcast URL is invalid."
msgstr "URL podcasta je neveljaven."
@@ -6783,71 +6525,67 @@ msgstr "URL podcasta je neveljaven."
msgid "Episode Details"
msgstr "Podrobnosti epizode"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
msgid "Check periodically for new episodes"
msgstr "Občasno preveri za nove epizode"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
-msgid ""
-"If checked, Banshee will check every hour to see if this podcast has new "
-"episodes"
-msgstr ""
-"Izbrana možnost določi, da predvajalnik Banshee vsako uro preveri ali so na "
-"podcastu na voljo nove epizode"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
+msgid "If checked, Banshee will check every hour to see if this podcast has new episodes"
+msgstr "Izbrana možnost določi, da predvajalnik Banshee vsako uro preveri ali so na podcastu na voljo nove epizode"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:105
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
msgid "Download new episodes"
msgstr "Prejmi nove epizode"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:112
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:137
msgid "Archive all episodes except the newest one"
msgstr "Arhiviraj vse epizode razen najnovejše"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:132
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
msgid "No description available"
msgstr "Opis ni na voljo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:152
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:156
msgid "Name:"
msgstr "Ime:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:153
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:157
msgid "Website:"
msgstr "Spletišče:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:159
msgid "Visit"
msgstr "Obišči"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:133
msgid "Subscription Options"
msgstr "Možnosti naročila"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:170
msgid "Feed URL:"
msgstr "Naslov URL vira:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:167
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
msgid "Last Refreshed:"
msgstr "Zadnjič osveženo:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:169
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:173
msgid "Category:"
msgstr "Kategorija:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:171
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:175
msgid "Copyright:"
msgstr "Avtorske pravice:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:76
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:128
msgid "URL:"
msgstr "Naslov URL:"
@@ -6857,8 +6595,7 @@ msgid "Subscribe to New Podcast"
msgstr "Naročilo na nov podcast"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
-msgid ""
-"Please enter the URL of the podcast to which you would like to subscribe."
+msgid "Please enter the URL of the podcast to which you would like to subscribe."
msgstr "Vnesite URL podcasta, na katerega se želite naročiti."
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
@@ -6965,22 +6702,22 @@ msgstr "kliknite"
msgid "menu"
msgstr "meni"
-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
msgstr "Skrij <i>{0}</i>"
#. Translators: {0} is substituted with the application name
-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+#: ../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:91
+#: ../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:135
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
msgid "An unhandled exception was thrown: "
msgstr "Nesprejeto izjemno dejanje: "
@@ -7136,15 +6873,15 @@ msgstr "se začne z"
msgid "ends with"
msgstr "se konča z"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:75
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Prijava v račun Last.fm"
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:78
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
msgid "Please enter your Last.fm account credentials."
msgstr "Vnesite uporabniške podatke računa Last.fm."
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
msgid "Save and Log In"
msgstr "Shrani in se prijavi"
@@ -7185,8 +6922,7 @@ msgid "The API key used by this application is invalid."
msgstr "Ključ API programa ni veljaven."
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
-msgid ""
-"The streaming system is offline for maintenance, please try again later."
+msgid "The streaming system is offline for maintenance, please try again later."
msgstr "Sistem pretoka ni na voljo zaradi vzdrževalnih del. Poskusite pozneje."
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
@@ -7211,9 +6947,7 @@ msgstr "Za to postajo ni dovolj sosedov."
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
msgid "This user is not allowed to listen to radio during peak usage"
-msgstr ""
-"Uporabniku ni dovoljeno poslušanje radijske postaje med največjimi "
-"obremenitvami povezave"
+msgstr "Uporabniku ni dovoljeno poslušanje radijske postaje med največjimi obremenitvami povezave"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
msgid "Radio station not found"
@@ -7228,12 +6962,8 @@ msgid "This type of request is no longer supported"
msgstr "Ta vrsta zahteve ni več podprta"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
-msgid ""
-"Your IP has made too many requests in a short period, exceeding our API "
-"guidelines"
-msgstr ""
-"Z vašega naslova IP je bilo podanih preveč zahtev v zelo kratkem času, kar "
-"presega določila API."
+msgid "Your IP has made too many requests in a short period, exceeding our API guidelines"
+msgstr "Z vašega naslova IP je bilo podanih preveč zahtev v zelo kratkem času, kar presega določila API."
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
msgid "There was an unknown error."
@@ -7269,8 +6999,18 @@ msgstr "Povezava z Last.fm"
msgid "Unknown Podcast"
msgstr "Neznan podcast"
-#~ msgid "Clear search"
-#~ msgstr "Počisti iskanje"
+#~ msgid "Volume"
+#~ msgstr "Glasnost"
+
+#~ msgid "Muted"
+#~ msgstr "Utišano"
+
+#~ msgid "Full Volume"
+#~ msgstr "Polna glasnost"
-#~ msgid "Banshee"
-#~ msgstr "Banshee"
+#~ msgid ""
+#~ "Last.fm username is invalid or Banshee is not authorized to access your "
+#~ "account."
+#~ msgstr ""
+#~ "Uporabniško ime za Last.fm je neveljavno ali pa predvajalnik Banshee ni "
+#~ "pooblaščen za dostop do računa."
diff --git a/po/sr.po b/po/sr.po
index ee8adeb..3d290dd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the banshee package.
# Maintainer: Горан Ракић <gox at devbase.net>
# urdated by: Милош Поповић <gpopac at gmail.com> (2009)
-# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011—2013.
+# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: banshee\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshe"
"e&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-16 23:07+0000\n"
-"PO-Revision-Date: 2013-04-02 09:27+0200\n"
+"POT-Creation-Date: 2012-09-04 17:57+0000\n"
+"PO-Revision-Date: 2012-09-07 10:04+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"Language: sr\n"
@@ -617,7 +617,7 @@ msgid "Audio Quality"
msgstr "Квалитет звука"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Медијски програм"
@@ -760,18 +760,18 @@ msgstr "Нема управљачког програма за откривање
msgid "Could not initialize GStreamer library"
msgstr "Не могу да покренем библиотеку Гстримера"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Непозната грешка"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Омогући исправљање појачања поновног пуштања"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -779,11 +779,11 @@ msgstr ""
"Аутоматски подешава јачину звука за песме које садрже податке појачања "
"поновног пуштања"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Без паузе из_међу песмама"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -800,7 +800,7 @@ msgstr "Не могу да створим преводиоца формата"
msgid "Could not create encoder pipeline : {0}"
msgstr "Не могу да направим спојку шифрера : {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "Гстример# 0.10"
@@ -811,6 +811,7 @@ msgstr "Не могу да направим спојку шифрера : {0}"
#. Translators: verb
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+#| msgid "_Import"
msgid "Import"
msgstr "Увези"
@@ -1257,87 +1258,91 @@ msgstr "Жанр"
msgid "Comment"
msgstr "Напомена"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "Непознат албум"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Непознат извођач"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Непознат албум"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Непознат наслов"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Разни извођачи"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Није пронађена путања до тока"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
msgid "File not found"
msgstr "Датотека није нађена"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Није доступан потребни кодек за пуштање ове врсте медија"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Датотека је заштићена правима на дигиталне формате (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Непозната грешка"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "Поново у_читај подемисију"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "Поново пу_сти аудиотеку"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "Поново пу_сти видео"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "Поново пу_сти песму"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "Поново пу_сти ставку"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Иди на пуштену подемисију"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Иди на пуштену аудиотеку"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Иди на пуштени видео"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Иди на пуштену песму"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Иди на пуштену ставку"
@@ -1460,7 +1465,7 @@ msgid "Scanning for media"
msgstr "Претражујем медијум"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Претражујем..."
@@ -1485,7 +1490,7 @@ msgstr "Увоз је у току. Да ли желите да га прекин
msgid "Importing {0} of {1}"
msgstr "Увозим {0} од {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Претражујем {0} од {1}"
@@ -1499,7 +1504,7 @@ msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr "Сачекајте док се стара база података не преведе на нови формат."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Освежавам податке о песмама"
@@ -1948,7 +1953,7 @@ msgstr "Обришите списак нумера"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Нови списак нумера"
@@ -2556,7 +2561,7 @@ msgstr "дрм"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
msgid "Unknown"
msgstr "Непознато"
@@ -2583,7 +2588,7 @@ msgid "Delete Smart Playlist"
msgstr "Обриши паметни списак нумера"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Сви жанрови ({0})"
@@ -3051,107 +3056,92 @@ msgid "Import a playlist"
msgstr "Увезите списак нумера"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Освежи Аудиотеку"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Освежава фасциклу Аудиотеке"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Отвори _место..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Отвара удаљену локацију из мреже"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Изађи"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Напушта Злослутницу"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Уређивање"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Поставке"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Измените ваша лична подешавања програма"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Алати"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Освежи Аудиотеку"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Освежава фасциклу Аудиотеке"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Радња поновног прегледања ће уклонити {0} песму из ваше музичке библиотеке."
-msgstr[1] ""
-"Радња поновног прегледања ће уклонити {0} песме из ваше музичке библиотеке."
-msgstr[2] ""
-"Радња поновног прегледања ће уклонити {0} песама из ваше музичке библиотеке."
-msgstr[3] ""
-"Радња поновног прегледања ће уклонити једну песму из ваше музичке библиотеке."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "По_моћ"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Садржај"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Напредна претрага Аудиотеке"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Нуди вам напредне начине за претрагу музичке и видео збирке"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Матична страница Злослутнице"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Посетите матичну страницу Злослутнице"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Укључите се"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Помозите развоју Злослутнице"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "По_даци о издању"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Прегледајте детаљне податке о издању и подешавању програма"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Увезите списак нумера"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Спискови нумера"
@@ -3541,14 +3531,6 @@ msgstr[1] "Да ли сигурно желите да уклоните {0} из
msgstr[2] "Да ли сигурно желите да уклоните {0} изабраних песама из ваше {1}?"
msgstr[3] "Да ли сигурно желите да уклоните ову песму из ваше {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Да ли сте сигурни да желите да наставите?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Уклони песме"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Извођач _компилације:"
@@ -3625,19 +3607,19 @@ msgstr "Поставите бројеве свих дискова и пресл
msgid "_Disc Number:"
msgstr "Број _диска:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Поставите све године на ову вредност"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Година:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Поставите све оцене на ову вредност"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Оцена:"
@@ -4314,39 +4296,29 @@ msgstr "Подржава омоте албума"
msgid "Supports photos"
msgstr "Подржава слике"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "Трајање песме је нула"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "Усаглашавам иПод"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Припремам за усаглашавање..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Додајем нумеру {0} од {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Освежавам метаподатке у нумери {0} од {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Уклањам нумеру {0} од {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Чистим, уклањам неисправну нумеру {0} од {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Записујем базу података медија"
@@ -4355,7 +4327,7 @@ msgstr "Записујем базу података медија"
msgid "Sync {0}"
msgstr "Усагласи {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Уређаји"
@@ -4364,31 +4336,31 @@ msgstr "Уређаји"
msgid "Device Properties"
msgstr "Особине уређаја"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Производ"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Продавац"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Учитавам {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Да"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Не"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4397,11 +4369,11 @@ msgstr ""
"Формат „{0}“ није подржан на овом уређају, а није пронађен претварач који би "
"га превео у други формат"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
msgid "File format conversion support is not available"
msgstr "Превођење овог формата датотеке још увек није подржано"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
msgid "Error converting file"
msgstr "Грешка прилико превођења датотеке"
@@ -4421,8 +4393,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Поставке усаглашавања"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+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.Gui/DapActions.cs:106
#, 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."
@@ -4431,9 +4407,13 @@ msgstr[1] "Усаглашавање ће уклонити {0} песме са в
msgstr[2] "Усаглашавање ће уклонити {0} песама са вашег уређаја."
msgstr[3] "Усаглашавање ће уклонити песму са вашег уређаја."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Усаглашавање"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Да ли сте сигурни да желите да наставите?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Уклони песме"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4506,12 +4486,12 @@ msgstr "Увези купљену музику"
msgid "Disconnect"
msgstr "Прекини везу"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Прекидам везу {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Не могу да прекинем везу {0}: {1}"
@@ -4886,11 +4866,11 @@ msgstr "Пријави ме"
msgid "Connecting to {0}"
msgstr "Повезујем се на {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Додај удаљени ДААП сервер"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Додајте нови удаљени ДААП сервер"
@@ -5649,7 +5629,7 @@ msgstr "Измени станицу"
msgid "Station"
msgstr "Станица"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5658,15 +5638,15 @@ msgstr[1] "{0} станице"
msgstr[2] "{0} станица"
msgstr[3] "Једна станица"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Унесите исправну адресу станице"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Унесите жанр за станицу"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Унесите назив станице"
@@ -5713,56 +5693,53 @@ msgstr "Опис:"
msgid "Rating:"
msgstr "Оцена:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-#| msgid "Processing track {0} of {1} ..."
-msgid "Processed {0} of {1} tracks"
-msgstr "Обрадио сам {0} од {1} нумерe"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Ласт.фм"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Подеси додатак за Аудиоскроблер"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "_Посети страницу профила"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Иди на мој Ласт.фм профил"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "Омогући изв_ештавање о песмама из Злослутнице"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Омогућава извештавање о песмама из Злослутнице"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "Омогући изв_ештавање о песмама са уређаја"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Омогућава извештавање о песмама са уређаја"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-#| msgid "Log in to Last.fm"
-msgid "Scrobbling to Last.FM"
-msgstr "Скроблујем на Ласт.ФМ"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Скробловање са уређаја"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-#| msgid "Scrobbling from device..."
-msgid "Scrobbling to Last.FM..."
-msgstr "Скроблујем на Ласт.ФМ..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Скробловање са уређаја..."
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Обрађујем нумеру {0} од {1} ..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5893,19 +5870,19 @@ msgstr "Пријављени сте на Ласт.фм као корисник <
msgid "Log out of Last.fm"
msgstr "Одјавите се са Ласт.фм-а"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Скорашње омиљене песме"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Скоро слушане песме"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Омиљени извођачи"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} слушање(а)"
@@ -7262,3 +7239,13 @@ msgstr "Повезани сте на Ласт.фм."
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:103
msgid "Unknown Podcast"
msgstr "Непозната подемисија"
+
+#~ msgid "Volume"
+#~ msgstr "Јачина звука"
+
+# bug(goran) plural
+#~ msgid "Muted"
+#~ msgstr "Утишано"
+
+#~ msgid "Full Volume"
+#~ msgstr "Најгласније"
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 8a3862c..69879e7 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the banshee package.
# Maintainer: Goran Rakić <gox at devbase.net>
# urdated by: Miloš Popović <gpopac at gmail.com> (2009)
-# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2011—2013.
+# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: banshee\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshe"
"e&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-16 23:07+0000\n"
-"PO-Revision-Date: 2013-04-02 09:27+0200\n"
+"POT-Creation-Date: 2012-09-04 17:57+0000\n"
+"PO-Revision-Date: 2012-09-07 10:04+0200\n"
"Last-Translator: Miroslav Nikolić <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"Language: sr\n"
@@ -617,7 +617,7 @@ msgid "Audio Quality"
msgstr "Kvalitet zvuka"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Medijski program"
@@ -760,18 +760,18 @@ msgstr "Nema upravljačkog programa za otkrivanje BPM podataka."
msgid "Could not initialize GStreamer library"
msgstr "Ne mogu da pokrenem biblioteku Gstrimera"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "Nepoznata greška"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "_Omogući ispravljanje pojačanja ponovnog puštanja"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -779,11 +779,11 @@ msgstr ""
"Automatski podešava jačinu zvuka za pesme koje sadrže podatke pojačanja "
"ponovnog puštanja"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "Bez pauze iz_među pesmama"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -800,7 +800,7 @@ msgstr "Ne mogu da stvorim prevodioca formata"
msgid "Could not create encoder pipeline : {0}"
msgstr "Ne mogu da napravim spojku šifrera : {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "Gstrimer# 0.10"
@@ -811,6 +811,7 @@ msgstr "Ne mogu da napravim spojku šifrera : {0}"
#. Translators: verb
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+#| msgid "_Import"
msgid "Import"
msgstr "Uvezi"
@@ -1257,87 +1258,91 @@ msgstr "Žanr"
msgid "Comment"
msgstr "Napomena"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "Nepoznat album"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Nepoznat izvođač"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Nepoznat album"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Nepoznat naslov"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Razni izvođači"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Nije pronađena putanja do toka"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
msgid "File not found"
msgstr "Datoteka nije nađena"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Nije dostupan potrebni kodek za puštanje ove vrste medija"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Datoteka je zaštićena pravima na digitalne formate (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Nepoznata greška"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "Ponovo u_čitaj podemisiju"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "Ponovo pu_sti audioteku"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "Ponovo pu_sti video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "Ponovo pu_sti pesmu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "Ponovo pu_sti stavku"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Idi na puštenu podemisiju"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Idi na puštenu audioteku"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Idi na pušteni video"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Idi na puštenu pesmu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Idi na puštenu stavku"
@@ -1460,7 +1465,7 @@ msgid "Scanning for media"
msgstr "Pretražujem medijum"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Pretražujem..."
@@ -1485,7 +1490,7 @@ msgstr "Uvoz je u toku. Da li želite da ga prekinete?"
msgid "Importing {0} of {1}"
msgstr "Uvozim {0} od {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Pretražujem {0} od {1}"
@@ -1499,7 +1504,7 @@ msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr "Sačekajte dok se stara baza podataka ne prevede na novi format."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Osvežavam podatke o pesmama"
@@ -1948,7 +1953,7 @@ msgstr "Obrišite spisak numera"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Novi spisak numera"
@@ -2556,7 +2561,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
msgid "Unknown"
msgstr "Nepoznato"
@@ -2583,7 +2588,7 @@ msgid "Delete Smart Playlist"
msgstr "Obriši pametni spisak numera"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Svi žanrovi ({0})"
@@ -3051,107 +3056,92 @@ msgid "Import a playlist"
msgstr "Uvezite spisak numera"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Osveži Audioteku"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Osvežava fasciklu Audioteke"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "Otvori _mesto..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Otvara udaljenu lokaciju iz mreže"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "_Izađi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Napušta Zloslutnicu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Uređivanje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Postavke"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Izmenite vaša lična podešavanja programa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Alati"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Osveži Audioteku"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Osvežava fasciklu Audioteke"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] ""
-"Radnja ponovnog pregledanja će ukloniti {0} pesmu iz vaše muzičke biblioteke."
-msgstr[1] ""
-"Radnja ponovnog pregledanja će ukloniti {0} pesme iz vaše muzičke biblioteke."
-msgstr[2] ""
-"Radnja ponovnog pregledanja će ukloniti {0} pesama iz vaše muzičke biblioteke."
-msgstr[3] ""
-"Radnja ponovnog pregledanja će ukloniti jednu pesmu iz vaše muzičke biblioteke."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Po_moć"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Sadržaj"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Napredna pretraga Audioteke"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Nudi vam napredne načine za pretragu muzičke i video zbirke"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Matična stranica Zloslutnice"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Posetite matičnu stranicu Zloslutnice"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Uključite se"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Pomozite razvoju Zloslutnice"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Po_daci o izdanju"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Pregledajte detaljne podatke o izdanju i podešavanju programa"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Uvezite spisak numera"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Spiskovi numera"
@@ -3541,14 +3531,6 @@ msgstr[1] "Da li sigurno želite da uklonite {0} izabrane pesme iz vaše {1}?"
msgstr[2] "Da li sigurno želite da uklonite {0} izabranih pesama iz vaše {1}?"
msgstr[3] "Da li sigurno želite da uklonite ovu pesmu iz vaše {1}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Da li ste sigurni da želite da nastavite?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Ukloni pesme"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Izvođač _kompilacije:"
@@ -3625,19 +3607,19 @@ msgstr "Postavite brojeve svih diskova i preslušavanja na ove vrednosti"
msgid "_Disc Number:"
msgstr "Broj _diska:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Postavite sve godine na ovu vrednost"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Godina:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Postavite sve ocene na ovu vrednost"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Ocena:"
@@ -4314,39 +4296,29 @@ msgstr "Podržava omote albuma"
msgid "Supports photos"
msgstr "Podržava slike"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "Trajanje pesme je nula"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "Usaglašavam iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "Pripremam za usaglašavanje..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Dodajem numeru {0} od {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Osvežavam metapodatke u numeri {0} od {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Uklanjam numeru {0} od {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Čistim, uklanjam neispravnu numeru {0} od {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "Zapisujem bazu podataka medija"
@@ -4355,7 +4327,7 @@ msgstr "Zapisujem bazu podataka medija"
msgid "Sync {0}"
msgstr "Usaglasi {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Uređaji"
@@ -4364,31 +4336,31 @@ msgstr "Uređaji"
msgid "Device Properties"
msgstr "Osobine uređaja"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Proizvod"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Prodavac"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "Učitavam {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Da"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Ne"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4397,11 +4369,11 @@ msgstr ""
"Format „{0}“ nije podržan na ovom uređaju, a nije pronađen pretvarač koji bi "
"ga preveo u drugi format"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
msgid "File format conversion support is not available"
msgstr "Prevođenje ovog formata datoteke još uvek nije podržano"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
msgid "Error converting file"
msgstr "Greška priliko prevođenja datoteke"
@@ -4421,8 +4393,12 @@ msgstr ""
msgid "Sync Preferences"
msgstr "Postavke usaglašavanja"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Usaglašavanje"
+
#. 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.Gui/DapActions.cs:106
#, 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."
@@ -4431,9 +4407,13 @@ msgstr[1] "Usaglašavanje će ukloniti {0} pesme sa vašeg uređaja."
msgstr[2] "Usaglašavanje će ukloniti {0} pesama sa vašeg uređaja."
msgstr[3] "Usaglašavanje će ukloniti pesmu sa vašeg uređaja."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Usaglašavanje"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Da li ste sigurni da želite da nastavite?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Ukloni pesme"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4506,12 +4486,12 @@ msgstr "Uvezi kupljenu muziku"
msgid "Disconnect"
msgstr "Prekini vezu"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Prekidam vezu {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Ne mogu da prekinem vezu {0}: {1}"
@@ -4886,11 +4866,11 @@ msgstr "Prijavi me"
msgid "Connecting to {0}"
msgstr "Povezujem se na {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Dodaj udaljeni DAAP server"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Dodajte novi udaljeni DAAP server"
@@ -5649,7 +5629,7 @@ msgstr "Izmeni stanicu"
msgid "Station"
msgstr "Stanica"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5658,15 +5638,15 @@ msgstr[1] "{0} stanice"
msgstr[2] "{0} stanica"
msgstr[3] "Jedna stanica"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Unesite ispravnu adresu stanice"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Unesite žanr za stanicu"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Unesite naziv stanice"
@@ -5713,56 +5693,53 @@ msgstr "Opis:"
msgid "Rating:"
msgstr "Ocena:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-#| msgid "Processing track {0} of {1} ..."
-msgid "Processed {0} of {1} tracks"
-msgstr "Obradio sam {0} od {1} numere"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Podesi dodatak za Audioskrobler"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "_Poseti stranicu profila"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Idi na moj Last.fm profil"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
msgid "_Enable Song Reporting From Banshee"
msgstr "Omogući izv_eštavanje o pesmama iz Zloslutnice"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
msgid "Enable song reporting From Banshee"
msgstr "Omogućava izveštavanje o pesmama iz Zloslutnice"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
msgid "_Enable Song Reporting From Device"
msgstr "Omogući izv_eštavanje o pesmama sa uređaja"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
msgid "Enable song reporting From Device"
msgstr "Omogućava izveštavanje o pesmama sa uređaja"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-#| msgid "Log in to Last.fm"
-msgid "Scrobbling to Last.FM"
-msgstr "Skroblujem na Last.FM"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Skroblovanje sa uređaja"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-#| msgid "Scrobbling from device..."
-msgid "Scrobbling to Last.FM..."
-msgstr "Skroblujem na Last.FM..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
+msgstr "Skroblovanje sa uređaja..."
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+msgid "Processing track {0} of {1} ..."
+msgstr "Obrađujem numeru {0} od {1} ..."
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
@@ -5893,19 +5870,19 @@ msgstr "Prijavljeni ste na Last.fm kao korisnik <i>{0}</i>."
msgid "Log out of Last.fm"
msgstr "Odjavite se sa Last.fm-a"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Skorašnje omiljene pesme"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Skoro slušane pesme"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Omiljeni izvođači"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} slušanje(a)"
@@ -7262,3 +7239,13 @@ msgstr "Povezani ste na Last.fm."
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:103
msgid "Unknown Podcast"
msgstr "Nepoznata podemisija"
+
+#~ msgid "Volume"
+#~ msgstr "Jačina zvuka"
+
+# bug(goran) plural
+#~ msgid "Muted"
+#~ msgstr "Utišano"
+
+#~ msgid "Full Volume"
+#~ msgstr "Najglasnije"
diff --git a/po/tr.po b/po/tr.po
index 30aad31..6ef5914 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,23 +3,22 @@
# This file is distributed under the same license as the banshee package.
#
# Hasan Yılmaz <iletisim at hasanyilmaz.net>, 2010.
-# Muhammet Kara <muhammetk at gmail.com>, 2011, 2012, 2013.
-#
+# Muhammet Kara <muhammetk at acikkaynak.name.tr>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Banshee\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-02 07:27+0000\n"
-"PO-Revision-Date: 2013-04-20 00:57+0300\n"
-"Last-Translator: Muhammet Kara <muhammetk at gmail.com>\n"
+"POT-Creation-Date: 2012-06-30 00:15+0000\n"
+"PO-Revision-Date: 2012-08-09 10:59+0000\n"
+"Last-Translator: Muhammet Kara <muhammetk at acikkaynak.name.tr>\n"
"Language-Team: Turkish <gnome-turk at gnome.org>\n"
-"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"Language: tr\n"
+"X-Generator: Lokalize 1.4\n"
#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
#: ../data/addin-xml-strings.cs:8
@@ -368,6 +367,7 @@ msgid "UPnP Client"
msgstr "UPnP İstemcisi"
#: ../data/addin-xml-strings.cs:169
+#| msgid "Browse and listen to music shared over your local network."
msgid ""
"Browse and play music and videos shared over your local network using UPnP."
msgstr ""
@@ -614,7 +614,7 @@ msgid "Audio Quality"
msgstr "Ses Kalitesi"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "Ortam Oynatıcı"
@@ -757,18 +757,18 @@ msgstr "BPM algılama sürücüsü oluşturulamadı."
msgid "Could not initialize GStreamer library"
msgstr "GStreamer kütüphanesi başlatılamadı"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
msgid "Unknown Error"
msgstr "Bilinmeyen Hata"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
msgid "_Enable ReplayGain correction"
msgstr "ReplayGain düzeltmesini _etkinleştir"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -776,11 +776,11 @@ msgstr ""
"ReplayGain verisi olan parçalar için kendiliğinden oynatma sesini ayarlar "
"(normalleştir)."
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
msgid "Enable _gapless playback"
msgstr "_Aralıksız çalma etkinleştir"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -797,7 +797,7 @@ msgstr "Kodlama değiştirici oluşturulamadı"
msgid "Could not create encoder pipeline : {0}"
msgstr "Kodlayıcı boru hattı oluşturulamadı : {0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -806,12 +806,6 @@ msgstr "GStreamer# 0.10"
msgid "Could not create encoding pipeline : {0}"
msgstr "Kodlama boru hattı oluşturulamadı : {0}"
-#. Translators: verb
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
-#| msgid "_Import"
-msgid "Import"
-msgstr "İçe Aktar"
-
#: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
msgid "Can't check for updates"
msgstr "Güncellemeler denetlenemiyor"
@@ -1257,87 +1251,91 @@ msgstr "Tür"
msgid "Comment"
msgstr "Açıklama"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "Bilinmeyen Albüm"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "Bilinmeyen Sanatçı"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "Bilinmeyen Albüm"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "Bilinmeyen Parça"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Çeşitli Sanatçılar"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Akış konumu bulunamadı"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
msgid "File not found"
msgstr "Dosya bulunamadı"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Bu ortam türünü çalmak için kodlayıcı mevcut değil"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Dosya Dijital Hak Yönetimi (DRM) ile korunmuş"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Bilinmeyen hata"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "Podcast'i _Yeniden Başlat"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "Sesli Kitabı _Yeniden Başlat"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "Videoyu _Yeniden Başlat"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "Şarkıyı _Yeniden Başlat"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "Öğeyi _Yeniden Başlat"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "Çalan Podcast'e _Atla"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "Çalan Sesli Kitaba _Atla"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "Çalan Videoya _Atla"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "Çalan Şarkıya _Atla"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "Çalan Öğeye _Atla"
@@ -1462,7 +1460,7 @@ msgid "Scanning for media"
msgstr "Ortam taranıyor"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "Taranıyor..."
@@ -1487,7 +1485,7 @@ msgstr "İçe aktarma işlemi şu an da devam ediyor. Durdurmak istiyor musunuz?
msgid "Importing {0} of {1}"
msgstr "İçe aktarılıyor {0} / {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Yeniden taranıyor {0} / {1}"
@@ -1501,7 +1499,7 @@ msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr "Eski Banshee veritabanı yeni biçime aktarılırken lütfen bekleyin."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "Üstveri Yenileniyor"
@@ -1587,6 +1585,7 @@ msgid "File Organization"
msgstr "Dosya Organizasyonu"
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
+#| msgid "Co_py files to media folders when importing"
msgid "Co_py files to media folder when importing"
msgstr "İçe aktarırken dosyaları ortam klasörüne ko_pyala"
@@ -1943,7 +1942,7 @@ msgstr "Çalma Listesini Sil"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Yeni Çalma Listesi"
@@ -2547,7 +2546,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
msgid "Unknown"
msgstr "Bilinmeyen"
@@ -2574,7 +2573,7 @@ msgid "Delete Smart Playlist"
msgstr "Akıllı Çalma Listesini Sil"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Tüm Türler ({0})"
@@ -2648,12 +2647,12 @@ msgstr "Klasör sıra _düzeni"
msgid "File _name"
msgstr "Dosya _adı"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:703
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "{2} içine {0} / {1} ekleniyor"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:722
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "{2} içinden {0} / {1} siliniyor"
@@ -2905,6 +2904,10 @@ msgstr "Sıradışı Çoklu Ortam Yönetimi ve Oynatma"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
#, csharp-format
+#| msgid ""
+#| "Copyright © 2005–{0} Novell, Inc.\n"
+#| "Copyright © 2005–{0} Others\n"
+#| "Copyright © 2005 Aaron Bockover"
msgid ""
"Copyright © 2005–{0} Novell, Inc.\n"
"Copyright © 2005–{1} Others\n"
@@ -2962,7 +2965,7 @@ msgid "Make Banshee the Default"
msgstr "Banshee Öntanımlı Olsun"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "İçe _aktar"
@@ -3020,102 +3023,92 @@ msgid "Import a playlist"
msgstr "Bir çalma listesi al"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "Müzik Kütüphanesini Yeniden Tara"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "Müzik Kütüphanesi klasörünü yeniden tara"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "_Konum Aç..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "Oynatma için uzak bir yer aç"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "Çı_k"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "Banshee'den Çık"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "_Düzenle"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "_Tercihler"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "Kişisel tercihlerinizi değiştirin"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "_Araçlar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "Müzik Kütüphanesini Yeniden Tara"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "Müzik Kütüphanesi klasörünü yeniden tara"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, 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."
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "Yeniden tarama işlemi {0} parçayı müzik kütüphanenizden silecek."
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Yardım"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_İçindekiler"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Gelişmiş Koleksiyon Arama"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Ortam koleksiyonunuzu aramanın gelişmiş yollarını öğrenin"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Banshee _Ana Sayfa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Banshee Ana Sayfasını Ziyaret Edin"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Dahil Ol"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Banshee geliştiricisi olun"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Sürüm Bilgisi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Ayrıntılı sürümü ve yapılandırma bilgisini görüntüle"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "Çalma Listesini Al"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Çalma Listeleri"
@@ -3501,14 +3494,6 @@ msgid_plural ""
"Are you sure you want to remove the selected {0} items from your {1}?"
msgstr[0] "Seçilen {0} öğeyi {1} içinden kaldırmak istediğinize emin misiniz?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "Devam etmek istediğinize emin misiniz?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "Parçaları sil"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "Albüm Sanatçısı _Derlemesi:"
@@ -3588,19 +3573,19 @@ msgstr "Tüm disk numaralarını ve sayımlarını bu değerlere ayarla"
msgid "_Disc Number:"
msgstr "_Disk Numarası:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "Tüm yılları bu değere ayarla"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "_Yıl:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "Tüm değerlendirmeleri bu değere ayarla"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "_Değerlendirme:"
@@ -4117,10 +4102,12 @@ msgid "Configure the filters available in the browser"
msgstr "Tarayıcıdaki kullanılabilir filtreleri yapılandır"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
+#| msgid "Show Year Filter"
msgid "Show Artist Filter"
msgstr "Sanatçı Filtresini Göster"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
+#| msgid "Show a list of years to filter by"
msgid "Show a list of artists to filter by"
msgstr "Filtreleme için bir sanatçı listesi göster"
@@ -4194,6 +4181,7 @@ msgstr "Sayfa engelleniyor çünkü muhtemelen aradığınız sayfa bu değil!"
#. Translators: {0} is the URL of the web page that was requested
#: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
#, csharp-format
+#| msgid "The specified resource is invalid."
msgid "The security certificate for {0} is invalid."
msgstr "{0} sayfasının güvenlik sertifikası geçersiz."
@@ -4231,6 +4219,18 @@ msgstr "Bağlanılıyor..."
msgid "Buffering"
msgstr "Tamponlanıyor"
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+msgid "Volume"
+msgstr "Ses Seviyesi"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+msgid "Muted"
+msgstr "Sessiz"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+msgid "Full Volume"
+msgstr "Son Ses"
+
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
msgid "Device"
msgstr "Aygıt"
@@ -4267,41 +4267,29 @@ msgstr "Albüm kapağını destekler"
msgid "Supports photos"
msgstr "Fotoğrafları destekler"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463
msgid "Track duration is zero"
msgstr "Parça süresi sıfır"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:569
msgid "Syncing iPod"
msgstr "iPod Eşleniyor"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
msgid "Preparing to synchronize..."
msgstr "Eşlemeye hazırlanılıyor..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:573
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Parça ekleniyor {0} / {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-#| msgid "Adding track {0} of {1}"
-msgid "Updating metadata in track {0} of {1}"
-msgstr "Parça üst bilgisi güncelleniyor {0} / {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:609
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Parça kaldırılıyor {0} / {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-#| msgid "Removing track {0} of {1}"
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "Temizlik yapılıyor, parça kaldırılıyor {0} / {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:662
msgid "Writing media database"
msgstr "Ortam veritabanı yazılıyor"
@@ -4310,7 +4298,7 @@ msgstr "Ortam veritabanı yazılıyor"
msgid "Sync {0}"
msgstr "Eşle {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "Aygıtlar"
@@ -4319,31 +4307,31 @@ msgstr "Aygıtlar"
msgid "Device Properties"
msgstr "Aygıt Özellikleri"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "Ürün"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "Sağlayıcı"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "{0} Yükleniyor"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Evet"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Hayır"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4352,11 +4340,11 @@ msgstr ""
"{0} biçimi aygıt tarafından desteklenmiyor ve dönüştürmek için bir "
"dönüştürücü bulunamadı"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
msgid "File format conversion support is not available"
msgstr "Dosya biçimi dönüştürme desteği kullanılır değil"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
msgid "Error converting file"
msgstr "Dosya dönüştürülürken hata"
@@ -4374,16 +4362,24 @@ msgstr "Aygıt takılınca ya da kütüphaneler değiştiğinde hemen eşlemeye
msgid "Sync Preferences"
msgstr "Eşleme Tercihleri"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+msgstr "Eşle"
+
#. 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.Gui/DapActions.cs:106
#, 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."
msgstr[0] "Eşleme işlemi {0} parçayı aygıttan silecek."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "Eşle"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "Devam etmek istediğinize emin misiniz?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "Parçaları sil"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4456,12 +4452,12 @@ msgstr "Satın alınan Müziği İçe Aktar"
msgid "Disconnect"
msgstr "Bağlantıyı Kes"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "Bağlantı Kesilen {0}..."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "Bağlantısı kesilemeyen {0}: {1}"
@@ -4821,11 +4817,11 @@ msgstr "Oturum Aç"
msgid "Connecting to {0}"
msgstr "Bağlanılıyor, {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "Uzaktaki DAAP Sunucusu Ekle"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "Yeni bir uzaktaki DAAP sunucusu ekle"
@@ -5273,6 +5269,7 @@ msgid "Library of Congress"
msgstr "Kongre Kütüphanesi"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+#| msgid "Sample"
msgid "Examples:"
msgstr "Örnekler:"
@@ -5572,21 +5569,21 @@ msgstr "İstasyon Ekle"
msgid "Station"
msgstr "İstasyon"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} istasyon"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Lütfen geçerli bir istasyon URI'si sağlayın"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Lütfen bir istasyon türü sağlayın"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Lütfen bir istasyon başlığı sağlayın"
@@ -5633,59 +5630,59 @@ msgstr "Açıklama:"
msgid "Rating:"
msgstr "Değerlendirme:"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:84
-#, csharp-format
-#| msgid "Processing track {0} of {1} ..."
-msgid "Processed {0} of {1} tracks"
-msgstr "{1} parçadan {0}'i işlendi"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:137
msgid "Configure the Audioscrobbler plugin"
msgstr "Audioscrobbler eklentisini yapılandır"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
msgid "Visit _User Profile Page"
msgstr "_Kullanıcı Profili Sayfasına Git"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:141
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:172
msgid "Visit Your Last.fm Profile Page"
msgstr "Last.fm Profil Sayfanıza Gidin"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Banshee"
msgstr "Banshee'den Şarkı Bildirimini _Etkinleştir"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Banshee"
msgstr "Banshee'den şarkı bildirimini etkinleştir"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:162
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+#| msgid "_Enable Song Reporting"
msgid "_Enable Song Reporting From Device"
msgstr "Aygıttan Şarkı Bildirimini _Etkinleştir"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:163
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+#| msgid "Enable song reporting"
msgid "Enable song reporting From Device"
msgstr "Aygıttan şarkı bildirimini etkinleştir"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:450
-#, fuzzy
-#| msgid "Log in to Last.fm"
-msgid "Scrobbling to Last.FM"
-msgstr "Last.fm'de oturum aç"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+msgid "Scrobbling from device"
+msgstr "Aygıttan veri toplanıyor"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:451
-#, fuzzy
-#| msgid "Scrobbling from device..."
-msgid "Scrobbling to Last.FM..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+msgid "Scrobbling from device..."
msgstr "Aygıttan veri toplanıyor..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+#, csharp-format
+#| msgid "Removing track {0} of {1}"
+msgid "Processing track {0} of {1} ..."
+msgstr "{1} parçadan {0}'ncisi işleniyor..."
+
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
msgid "Connect"
msgstr "Bağlan"
@@ -5815,19 +5812,19 @@ msgstr "Last.fm'e <i>{0}</i> kullanıcısı ile giriş yapmışsınız."
msgid "Log out of Last.fm"
msgstr "Last.fm'den çık"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "Son Sevilen Parçalar"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "Son Çalınan Parçalar"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "Tuttuğum Sanatçılar"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} çalma"
@@ -6314,6 +6311,7 @@ msgstr "İçe Aktar ‟{0}”"
#. Translators: {0} is the type of disc, "Audio CD" or "DVD"
#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
#, csharp-format
+#| msgid "Disconnecting {0}..."
msgid "Ejecting {0}..."
msgstr "{0} çıkartılıyor..."
@@ -6495,11 +6493,11 @@ msgstr "Çalma kuyruğunu çıkarken temizle"
msgid "Remove From Play Queue"
msgstr "Çalma Kuyruğundan Kaldır"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
msgid "Number of _played songs to show"
msgstr "Gösterilecek _çalınan parçaların sayısını göster"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:971
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
msgid "Number of _upcoming songs to show"
msgstr "_Gelecek parçaların sayısını göster"
@@ -6830,6 +6828,7 @@ msgid "Track Preview"
msgstr "Parça Önizlemesi"
#: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPContainerSource.cs:39
+#| msgid "Shared Music"
msgid "Shared Media"
msgstr "Paylaşılan Ortam"
@@ -7113,6 +7112,7 @@ msgstr ""
"Bu kullanıcının yoğun kullanım sırasında radyo dinlemesine izin verilmiyor"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
+#| msgid "Stream location not found"
msgid "Radio station not found"
msgstr "Radyo istasyonu bulunamadı"
@@ -7166,18 +7166,6 @@ msgstr "Last.fm'e bağlanıldı."
msgid "Unknown Podcast"
msgstr "Bilinmeyen Podcast"
-#~ msgid "Volume"
-#~ msgstr "Ses Seviyesi"
-
-#~ msgid "Muted"
-#~ msgstr "Sessiz"
-
-#~ msgid "Full Volume"
-#~ msgstr "Son Ses"
-
-#~ msgid "Scrobbling from device"
-#~ msgstr "Aygıttan veri toplanıyor"
-
#~ msgid "Dvd"
#~ msgstr "Dvd"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index da2c2b7..ac89d86 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: Banshee 2.3.6\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-25 00:16+0000\n"
-"PO-Revision-Date: 2013-01-30 11:20+0800\n"
+"POT-Creation-Date: 2012-08-25 10:08+0000\n"
+"PO-Revision-Date: 2012-08-29 18:03+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
"Language: \n"
@@ -590,7 +590,7 @@ msgid "Audio Quality"
msgstr "音訊品質"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "媒體播放程式"
@@ -733,28 +733,28 @@ msgstr "無法建立 BPM 偵測驅動程式。"
msgid "Could not initialize GStreamer library"
msgstr "無法初始化 GStreamer 函式庫"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "未知的錯誤"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "啟用回放增益校正(_E)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
msgstr "對於含有 ReplayGain 資料的曲目，自動縮放 (正規化) 播放音量。"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "啟用無縫播放(_G)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -769,7 +769,7 @@ msgstr "無法建立編碼轉換器"
msgid "Could not create encoder pipeline : {0}"
msgstr "無法建立編碼器管線：{0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -1213,87 +1213,91 @@ msgstr "曲風"
msgid "Comment"
msgstr "備註"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "未知的專輯"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "未知的演出者"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "未知的專輯"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "未知的標題"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "各類演出者"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "找不到串流位置"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
msgid "File not found"
msgstr "找不到檔案"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "用來播放此媒體類型的編解碼器不可用"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "檔案受數碼權利管理 (DRM) 保護"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "未知錯誤"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "重新播放 Podcast(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "重新播放有聲書(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "重新播放影片(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "重新播放歌曲(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "重新播放項目(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "跳至播放中 Podcast(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "跳至播放中有聲書(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "跳到播放影片(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "跳到播放中的曲目(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "跳至播放中項目(_J)"
@@ -1415,7 +1419,7 @@ msgid "Scanning for media"
msgstr "掃描媒體"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "掃描中…"
@@ -1440,7 +1444,7 @@ msgstr "匯入程序目前正在執行。你想要停止嗎？"
msgid "Importing {0} of {1}"
msgstr "正在匯入 {0} / {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "正在重新掃描 {1} 的 {0}"
@@ -1454,7 +1458,7 @@ msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr "在你的舊 Banshee 資料庫轉移到新格式時請稍候。"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "重新整理中繼資料"
@@ -1887,7 +1891,7 @@ msgstr "刪除播放清單"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "新的播放清單"
@@ -2491,7 +2495,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
msgid "Unknown"
msgstr "未知"
@@ -2518,7 +2522,7 @@ msgid "Delete Smart Playlist"
msgstr "刪除智慧型播放清單"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "全部曲風 ({0})"
@@ -2962,101 +2966,92 @@ msgid "Import a playlist"
msgstr "匯入播放清單"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "重新掃描音樂庫"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "重新掃描音樂庫資料夾"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "開啟位置(_L)…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "播放開啟的遠端位置"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "退出 Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "偏好設定(_P)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "修改你的個人偏好設定"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "工具(_T)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "重新掃描音樂庫"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "重新掃描音樂庫資料夾"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "該重新掃描操作將從你的音樂庫中移除一首曲目。"
-msgstr[1] "該重新掃描操作將從你的音樂庫中移除 {0} 首曲目。"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "求助(_H)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "內容(_C)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "進階收藏搜尋功能"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "學習進階的方式來搜尋你的媒體收藏"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Bans_hee 首頁"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "拜訪 Banshee 首頁"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "參與我們(_G)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "成為 Banshee 的貢獻者"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "版本資訊(_V)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "檢視版本細節與配置資訊"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "匯入播放清單"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "播放清單"
@@ -3440,14 +3435,6 @@ msgid_plural ""
msgstr[0] "你確定要從 {1} 中移除選取的項目？"
msgstr[1] "你確定要從 {1} 中移除選取的 {0} 個項目？"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "你確定要繼續嗎？"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "移除曲目"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "專輯合集演出者(_P)："
@@ -3522,19 +3509,19 @@ msgstr "以這些值設定所有磁碟編號與計數"
msgid "_Disc Number:"
msgstr "光碟編號(_D)："
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "以此值設定所有年份"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "年份(_Y)："
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "以此值設定所有評等"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "評等(_R)："
@@ -4196,39 +4183,29 @@ msgstr "支援封面插圖"
msgid "Supports photos"
msgstr "支援的相片"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "曲目長度為零"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "正在同步 iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "正在準備同步化…"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "正在加入 {1} 中的 {0}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "正在更新曲目 {0} / {1} 的中介資料"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "正在匯入曲目 {0} / {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "正在清理、移除無效的曲目 {0} / {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "正在寫入媒體資料庫"
@@ -4237,7 +4214,7 @@ msgstr "正在寫入媒體資料庫"
msgid "Sync {0}"
msgstr "同步 {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "裝置"
@@ -4246,42 +4223,42 @@ msgstr "裝置"
msgid "Device Properties"
msgstr "裝置屬性"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "產品"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "廠商"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "正在載入 {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "是"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "否"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
"convert it"
msgstr "此裝置不支援 {0} 格式，而且也找不到轉換器來轉換它"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
msgid "File format conversion support is not available"
msgstr "無法使用檔案格式轉換支援"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
msgid "Error converting file"
msgstr "轉換檔案時發生錯誤"
@@ -4299,17 +4276,25 @@ msgstr "當連接此裝置或音樂館有改變時儘快開始同步。"
msgid "Sync Preferences"
msgstr "同步偏好設定"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+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.Gui/DapActions.cs:106
#, 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."
msgstr[0] "該同步操作將從你的裝置移除一首曲目。"
msgstr[1] "該同步操作將從你的裝置移除 {0} 首曲目。"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "同步"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "你確定要繼續嗎？"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "移除曲目"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4382,12 +4367,12 @@ msgstr "匯入購買的音樂"
msgid "Disconnect"
msgstr "斷線"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "正在與 {0} 中斷連接…"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "無法與 {0} 中斷連接：{1}"
@@ -4742,11 +4727,11 @@ msgstr "登入"
msgid "Connecting to {0}"
msgstr "連線到 {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "加入遠端 DAAP 伺服器"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "加入新的遠端 DAAP 伺服器"
@@ -5484,22 +5469,22 @@ msgstr "編輯電臺"
msgid "Station"
msgstr "電臺"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} 電臺"
msgstr[1] "{0} 電臺"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../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:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "請提供電臺曲風"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "請提供電臺標題"
@@ -5719,19 +5704,19 @@ msgstr "你已登入 Last.fm，使用者身分為 <i>{0}</i>。"
msgid "Log out of Last.fm"
msgstr "登出 Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "最近喜愛的曲目"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "最近播放的曲目"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "我的最佳演出者"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} 次播放"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2c4dad0..be8f8a4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: Banshee 2.3.6\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-25 00:16+0000\n"
-"PO-Revision-Date: 2013-01-28 12:25+0800\n"
+"POT-Creation-Date: 2012-08-25 10:08+0000\n"
+"PO-Revision-Date: 2012-08-25 20:54+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
"Language-Team: Chinese (Taiwan) <chinese-l10n at googlegroups.com>\n"
"Language: \n"
@@ -604,7 +604,7 @@ msgid "Audio Quality"
msgstr "音訊品質"
#: ../data/desktop-files/common.desktop.in.h:1
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
msgid "Media Player"
msgstr "媒體播放程式"
@@ -747,28 +747,28 @@ msgstr "無法建立 BPM 偵測驅動程式。"
msgid "Could not initialize GStreamer library"
msgstr "無法初始化 GStreamer 函式庫"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:510
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:566
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
msgid "Unknown Error"
msgstr "未知的錯誤"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:883
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:989
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
msgid "_Enable ReplayGain correction"
msgstr "啟用回放增益校正(_E)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:884
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:990
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
msgstr "對於含有 ReplayGain 資料的曲目，自動縮放 (正規化) 播放音量。"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:889
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
msgid "Enable _gapless playback"
msgstr "啟用無縫播放(_G)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:890
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
@@ -783,7 +783,7 @@ msgstr "無法建立編碼轉換器"
msgid "Could not create encoder pipeline : {0}"
msgstr "無法建立編碼器管線：{0}"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:811
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -1230,87 +1230,91 @@ msgstr "曲風"
msgid "Comment"
msgstr "備註"
-#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-msgid "Unknown Album"
-msgstr "未知的專輯"
-
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:138
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:101
msgid "Unknown Artist"
msgstr "未知的演出者"
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:45
+#: ../src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs:40
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:102
+msgid "Unknown Album"
+msgstr "未知的專輯"
+
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
msgid "Unknown Title"
msgstr "未知的標題"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:192
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "各類演出者"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "找不到串流位置"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
msgid "File not found"
msgstr "找不到檔案"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:350
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "用來播放此媒體類型的編解碼器不可用"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:352
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "檔案受數位權利管理 (DRM) 保護"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:354
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "未知錯誤"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "重新播放 Podcast(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "重新播放有聲書(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "重新播放影片(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "重新播放歌曲(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:427
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "重新播放項目(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "跳至播放中 Podcast(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "跳至播放中有聲書(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "跳到播放影片(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "跳到播放中的曲目(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:447
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "跳至播放中項目(_J)"
@@ -1432,7 +1436,7 @@ msgid "Scanning for media"
msgstr "掃描媒體"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1423
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
msgid "Scanning..."
msgstr "掃描中…"
@@ -1457,7 +1461,7 @@ msgstr "匯入程序目前正在執行。您想要停止嗎？"
msgid "Importing {0} of {1}"
msgstr "正在匯入 {0} / {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "正在重新掃描 {1} 的 {0}"
@@ -1471,7 +1475,7 @@ msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr "在您的舊 Banshee 資料庫轉移到新格式時請稍候。"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1420
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
msgid "Refreshing Metadata"
msgstr "重新整理中繼資料"
@@ -1904,7 +1908,7 @@ msgstr "刪除播放清單"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "新的播放清單"
@@ -2508,7 +2512,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
msgid "Unknown"
msgstr "未知"
@@ -2535,7 +2539,7 @@ msgid "Delete Smart Playlist"
msgstr "刪除智慧型播放清單"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:149
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "全部曲風 ({0})"
@@ -2984,101 +2988,92 @@ msgid "Import a playlist"
msgstr "匯入播放清單"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
+msgid "Rescan Music Library"
+msgstr "重新掃描音樂庫"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+msgid "Rescan the Music Library folder"
+msgstr "重新掃描音樂庫資料夾"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
msgstr "開啟位置(_L)…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
msgid "Open a remote location for playback"
msgstr "播放開啟的遠端位置"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:65
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
msgid "Quit Banshee"
msgstr "退出 Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
msgid "_Preferences"
msgstr "偏好設定(_P)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:80
msgid "Modify your personal preferences"
msgstr "修改您的個人偏好設定"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
msgid "_Tools"
msgstr "工具(_T)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:81
-msgid "Rescan Music Library"
-msgstr "重新掃描音樂庫"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:82
-msgid "Rescan the Music Library folder"
-msgstr "重新掃描音樂庫資料夾"
-
-#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
-#, csharp-format
-msgid "The rescan operation will remove one track from your music library."
-msgid_plural ""
-"The rescan operation will remove {0} tracks from your music library."
-msgstr[0] "該重新掃描操作將從您的音樂庫中移除一首曲目。"
-msgstr[1] "該重新掃描操作將從您的音樂庫中移除 {0} 首曲目。"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "求助(_H)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "內容(_C)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:106
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "進階收藏搜尋功能"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "學習進階的方式來搜尋您的媒體收藏"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Bans_hee 首頁"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "拜訪 Banshee 首頁"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "參與我們(_G)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "成為 Banshee 的貢獻者"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "版本資訊(_V)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "檢視版本細節與配置資訊"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:171
msgid "Import Playlist"
msgstr "匯入播放清單"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:172
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "播放清單"
@@ -3462,14 +3457,6 @@ msgid_plural ""
msgstr[0] "您確定要從 {1} 中移除選取的項目？"
msgstr[1] "您確定要從 {1} 中移除選取的 {0} 個項目？"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:645
-msgid "Are you sure you want to continue?"
-msgstr "您確定要繼續嗎？"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:656
-msgid "Remove tracks"
-msgstr "移除曲目"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
msgid "Com_pilation Album Artist:"
msgstr "專輯合集演出者(_P)："
@@ -3546,19 +3533,19 @@ msgstr "以這些值設定所有磁碟編號與計數"
msgid "_Disc Number:"
msgstr "光碟編號(_D)："
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
msgstr "以此值設定所有年份"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
msgid "_Year:"
msgstr "年份(_Y)："
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
msgid "Set all ratings to this value"
msgstr "以此值設定所有評等"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
msgid "_Rating:"
msgstr "評等(_R)："
@@ -4222,39 +4209,29 @@ msgstr "支援封面插圖"
msgid "Supports photos"
msgstr "支援的相片"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
msgid "Track duration is zero"
msgstr "曲目長度為零"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
msgid "Syncing iPod"
msgstr "正在同步 iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
msgid "Preparing to synchronize..."
msgstr "正在準備同步化…"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "正在加入 {1} 中的 {0}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:620
-#, csharp-format
-msgid "Updating metadata in track {0} of {1}"
-msgstr "正在更新曲目 {0} / {1} 的中介資料"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:640
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "正在匯入曲目 {0} / {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:670
-#, csharp-format
-msgid "Cleaning up, removing invalid track {0} of {1}"
-msgstr "正在清理、移除無效的曲目 {0} / {1}"
-
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:717
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
msgid "Writing media database"
msgstr "正在寫入媒體資料庫"
@@ -4263,7 +4240,7 @@ msgstr "正在寫入媒體資料庫"
msgid "Sync {0}"
msgstr "同步 {0}"
-#. This group source gives us a separator for DAPs in the source view.
+#. This group source gives us a seperator for DAPs in the source view.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:64
msgid "Devices"
msgstr "裝置"
@@ -4272,42 +4249,42 @@ msgstr "裝置"
msgid "Device Properties"
msgstr "裝置屬性"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
msgid "Product"
msgstr "產品"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
msgid "Vendor"
msgstr "廠商"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
#, csharp-format
msgid "Loading {0}"
msgstr "正在載入 {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "是"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "否"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
"convert it"
msgstr "此裝置不支援 {0} 格式，而且也找不到轉換器來轉換它"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
msgid "File format conversion support is not available"
msgstr "無法使用檔案格式轉換支援"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
msgid "Error converting file"
msgstr "轉換檔案時發生錯誤"
@@ -4325,17 +4302,25 @@ msgstr "當連接此裝置或音樂館有改變時儘快開始同步。"
msgid "Sync Preferences"
msgstr "同步偏好設定"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
+msgid "Sync"
+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.Gui/DapActions.cs:106
#, 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."
msgstr[0] "該同步操作將從您的裝置移除一首曲目。"
msgstr[1] "該同步操作將從您的裝置移除 {0} 首曲目。"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:53
-msgid "Sync"
-msgstr "同步"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:110
+msgid "Are you sure you want to continue?"
+msgstr "您確定要繼續嗎？"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
+msgid "Remove tracks"
+msgstr "移除曲目"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
@@ -4408,12 +4393,12 @@ msgstr "匯入購買的音樂"
msgid "Disconnect"
msgstr "斷線"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
#, csharp-format
msgid "Disconnecting {0}..."
msgstr "正在與 {0} 中斷連接…"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
#, csharp-format
msgid "Could not disconnect {0}: {1}"
msgstr "無法與 {0} 中斷連接：{1}"
@@ -4771,11 +4756,11 @@ msgstr "登入"
msgid "Connecting to {0}"
msgstr "連線到 {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
msgid "Add Remote DAAP Server"
msgstr "加入遠端 DAAP 伺服器"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
msgid "Add a new remote DAAP server"
msgstr "加入新的遠端 DAAP 伺服器"
@@ -5522,22 +5507,22 @@ msgstr "編輯電臺"
msgid "Station"
msgstr "電臺"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} 電臺"
msgstr[1] "{0} 電臺"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../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:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "請提供電臺曲風"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "請提供電臺標題"
@@ -5757,19 +5742,19 @@ msgstr "您已登入 Last.fm，使用者身分為 <i>{0}</i>。"
msgid "Log out of Last.fm"
msgstr "登出 Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:150
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
msgstr "最近喜愛的曲目"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
msgid "Recently Played Tracks"
msgstr "最近播放的曲目"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
msgid "My Top Artists"
msgstr "我的最佳演出者"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:238
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:211
#, csharp-format
msgid "{0} plays"
msgstr "{0} 次播放"
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
index 34cdc57..949be9e 100644
--- a/src/AssemblyInfo.cs
+++ b/src/AssemblyInfo.cs
@@ -2,10 +2,10 @@ using System;
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: ApplicationVersion ("2.9.0", "2.9")]
-[assembly: ApplicationBuildInformation ("git-checkout", "linux-gnu", "x86_64", "2013-10-08 13:08:33 CEST")]
+[assembly: ApplicationVersion ("2.6.1", "2.6.1")]
+[assembly: ApplicationBuildInformation ("git-checkout", "linux-gnu", "x86_64", "2013-04-16 21:04:45 BST")]
-[assembly: AssemblyVersion ("2.9.0.0")]
+[assembly: AssemblyVersion ("2.6.0.0")]
[assembly: AssemblyTitle ("Banshee")]
[assembly: AssemblyDescription ("Banshee Media Player")]
[assembly: AssemblyCopyright ("Copyright (C) 2005-2010 Novell Inc. and others")]
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
index b60e155..278ff51 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
@@ -278,12 +278,6 @@ namespace Banshee.GStreamer
}
}
- public override void Seek (uint position, bool accurate_seek)
- {
- bp_set_position (handle, (ulong)position, accurate_seek);
- OnEventChanged (PlayerEvent.Seek);
- }
-
public override void VideoExpose (IntPtr window, bool direct)
{
bp_video_window_expose (handle, window, direct);
@@ -653,7 +647,10 @@ namespace Banshee.GStreamer
public override uint Position {
get { return (uint)bp_get_position(handle); }
- set { Seek (value); }
+ set {
+ bp_set_position (handle, (ulong)value);
+ OnEventChanged (PlayerEvent.Seek);
+ }
}
public override bool CanSeek {
@@ -1006,7 +1003,7 @@ namespace Banshee.GStreamer
private static extern bool bp_audiosink_has_volume (HandleRef player);
[DllImport ("libbanshee.dll")]
- private static extern bool bp_set_position (HandleRef player, ulong time_ms, bool accurate_seek);
+ private static extern bool bp_set_position (HandleRef player, ulong time_ms);
[DllImport ("libbanshee.dll")]
private static extern ulong bp_get_position (HandleRef player);
diff --git a/src/Backends/Banshee.GStreamer/Makefile.in b/src/Backends/Banshee.GStreamer/Makefile.in
index c850a55..2ca65d1 100644
--- a/src/Backends/Banshee.GStreamer/Makefile.in
+++ b/src/Backends/Banshee.GStreamer/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -450,14 +465,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -572,7 +588,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -580,7 +596,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -588,7 +603,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -607,7 +622,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -647,7 +662,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Banshee.GStreamer.dll.config
@ENABLE_GAPLESS_TRUE at BUILD_DEFINES = "-define:ENABLE_GAPLESS"
@@ -902,12 +916,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
index 7258e42..1bb31e2 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
@@ -449,17 +449,6 @@ namespace Banshee.GStreamerSharp
next_track_set.Set ();
}
- public override void Seek (uint position, bool accurate_seek)
- {
- SeekFlags seek_flags = SeekFlags.Flush;
- if (accurate_seek) {
- seek_flags |= SeekFlags.Accurate;
- }
-
- playbin.Seek (Format.Time, seek_flags, (long)(position * Gst.Clock.MSecond));
- OnEventChanged (PlayerEvent.Seek);
- }
-
private bool OnBusMessage (Bus bus, Message msg)
{
switch (msg.Type) {
@@ -782,7 +771,9 @@ namespace Banshee.GStreamerSharp
playbin.QueryPosition (ref query_format, out pos);
return (uint) ((ulong)pos / Gst.Clock.MSecond);
}
- set { Seek (value); }
+ set {
+ playbin.Seek (Format.Time, SeekFlags.Accurate, (long)(value * Gst.Clock.MSecond));
+ }
}
public override uint Length {
diff --git a/src/Backends/Banshee.GStreamerSharp/Makefile.in b/src/Backends/Banshee.GStreamerSharp/Makefile.in
index 2e63e00..7b6d3b9 100644
--- a/src/Backends/Banshee.GStreamerSharp/Makefile.in
+++ b/src/Backends/Banshee.GStreamerSharp/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -451,14 +466,15 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
# External libraries to link against, generated from configure
@ENABLE_GST_SHARP_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_GST_SHARP_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_GST_SHARP_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_GST_SHARP_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_GST_SHARP_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_GST_SHARP_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_GST_SHARP_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_GST_SHARP_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_GST_SHARP_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_GST_SHARP_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_GST_SHARP_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_GST_SHARP_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_GST_SHARP_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_GST_SHARP_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -573,7 +589,7 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_GST_SHARP_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_GST_SHARP_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GST_SHARP_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -581,7 +597,6 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_GST_SHARP_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -589,7 +604,7 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
@ENABLE_GST_SHARP_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_GST_SHARP_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_GST_SHARP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_GST_SHARP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_GST_SHARP_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -608,7 +623,7 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_GST_SHARP_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_GST_SHARP_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_GST_SHARP_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_GST_SHARP_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_GST_SHARP_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -673,7 +688,6 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
@ENABLE_GST_SHARP_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_GST_SHARP_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_GST_SHARP_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_GST_SHARP_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_GST_SHARP_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_GST_SHARP_TRUE at module_SCRIPTS = $(OUTPUT_FILES) \
@ENABLE_GST_SHARP_TRUE@ Banshee.GStreamerSharp.dll.config
@@ -931,12 +945,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_GST_SHARP_TRUE at build-debug:
@ENABLE_GST_SHARP_TRUE@ @echo $(DEP_LINK)
- at ENABLE_GST_SHARP_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_GST_SHARP_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_GST_SHARP_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_GST_SHARP_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_GST_SHARP_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_GST_SHARP_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_GST_SHARP_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_GST_SHARP_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DeviceMediaCapabilities.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DeviceMediaCapabilities.cs
index 62688a6..5a1b5a3 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DeviceMediaCapabilities.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DeviceMediaCapabilities.cs
@@ -29,11 +29,11 @@ using System;
using System.Collections.Generic;
using System.Linq;
-using GLib;
+using KeyFile;
using Banshee.Base;
using Banshee.Hardware;
-using Hyena;
+using Banshee.IO;
namespace Banshee.Hardware.Gio
{
@@ -136,25 +136,24 @@ namespace Banshee.Hardware.Gio
#endregion
private class GMpiFileInfo
{
- private const char Separator = ';';
+ private const char Seperator = ';';
private const string MediaGroup = "Media";
private const string DeviceGroup = "Device";
private const string VendorGroup = "Vendor";
private const string StorageGroup = "storage";
private const string PlaylistGroup = "Playlist";
- private KeyFile mpi_file;
+ private GKeyFile mpi_file;
public GMpiFileInfo (string mediaPlayerId)
{
try {
- mpi_file = new KeyFile ();
- mpi_file.SetListSeparator (Separator);
- string full_path;
+ mpi_file = new GKeyFile ();
+ mpi_file.ListSeparator = Seperator;
mpi_file.LoadFromDirs (String.Format ("{0}.mpi", mediaPlayerId),
new string [] {"/usr/share/media-player-info",
"/usr/local/share/media-player-info"},
- out full_path, KeyFileFlags.None);
+ null, Flags.None);
} catch (GLib.GException) {
Hyena.Log.WarningFormat ("Failed to load media-player-info file for {0}",
mediaPlayerId);
@@ -233,7 +232,7 @@ namespace Banshee.Hardware.Gio
if (mpi_file.HasKey (PlaylistGroup, "FolderSeparator")) {
string folder_separator = mpi_file.GetString (PlaylistGroup, "FolderSeparator");
if (folder_separator == "DOS") {
- FolderSeparator = Paths.Folder.DosSeparator;
+ FolderSeparator = Directory.DosSeparator;
}
}
}
@@ -252,7 +251,7 @@ namespace Banshee.Hardware.Gio
OutputFormats = new string[] {};
PlaylistFormats = new string[] {};
AccessProtocols = new string[] {};
- FolderSeparator = Paths.Folder.UnixSeparator;
+ FolderSeparator = Directory.UnixSeparator;
}
}
}
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioDriveMetadataSource.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioDriveMetadetaSource.cs
similarity index 91%
rename from src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioDriveMetadataSource.cs
rename to src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioDriveMetadetaSource.cs
index 7d4c893..97df8e5 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioDriveMetadataSource.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioDriveMetadetaSource.cs
@@ -2,9 +2,9 @@
// GioDriveMetadetaSource.cs
//
// Author:
-// Alex Launi <alex.launi at gmail.com>
+// alex <${AuthorEmail}>
//
-// Copyright (c) 2010 Alex Launi
+// Copyright (c) 2010 alex
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -31,11 +31,11 @@ using GLib;
namespace Banshee.Hardware.Gio
{
- public class GioDriveMetadataSource : GioMetadataSource
+ public class GioDriveMetadetaSource : GioMetadataSource
{
- IDrive Drive { get; set; }
+ Drive Drive { get; set; }
- public GioDriveMetadataSource (IDrive drive)
+ public GioDriveMetadetaSource (Drive drive)
{
Drive = drive;
}
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioMetadataSource.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioMetadataSource.cs
index fa65026..467d052 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioMetadataSource.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioMetadataSource.cs
@@ -2,9 +2,9 @@
// GioMetadataSource.cs
//
// Author:
-// Alex Launi <alex.launi at gmail.com>
+// alex <${AuthorEmail}>
//
-// Copyright (c) 2010 Alex Launi
+// Copyright (c) 2010 alex
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioVolumeMetadataSource.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioVolumeMetadataSource.cs
index b708d7c..459a97f 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioVolumeMetadataSource.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/GioVolumeMetadataSource.cs
@@ -32,11 +32,11 @@ namespace Banshee.Hardware.Gio
{
public class GioVolumeMetadataSource : GioMetadataSource
{
- GLib.IVolume Volume {
+ GLib.Volume Volume {
get; set;
}
- public GioVolumeMetadataSource (GLib.IVolume volume)
+ public GioVolumeMetadataSource (GLib.Volume volume)
{
Volume = volume;
}
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
index f1ff6c4..213e747 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
@@ -72,7 +72,6 @@ namespace Banshee.Hardware.Gio
void HandleMonitorMountAdded (object o, MountAddedArgs args)
{
// Manually get the mount as gio-sharp translates it to the wrong managed object
- // TODO: check if this workaround is still needed
var mount = GLib.MountAdapter.GetObject ((GLib.Object) args.Args [0]);
if (mount.Volume == null)
return;
@@ -111,7 +110,7 @@ namespace Banshee.Hardware.Gio
}
- void VolumeRemoved (GLib.IVolume volume)
+ void VolumeRemoved (GLib.Volume volume)
{
var h = DeviceRemoved;
if (h != null) {
@@ -131,7 +130,7 @@ namespace Banshee.Hardware.Gio
public IEnumerable<IDevice> GetAllDevices ()
{
- foreach (GLib.IVolume vol in monitor.Volumes) {
+ foreach (GLib.Volume vol in monitor.Volumes) {
var device = GudevDeviceFromGioVolume (vol);
if (device == null) {
continue;
@@ -157,7 +156,7 @@ namespace Banshee.Hardware.Gio
}
- public GUdev.Device GudevDeviceFromGioDrive (GLib.IDrive drive)
+ public GUdev.Device GudevDeviceFromGioDrive (GLib.Drive drive)
{
GUdev.Device device = null;
@@ -173,7 +172,7 @@ namespace Banshee.Hardware.Gio
return device;
}
- public GUdev.Device GudevDeviceFromGioVolume (GLib.IVolume volume)
+ public GUdev.Device GudevDeviceFromGioVolume (GLib.Volume volume)
{
GUdev.Device device = null;
@@ -199,7 +198,7 @@ namespace Banshee.Hardware.Gio
return device;
}
- public GUdev.Device GudevDeviceFromGioMount (GLib.IMount mount)
+ public GUdev.Device GudevDeviceFromGioMount (GLib.Mount mount)
{
if (mount == null) {
return null;
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawBlockDevice.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawBlockDevice.cs
index 3711945..59c0344 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawBlockDevice.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawBlockDevice.cs
@@ -2,9 +2,9 @@
// RawBlockDevice.cs
//
// Author:
-// Alex Launi <alex.launi at gmail.com>
+// alex <${AuthorEmail}>
//
-// Copyright (c) 2010 Alex Launi
+// Copyright (c) 2010 alex
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -33,13 +33,13 @@ namespace Banshee.Hardware.Gio
{
class RawBlockDevice : RawDevice
{
- public RawBlockDevice (GLib.IDrive drive, Manager manager, GioDriveMetadataSource gioMetadata, UdevMetadataSource udevMetadata)
+ public RawBlockDevice (GLib.Drive drive, Manager manager, GioDriveMetadetaSource gioMetadata, UdevMetadataSource udevMetadata)
: base (manager, gioMetadata, udevMetadata)
{
Drive = drive;
}
- GLib.IDrive Drive { get; set; }
+ GLib.Drive Drive { get; set; }
public IEnumerable<Volume> Volumes {
get {
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
index 7277ce9..0ac09f9 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
@@ -42,7 +42,7 @@ namespace Banshee.Hardware.Gio
const string FileSystemSize = "filesystem::size";
const string FileSystemReadOnly = "filesystem::readonly";
- public GLib.IVolume Volume {
+ public GLib.Volume Volume {
get; set;
}
@@ -147,7 +147,7 @@ namespace Banshee.Hardware.Gio
}
- public RawVolume (GLib.IVolume volume, Manager manager, GioVolumeMetadataSource gioMetadata, UdevMetadataSource udevMetadata)
+ public RawVolume (GLib.Volume volume, Manager manager, GioVolumeMetadataSource gioMetadata, UdevMetadataSource udevMetadata)
: base (manager, gioMetadata, udevMetadata)
{
Volume = volume;
@@ -239,15 +239,10 @@ namespace Banshee.Hardware.Gio
if (Volume.Drive == null) {
return null;
}
-
- var device = Manager.GudevDeviceFromGioDrive (Volume.Drive);
- if (device == null) {
- return null;
- }
return new RawBlockDevice (Volume.Drive,
Manager,
- new GioDriveMetadataSource (Volume.Drive),
- new UdevMetadataSource (device));
+ new GioDriveMetadetaSource (Volume.Drive),
+ new UdevMetadataSource (Manager.GudevDeviceFromGioDrive (Volume.Drive)));
}
}
diff --git a/src/Backends/Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs b/src/Backends/Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs
index 64ffdb5..4a347b1 100644
--- a/src/Backends/Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs
+++ b/src/Backends/Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs
@@ -35,7 +35,7 @@ namespace Banshee.IO.Gio
{
public class DemuxVfs : IDemuxVfs
{
- private GLib.IFile file;
+ private GLib.File file;
public DemuxVfs (string path)
{
diff --git a/src/Backends/Banshee.Gio/Banshee.IO.Gio/Directory.cs b/src/Backends/Banshee.Gio/Banshee.IO.Gio/Directory.cs
index ed5a443..9169e19 100644
--- a/src/Backends/Banshee.Gio/Banshee.IO.Gio/Directory.cs
+++ b/src/Backends/Banshee.Gio/Banshee.IO.Gio/Directory.cs
@@ -59,7 +59,7 @@ namespace Banshee.IO.Gio
internal static bool DisableNativeOptimizations = false;
- private void Delete (string directory, GLib.IFile dir, bool recursive)
+ private void Delete (string directory, GLib.File dir, bool recursive)
{
if (!dir.Exists) {
return;
@@ -88,12 +88,12 @@ namespace Banshee.IO.Gio
dir.Delete ();
}
- private static GLib.IFile GetDir (string directory)
+ private static GLib.File GetDir (string directory)
{
return GetDir (directory, directory.Contains ("://"));
}
- private static GLib.IFile GetDir (string directory, bool directoryIsUri)
+ private static GLib.File GetDir (string directory, bool directoryIsUri)
{
return directoryIsUri ? FileFactory.NewForUri (directory) : FileFactory.NewForPath (directory);
}
@@ -113,7 +113,7 @@ namespace Banshee.IO.Gio
return GetFiles (GetDir (directory), true);
}
- private IEnumerable<SafeUri> GetFiles (GLib.IFile dir, bool followSymlinks)
+ private IEnumerable<SafeUri> GetFiles (GLib.File dir, bool followSymlinks)
{
var enumerator = dir.EnumerateChildren ("standard::type,standard::name", followSymlinks ? FileQueryInfoFlags.None : FileQueryInfoFlags.NofollowSymlinks, null);
foreach (FileInfo file in enumerator) {
@@ -136,7 +136,7 @@ namespace Banshee.IO.Gio
return GetDirectories (GetDir (directory), true);
}
- private IEnumerable<SafeUri> GetDirectories (GLib.IFile dir, bool followSymlinks)
+ private IEnumerable<SafeUri> GetDirectories (GLib.File dir, bool followSymlinks)
{
var enumerator = dir.EnumerateChildren ("standard::type,standard::name", followSymlinks ? FileQueryInfoFlags.None : FileQueryInfoFlags.NofollowSymlinks, null);
foreach (FileInfo file in enumerator) {
diff --git a/src/Backends/Banshee.Gio/Makefile.am b/src/Backends/Banshee.Gio/Makefile.am
index f1800f5..87d6428 100644
--- a/src/Backends/Banshee.Gio/Makefile.am
+++ b/src/Backends/Banshee.Gio/Makefile.am
@@ -14,7 +14,7 @@ SOURCES = \
Banshee.Hardware.Gio/DeviceMediaCapabilities.cs \
Banshee.Hardware.Gio/DiscVolume.cs \
Banshee.Hardware.Gio/HardwareManager.cs \
- Banshee.Hardware.Gio/LowLevel/GioDriveMetadataSource.cs \
+ Banshee.Hardware.Gio/LowLevel/GioDriveMetadetaSource.cs \
Banshee.Hardware.Gio/LowLevel/GioMetadataSource.cs \
Banshee.Hardware.Gio/LowLevel/GioVolumeMetadataSource.cs \
Banshee.Hardware.Gio/LowLevel/IMetadataSource.cs \
@@ -36,8 +36,22 @@ SOURCES = \
RESOURCES = Banshee.Gio.addin.xml
+EXTRA_BUNDLE = $(GIOSHARP_ASSEMBLIES)
+
if ENABLE_GIO
include $(top_srcdir)/build/build.mk
+
+define EXTRA_INSTALL_DATA_HOOK
+ for ASM in $(GIOSHARP_ASSEMBLIES); do \
+ $(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+ done;
+endef
+
+define EXTRA_UNINSTALL_HOOK
+ for ASM in $(GIOSHARP_ASSEMBLIES); do \
+ rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+ done;
+endef
else
include $(top_srcdir)/build/build.dist.mk
endif
diff --git a/src/Backends/Banshee.Gio/Makefile.in b/src/Backends/Banshee.Gio/Makefile.in
index 017b523..5767a6d 100644
--- a/src/Backends/Banshee.Gio/Makefile.in
+++ b/src/Backends/Banshee.Gio/Makefile.in
@@ -206,15 +206,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -223,6 +232,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@ $(am__append_1)
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -237,6 +248,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -244,6 +257,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -436,7 +451,7 @@ SOURCES = \
Banshee.Hardware.Gio/DeviceMediaCapabilities.cs \
Banshee.Hardware.Gio/DiscVolume.cs \
Banshee.Hardware.Gio/HardwareManager.cs \
- Banshee.Hardware.Gio/LowLevel/GioDriveMetadataSource.cs \
+ Banshee.Hardware.Gio/LowLevel/GioDriveMetadetaSource.cs \
Banshee.Hardware.Gio/LowLevel/GioMetadataSource.cs \
Banshee.Hardware.Gio/LowLevel/GioVolumeMetadataSource.cs \
Banshee.Hardware.Gio/LowLevel/IMetadataSource.cs \
@@ -457,6 +472,7 @@ SOURCES = \
Banshee.IO.Gio/Tests.cs
RESOURCES = Banshee.Gio.addin.xml
+EXTRA_BUNDLE = $(GIOSHARP_ASSEMBLIES)
# Initializers
@ENABLE_GIO_TRUE at MONO_BASE_PATH =
@@ -469,14 +485,15 @@ RESOURCES = Banshee.Gio.addin.xml
# External libraries to link against, generated from configure
@ENABLE_GIO_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_GIO_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_GIO_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_GIO_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_GIO_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_GIO_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_GIO_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_GIO_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_GIO_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_GIO_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_GIO_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_GIO_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_GIO_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_GIO_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -591,7 +608,7 @@ RESOURCES = Banshee.Gio.addin.xml
@ENABLE_GIO_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_GIO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_GIO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GIO_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -599,7 +616,6 @@ RESOURCES = Banshee.Gio.addin.xml
@ENABLE_GIO_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_GIO_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_GIO_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -607,7 +623,7 @@ RESOURCES = Banshee.Gio.addin.xml
@ENABLE_GIO_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_GIO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_GIO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_GIO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_GIO_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_GIO_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_GIO_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -626,7 +642,7 @@ RESOURCES = Banshee.Gio.addin.xml
@ENABLE_GIO_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_GIO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_GIO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_GIO_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_GIO_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_GIO_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -683,7 +699,6 @@ RESOURCES = Banshee.Gio.addin.xml
@ENABLE_GIO_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_GIO_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_GIO_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_GIO_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_GIO_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_GIO_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -939,12 +954,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_GIO_TRUE at build-debug:
@ENABLE_GIO_TRUE@ @echo $(DEP_LINK)
- at ENABLE_GIO_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_GIO_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_GIO_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_GIO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_GIO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_GIO_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_GIO_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_GIO_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
@@ -975,6 +987,18 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_GIO_TRUE@ @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
@ENABLE_GIO_TRUE@ $(EXTRA_UNINSTALL_HOOK)
+ at ENABLE_GIO_TRUE@define EXTRA_INSTALL_DATA_HOOK
+ at ENABLE_GIO_TRUE@ for ASM in $(GIOSHARP_ASSEMBLIES); do \
+ at ENABLE_GIO_TRUE@ $(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+ at ENABLE_GIO_TRUE@ done;
+ at ENABLE_GIO_TRUE@endef
+
+ at ENABLE_GIO_TRUE@define EXTRA_UNINSTALL_HOOK
+ at ENABLE_GIO_TRUE@ for ASM in $(GIOSHARP_ASSEMBLIES); do \
+ at ENABLE_GIO_TRUE@ rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+ at ENABLE_GIO_TRUE@ done;
+ at ENABLE_GIO_TRUE@endef
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
index b6a18f0..5754d2a 100644
--- a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
+++ b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
@@ -87,8 +87,8 @@ namespace Banshee.GnomeBackend
private bool OpenUrl (string url)
{
- Hyena.Log.Debug ("Opening URL via Gtk.Global.ShowUri", url);
- return Gtk.Global.ShowUri (url);
+ Hyena.Log.Debug ("Opening URL via gtk_show_uri", url);
+ return Hyena.Gui.GtkUtilities.ShowUri (url);
}
string IService.ServiceName {
diff --git a/src/Backends/Banshee.Gnome/Makefile.in b/src/Backends/Banshee.Gnome/Makefile.in
index 63c1b5c..9be53a2 100644
--- a/src/Backends/Banshee.Gnome/Makefile.in
+++ b/src/Backends/Banshee.Gnome/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -452,14 +467,15 @@ RESOURCES = \
# External libraries to link against, generated from configure
@ENABLE_GNOME_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_GNOME_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_GNOME_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_GNOME_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_GNOME_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_GNOME_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_GNOME_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_GNOME_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_GNOME_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_GNOME_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_GNOME_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_GNOME_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_GNOME_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_GNOME_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -574,7 +590,7 @@ RESOURCES = \
@ENABLE_GNOME_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_GNOME_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_GNOME_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -582,7 +598,6 @@ RESOURCES = \
@ENABLE_GNOME_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_GNOME_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_GNOME_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -590,7 +605,7 @@ RESOURCES = \
@ENABLE_GNOME_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_GNOME_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_GNOME_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_GNOME_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_GNOME_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_GNOME_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_GNOME_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -609,7 +624,7 @@ RESOURCES = \
@ENABLE_GNOME_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_GNOME_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_GNOME_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_GNOME_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_GNOME_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_GNOME_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -667,7 +682,6 @@ RESOURCES = \
@ENABLE_GNOME_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_GNOME_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_GNOME_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_GNOME_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_GNOME_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_GNOME_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -923,12 +937,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_GNOME_TRUE at build-debug:
@ENABLE_GNOME_TRUE@ @echo $(DEP_LINK)
- at ENABLE_GNOME_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_GNOME_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_GNOME_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_GNOME_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_GNOME_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_GNOME_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_GNOME_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_GNOME_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Backends/Banshee.NowPlaying.X11/Makefile.in b/src/Backends/Banshee.NowPlaying.X11/Makefile.in
index 5620fda..43fe343 100644
--- a/src/Backends/Banshee.NowPlaying.X11/Makefile.in
+++ b/src/Backends/Banshee.NowPlaying.X11/Makefile.in
@@ -245,15 +245,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -262,6 +271,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -276,6 +287,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -283,6 +296,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -483,14 +498,15 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
# External libraries to link against, generated from configure
@HAVE_XVIDMODE_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_XVIDMODE_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_XVIDMODE_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_XVIDMODE_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_XVIDMODE_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_XVIDMODE_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_XVIDMODE_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_XVIDMODE_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_XVIDMODE_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_XVIDMODE_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_XVIDMODE_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_XVIDMODE_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_XVIDMODE_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_XVIDMODE_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -605,7 +621,7 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_XVIDMODE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_XVIDMODE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_XVIDMODE_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -613,7 +629,6 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_XVIDMODE_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -621,7 +636,7 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
@HAVE_XVIDMODE_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_XVIDMODE_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_XVIDMODE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_XVIDMODE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_XVIDMODE_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -640,7 +655,7 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_XVIDMODE_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_XVIDMODE_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_XVIDMODE_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_XVIDMODE_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_XVIDMODE_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -699,7 +714,6 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
@ENABLE_TESTS_TRUE@@HAVE_XVIDMODE_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_XVIDMODE_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_XVIDMODE_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_XVIDMODE_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_XVIDMODE_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_XVIDMODE_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-recursive
@@ -1114,12 +1128,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_XVIDMODE_TRUE at build-debug:
@HAVE_XVIDMODE_TRUE@ @echo $(DEP_LINK)
- at HAVE_XVIDMODE_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_XVIDMODE_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_XVIDMODE_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_XVIDMODE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_XVIDMODE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_XVIDMODE_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_XVIDMODE_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_XVIDMODE_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in
index ec57069..03a1eae 100644
--- a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in
+++ b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in
@@ -230,15 +230,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -247,6 +256,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -261,6 +272,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -268,6 +281,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c
index 607b56c..9278e32 100644
--- a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c
+++ b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c
@@ -225,7 +225,7 @@ bacon_resize_resize (BaconResize *resize)
g_return_if_fail (GTK_IS_WIDGET (resize->priv->video_widget));
g_return_if_fail (GTK_WIDGET_REALIZED (resize->priv->video_widget));
- Display = GDK_WINDOW_XDISPLAY (gtk_widget_get_window (resize->priv->video_widget));
+ Display = GDK_DRAWABLE_XDISPLAY (resize->priv->video_widget->window);
if (Display == NULL)
return;
@@ -306,7 +306,7 @@ bacon_resize_restore (BaconResize *resize)
if (resize->priv->xr_screen_conf == NULL)
return;
- Display = GDK_WINDOW_XDISPLAY (gtk_widget_get_window (resize->priv->video_widget));
+ Display = GDK_DRAWABLE_XDISPLAY (resize->priv->video_widget->window);
if (Display == NULL)
return;
diff --git a/src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs b/src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs
index 01f674c..d970fdf 100644
--- a/src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs
+++ b/src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs
@@ -171,9 +171,9 @@ namespace Banshee.OsxBackend
}
// remove unnecessary separator as we have moved the preferences item
- var preferences_separator = interface_action_service.UIManager.GetWidget ("/MainMenu/EditMenu/PreferencesSeparator") as SeparatorMenuItem;
- if (preferences_separator != null) {
- preferences_separator.Destroy ();
+ var preferences_seperator = interface_action_service.UIManager.GetWidget ("/MainMenu/EditMenu/PreferencesSeparator") as SeparatorMenuItem;
+ if (preferences_seperator != null) {
+ preferences_seperator.Destroy ();
}
// actually performs the menu binding
diff --git a/src/Backends/Banshee.Osx/Makefile.in b/src/Backends/Banshee.Osx/Makefile.in
index 971ba33..fada5ef 100644
--- a/src/Backends/Banshee.Osx/Makefile.in
+++ b/src/Backends/Banshee.Osx/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -463,14 +478,15 @@ EXTRA_BUNDLE = $(MONOMAC_ASSEMBLIES)
# External libraries to link against, generated from configure
@PLATFORM_DARWIN_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at PLATFORM_DARWIN_TRUE@LINK_CAIRO = -r:Mono.Cairo
@PLATFORM_DARWIN_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@PLATFORM_DARWIN_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@PLATFORM_DARWIN_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@PLATFORM_DARWIN_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@PLATFORM_DARWIN_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@PLATFORM_DARWIN_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at PLATFORM_DARWIN_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at PLATFORM_DARWIN_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at PLATFORM_DARWIN_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@PLATFORM_DARWIN_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@PLATFORM_DARWIN_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@PLATFORM_DARWIN_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -585,7 +601,7 @@ EXTRA_BUNDLE = $(MONOMAC_ASSEMBLIES)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at PLATFORM_DARWIN_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at PLATFORM_DARWIN_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -593,7 +609,6 @@ EXTRA_BUNDLE = $(MONOMAC_ASSEMBLIES)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at PLATFORM_DARWIN_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -601,7 +616,7 @@ EXTRA_BUNDLE = $(MONOMAC_ASSEMBLIES)
@PLATFORM_DARWIN_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@PLATFORM_DARWIN_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at PLATFORM_DARWIN_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at PLATFORM_DARWIN_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@PLATFORM_DARWIN_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -620,7 +635,7 @@ EXTRA_BUNDLE = $(MONOMAC_ASSEMBLIES)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at PLATFORM_DARWIN_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at PLATFORM_DARWIN_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@PLATFORM_DARWIN_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@PLATFORM_DARWIN_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@PLATFORM_DARWIN_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -680,7 +695,6 @@ MAINTAINERCLEANFILES = Makefile.in
@ENABLE_TESTS_TRUE@@PLATFORM_DARWIN_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@PLATFORM_DARWIN_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@PLATFORM_DARWIN_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at PLATFORM_DARWIN_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@PLATFORM_DARWIN_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@PLATFORM_DARWIN_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -936,12 +950,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@PLATFORM_DARWIN_TRUE at build-debug:
@PLATFORM_DARWIN_TRUE@ @echo $(DEP_LINK)
- at PLATFORM_DARWIN_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at PLATFORM_DARWIN_TRUE@ $(MCS) -out:$@ $<
-
@PLATFORM_DARWIN_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at PLATFORM_DARWIN_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at PLATFORM_DARWIN_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@PLATFORM_DARWIN_TRUE@ @mkdir -p $(top_builddir)/bin
@PLATFORM_DARWIN_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@PLATFORM_DARWIN_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Backends/Banshee.Unix/Makefile.in b/src/Backends/Banshee.Unix/Makefile.in
index 2a9364d..5ed6a6a 100644
--- a/src/Backends/Banshee.Unix/Makefile.in
+++ b/src/Backends/Banshee.Unix/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -447,14 +462,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -569,7 +585,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -577,7 +593,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -585,7 +600,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -604,7 +619,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -644,7 +659,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Banshee.Unix.dll.config
all: all-am
@@ -898,12 +912,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Backends/Banshee.Windows/Banshee.Windows/GtkWindowThumbnailToolbarManager.cs b/src/Backends/Banshee.Windows/Banshee.Windows/GtkWindowThumbnailToolbarManager.cs
index 4293d0b..72c7971 100644
--- a/src/Backends/Banshee.Windows/Banshee.Windows/GtkWindowThumbnailToolbarManager.cs
+++ b/src/Backends/Banshee.Windows/Banshee.Windows/GtkWindowThumbnailToolbarManager.cs
@@ -66,7 +66,7 @@ namespace Banshee.Windows
return;
}
- ThumbnailToolbarManager.Register (gdk_win32_drawable_get_handle (window.Window.Handle), cb);
+ ThumbnailToolbarManager.Register (gdk_win32_drawable_get_handle (window.GdkWindow.Handle), cb);
}
[DllImport ("libgdk-win32-2.0-0.dll")]
diff --git a/src/Backends/Banshee.Windows/Makefile.in b/src/Backends/Banshee.Windows/Makefile.in
index 62934b2..f97da21 100644
--- a/src/Backends/Banshee.Windows/Makefile.in
+++ b/src/Backends/Banshee.Windows/Makefile.in
@@ -171,15 +171,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -188,6 +197,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -202,6 +213,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -209,6 +222,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Backends/Makefile.in b/src/Backends/Makefile.in
index 26b4069..4765242 100644
--- a/src/Backends/Makefile.in
+++ b/src/Backends/Makefile.in
@@ -211,15 +211,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -228,6 +237,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -242,6 +253,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,6 +262,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Clients/Beroe/Makefile.in b/src/Clients/Beroe/Makefile.in
index 61fa385..d5e6ede 100644
--- a/src/Clients/Beroe/Makefile.in
+++ b/src/Clients/Beroe/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -440,14 +455,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -562,7 +578,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -570,7 +586,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -578,7 +593,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -597,7 +612,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -636,7 +651,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -890,12 +904,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Clients/Booter/Booter/Entry.cs b/src/Clients/Booter/Booter/Entry.cs
index a003a5e..ef38119 100644
--- a/src/Clients/Booter/Booter/Entry.cs
+++ b/src/Clients/Booter/Booter/Entry.cs
@@ -148,9 +148,6 @@ namespace Booter
Console.WriteLine ("Usage: {0} [options...] [files|URIs...]", "banshee");
Console.WriteLine ();
- string css_file = Path.Combine (Paths.ApplicationData, "gtk.css").Replace (
- Environment.GetFolderPath (Environment.SpecialFolder.Personal), "~");
-
Layout commands = new Layout (
new LayoutGroup ("help", Catalog.GetString ("Help Options"),
new LayoutOption ("help", Catalog.GetString ("Show this help")),
@@ -224,10 +221,10 @@ namespace Booter
new LayoutOption ("uninstalled", Catalog.GetString ("Optimize instance for running uninstalled; " +
"most notably, this will create an alternate Mono.Addins database in the working directory")),
new LayoutOption ("disable-dbus", Catalog.GetString ("Disable DBus support completely")),
- new LayoutOption ("no-gtkcss", String.Format (Catalog.GetString (
- "Skip loading a custom gtk.css file ({0}) if it exists"), css_file)),
- new LayoutOption ("debug-gtkcss", String.Format (Catalog.GetString (
- "Reload the custom gtk.css file ({0}) every 5 seconds"), css_file))
+ new LayoutOption ("no-gtkrc", String.Format (Catalog.GetString (
+ "Skip loading a custom gtkrc file ({0}) if it exists"),
+ Path.Combine (Paths.ApplicationData, "gtkrc").Replace (
+ Environment.GetFolderPath (Environment.SpecialFolder.Personal), "~")))
)
);
diff --git a/src/Clients/Booter/Makefile.in b/src/Clients/Booter/Makefile.in
index fd9f8c6..cefba88 100644
--- a/src/Clients/Booter/Makefile.in
+++ b/src/Clients/Booter/Makefile.in
@@ -206,15 +206,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -223,6 +232,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -237,6 +248,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -244,6 +257,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -441,14 +456,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -563,7 +579,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -571,7 +587,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -579,7 +594,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -598,7 +613,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -638,7 +653,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Banshee.exe.config
bin_SCRIPTS = banshee
@@ -935,12 +949,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Clients/Booter/banshee.linux.in b/src/Clients/Booter/banshee.linux.in
index 724a6d7..a255940 100644
--- a/src/Clients/Booter/banshee.linux.in
+++ b/src/Clients/Booter/banshee.linux.in
@@ -44,10 +44,6 @@ if [ ! -z "$BANSHEE_CLIENT" ]; then
BANSHEE_CLIENT="--client=${BANSHEE_CLIENT}"
fi
-if [ "$BANSHEE_DEBUG" = "--debug" ] && [ "x$BANSHEE_PROFILE" = "x" ]; then
- BANSHEE_PROFILE="--profile=gui-thread-check"
-fi
-
# We were testing the SGen compacting GC; disabled for 2.0 release b/c there are serious
# issues with sgen on Mono 2.8.0
#export MONO_ENV_OPTIONS="--gc=sgen"
diff --git a/src/Clients/Halie/Makefile.in b/src/Clients/Halie/Makefile.in
index 1fb669e..29c8b2a 100644
--- a/src/Clients/Halie/Makefile.in
+++ b/src/Clients/Halie/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -440,14 +455,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -562,7 +578,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -570,7 +586,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -578,7 +593,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -597,7 +612,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -636,7 +651,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -890,12 +904,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Clients/Makefile.in b/src/Clients/Makefile.in
index e6fc8d8..4706ba0 100644
--- a/src/Clients/Makefile.in
+++ b/src/Clients/Makefile.in
@@ -211,15 +211,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -228,6 +237,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -242,6 +253,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,6 +262,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Clients/MeeGo/Makefile.in b/src/Clients/MeeGo/Makefile.in
index bb4ba0c..bee1443 100644
--- a/src/Clients/MeeGo/Makefile.in
+++ b/src/Clients/MeeGo/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -440,14 +455,15 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
# External libraries to link against, generated from configure
@HAVE_MEEGO_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_MEEGO_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_MEEGO_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_MEEGO_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_MEEGO_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_MEEGO_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_MEEGO_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_MEEGO_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_MEEGO_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_MEEGO_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_MEEGO_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_MEEGO_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_MEEGO_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_MEEGO_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -562,7 +578,7 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
@HAVE_MEEGO_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_MEEGO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_MEEGO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -570,7 +586,6 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
@HAVE_MEEGO_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_MEEGO_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_MEEGO_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -578,7 +593,7 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
@HAVE_MEEGO_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_MEEGO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_MEEGO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_MEEGO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_MEEGO_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_MEEGO_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_MEEGO_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -597,7 +612,7 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
@HAVE_MEEGO_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_MEEGO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_MEEGO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_MEEGO_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_MEEGO_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_MEEGO_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -654,7 +669,6 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
@ENABLE_TESTS_TRUE@@HAVE_MEEGO_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_MEEGO_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_MEEGO_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_MEEGO_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_MEEGO_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_MEEGO_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -910,12 +924,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_MEEGO_TRUE at build-debug:
@HAVE_MEEGO_TRUE@ @echo $(DEP_LINK)
- at HAVE_MEEGO_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_MEEGO_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_MEEGO_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_MEEGO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_MEEGO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_MEEGO_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_MEEGO_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_MEEGO_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Clients/Muinshee/Makefile.in b/src/Clients/Muinshee/Makefile.in
index ed6a3b0..4c58d19 100644
--- a/src/Clients/Muinshee/Makefile.in
+++ b/src/Clients/Muinshee/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -451,14 +466,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -573,7 +589,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -581,7 +597,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -589,7 +604,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -608,7 +623,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -647,7 +662,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -901,12 +915,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Clients/Muinshee/Muinshee/AlbumDialog.cs b/src/Clients/Muinshee/Muinshee/AlbumDialog.cs
index 8bc80ee..b29ea75 100644
--- a/src/Clients/Muinshee/Muinshee/AlbumDialog.cs
+++ b/src/Clients/Muinshee/Muinshee/AlbumDialog.cs
@@ -63,38 +63,25 @@ namespace Muinshee
public class AlbumDialog : BaseDialog
{
- const string CONFIG_NAMESPACE = BaseDialog.CONFIG_NAMESPACE_PREFIX + ".album";
- static readonly SchemaEntry<int> WidthSchema = WindowConfiguration.NewWidthSchema (CONFIG_NAMESPACE, BaseDialog.DEFAULT_WIDTH);
- static readonly SchemaEntry<int> HeightSchema = WindowConfiguration.NewHeightSchema (CONFIG_NAMESPACE, BaseDialog.DEFAULT_HEIGHT);
- static readonly SchemaEntry<int> XPosSchema = WindowConfiguration.NewXPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<int> YPosSchema = WindowConfiguration.NewYPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<bool> MaximizedSchema = WindowConfiguration.NewMaximizedSchema (CONFIG_NAMESPACE);
-
private static DatabaseAlbumListModel album_model;
- private static DatabaseAlbumListModel AlbumModel {
- get {
- if (album_model == null) {
- // TODO set the Album filter as the one/only current filter
- foreach (IFilterListModel filter in Music.CurrentFilters) {
- if (filter is DatabaseAlbumListModel) {
- album_model = filter as DatabaseAlbumListModel;
- }
- }
+
+ static AlbumDialog () {
+ // TODO set the Album filter as the one/only current filter
+ foreach (IFilterListModel filter in Music.CurrentFilters) {
+ if (filter is DatabaseAlbumListModel) {
+ album_model = filter as DatabaseAlbumListModel;
}
- return album_model;
}
}
- public AlbumDialog (PlaylistSource queue) :
- base (queue, Catalog.GetString ("Play Album"),
- new WindowConfiguration (WidthSchema, HeightSchema, XPosSchema, YPosSchema, MaximizedSchema))
+ public AlbumDialog (PlaylistSource queue) : base (queue, Catalog.GetString ("Play Album"), "album")
{
}
protected override Widget GetItemWidget ()
{
AlbumListView album_view = new MuinsheeAlbumView ();
- album_view.SetModel (AlbumModel);
+ album_view.SetModel (album_model);
album_view.RowActivated += OnRowActivated;
return album_view;
@@ -111,7 +98,7 @@ namespace Muinshee
public override void Destroy ()
{
- AlbumModel.Selection.Clear ();
+ album_model.Selection.Clear ();
base.Destroy ();
}
diff --git a/src/Clients/Muinshee/Muinshee/BaseDialog.cs b/src/Clients/Muinshee/Muinshee/BaseDialog.cs
index 8dededf..261ae86 100644
--- a/src/Clients/Muinshee/Muinshee/BaseDialog.cs
+++ b/src/Clients/Muinshee/Muinshee/BaseDialog.cs
@@ -63,15 +63,11 @@ namespace Muinshee
public abstract class BaseDialog : BansheeDialog
{
- protected const string CONFIG_NAMESPACE_PREFIX = "muinshee";
- protected const int DEFAULT_WIDTH = 500;
- protected const int DEFAULT_HEIGHT = 475;
-
private SearchEntry search_entry;
private PlaylistSource queue;
private PersistentWindowController window_controller;
- public BaseDialog (PlaylistSource queue, string title, WindowConfiguration windowConfig) : base (title)
+ public BaseDialog (PlaylistSource queue, string title, string addType) : base (title)
{
this.queue = queue;
VBox.Spacing = 6;
@@ -103,7 +99,7 @@ namespace Muinshee
Button play_button = new ImageButton (Catalog.GetString ("_Play"), "media-playback-start");
AddButton (play_button, Gtk.ResponseType.Ok, true);
- window_controller = new PersistentWindowController (this, windowConfig, WindowPersistOptions.Size);
+ window_controller = new PersistentWindowController (this, String.Format ("muinshee.{0}", addType), 500, 475, WindowPersistOptions.Size);
window_controller.Restore ();
ShowAll ();
diff --git a/src/Clients/Muinshee/Muinshee/PlayerInterface.cs b/src/Clients/Muinshee/Muinshee/PlayerInterface.cs
index f911a6f..0b49fcd 100644
--- a/src/Clients/Muinshee/Muinshee/PlayerInterface.cs
+++ b/src/Clients/Muinshee/Muinshee/PlayerInterface.cs
@@ -59,15 +59,6 @@ namespace Muinshee
{
public class PlayerInterface : BaseClientWindow, IClientWindow, IDBusObjectName, IService, IDisposable
{
- const string CONFIG_NAMESPACE = "muinshee";
- const int DEFAULT_WIDTH = -1;
- const int DEFAULT_HEIGHT = 450;
- static readonly SchemaEntry<int> WidthSchema = WindowConfiguration.NewWidthSchema (CONFIG_NAMESPACE, DEFAULT_WIDTH);
- static readonly SchemaEntry<int> HeightSchema = WindowConfiguration.NewHeightSchema (CONFIG_NAMESPACE, DEFAULT_HEIGHT);
- static readonly SchemaEntry<int> XPosSchema = WindowConfiguration.NewXPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<int> YPosSchema = WindowConfiguration.NewYPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<bool> MaximizedSchema = WindowConfiguration.NewMaximizedSchema (CONFIG_NAMESPACE);
-
// Major Layout Components
private VBox content_vbox;
private VBox main_vbox;
@@ -82,9 +73,7 @@ namespace Muinshee
private int played_songs_number = -1;
private SchemaPreference<int> played_songs_number_pref;
- public PlayerInterface () :
- base (Catalog.GetString ("Banshee Media Player"),
- new WindowConfiguration (WidthSchema, HeightSchema, XPosSchema, YPosSchema, MaximizedSchema))
+ public PlayerInterface () : base (Catalog.GetString ("Banshee Media Player"), "muinshee", -1, 450)
{
}
@@ -134,19 +123,17 @@ namespace Muinshee
#region System Overrides
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
lock (this) {
- if (disposing) {
- Hide ();
- if (played_songs_number >= 0) {
- played_songs_number_pref.Value = played_songs_number;
- }
- if (actions != null) {
- actions.Dispose ();
- }
+ Hide ();
+ if (played_songs_number >= 0) {
+ played_songs_number_pref.Value = played_songs_number;
+ }
+ if (actions != null) {
+ actions.Dispose ();
}
- base.Dispose (disposing);
+ base.Dispose ();
Gtk.Application.Quit ();
}
}
@@ -247,8 +234,7 @@ namespace Muinshee
{
base.ConnectEvents ();
ServiceManager.SourceManager.SourceUpdated += OnSourceUpdated;
- // FIXME: confirm that this is not needed anymore
- //header_toolbar.ExposeEvent += OnToolbarExposeEvent;
+ header_toolbar.ExposeEvent += OnToolbarExposeEvent;
}
#endregion
diff --git a/src/Clients/Muinshee/Muinshee/SongDialog.cs b/src/Clients/Muinshee/Muinshee/SongDialog.cs
index f9c9f41..92da9b8 100644
--- a/src/Clients/Muinshee/Muinshee/SongDialog.cs
+++ b/src/Clients/Muinshee/Muinshee/SongDialog.cs
@@ -50,16 +50,7 @@ namespace Muinshee
{
public class SongDialog : BaseDialog
{
- const string CONFIG_NAMESPACE = BaseDialog.CONFIG_NAMESPACE_PREFIX + ".song";
- static readonly SchemaEntry<int> WidthSchema = WindowConfiguration.NewWidthSchema (CONFIG_NAMESPACE, BaseDialog.DEFAULT_WIDTH);
- static readonly SchemaEntry<int> HeightSchema = WindowConfiguration.NewHeightSchema (CONFIG_NAMESPACE, BaseDialog.DEFAULT_HEIGHT);
- static readonly SchemaEntry<int> XPosSchema = WindowConfiguration.NewXPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<int> YPosSchema = WindowConfiguration.NewYPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<bool> MaximizedSchema = WindowConfiguration.NewMaximizedSchema (CONFIG_NAMESPACE);
-
- public SongDialog (PlaylistSource queue) :
- base (queue, Catalog.GetString ("Play Song"),
- new WindowConfiguration (WidthSchema, HeightSchema, XPosSchema, YPosSchema, MaximizedSchema))
+ public SongDialog (PlaylistSource queue) : base (queue, Catalog.GetString ("Play Song"), "song")
{
}
diff --git a/src/Clients/Nereid/Makefile.in b/src/Clients/Nereid/Makefile.in
index f94fee6..33e6d93 100644
--- a/src/Clients/Nereid/Makefile.in
+++ b/src/Clients/Nereid/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -444,14 +459,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -566,7 +582,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -574,7 +590,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -582,7 +597,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -601,7 +616,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -640,7 +655,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -894,12 +908,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Clients/Nereid/Nereid/PlayerInterface.cs b/src/Clients/Nereid/Nereid/PlayerInterface.cs
index a07c320..60d7215 100644
--- a/src/Clients/Nereid/Nereid/PlayerInterface.cs
+++ b/src/Clients/Nereid/Nereid/PlayerInterface.cs
@@ -58,13 +58,6 @@ namespace Nereid
{
public class PlayerInterface : BaseClientWindow, IClientWindow, IDBusObjectName, IService, IDisposable, IHasSourceView
{
- const string CONFIG_NAMESPACE = "player_window";
- static readonly SchemaEntry<int> WidthSchema = WindowConfiguration.NewWidthSchema (CONFIG_NAMESPACE, 1024);
- static readonly SchemaEntry<int> HeightSchema = WindowConfiguration.NewHeightSchema (CONFIG_NAMESPACE, 700);
- static readonly SchemaEntry<int> XPosSchema = WindowConfiguration.NewXPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<int> YPosSchema = WindowConfiguration.NewYPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<bool> MaximizedSchema = WindowConfiguration.NewMaximizedSchema (CONFIG_NAMESPACE);
-
// Major Layout Components
private VBox primary_vbox;
private Table header_table;
@@ -111,9 +104,7 @@ namespace Nereid
}
}
- public PlayerInterface () :
- base (Catalog.GetString ("Banshee Media Player"),
- new WindowConfiguration (WidthSchema, HeightSchema, XPosSchema, YPosSchema, MaximizedSchema))
+ public PlayerInterface () : base (Catalog.GetString ("Banshee Media Player"), "player_window", 1024, 700)
{
// if (PlatformDetection.IsMeeGo) {
// Gdk.Window.AddFilterForAll (OnGdkEventFilter);
@@ -155,13 +146,11 @@ namespace Nereid
#region System Overrides
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
lock (this) {
- if (disposing) {
- Hide ();
- }
- base.Dispose (disposing);
+ Hide ();
+ base.Dispose ();
Gtk.Application.Quit ();
}
}
@@ -181,18 +170,7 @@ namespace Nereid
search_entry_align = new Alignment (1.0f, 0.5f, 0f, 0f);
var box = new HBox () { Spacing = 2 };
var grabber = new GrabHandle ();
- var search_entry = view_container.SearchEntry;
- grabber.ControlWidthOf (search_entry, 150, 350, false);
-
- int search_entry_width = SearchEntryWidth.Get ();
-
- // -1 indicates that height should be preserved
- search_entry.SetSizeRequest (search_entry_width, -1);
-
- search_entry.SizeAllocated += (o, a) => {
- SearchEntryWidth.Set (search_entry.Allocation.Width);
- };
-
+ grabber.ControlWidthOf (view_container.SearchEntry, 150, 350, false);
box.PackStart (grabber, false, false, 0);
box.PackStart (view_container.SearchEntry, false, false, 0);
search_entry_align.Child = box;
@@ -209,7 +187,6 @@ namespace Nereid
{
header_table = new Table (2, 2, false);
header_table.Show ();
- header_table.Vexpand = false;
primary_vbox.PackStart (header_table, false, false, 0);
main_menu = new MainMenu ();
@@ -311,9 +288,9 @@ namespace Nereid
};
source_scroll.Add (source_view);
- var color = new Gdk.RGBA ();
- color.Parse ("e6e6e6");
- source_view.OverrideBackgroundColor (StateFlags.Normal, color);
+ var color = new Gdk.Color ((byte)0xe6, (byte)0xe6, (byte)0xe6);
+ Gdk.Colormap.System.AllocColor (ref color, true, true);
+ source_view.ModifyBase (StateType.Normal, color);
} else {
Hyena.Widgets.ScrolledWindow window;
if (ApplicationContext.CommandLine.Contains ("smooth-scroll")) {
@@ -438,8 +415,7 @@ namespace Nereid
// UI events
view_container.SearchEntry.Changed += OnSearchEntryChanged;
- // TODO: Check that this still works, it was using SizeRequested
- views_pane.SizeAllocated += delegate {
+ views_pane.SizeRequested += delegate {
SourceViewWidth.Set (views_pane.Position);
};
@@ -458,6 +434,10 @@ namespace Nereid
}
}
};
+
+ if (!PlatformDetection.IsMeeGo) {
+ header_toolbar.ExposeEvent += OnToolbarExposeEvent;
+ }
}
#endregion
@@ -744,7 +724,7 @@ namespace Nereid
var src = ServiceManager.SourceManager.ActiveSource;
var search_entry = src.Properties.Get<SearchEntry> ("Nereid.SearchEntry") ?? view_container.SearchEntry;
if (focus_search && search_entry.Visible && !source_view.EditingRow) {
- search_entry.GrabFocus ();
+ search_entry.InnerEntry.GrabFocus ();
search_entry.HasFocus = true;
return true;
}
@@ -827,11 +807,6 @@ namespace Nereid
175, "Width of seek slider in px", ""
);
- private static readonly SchemaEntry<int> SearchEntryWidth = new SchemaEntry<int> (
- "player_window", "search_entry_width",
- 200, "Width of search entry element in px", ""
- );
-
#endregion
IDBusExportable IDBusExportable.Parent {
diff --git a/src/Clients/Nereid/Nereid/ViewContainer.cs b/src/Clients/Nereid/Nereid/ViewContainer.cs
index d2affa5..7d03221 100644
--- a/src/Clients/Nereid/Nereid/ViewContainer.cs
+++ b/src/Clients/Nereid/Nereid/ViewContainer.cs
@@ -170,7 +170,7 @@ namespace Nereid
search_entry.Query = String.IsNullOrEmpty (query) ? String.Empty : query + ":";
- var editable = search_entry as IEditable;
+ Editable editable = search_entry.InnerEntry as Editable;
if (editable != null) {
editable.Position = search_entry.Query.Length;
}
diff --git a/src/Core/Banshee.CollectionIndexer/Makefile.in b/src/Core/Banshee.CollectionIndexer/Makefile.in
index e1e83fa..2c100d6 100644
--- a/src/Core/Banshee.CollectionIndexer/Makefile.in
+++ b/src/Core/Banshee.CollectionIndexer/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -449,14 +464,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -571,7 +587,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -579,7 +595,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -587,7 +602,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -606,7 +621,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -645,7 +660,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -899,12 +913,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs b/src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs
index 16cf854..3ab2849 100644
--- a/src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs
+++ b/src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs
@@ -35,12 +35,16 @@ using System.Text;
using System.Text.RegularExpressions;
using Mono.Unix;
-using Banshee.Collection;
namespace Banshee.Base
{
public static class CoverArtSpec
{
+ private static string unknown_artist_tr = Catalog.GetString ("Unknown Artist");
+ private static string unknown_artist = "Unknown Artist";
+ private static string unknown_album_tr = Catalog.GetString ("Unknown Album");
+ private static string unknown_album = "Unknown Album";
+
public static bool CoverExists (string artist, string album)
{
return CoverExists (CreateArtistAlbumId (artist, album));
@@ -83,12 +87,12 @@ namespace Banshee.Base
public static string CreateArtistAlbumId (string artist, string album)
{
- if (IsAlbumUnknown (album)) {
+ if (album == null || album == unknown_album || album == unknown_album_tr) {
// do not attempt to group unknown album tracks together
return null;
}
- if (IsArtistUnknown (artist)) {
+ if (artist == null || artist == unknown_artist || artist == unknown_artist_tr) {
return null;
}
@@ -110,16 +114,6 @@ namespace Banshee.Base
Hyena.Log.DebugFormat ("Album artwork path set to {0}", root_path);
}
- static bool IsAlbumUnknown (string album)
- {
- return album == null || album == AlbumInfo.UnknownAlbumTitleUntranslated || album == AlbumInfo.UnknownAlbumTitle;
- }
-
- static bool IsArtistUnknown (string artist)
- {
- return artist == null || artist == ArtistInfo.UnknownArtistNameUntranslated || artist == ArtistInfo.UnknownArtistName;
- }
-
private static string root_path = Path.Combine (XdgBaseDirectorySpec.GetUserDirectory (
"XDG_CACHE_HOME", ".cache"), "media-art");
@@ -138,7 +132,7 @@ namespace Banshee.Base
public static string CreateLegacyArtistAlbumId (string artist, string album)
{
- if (IsArtistUnknown (artist) || IsAlbumUnknown (album)) {
+ if (artist == unknown_artist || artist == unknown_artist_tr || album == unknown_album || album == unknown_album_tr) {
return null;
}
diff --git a/src/Core/Banshee.Core/Banshee.Base/PathPattern.cs b/src/Core/Banshee.Core/Banshee.Base/PathPattern.cs
index e6d89c6..1c61fe3 100644
--- a/src/Core/Banshee.Core/Banshee.Base/PathPattern.cs
+++ b/src/Core/Banshee.Core/Banshee.Base/PathPattern.cs
@@ -167,16 +167,16 @@ namespace Banshee.Base
ext = String.Format (".{0}", ext);
}
- string track_path = CreateFromTrackInfo (track);
- track_path = Hyena.StringUtil.EscapePath (track_path);
+ string songpath = CreateFromTrackInfo (track);
+ songpath = Hyena.StringUtil.EscapePath (songpath);
string dir = Path.GetFullPath (Path.Combine (base_dir,
- Path.GetDirectoryName (track_path)));
+ Path.GetDirectoryName (songpath)));
if (!Banshee.IO.Directory.Exists (dir)) {
Banshee.IO.Directory.Create (dir);
}
- string filename = Path.GetFileName (track_path);
+ string filename = Path.GetFileName (songpath);
// Most filesystems have a filename length limit of 255 characters or bytes
// We use a limit of 200 characters as a compromise
if (filename.Length > 200) {
diff --git a/src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs
index 44124aa..0d9fbc1 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/AlbumInfo.cs
@@ -38,7 +38,6 @@ namespace Banshee.Collection
public class AlbumInfo : CacheableItem
{
public static readonly string UnknownAlbumTitle = Catalog.GetString ("Unknown Album");
- public static readonly string UnknownAlbumTitleUntranslated = "Unknown Album";
private string title;
private string title_sort;
diff --git a/src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs
index 50025b7..bbf9253 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs
@@ -35,7 +35,6 @@ namespace Banshee.Collection
public class ArtistInfo : CacheableItem
{
public static readonly string UnknownArtistName = Catalog.GetString ("Unknown Artist");
- public static readonly string UnknownArtistNameUntranslated = "Unknown Artist";
private string name;
private string name_sort;
diff --git a/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
index 2014e72..8ecefc7 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
@@ -47,7 +47,6 @@ namespace Banshee.Collection
public static readonly double PlaybackSkippedThreshold = 0.5;
public static readonly string UnknownTitle = Catalog.GetString ("Unknown Title");
- public static readonly string UnknownTitleUntranslated = "Unknown Title";
public class ExportableAttribute : Attribute
{
diff --git a/src/Core/Banshee.Core/Banshee.Configuration/ConfigurationClient.cs b/src/Core/Banshee.Core/Banshee.Configuration/ConfigurationClient.cs
index 52c9719..7534c04 100644
--- a/src/Core/Banshee.Core/Banshee.Configuration/ConfigurationClient.cs
+++ b/src/Core/Banshee.Core/Banshee.Configuration/ConfigurationClient.cs
@@ -36,12 +36,12 @@ namespace Banshee.Configuration
{
public static class ConfigurationClient
{
- private static IConfigurationClient instance;
+ private static IConfigurationClient client;
private static void Initialize ()
{
lock (typeof (ConfigurationClient)) {
- if (instance != null) {
+ if (client != null) {
return;
}
@@ -49,8 +49,8 @@ namespace Banshee.Configuration
foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes (
"/Banshee/Platform/ConfigurationClient")) {
try {
- instance = (IConfigurationClient)node.CreateInstance (typeof (IConfigurationClient));
- if (instance != null) {
+ client = (IConfigurationClient)node.CreateInstance (typeof (IConfigurationClient));
+ if (client != null) {
break;
}
} catch (Exception e) {
@@ -58,24 +58,65 @@ namespace Banshee.Configuration
}
}
- if (instance == null) {
- instance = new XmlConfigurationClient ();
+ if (client == null) {
+ client = new XmlConfigurationClient ();
}
} else {
- instance = new MemoryConfigurationClient ();
+ client = new MemoryConfigurationClient ();
}
- Log.DebugFormat ("Configuration client extension loaded ({0})", instance.GetType ().FullName);
+ Log.DebugFormat ("Configuration client extension loaded ({0})", client.GetType ().FullName);
}
}
- public static IConfigurationClient Instance {
+ public static IConfigurationClient Client {
get {
- if (instance == null) {
+ if (client == null) {
Initialize ();
}
- return instance;
+ return client;
}
}
+
+ public static T Get<T>(SchemaEntry<T> entry)
+ {
+ return Get<T>(entry.Namespace, entry.Key, entry.DefaultValue);
+ }
+
+ public static T Get<T>(SchemaEntry<T> entry, T fallback)
+ {
+ return Get<T>(entry.Namespace, entry.Key, fallback);
+ }
+
+ public static T Get<T>(string key, T fallback)
+ {
+ return Get<T>(null, key, fallback);
+ }
+
+ public static T Get<T>(string namespce, string key, T fallback)
+ {
+ T result;
+ return TryGet<T> (namespce, key, out result) ? result : fallback;
+ }
+
+ public static bool TryGet<T> (string @namespace, string key, out T result)
+ {
+ return Client.TryGet<T> (@namespace, key, out result);
+ }
+
+ public static void Set<T> (SchemaEntry<T> entry, T value)
+ {
+ Set (entry.Namespace, entry.Key, value);
+ }
+
+ public static void Set<T> (string key, T value)
+ {
+ Set (null, key, value);
+ }
+
+ public static void Set<T> (string @namespace, string key, T value)
+ {
+ Client.Set<T> (@namespace, key, value);
+ }
}
}
diff --git a/src/Core/Banshee.Core/Banshee.Configuration/SchemaEntry.cs b/src/Core/Banshee.Core/Banshee.Configuration/SchemaEntry.cs
index 52334a2..c981516 100644
--- a/src/Core/Banshee.Core/Banshee.Configuration/SchemaEntry.cs
+++ b/src/Core/Banshee.Core/Banshee.Configuration/SchemaEntry.cs
@@ -69,12 +69,12 @@ namespace Banshee.Configuration
public T Get ()
{
- return ConfigurationClient.Instance.Get<T> (this);
+ return ConfigurationClient.Get<T> (this);
}
public T Get (T fallback)
{
- return ConfigurationClient.Instance.Get<T> (this, fallback);
+ return ConfigurationClient.Get<T> (this, fallback);
}
public bool Set (T value)
@@ -86,7 +86,7 @@ namespace Banshee.Configuration
}
}
- ConfigurationClient.Instance.Set<T> (this, value);
+ ConfigurationClient.Set<T> (this, value);
return true;
}
diff --git a/src/Core/Banshee.Core/Banshee.IO/Directory.cs b/src/Core/Banshee.Core/Banshee.IO/Directory.cs
index 927ef88..ed098f0 100644
--- a/src/Core/Banshee.Core/Banshee.IO/Directory.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/Directory.cs
@@ -35,6 +35,9 @@ namespace Banshee.IO
{
public static class Directory
{
+ public const char DosSeparator = '\\';
+ public const char UnixSeparator = '/';
+
public static bool Exists (string directory)
{
return Provider.Directory.Exists (Provider.GetPath (directory));
diff --git a/src/Core/Banshee.Core/Banshee.IO/Provider.cs b/src/Core/Banshee.Core/Banshee.IO/Provider.cs
index 50214b6..345c992 100644
--- a/src/Core/Banshee.Core/Banshee.IO/Provider.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/Provider.cs
@@ -63,7 +63,7 @@ namespace Banshee.IO
var extensions = GetOrderedExtensions (
"/Banshee/Platform/IOProvider",
- ProviderConfiguration.ProviderSchema.Get (),
+ ProviderSchema.Get (),
"Banshee.IO.Gio.Provider", "Banshee.IO.Unix.Provider", "Banshee.IO.SystemIO.Provider"
);
@@ -119,5 +119,15 @@ namespace Banshee.IO
return uri;
}
+
+ internal static readonly SchemaEntry<string> ProviderSchema = new SchemaEntry<string> (
+ "core", "io_provider",
+ "Banshee.IO.Gio.Provider",
+ "Set the IO provider backend in Banshee",
+ "Can be either \"Banshee.IO.SystemIO.Provider\" (.NET System.IO), " +
+ "\"Banshee.IO.Gio.Provider\" (GIO), or " +
+ "\"Banshee.IO.Unix.Provider\" (Native Unix/POSIX), or " +
+ "takes effect on Banshee start (restart necessary)"
+ );
}
}
diff --git a/src/Core/Banshee.Core/Banshee.IO/ProviderConfiguration.cs b/src/Core/Banshee.Core/Banshee.IO/ProviderConfiguration.cs
deleted file mode 100644
index 95e384e..0000000
--- a/src/Core/Banshee.Core/Banshee.IO/ProviderConfiguration.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// ProviderConfiguration.cs
-//
-// Author:
-// Aaron Bockover <abockover at novell.com>
-//
-// Copyright (C) 2006-2008 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using Banshee.Configuration;
-
-namespace Banshee.IO
-{
- public static class ProviderConfiguration
- {
- internal static readonly SchemaEntry<string> ProviderSchema = new SchemaEntry<string> (
- "core", "io_provider",
- "Banshee.IO.Gio.Provider",
- "Set the IO provider backend in Banshee",
- "Can be either \"Banshee.IO.SystemIO.Provider\" (.NET System.IO), " +
- "\"Banshee.IO.Gio.Provider\" (GIO), or " +
- "\"Banshee.IO.Unix.Provider\" (Native Unix/POSIX), or " +
- "takes effect on Banshee start (restart necessary)"
- );
- }
-}
-
diff --git a/src/Core/Banshee.Core/Makefile.am b/src/Core/Banshee.Core/Makefile.am
index 3b0e064..ba64f54 100644
--- a/src/Core/Banshee.Core/Makefile.am
+++ b/src/Core/Banshee.Core/Makefile.am
@@ -47,7 +47,6 @@ SOURCES = \
Banshee.IO/IFile.cs \
Banshee.IO/IProvider.cs \
Banshee.IO/Provider.cs \
- Banshee.IO/ProviderConfiguration.cs \
Banshee.IO/StreamAssist.cs \
Banshee.IO/Tests.cs \
Banshee.IO/Utilities.cs \
diff --git a/src/Core/Banshee.Core/Makefile.in b/src/Core/Banshee.Core/Makefile.in
index 9dc26b6..9912b42 100644
--- a/src/Core/Banshee.Core/Makefile.in
+++ b/src/Core/Banshee.Core/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -473,7 +488,6 @@ SOURCES = \
Banshee.IO/IFile.cs \
Banshee.IO/IProvider.cs \
Banshee.IO/Provider.cs \
- Banshee.IO/ProviderConfiguration.cs \
Banshee.IO/StreamAssist.cs \
Banshee.IO/Tests.cs \
Banshee.IO/Utilities.cs \
@@ -507,14 +521,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -629,7 +644,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -637,7 +652,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -645,7 +659,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -664,7 +678,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -704,7 +718,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Banshee.Core.dll.config
all: all-am
@@ -958,12 +971,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Core/Banshee.Core/Resources/COPYING b/src/Core/Banshee.Core/Resources/COPYING
index 26a505e..d89d829 100644
--- a/src/Core/Banshee.Core/Resources/COPYING
+++ b/src/Core/Banshee.Core/Resources/COPYING
@@ -1,5 +1,5 @@
Copyright (C) 2005-2011 Novell, Inc.
-Copyright (C) 2005–2013 Other Contributors
+Copyright (C) 2005–2012 Other Contributors
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/src/Core/Banshee.Core/Resources/contributors.xml b/src/Core/Banshee.Core/Resources/contributors.xml
index 99e0568..d371cfa 100644
--- a/src/Core/Banshee.Core/Resources/contributors.xml
+++ b/src/Core/Banshee.Core/Resources/contributors.xml
@@ -1,11 +1,11 @@
<people>
<author role="Maintainer">Aaron Bockover</author>
- <author role="Maintainer">Andrés G. Aragoneses</author>
<author role="Maintainer">Alexander Kojevnikov</author>
+ <author role="Maintainer">Andrés G. Aragoneses</author>
<author role="Maintainer">Bertrand Lorentz</author>
<author role="Maintainer">Gabriel Burt</author>
+ <contributor>Aaron Borden</contributor>
<contributor>Alan McGovern</contributor>
- <contributor>Alex Willmy</contributor>
<contributor>Abner Silva</contributor>
<contributor>Adam Lofts</contributor>
<contributor>Age Bosma</contributor>
@@ -24,7 +24,6 @@
<contributor>Andrea Cimitan</contributor>
<contributor>Andreas Neustifter</contributor>
<contributor>Andrew Conkling</contributor>
- <contributor>Andrés G. Aragoneses</contributor>
<contributor>Andy Midgette</contributor>
<contributor>Andy Street</contributor>
<contributor>Aran Cox</contributor>
@@ -88,10 +87,10 @@
<contributor>Götz Waschk</contributor>
<contributor>Haitao Feng</contributor>
<contributor>Hajime Mizuno</contributor>
- <contributor>Hans Oesterholt</contributor>
<contributor>Hans Petter Jansson</contributor>
<contributor>Harold Schreckengost</contributor>
<contributor>Iain Lane</contributor>
+ <contributor>IBBoard</contributor>
<contributor>Igor Guerrero Fonseca</contributor>
<contributor>Ilya Konstantinov</contributor>
<contributor>Ivan N. Zlatev</contributor>
@@ -134,7 +133,6 @@
<contributor>Martin Pitt</contributor>
<contributor>Matt Enright</contributor>
<contributor>Matt Sturgeon</contributor>
- <contributor>Michael Farrell</contributor>
<contributor>Michael Kaiser</contributor>
<contributor>Michael Martin-Smucker</contributor>
<contributor>Michael Monreal</contributor>
@@ -167,7 +165,6 @@
<contributor>Phil Trimble</contributor>
<contributor>Pratik Patel</contributor>
<contributor>Przemysław Grzegorczyk</contributor>
- <contributor>Rashid Khan</contributor>
<contributor>Raimo Radczewski</contributor>
<contributor>Robin Stocker</contributor>
<contributor>Roderich Schupp</contributor>
@@ -179,6 +176,7 @@
<contributor>Scott Peterson</contributor>
<contributor>Sebastian Dröge</contributor>
<contributor>Shaun McCance</contributor>
+ <contributor>Sindhu S</contributor>
<contributor>Sjoerd Simons</contributor>
<contributor>Tim Fisken</contributor>
<contributor>Tim Yamin</contributor>
@@ -187,7 +185,6 @@
<contributor>Tobias Arrskog</contributor>
<contributor>Tobias Mueller</contributor>
<contributor>Todd Berman</contributor>
- <contributor>Tomasz Maczynski</contributor>
<contributor>Travis Glenn Hansen</contributor>
<contributor>Travis Patterson</contributor>
<contributor>Travis Reitter</contributor>
diff --git a/src/Core/Banshee.Core/Resources/translators.xml b/src/Core/Banshee.Core/Resources/translators.xml
index 1d3c1a1..5871a5f 100644
--- a/src/Core/Banshee.Core/Resources/translators.xml
+++ b/src/Core/Banshee.Core/Resources/translators.xml
@@ -51,10 +51,10 @@
<person>yumkee lhamo</person>
</language>
<language code="el" name="Greek">
- <person>Dimitris Spingos (Δημήτρης Σπίγγος)</person>
<person>Emmanouel Kapernaros</person>
<person>Ioannis Zampoukas</person>
<person>Michael Kotsarinis</person>
+ <person>Tom Tryfonidis</person>
</language>
<language code="en_CA" name="Canadian English">
<person>Adam Weinberger</person>
@@ -94,6 +94,7 @@
<person>Florent Le Coz</person>
<person>Jonathan Ernst</person>
<person>Laurent Coudeur</person>
+ <person>Pierre Henry</person>
<person>Robert-André Mauchin</person>
<person>Stéphane Raimbault</person>
<person>Yannick Tailliez</person>
@@ -114,7 +115,6 @@
<person>Yaron Shahrabani</person>
</language>
<language code="hu" name="Hungarian">
- <person>Balázs Úr</person>
<person>Gabor Kelemen</person>
<person>Kéménczy Kálmán</person>
</language>
@@ -146,7 +146,7 @@
<person>Gintautas Miliauskas</person>
<person>Žygimantas Beručka</person>
</language>
- <language code="lv" name="Latvian">
+ <language code="lv" name="Latviešu">
<person>Raivis Dejus</person>
<person>Rūdolfs Mazurs</person>
</language>
@@ -206,7 +206,6 @@
<person>Lucian Adrian Grijincu</person>
</language>
<language code="ru" name="Russian">
- <person>Aleksej Kabanov</person>
<person>Alexander Saprykin</person>
<person>Alexandre Prokoudine</person>
<person>Daniel Abramov</person>
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs
index e0a0385..4fe4a70 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs
@@ -55,7 +55,7 @@ namespace Banshee.Collection.Database
public long BookmarkId { get; private set; }
[DatabaseColumn]
- protected long TrackId {
+ protected int TrackId {
get { return Track.TrackId; }
set {
Track = DatabaseTrackInfo.Provider.FetchSingle (value);
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistInfo.cs
index 8dc1e66..3448cb9 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistInfo.cs
@@ -51,8 +51,8 @@ namespace Banshee.Collection.Database
}
[DatabaseColumn("ArtistID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
- private long dbid;
- public long DbId {
+ private int dbid;
+ public int DbId {
get { return dbid; }
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs
index a30a2f4..b973796 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs
@@ -60,7 +60,7 @@ namespace Banshee.Collection.Database
(String.IsNullOrEmpty (provider.Where) ? "1=1" : provider.Where)
));
- private static long last_artist_id;
+ private static int last_artist_id;
private static string last_title;
private static DatabaseAlbumInfo last_album;
@@ -86,7 +86,7 @@ namespace Banshee.Collection.Database
return FindOrCreate (artist, album);
}
- private static IDataReader FindExistingArtists (long artist_id, string title)
+ private static IDataReader FindExistingArtists (int artist_id, string title)
{
HyenaSqliteConnection db = ServiceManager.DbConnection;
if (title == null) {
@@ -192,14 +192,14 @@ namespace Banshee.Collection.Database
}
[DatabaseColumn("AlbumID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
- private long dbid;
- public long DbId {
+ private int dbid;
+ public int DbId {
get { return dbid; }
}
[DatabaseColumn("ArtistID")]
- private long artist_id;
- public long ArtistId {
+ private int artist_id;
+ public int ArtistId {
get { return artist_id; }
set { artist_id = value; }
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs
index 2550ab0..0705eab 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs
@@ -37,8 +37,6 @@ using Hyena.Data.Sqlite;
using Hyena.Query;
using Banshee.Database;
-using Banshee.Query;
-using Banshee.Sources;
namespace Banshee.Collection.Database
{
@@ -50,11 +48,11 @@ namespace Banshee.Collection.Database
public class DatabaseAlbumListModel : DatabaseFilterListModel<DatabaseAlbumInfo, AlbumInfo>
{
- public DatabaseAlbumListModel (DatabaseSource source, DatabaseTrackListModel trackModel, BansheeDbConnection connection, string uuid)
- : base (BansheeQuery.AlbumField.Name, BansheeQuery.AlbumField.Label,
+ public DatabaseAlbumListModel (Banshee.Sources.DatabaseSource source, DatabaseTrackListModel trackModel, BansheeDbConnection connection, string uuid)
+ : base (Banshee.Query.BansheeQuery.AlbumField.Name, Banshee.Query.BansheeQuery.AlbumField.Label,
source, trackModel, connection, DatabaseAlbumInfo.Provider, new AllAlbumInfo (), uuid)
{
- QueryFields = new QueryFieldSet (BansheeQuery.AlbumField);
+ QueryFields = new QueryFieldSet (Banshee.Query.BansheeQuery.AlbumField);
ReloadFragmentFormat = @"
FROM CoreAlbums WHERE CoreAlbums.AlbumID IN
(SELECT CoreTracks.AlbumID FROM CoreTracks, CoreCache{0}
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs
index e2d7cd0..3ebf54f 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs
@@ -151,8 +151,8 @@ namespace Banshee.Collection.Database
}
[DatabaseColumn("ArtistID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
- private long dbid;
- public long DbId {
+ private int dbid;
+ public int DbId {
get { return dbid; }
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
index 8750579..5500dbd 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
@@ -78,21 +78,21 @@ namespace Banshee.Collection.Database
public delegate PrimarySource TrackPrimarySourceChooser (DatabaseTrackInfo track);
private TrackPrimarySourceChooser trackPrimarySourceChooser;
- private Dictionary<long, int> counts;
+ private Dictionary<int, int> counts;
private ErrorSource error_source;
- private long [] primary_source_ids;
+ private int [] primary_source_ids;
private string base_directory;
private bool force_copy;
public event DatabaseImportResultHandler ImportResult;
public DatabaseImportManager (PrimarySource psource) :
- this (psource.ErrorSource, delegate { return psource; }, new long [] {psource.DbId}, psource.BaseDirectory)
+ this (psource.ErrorSource, delegate { return psource; }, new int [] {psource.DbId}, psource.BaseDirectory)
{
}
public DatabaseImportManager (ErrorSource error_source, TrackPrimarySourceChooser chooser,
- long [] primarySourceIds, string baseDirectory) : this (chooser)
+ int [] primarySourceIds, string baseDirectory) : this (chooser)
{
this.error_source = error_source;
primary_source_ids = primarySourceIds;
@@ -102,14 +102,14 @@ namespace Banshee.Collection.Database
public DatabaseImportManager (TrackPrimarySourceChooser chooser)
{
trackPrimarySourceChooser = chooser;
- counts = new Dictionary<long, int> ();
+ counts = new Dictionary<int, int> ();
}
protected virtual ErrorSource ErrorSource {
get { return error_source; }
}
- protected virtual long [] PrimarySourceIds {
+ protected virtual int [] PrimarySourceIds {
get { return primary_source_ids; }
set { primary_source_ids = value; }
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
index 20162e5..e44b5aa 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
@@ -242,16 +242,16 @@ namespace Banshee.Collection.Database
return Provider.Refresh (this);
}
- private long track_id;
+ private int track_id;
[DatabaseColumn ("TrackID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
- public long TrackId {
+ public int TrackId {
get { return track_id; }
protected set { track_id = value; }
}
- private long primary_source_id;
+ private int primary_source_id;
[DatabaseColumn ("PrimarySourceID")]
- public long PrimarySourceId {
+ public int PrimarySourceId {
get { return primary_source_id; }
set { primary_source_id = value; }
}
@@ -261,16 +261,16 @@ namespace Banshee.Collection.Database
set { PrimarySourceId = value.DbId; }
}
- private long artist_id;
+ private int artist_id;
[DatabaseColumn ("ArtistID")]
- public long ArtistId {
+ public int ArtistId {
get { return artist_id; }
set { artist_id = value; }
}
- private long album_id;
+ private int album_id;
[DatabaseColumn ("AlbumID")]
- public long AlbumId {
+ public int AlbumId {
get { return album_id; }
set { album_id = value; }
}
@@ -794,27 +794,27 @@ namespace Banshee.Collection.Database
"SELECT COUNT('x') FROM CoreTracks WHERE PrimarySourceId IN (?) AND MetadataHash = ?"
);
- public static long GetTrackIdForUri (string uri)
+ public static int GetTrackIdForUri (string uri)
{
return GetTrackIdForUri (new SafeUri (uri));
}
- public static long GetTrackIdForUri (SafeUri uri, params long [] primary_sources)
+ public static int GetTrackIdForUri (SafeUri uri, params int [] primary_sources)
{
return GetTrackIdForUri (uri.AbsoluteUri, primary_sources);
}
- public static long GetTrackIdForUri (string absoluteUri, params long [] primary_sources)
+ public static int GetTrackIdForUri (string absoluteUri, params int [] primary_sources)
{
if (primary_sources == null || primary_sources.Length == 0) {
- return ServiceManager.DbConnection.Query<long> (get_track_id_by_uri_plain, absoluteUri);
+ return ServiceManager.DbConnection.Query<int> (get_track_id_by_uri_plain, absoluteUri);
}
- return ServiceManager.DbConnection.Query<long> (
+ return ServiceManager.DbConnection.Query<int> (
get_track_id_by_uri_primarysources, primary_sources, absoluteUri
);
}
- private static IDataReader FindTrackByMetadataHash (string metadata_hash, long [] primary_sources)
+ private static IDataReader FindTrackByMetadataHash (string metadata_hash, int [] primary_sources)
{
var command = new HyenaSqliteCommand (String.Format (
get_track_by_metadata_hash,
@@ -823,12 +823,12 @@ namespace Banshee.Collection.Database
primary_sources, metadata_hash);
}
- public static bool ContainsUri (SafeUri uri, long [] primary_sources)
+ public static bool ContainsUri (SafeUri uri, int [] primary_sources)
{
return GetTrackIdForUri (uri, primary_sources) > 0;
}
- internal static DatabaseTrackInfo GetTrackForMetadataHash (string metadata_hash, long [] primary_sources)
+ internal static DatabaseTrackInfo GetTrackForMetadataHash (string metadata_hash, int [] primary_sources)
{
using (IDataReader reader = FindTrackByMetadataHash (metadata_hash, primary_sources)) {
if (reader.Read ()) {
@@ -838,7 +838,7 @@ namespace Banshee.Collection.Database
}
}
- internal static int MetadataHashCount (string metadata_hash, long [] primary_sources)
+ internal static int MetadataHashCount (string metadata_hash, int [] primary_sources)
{
return ServiceManager.DbConnection.Query<int> (get_track_count_by_metadata_hash,
primary_sources, metadata_hash);
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearInfo.cs
index 04a52ea..063650b 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearInfo.cs
@@ -50,9 +50,9 @@ namespace Banshee.Collection.Database
{
}
- private long track_id;
+ private int track_id;
[DatabaseColumn ("TrackID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
- public long TrackId {
+ public int TrackId {
get { return track_id; }
protected set { track_id = value; }
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs
index d37d079..4d93928 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs
@@ -43,7 +43,7 @@ namespace Banshee.Collection.Database
public class RandomByAlbum : RandomBy
{
private HyenaSqliteCommand album_query;
- private long? album_id;
+ private int? album_id;
public RandomByAlbum () : base ("album")
{
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs
index 455d0af..b621501 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs
@@ -43,7 +43,7 @@ namespace Banshee.Collection.Database
public class RandomByArtist : RandomBy
{
private HyenaSqliteCommand query;
- private long? id;
+ private int? id;
public RandomByArtist () : base ("artist")
{
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
index 0cdfb7b..296d496 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
@@ -65,7 +65,7 @@ namespace Banshee.Collection.Database
private TrackInfo last_track;
public string Id { get; private set; }
- public long DbId { get; private set; }
+ public int DbId { get; private set; }
public Action<RandomBy> RandomModeAdded;
public Action<RandomBy> RandomModeRemoved;
@@ -185,12 +185,12 @@ namespace Banshee.Collection.Database
}
}
- internal void RecordShuffle (long trackId)
+ internal void RecordShuffle (int trackId)
{
ServiceManager.DbConnection.Execute (add_shuffle_cmd, this.DbId, DateTime.Now, trackId);
}
- public void RecordShuffleModification (long trackId, ShuffleModificationType type)
+ public void RecordShuffleModification (int trackId, ShuffleModificationType type)
{
ServiceManager.DbConnection.Execute (add_discard_cmd, this.DbId, DateTime.Now, (int)type, trackId);
}
@@ -239,7 +239,7 @@ namespace Banshee.Collection.Database
{
var db = ServiceManager.DbConnection;
- long res = db.Query<long> ("SELECT ShufflerID FROM CoreShufflers WHERE ID = ?", Id);
+ int res = db.Query<int> ("SELECT ShufflerID FROM CoreShufflers WHERE ID = ?", Id);
if (res > 0) {
DbId = res;
} else {
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs b/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
index 2bda43d..a406038 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
@@ -31,6 +31,9 @@ using System.Collections.Generic;
using DBus;
+using Hyena.Query;
+using Hyena.Data.Sqlite;
+
using Banshee.Library;
using Banshee.Sources;
using Banshee.ServiceStack;
@@ -158,7 +161,7 @@ namespace Banshee.Collection.Indexer
List<string> fields = new List<string> ();
foreach (KeyValuePair<string, System.Reflection.PropertyInfo> field in TrackInfo.GetExportableProperties (
- typeof (DatabaseTrackInfo))) {
+ typeof (Banshee.Collection.Database.DatabaseTrackInfo))) {
fields.Add (field.Key);
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs b/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
index 9faaaba..8da1020 100644
--- a/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
@@ -60,14 +60,11 @@ namespace Banshee.Collection
private PrimarySource psource;
private BatchUserJob job;
private TrackSyncPipelineElement track_sync;
- private Func<int, bool> remove_confirmation;
- private readonly int MAX_NOWARN_TRACKS_REMOVAL = 50;
- public RescanPipeline (LibrarySource psource, Func<int, bool> removeConfirmation) : base ()
+ public RescanPipeline (LibrarySource psource) : base ()
{
this.psource = psource;
scan_started = DateTime.Now;
- remove_confirmation = removeConfirmation;
AddElement (new Banshee.IO.DirectoryScannerPipelineElement ());
AddElement (track_sync = new TrackSyncPipelineElement (psource, scan_started));
@@ -97,7 +94,7 @@ namespace Banshee.Collection
{
job.Finish ();
- if (cancelled || remove_confirmation == null) {
+ if (cancelled) {
return;
}
@@ -110,40 +107,20 @@ namespace Banshee.Collection
);
string uri = Hyena.StringUtil.EscapeLike (new SafeUri (psource.BaseDirectoryWithSeparator).AbsoluteUri) + "%";
- int remove_count = ServiceManager.DbConnection.Query<int> (
- String.Format (@"SELECT COUNT('x') FROM CoreTracks {0}", condition),
- psource.DbId, uri, scan_started);
-
- if (remove_count > MAX_NOWARN_TRACKS_REMOVAL) {
-
- if (!remove_confirmation (remove_count)) {
- Refresh ();
- return;
- }
- }
-
- if (remove_count > 0) {
-
- ServiceManager.DbConnection.Execute (String.Format (@"BEGIN;
- DELETE FROM CorePlaylistEntries WHERE TrackID IN (SELECT TrackID FROM CoreTracks {0});
- DELETE FROM CoreSmartPlaylistEntries WHERE TrackID IN (SELECT TrackID FROM CoreTracks {0});
- DELETE FROM CoreTracks {0}; COMMIT",
- condition),
- psource.DbId, uri, scan_started,
- psource.DbId, uri, scan_started,
- psource.DbId, uri, scan_started
- );
- }
+ ServiceManager.DbConnection.Execute (String.Format (@"BEGIN;
+ DELETE FROM CorePlaylistEntries WHERE TrackID IN (SELECT TrackID FROM CoreTracks {0});
+ DELETE FROM CoreSmartPlaylistEntries WHERE TrackID IN (SELECT TrackID FROM CoreTracks {0});
+ DELETE FROM CoreTracks {0}; COMMIT",
+ condition),
+ psource.DbId, uri, scan_started,
+ psource.DbId, uri, scan_started,
+ psource.DbId, uri, scan_started
+ );
// TODO prune artists/albums
- Refresh ();
- //Hyena.Log.DebugFormat ("Have {0} items after delete", ServiceManager.DbConnection.Query<int>("select count(*) from coretracks where primarysourceid=?", psource.DbId));
- }
-
- private void Refresh ()
- {
psource.Reload ();
psource.NotifyTracksChanged ();
+ //Hyena.Log.DebugFormat ("Have {0} items after delete", ServiceManager.DbConnection.Query<int>("select count(*) from coretracks where primarysourceid=?", psource.DbId));
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs b/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
index 522f556..f63455d 100644
--- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
+++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
@@ -603,29 +603,25 @@ namespace Banshee.Database
[DatabaseVersion (26)]
private bool Migrate_26 ()
{
+ string unknown_artist = "Unknown Artist";
+ string unknown_album = "Unknown Album";
+ string unknown_title = "Unknown Title";
+
connection.Execute ("UPDATE CoreArtists SET Name = NULL, NameLowered = HYENA_SEARCH_KEY(?)" +
" WHERE Name IN ('', ?, ?) OR Name IS NULL",
- ArtistInfo.UnknownArtistName,
- ArtistInfo.UnknownArtistNameUntranslated,
- ArtistInfo.UnknownArtistName);
+ ArtistInfo.UnknownArtistName, unknown_artist, ArtistInfo.UnknownArtistName);
connection.Execute ("UPDATE CoreAlbums SET ArtistName = NULL, ArtistNameLowered = HYENA_SEARCH_KEY(?)" +
" WHERE ArtistName IN ('', ?, ?) OR ArtistName IS NULL",
- ArtistInfo.UnknownArtistName,
- ArtistInfo.UnknownArtistNameUntranslated,
- ArtistInfo.UnknownArtistName);
+ ArtistInfo.UnknownArtistName, unknown_artist, ArtistInfo.UnknownArtistName);
connection.Execute ("UPDATE CoreAlbums SET Title = NULL, TitleLowered = HYENA_SEARCH_KEY(?)" +
" WHERE Title IN ('', ?, ?) OR Title IS NULL",
- AlbumInfo.UnknownAlbumTitle,
- AlbumInfo.UnknownAlbumTitleUntranslated,
- AlbumInfo.UnknownAlbumTitle);
+ AlbumInfo.UnknownAlbumTitle, unknown_album, AlbumInfo.UnknownAlbumTitle);
connection.Execute ("UPDATE CoreTracks SET Title = NULL, TitleLowered = HYENA_SEARCH_KEY(?)" +
" WHERE Title IN ('', ?, ?) OR Title IS NULL",
- TrackInfo.UnknownTitle,
- TrackInfo.UnknownTitleUntranslated,
- TrackInfo.UnknownTitle);
+ TrackInfo.UnknownTitle, unknown_title, TrackInfo.UnknownTitle);
return true;
}
diff --git a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
index dc80482..9effe5a 100644
--- a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
@@ -47,7 +47,7 @@ namespace Banshee.Equalizer
{
public class EqualizerManager : IEnumerable<EqualizerSetting>, IEnumerable
{
- private string legacy_xml_path = System.IO.Path.Combine (
+ private static string legacy_xml_path = System.IO.Path.Combine (
Paths.ApplicationData, "equalizers.xml");
private static EqualizerManager instance;
diff --git a/src/Core/Banshee.Services/Banshee.Hardware/FileSystem.cs b/src/Core/Banshee.Services/Banshee.Hardware/FileSystem.cs
deleted file mode 100644
index 6abc9ad..0000000
--- a/src/Core/Banshee.Services/Banshee.Hardware/FileSystem.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// FileSystem.cs
-//
-// Author:
-// Nicholas Little <arealityfarbetween at googlemail.com>
-//
-// Copyright 2013 Nicholas Little
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Linq;
-
-namespace Banshee.Hardware
-{
- public static class FileSystem
- {
- public static bool IsCaseSensitive (IVolume volume)
- {
- var drive = new DriveInfo (volume.MountPoint);
- return !case_insensitive_filesystems.Contains (drive.DriveFormat);
- }
-
- private static readonly string[] case_insensitive_filesystems = { "vfat", "msdos", "ntfs" };
- }
-}
-
diff --git a/src/Core/Banshee.Services/Banshee.Library/LibraryImportManager.cs b/src/Core/Banshee.Services/Banshee.Library/LibraryImportManager.cs
index a05a901..25ba9c6 100644
--- a/src/Core/Banshee.Services/Banshee.Library/LibraryImportManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Library/LibraryImportManager.cs
@@ -60,10 +60,10 @@ namespace Banshee.Library
get { return ServiceManager.SourceManager.MusicLibrary.ErrorSource; }
}
- protected override long [] PrimarySourceIds {
+ protected override int [] PrimarySourceIds {
get {
if (base.PrimarySourceIds == null) {
- base.PrimarySourceIds = new long [] {
+ base.PrimarySourceIds = new int [] {
ServiceManager.SourceManager.VideoLibrary.DbId,
ServiceManager.SourceManager.MusicLibrary.DbId
};
diff --git a/src/Core/Banshee.Services/Banshee.Library/LibrarySchema.cs b/src/Core/Banshee.Services/Banshee.Library/LibrarySchema.cs
index 1d5afbb..3d1ff7e 100644
--- a/src/Core/Banshee.Services/Banshee.Library/LibrarySchema.cs
+++ b/src/Core/Banshee.Services/Banshee.Library/LibrarySchema.cs
@@ -55,6 +55,13 @@ namespace Banshee.Configuration.Schema
"%album_artist_initial%, %artist% (deprecated, use %album_artist%)."
);
+ public static readonly SchemaEntry<bool> MoveOnInfoSave = new SchemaEntry<bool>(
+ "library", "move_on_info_save",
+ false,
+ "Move music on info save",
+ "Move music within banshee music library directory when saving track info"
+ );
+
public static readonly SchemaEntry<bool> WriteMetadata = new SchemaEntry<bool>(
"library", "write_metadata",
false,
diff --git a/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs b/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
index 9516605..7a4a0fc 100644
--- a/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
+++ b/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
@@ -49,7 +49,6 @@ namespace Banshee.Library
public abstract class LibrarySource : PrimarySource
{
// Deprecated, don't use in new code
- // TODO: remove before GConf->GSettings migration?
internal static readonly Banshee.Configuration.SchemaEntry<string> OldLocationSchema = new Banshee.Configuration.SchemaEntry<string> ("library", "base_location", null, null, null);
internal static readonly Banshee.Configuration.SchemaEntry<bool> OldImportSetting = new Banshee.Configuration.SchemaEntry<bool> ("library", "copy_on_import", false, null, null);
internal static readonly Banshee.Configuration.SchemaEntry<bool> OldRenameSetting = new Banshee.Configuration.SchemaEntry<bool> ("library", "move_on_info_save", false, null, null);
@@ -202,8 +201,8 @@ namespace Banshee.Library
SafeUri uri = new SafeUri (path);
// Make sure it's not already in the library
- // TODO optimize - no need to recreate this long [] every time
- if (DatabaseTrackInfo.ContainsUri (uri, new long [] {DbId})) {
+ // TODO optimize - no need to recreate this int [] every time
+ if (DatabaseTrackInfo.ContainsUri (uri, new int [] {DbId})) {
return;
}
diff --git a/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs b/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
index 9d4174d..2fc7bc8 100644
--- a/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
+++ b/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
@@ -56,10 +56,8 @@ namespace Banshee.Library
Banshee.Base.FileNamePattern.MusicPattern = music_filename_pattern;
}
- public static readonly string SourceName = Catalog.GetString ("Music");
-
// Catalog.GetString ("Music Library")
- public MusicLibrarySource () : base (SourceName, "Library", 40)
+ public MusicLibrarySource () : base (Catalog.GetString ("Music"), "Library", 40)
{
MediaTypes = TrackMediaAttributes.Music | TrackMediaAttributes.AudioStream;
NotMediaTypes = TrackMediaAttributes.Podcast | TrackMediaAttributes.VideoStream | TrackMediaAttributes.AudioBook;
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
index 33094ce..780fe07 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
@@ -49,10 +49,6 @@ namespace Banshee.MediaEngine
OnStateChanged (PlayerState.Paused);
}
- public override void Seek (uint position, bool accurate_seek)
- {
- }
-
private ushort volume;
public override ushort Volume {
get { return volume; }
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
index d323b9e..81a5879 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
@@ -148,13 +148,6 @@ namespace Banshee.MediaEngine
public abstract void Pause ();
- public abstract void Seek (uint position, bool accurate_seek);
-
- public void Seek (uint position)
- {
- Seek (position, false);
- }
-
public virtual void SetNextTrackUri (SafeUri uri, bool maybeVideo)
{
// Opening files on SetNextTrack is a sane default behaviour.
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
index 3aec4b3..793b9cd 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
@@ -294,7 +294,7 @@ namespace Banshee.MediaEngine
bool found = false;
if (ServiceManager.DbConnection != null) {
// Try to find uri in the library
- long track_id = DatabaseTrackInfo.GetTrackIdForUri (uri);
+ int track_id = DatabaseTrackInfo.GetTrackIdForUri (uri);
if (track_id > 0) {
DatabaseTrackInfo track_db = DatabaseTrackInfo.Provider.FetchSingle (track_id);
found = true;
@@ -538,16 +538,6 @@ namespace Banshee.MediaEngine
}
}
- public void Seek (uint position, bool accurate_seek)
- {
- active_engine.Seek (position, accurate_seek);
- }
-
- public void Seek (uint position)
- {
- Seek (position, false);
- }
-
public void VideoExpose (IntPtr displayContext, bool direct)
{
active_engine.VideoExpose (displayContext, direct);
diff --git a/src/Core/Banshee.Services/Banshee.MediaProfiles/ProfileConfiguration.cs b/src/Core/Banshee.Services/Banshee.MediaProfiles/ProfileConfiguration.cs
index 615ccbe..58471e1 100644
--- a/src/Core/Banshee.Services/Banshee.MediaProfiles/ProfileConfiguration.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaProfiles/ProfileConfiguration.cs
@@ -51,7 +51,7 @@ namespace Banshee.MediaProfiles
public static ProfileConfiguration LoadActive (MediaProfileManager manager, string id)
{
- string profile_id = ConfigurationClient.Instance.Get<string> (MakeConfNamespace (id), "active_profile", string.Empty);
+ string profile_id = ConfigurationClient.Get<string>(MakeConfNamespace(id), "active_profile", string.Empty);
if(profile_id == string.Empty) {
return null;
@@ -69,7 +69,7 @@ namespace Banshee.MediaProfiles
public static void SaveActiveProfile(Profile profile, string id)
{
- ConfigurationClient.Instance.Set<string> (MakeConfNamespace (id), "active_profile", profile.Id);
+ ConfigurationClient.Set<string>(MakeConfNamespace(id), "active_profile", profile.Id);
}
public ProfileConfiguration(Profile profile, string id)
@@ -80,8 +80,8 @@ namespace Banshee.MediaProfiles
protected virtual void Load()
{
- foreach (string variable in ConfigurationClient.Instance.Get<string[]> (ConfNamespace, "variables", new string [0])) {
- Add(variable, ConfigurationClient.Instance.Get<string> (ConfNamespace, variable, string.Empty));
+ foreach(string variable in ConfigurationClient.Get<string[]>(ConfNamespace, "variables", new string[0])) {
+ Add(variable, ConfigurationClient.Get<string>(ConfNamespace, variable, string.Empty));
}
}
@@ -90,9 +90,9 @@ namespace Banshee.MediaProfiles
List<string> variable_names = new List<string>(Count);
foreach(KeyValuePair<string, string> variable in this) {
variable_names.Add(variable.Key);
- ConfigurationClient.Instance.Set<string> (ConfNamespace, variable.Key, variable.Value);
+ ConfigurationClient.Set<string>(ConfNamespace, variable.Key, variable.Value);
}
- ConfigurationClient.Instance.Set<string[]> (ConfNamespace, "variables", variable_names.ToArray ());
+ ConfigurationClient.Set<string[]>(ConfNamespace, "variables", variable_names.ToArray());
}
public void Add(string variable, string value)
diff --git a/src/Core/Banshee.Services/Banshee.Metadata/MetadataService.cs b/src/Core/Banshee.Services/Banshee.Metadata/MetadataService.cs
index 76c0d64..23e4721 100644
--- a/src/Core/Banshee.Services/Banshee.Metadata/MetadataService.cs
+++ b/src/Core/Banshee.Services/Banshee.Metadata/MetadataService.cs
@@ -84,7 +84,8 @@ namespace Banshee.Metadata
return;
}
- if (String.IsNullOrEmpty (track.AlbumTitle) || String.IsNullOrEmpty (track.ArtistName)) {
+ if (String.IsNullOrEmpty (track.AlbumTitle) || track.AlbumTitle == AlbumInfo.UnknownAlbumTitle ||
+ String.IsNullOrEmpty (track.ArtistName) || track.ArtistName == ArtistInfo.UnknownArtistName) {
// Do not try to fetch album art for these
return;
}
diff --git a/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs b/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs
index 7f8d378..dfeb3a6 100644
--- a/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs
+++ b/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs
@@ -125,10 +125,6 @@ namespace Banshee.Metadata
private bool RenameFile (DatabaseTrackInfo track)
{
- if (track.PathPattern == null) {
- return false;
- }
-
SafeUri old_uri = track.Uri;
bool in_library = old_uri.AbsolutePath.StartsWith (musicLibrarySource.BaseDirectoryWithSeparator);
diff --git a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
index a881ef8..19a649a 100644
--- a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
+++ b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
@@ -283,10 +283,10 @@ namespace Banshee.PlaybackController
public void RestartOrPrevious (bool restart)
{
const int delay = 4000; // ms
- if (player_engine.CanSeek && player_engine.Position > delay) {
- Restart ();
- } else {
+ if (player_engine.Position < delay) {
Previous ();
+ } else {
+ Restart ();
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs b/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
index d4cc668..f9659ce 100644
--- a/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
@@ -50,7 +50,7 @@ namespace Banshee.Playlist
{
public abstract class AbstractPlaylistSource : DatabaseSource
{
- protected long? dbid;
+ protected int? dbid;
protected abstract string SourceTable { get; }
protected abstract string SourcePrimaryKey { get; }
@@ -77,7 +77,7 @@ namespace Banshee.Playlist
get { return true; }
}
- public long? DbId {
+ public int? DbId {
get { return dbid; }
protected set {
if (value != null && value != dbid) {
@@ -86,8 +86,8 @@ namespace Banshee.Playlist
}
}
- protected long primary_source_id;
- public long PrimarySourceId {
+ protected int primary_source_id;
+ public int PrimarySourceId {
get { return primary_source_id; }
}
@@ -134,7 +134,7 @@ namespace Banshee.Playlist
}
}
- public AbstractPlaylistSource (string generic_name, string name, long dbid, int sortColumn, int sortType, PrimarySource parent, bool is_temp)
+ public AbstractPlaylistSource (string generic_name, string name, int dbid, int sortColumn, int sortType, PrimarySource parent, bool is_temp)
: base (generic_name, name, dbid.ToString (), 500, parent)
{
primary_source_id = parent.DbId;
diff --git a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
index e2df84e..470526d 100644
--- a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
@@ -108,6 +108,23 @@ namespace Banshee.Playlist
return default_export_index;
}
+ public static string [] ImportPlaylist (string playlistUri)
+ {
+ return ImportPlaylist (playlistUri, null);
+ }
+
+ public static string [] ImportPlaylist (string playlistUri, Uri baseUri)
+ {
+ IPlaylistFormat playlist = Load (playlistUri, baseUri);
+ List<string> uris = new List<string> ();
+ if (playlist != null) {
+ foreach (Dictionary<string, object> element in playlist.Elements) {
+ uris.Add (((Uri)element["uri"]).AbsoluteUri);
+ }
+ }
+ return uris.ToArray ();
+ }
+
public static bool PathHasPlaylistExtension (string playlistUri)
{
if (System.IO.Path.HasExtension (playlistUri)) {
@@ -122,7 +139,7 @@ namespace Banshee.Playlist
return false;
}
- public static IPlaylistFormat Load (string playlistUri, Uri baseUri, Uri rootPath)
+ public static IPlaylistFormat Load (string playlistUri, Uri baseUri)
{
PlaylistFormatDescription [] formats = PlaylistFileUtil.ExportFormats;
@@ -152,7 +169,6 @@ namespace Banshee.Playlist
try {
IPlaylistFormat playlist = (IPlaylistFormat)Activator.CreateInstance (format.Type);
playlist.BaseUri = baseUri;
- playlist.RootPath = rootPath;
playlist.Load (Banshee.IO.File.OpenRead (new SafeUri (playlistUri)), true);
return playlist;
} catch (InvalidPlaylistException) {
@@ -180,11 +196,12 @@ namespace Banshee.Playlist
parser.BaseUri = new Uri (relative_dir);
if (parser.Parse (uri)) {
List<string> uris = new List<string> ();
- foreach (PlaylistElement element in parser.Elements) {
- if (element.Uri.IsFile) {
- uris.Add (element.Uri.LocalPath);
+ foreach (Dictionary<string, object> element in parser.Elements) {
+ Uri elt = (Uri)element["uri"];
+ if (elt.IsFile) {
+ uris.Add (elt.LocalPath);
} else {
- Log.InformationFormat ("Ignoring invalid playlist element: {0}", element.Uri.OriginalString);
+ Log.InformationFormat ("Ignoring invalid playlist element: {0}", elt.OriginalString);
}
}
@@ -271,7 +288,7 @@ namespace Banshee.Playlist
//ServiceManager.DbConnection.BeginTransaction ();
foreach (string uri in uris) {
// FIXME: Does the following call work if the source is just a PrimarySource (not LibrarySource)?
- long track_id = source.GetTrackIdForUri (uri);
+ int track_id = source.GetTrackIdForUri (uri);
if (track_id > 0) {
ServiceManager.DbConnection.Execute (insert_command, track_id);
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
index 8966aff..f912964 100644
--- a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
@@ -114,11 +114,11 @@ namespace Banshee.Playlist
SetProperties ();
}
- protected PlaylistSource (string name, long dbid, PrimarySource parent) : this (name, dbid, -1, 0, parent, 0, false)
+ protected PlaylistSource (string name, int dbid, PrimarySource parent) : this (name, dbid, -1, 0, parent, 0, false)
{
}
- protected PlaylistSource (string name, long dbid, int sortColumn, int sortType, PrimarySource parent, int count, bool is_temp)
+ protected PlaylistSource (string name, int dbid, int sortColumn, int sortType, PrimarySource parent, int count, bool is_temp)
: base (generic_name, name, dbid, sortColumn, sortType, parent, is_temp)
{
SetProperties ();
@@ -232,7 +232,7 @@ namespace Banshee.Playlist
#endregion
- protected void AddTrack (long track_id)
+ protected void AddTrack (int track_id)
{
ServiceManager.DbConnection.Execute (add_track_command, DbId, track_id, MaxViewOrder);
OnTracksAdded ();
@@ -350,7 +350,7 @@ namespace Banshee.Playlist
WHERE Special = 0 AND PrimarySourceID = ?", parent.DbId))) {
while (reader.Read ()) {
yield return new PlaylistSource (
- reader.Get<string> (1), reader.Get<long> (0),
+ reader.Get<string> (1), reader.Get<int> (0),
reader.Get<int> (2), reader.Get<int> (3), parent,
reader.Get<int> (5), reader.Get<bool> (6)
);
@@ -380,9 +380,9 @@ namespace Banshee.Playlist
}
}
- private static long GetPlaylistId (string name)
+ private static int GetPlaylistId (string name)
{
- return ServiceManager.DbConnection.Query<long> (
+ return ServiceManager.DbConnection.Query<int> (
"SELECT PlaylistID FROM Playlists WHERE Name = ? LIMIT 1", name
);
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/AsfReferencePlaylistFormat.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/AsfReferencePlaylistFormat.cs
index c5396ba..7a8b012 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/AsfReferencePlaylistFormat.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/AsfReferencePlaylistFormat.cs
@@ -59,7 +59,7 @@ namespace Banshee.Playlists.Formats
public override void Load (StreamReader reader, bool validateHeader)
{
string line;
- PlaylistElement element = AddElement ();
+ Dictionary<string, object> element = AddElement ();
while ((line = reader.ReadLine()) != null) {
if (line.StartsWith ("ref01", StringComparison.CurrentCultureIgnoreCase) ||
@@ -69,7 +69,7 @@ namespace Banshee.Playlists.Formats
if (uri_aux.StartsWith ("http", StringComparison.CurrentCultureIgnoreCase))
uri_aux = "mmsh" + uri_aux.Substring (4);
- element.Uri = ResolveUri (uri_aux);
+ element["uri"] = ResolveUri (uri_aux);
break;
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs
index a5a7c66..6346170 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs
@@ -109,7 +109,7 @@ namespace Banshee.Playlists.Formats
PlaylistParser secondary = new PlaylistParser ();
if (secondary.Parse (new SafeUri (ResolveUri (href)))) {
// splice in Elements of secondary
- foreach (PlaylistElement e in secondary.Elements) {
+ foreach (Dictionary<string, object> e in secondary.Elements) {
Elements.Add (e);
}
}
@@ -121,7 +121,7 @@ namespace Banshee.Playlists.Formats
private void LoadEntry (XmlTextReader xml_reader)
{
- PlaylistElement element = AddElement ();
+ Dictionary<string, object> element = AddElement ();
do {
try {
@@ -137,7 +137,7 @@ namespace Banshee.Playlists.Formats
switch (xml_reader.LocalName.ToLower ()) {
case "title":
xml_reader.Read ();
- element.Title = xml_reader.Value;
+ element["title"] = xml_reader.Value;
break;
case "ref":
@@ -147,13 +147,13 @@ namespace Banshee.Playlists.Formats
uri_aux = "mmsh" + uri_aux.Substring (4);
}
- element.Uri = ResolveUri (uri_aux);
+ element["uri"] = ResolveUri (uri_aux);
break;
case "duration":
try {
xml_reader.Read ();
- element.Duration = TimeSpan.Parse (xml_reader.Value);
+ element["duration"] = TimeSpan.Parse (xml_reader.Value);
} catch {
}
break;
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/IPlaylistFormat.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/IPlaylistFormat.cs
index 85d3c01..98d8114 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/IPlaylistFormat.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/IPlaylistFormat.cs
@@ -42,11 +42,10 @@ namespace Banshee.Playlists.Formats
void Save(Stream stream, ITrackModelSource source);
Dictionary<string, object> Attributes { get; }
- List<PlaylistElement> Elements { get; }
+ List<Dictionary<string, object>> Elements { get; }
Uri BaseUri { get; set; }
string Title { get; set; }
char FolderSeparator { get; set; }
- Uri RootPath { get; set; }
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs
index a8a6460..031bbb9 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs
@@ -35,7 +35,7 @@ using Mono.Unix;
using Banshee.Base;
using Banshee.Collection;
using Banshee.Sources;
-using Hyena;
+using Folder = Banshee.IO.Directory;
namespace Banshee.Playlists.Formats
{
@@ -63,7 +63,7 @@ namespace Banshee.Playlists.Formats
public override void Load(StreamReader reader, bool validateHeader)
{
string line;
- PlaylistElement element = null;
+ Dictionary<string, object> element = null;
while((line = reader.ReadLine()) != null) {
line = line.Trim();
@@ -88,7 +88,7 @@ namespace Banshee.Playlists.Formats
}
try {
- element.Uri = ResolveUri (line);
+ element["uri"] = ResolveUri(line);
} catch {
Elements.Remove(element);
}
@@ -97,16 +97,16 @@ namespace Banshee.Playlists.Formats
}
}
- private void ParseExtended (PlaylistElement element, string line)
+ private void ParseExtended(Dictionary<string, object> element, string line)
{
string split = line.Substring(8).TrimStart(',');
string [] parts = split.Split(new char [] { ',' }, 2);
if(parts.Length == 2) {
- element.Duration = SecondsStringToTimeSpan (parts[0]);
- element.Title = parts[1].Trim ();
+ element["duration"] = SecondsStringToTimeSpan(parts[0]);
+ element["title"] = parts[1].Trim();
} else {
- element.Title = split.Trim ();
+ element["title"] = split.Trim();
}
}
@@ -124,8 +124,8 @@ namespace Banshee.Playlists.Formats
writer.WriteLine("#EXTINF:{0},{1} - {2}", duration, track.DisplayArtistName, track.DisplayTrackTitle);
string trackpath = ExportUri (track.Uri);
- if (FolderSeparator == Paths.Folder.DosSeparator) {
- trackpath = Paths.NormalizeToDos (trackpath);
+ if (FolderSeparator == Folder.DosSeparator) {
+ trackpath = trackpath.Replace (Folder.UnixSeparator, Folder.DosSeparator);
}
writer.WriteLine( trackpath );
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistElement.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistElement.cs
deleted file mode 100644
index 889191b..0000000
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistElement.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// PlaylistElement.cs
-//
-// Author:
-// Andres G. Aragoneses <knocte at gmail.com>
-//
-// Copyright 2012 Andres G. Aragoneses
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-namespace Banshee.Playlists.Formats
-{
- public class PlaylistElement
- {
- public string Title { get; internal set; }
- public Uri Uri { get; internal set; }
- public TimeSpan Duration { get; internal set; }
- }
-}
-
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistFormatBase.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistFormatBase.cs
index 667b199..2889100 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistFormatBase.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistFormatBase.cs
@@ -34,20 +34,21 @@ using Hyena;
using Banshee.Base;
using Banshee.Sources;
+using Folder = Banshee.IO.Directory;
namespace Banshee.Playlists.Formats
{
public abstract class PlaylistFormatBase : IPlaylistFormat
{
private Dictionary<string, object> attributes = new Dictionary<string, object>();
- private List<PlaylistElement> elements = new List<PlaylistElement> ();
+ private List<Dictionary<string, object>> elements = new List<Dictionary<string, object>>();
private Uri base_uri = null;
private string title = null;
public PlaylistFormatBase()
{
attributes = new Dictionary<string, object>();
- elements = new List<PlaylistElement> ();
+ elements = new List<Dictionary<string, object>>();
if (Environment.CurrentDirectory.Equals ("/")) {
// System.Uri doesn't like / as a value
@@ -69,26 +70,19 @@ namespace Banshee.Playlists.Formats
public abstract void Save(Stream stream, ITrackModelSource source);
- protected virtual PlaylistElement AddElement ()
+ protected virtual Dictionary<string, object> AddElement()
{
- var element = new PlaylistElement ();
+ Dictionary<string, object> element = new Dictionary<string, object>();
Elements.Add(element);
return element;
}
protected virtual Uri ResolveUri(string uri)
{
- uri = Paths.NormalizeToUnix (uri);
-
- if (BaseUri == null) {
- return new Uri (uri);
- }
-
- if (RootPath != null) {
- uri = Paths.SwitchRoot (uri, RootPath.LocalPath, BaseUri.LocalPath);
+ if (!uri.Contains (Folder.UnixSeparator.ToString ()) && uri.Contains (Folder.DosSeparator.ToString ())) {
+ uri = uri.Replace (Folder.DosSeparator, Folder.UnixSeparator);
}
-
- return new Uri (BaseUri, uri);
+ return BaseUri == null ? new Uri(uri) : new Uri(BaseUri, uri);
}
protected virtual string ExportUri(SafeUri uri)
@@ -101,10 +95,6 @@ namespace Banshee.Playlists.Formats
return uri.AbsoluteUri;
}
- if (RootPath != null) {
- return Paths.SwitchRoot (uri.LocalPath, BaseUri.LocalPath, RootPath.LocalPath);
- }
-
var result = Paths.MakePathRelative (uri.LocalPath, new DirectoryInfo (BaseUri.LocalPath).FullName);
return result ?? uri.AbsoluteUri;
@@ -124,7 +114,7 @@ namespace Banshee.Playlists.Formats
get { return attributes; }
}
- public virtual List<PlaylistElement> Elements {
+ public virtual List<Dictionary<string, object>> Elements {
get { return elements; }
}
@@ -145,7 +135,5 @@ namespace Banshee.Playlists.Formats
}
public virtual char FolderSeparator { get; set; }
-
- public Uri RootPath { get; set; } //if not null, elements should have Absolute Uris
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistParser.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistParser.cs
index 9e416dc..6dcad3a 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistParser.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlaylistParser.cs
@@ -49,7 +49,7 @@ namespace Banshee.Playlists.Formats
XspfPlaylistFormat.FormatDescription
};
- private List<PlaylistElement> elements;
+ private List<Dictionary<string, object>> elements;
private Uri base_uri = null;
private string title = null;
private readonly int HTTP_REQUEST_RETRIES = 3;
@@ -192,7 +192,7 @@ namespace Banshee.Playlists.Formats
}
}
- public List<PlaylistElement> Elements {
+ public List<Dictionary<string, object>> Elements {
get { return elements; }
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs
index b605e96..44ff9e9 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs
@@ -108,19 +108,19 @@ namespace Banshee.Playlists.Formats
int index = Int32.Parse(line.Substring(index_offset, eq_offset - index_offset),
ApplicationContext.InternalCultureInfo.NumberFormat) - 1;
string value_string = line.Substring(eq_offset + 1).Trim();
- PlaylistElement element = index < Elements.Count
+ Dictionary<string, object> element = index < Elements.Count
? Elements[index]
: AddElement();
switch(element_type) {
case PlsType.File:
- element.Uri = ResolveUri (value_string);
+ element["uri"] = ResolveUri(value_string);
break;
case PlsType.Title:
- element.Title = value_string;
+ element["title"] = value_string;
break;
case PlsType.Length:
- element.Duration = SecondsStringToTimeSpan (value_string);
+ element["duration"] = SecondsStringToTimeSpan(value_string);
break;
}
} catch {
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/Tests/PlaylistFormatTests.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/Tests/PlaylistFormatTests.cs
index a34f485..25bb977 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/Tests/PlaylistFormatTests.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/Tests/PlaylistFormatTests.cs
@@ -48,7 +48,7 @@ namespace Banshee.Playlists.Formats.Tests
#region Setup
private static Uri BaseUri = new Uri ("/iamyourbase/");
- private List<PlaylistElement> elements = new List<PlaylistElement> ();
+ private List<Dictionary<string, object>> elements = new List<Dictionary<string, object>> ();
private string playlists_dir;
[TestFixtureSetUp]
@@ -58,7 +58,7 @@ namespace Banshee.Playlists.Formats.Tests
playlists_dir = Path.Combine (TestsDir, "data/playlist-data");
IPlaylistFormat playlist = LoadPlaylist (new M3uPlaylistFormat (), "extended.m3u");
- foreach (PlaylistElement element in playlist.Elements) {
+ foreach (Dictionary<string, object> element in playlist.Elements) {
elements.Add (element);
}
}
@@ -71,14 +71,14 @@ namespace Banshee.Playlists.Formats.Tests
public void ReadAsfReferenceLocal ()
{
IPlaylistFormat pl = LoadPlaylist (new AsfReferencePlaylistFormat (), "reference_local.asx");
- Assert.AreEqual (elements[2].Uri, pl.Elements[0].Uri);
+ Assert.AreEqual (elements[2]["uri"], pl.Elements[0]["uri"]);
}
[Test]
public void ReadAsfReferenceRemote ()
{
IPlaylistFormat pl = LoadPlaylist (new AsfReferencePlaylistFormat (), "reference_remote.asx");
- Assert.AreEqual ("mmsh://remote/remote.mp3", (pl.Elements[0].Uri).AbsoluteUri);
+ Assert.AreEqual ("mmsh://remote/remote.mp3", (pl.Elements[0]["uri"] as Uri).AbsoluteUri);
}
[Test]
@@ -101,23 +101,7 @@ namespace Banshee.Playlists.Formats.Tests
parser.Parse (new SafeUri ("http://download.banshee.fm/test/remote.asx"));
IPlaylistFormat plref = LoadPlaylist (new AsxPlaylistFormat (), "entryref.asx");
- Assert.AreEqual (2, plref.Elements.Count);
- AssertEqual (parser.Elements, plref.Elements);
- }
-
- private void AssertEqual (List<PlaylistElement> l1, List<PlaylistElement> l2)
- {
- Assert.AreEqual (l1.Count, l2.Count);
- for (int i = 0; i < l1.Count; i++) {
- AssertEqual (l1[i], l2[i]);
- }
- }
-
- private void AssertEqual (PlaylistElement e1, PlaylistElement e2)
- {
- Assert.AreEqual (e1.Title, e2.Title);
- Assert.AreEqual (e1.Duration, e2.Duration);
- Assert.AreEqual (e1.Uri.ToString (), e2.Uri.ToString ());
+ Assert.AreEqual (parser.Elements, plref.Elements);
}
[Test]
@@ -132,19 +116,6 @@ namespace Banshee.Playlists.Formats.Tests
LoadTest (new M3uPlaylistFormat (), "extended.m3u", false);
}
- [Test] // https://bugzilla.gnome.org/show_bug.cgi?id=661507
- public void ReadM3uWithDosPathAsRootPath ()
- {
- playlists_dir = Path.Combine (TestsDir, "data/playlist-data");
- IPlaylistFormat playlist = LoadPlaylist (new M3uPlaylistFormat (),
- "dos_path_nokia.m3u",
- new Uri ("E:\\"));
- Assert.AreEqual (playlist.Elements [0].Uri.AbsoluteUri.ToString (),
- "file:///iamyourbase/Music/Atari%20Doll/Atari%20Doll/01.%20Queen%20for%20a%20Day.mp3");
- Assert.AreEqual (playlist.Elements [1].Uri.AbsoluteUri.ToString (),
- "file:///iamyourbase/Music/Barenaked%20Ladies/All%20Their%20Greatest%20Hits%201991/04.%20One%20Week.mp3");
- }
-
[Test]
public void ReadPlsSimple ()
{
@@ -175,43 +146,35 @@ namespace Banshee.Playlists.Formats.Tests
#region Utilities
- private IPlaylistFormat LoadPlaylist (IPlaylistFormat playlist, string filename, Uri rootPath)
+ private IPlaylistFormat LoadPlaylist (IPlaylistFormat playlist, string filename)
{
playlist.BaseUri = BaseUri;
- if (rootPath != null) {
- playlist.RootPath = rootPath;
- }
playlist.Load (File.OpenRead (Path.Combine (playlists_dir, filename)), true);
return playlist;
}
- private IPlaylistFormat LoadPlaylist (IPlaylistFormat playlist, string filename)
- {
- return LoadPlaylist (playlist, filename, null);
- }
-
private void LoadTest (IPlaylistFormat playlist, string filename, bool mmsh)
{
LoadPlaylist (playlist, filename);
AssertTest (playlist.Elements, mmsh);
}
- private void AssertTest (List<PlaylistElement> plelements, bool mmsh)
+ private void AssertTest (List<Dictionary<string, object>> plelements, bool mmsh)
{
int i = 0;
- foreach (PlaylistElement element in plelements) {
+ foreach (Dictionary<string, object> element in plelements) {
if (mmsh) {
- Assert.AreEqual (elements[i].Uri.AbsoluteUri.Replace ("http", "mmsh"), element.Uri.AbsoluteUri);
+ Assert.AreEqual (((Uri)elements[i]["uri"]).AbsoluteUri.Replace ("http", "mmsh"), ((Uri)element["uri"]).AbsoluteUri);
} else {
- Assert.AreEqual (elements[i].Uri, element.Uri);
+ Assert.AreEqual ((Uri)elements[i]["uri"], (Uri)element["uri"]);
}
- if (element.Title != null) {
- Assert.AreEqual (elements[i].Title, element.Title);
+ if (element.ContainsKey ("title")) {
+ Assert.AreEqual ((string)elements[i]["title"], (string)element["title"]);
}
- if (element.Duration != default(TimeSpan)) {
- Assert.AreEqual (elements[i].Duration, element.Duration);
+ if (element.ContainsKey ("duration")) {
+ Assert.AreEqual ((TimeSpan)elements[i]["duration"], (TimeSpan)element["duration"]);
}
i++;
diff --git a/src/Core/Banshee.Services/Banshee.Playlists.Formats/XspfPlaylistFormat.cs b/src/Core/Banshee.Services/Banshee.Playlists.Formats/XspfPlaylistFormat.cs
index aabb2e5..5c0fe26 100644
--- a/src/Core/Banshee.Services/Banshee.Playlists.Formats/XspfPlaylistFormat.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlists.Formats/XspfPlaylistFormat.cs
@@ -66,8 +66,8 @@ namespace Banshee.Playlists.Formats
playlist.Load (stream);
Title = playlist.Title;
foreach (Xspf.Track track in playlist.Tracks) {
- PlaylistElement element = AddElement ();
- element.Uri = track.GetLocationAt (0);
+ Dictionary<string, object> element = AddElement ();
+ element["uri"] = track.GetLocationAt (0);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs b/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
index 878e33d..4200d46 100644
--- a/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
+++ b/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
@@ -232,7 +232,7 @@ namespace Banshee.SmartPlaylist
}
// For existing smart playlists that we're loading from the database
- protected SmartPlaylistSource (long dbid, string name, string condition_xml, string order_by, string limit_number, string limit_criterion, PrimarySource parent, int count, bool is_temp, bool hiddenWhenEmpty) :
+ protected SmartPlaylistSource (int dbid, string name, string condition_xml, string order_by, string limit_number, string limit_criterion, PrimarySource parent, int count, bool is_temp, bool hiddenWhenEmpty) :
base (generic_name, name, dbid, -1, 0, parent, is_temp)
{
ConditionXml = condition_xml;
@@ -542,7 +542,7 @@ namespace Banshee.SmartPlaylist
SmartPlaylistSource playlist = null;
try {
playlist = new SmartPlaylistSource (
- reader.Get<long> (0), reader.Get<string> (1),
+ reader.Get<int> (0), reader.Get<string> (1),
reader.Get<string> (2), reader.Get<string> (3),
reader.Get<string> (4), reader.Get<string> (5),
parent, reader.Get<int> (7), reader.Get<bool> (8),
@@ -644,7 +644,7 @@ namespace Banshee.SmartPlaylist
playlists.Sort (new DependencyComparer ());
}
- public static SmartPlaylistSource GetById (long dbId)
+ public static SmartPlaylistSource GetById (int dbId)
{
// TODO use a dictionary
foreach (SmartPlaylistSource sp in playlists) {
diff --git a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
index 87f0b68..a1250ec 100644
--- a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
+++ b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
@@ -119,14 +119,14 @@ namespace Banshee.Sources
get { return expanded_schema; }
}
- private long dbid;
- public long DbId {
+ private int dbid;
+ public int DbId {
get {
if (dbid > 0) {
return dbid;
}
- dbid = ServiceManager.DbConnection.Query<long> ("SELECT PrimarySourceID FROM CorePrimarySources WHERE StringID = ?", UniqueId);
+ dbid = ServiceManager.DbConnection.Query<int> ("SELECT PrimarySourceID FROM CorePrimarySources WHERE StringID = ?", UniqueId);
if (dbid == 0) {
dbid = ServiceManager.DbConnection.Execute ("INSERT INTO CorePrimarySources (StringID, IsTemporary) VALUES (?, ?)", UniqueId, IsTemporary);
} else {
@@ -190,8 +190,8 @@ namespace Banshee.Sources
public event TrackEventHandler TracksChanged;
public event TrackEventHandler TracksDeleted;
- private static Dictionary<long, PrimarySource> primary_sources = new Dictionary<long, PrimarySource> ();
- public static PrimarySource GetById (long id)
+ private static Dictionary<int, PrimarySource> primary_sources = new Dictionary<int, PrimarySource> ();
+ public static PrimarySource GetById (int id)
{
return (primary_sources.ContainsKey (id)) ? primary_sources[id] : null;
}
@@ -510,8 +510,8 @@ namespace Banshee.Sources
protected virtual void DeleteTrackList (CachedList<DatabaseTrackInfo> list)
{
is_deleting = true;
- DeleteTrackJob.Total += list.Count;
- var skip_deletion = new List<DatabaseTrackInfo> ();
+ DeleteTrackJob.Total += (int) list.Count;
+ List<DatabaseTrackInfo> skip_deletion = null;
// Remove from file system
foreach (DatabaseTrackInfo track in list) {
@@ -520,14 +520,12 @@ namespace Banshee.Sources
continue;
}
- if (DeleteTrackJob.IsCancelRequested) {
- skip_deletion.Add (track);
- continue;
- }
-
try {
DeleteTrackJob.Status = String.Format ("{0} - {1}", track.ArtistName, track.TrackTitle);
if (!DeleteTrack (track)) {
+ if (skip_deletion == null) {
+ skip_deletion = new List<DatabaseTrackInfo> ();
+ }
skip_deletion.Add (track);
}
} catch (Exception e) {
@@ -541,15 +539,17 @@ namespace Banshee.Sources
}
}
- if (!DeleteTrackJob.IsFinished || DeleteTrackJob.IsCancelRequested) {
+ is_deleting = false;
+
+ if (DeleteTrackJob.Total == DeleteTrackJob.Completed) {
delete_track_job.Finish ();
+ delete_track_job = null;
}
- delete_track_job = null;
- is_deleting = false;
- if (skip_deletion.Count > 0) {
+ if (skip_deletion != null) {
list.Remove (skip_deletion);
skip_deletion.Clear ();
+ skip_deletion = null;
}
// Remove from database
@@ -602,7 +602,7 @@ namespace Banshee.Sources
return true;
}
- public long GetTrackIdForUri (string uri)
+ public int GetTrackIdForUri (string uri)
{
return DatabaseTrackInfo.GetTrackIdForUri (new SafeUri (uri), DbId);
}
@@ -628,7 +628,7 @@ namespace Banshee.Sources
{
CachedList<DatabaseTrackInfo> list = cached_list as CachedList<DatabaseTrackInfo>;
is_adding = true;
- AddTrackJob.Total += list.Count;
+ AddTrackJob.Total += (int) list.Count;
foreach (DatabaseTrackInfo track in list) {
if (AddTrackJob.IsCancelRequested) {
@@ -663,7 +663,7 @@ namespace Banshee.Sources
bool finished = false, notify = false;
lock (this) {
- AddTrackJob.Completed++;
+ add_track_job.Completed++;
if (add_track_job.IsFinished) {
finished = true;
@@ -727,7 +727,6 @@ namespace Banshee.Sources
delete_track_job.SetResources (Resource.Cpu, Resource.Database);
delete_track_job.PriorityHints = PriorityHints.SpeedSensitive | PriorityHints.DataLossIfStopped;
delete_track_job.DelayShow = DelayDeleteJob;
- delete_track_job.CanCancel = true;
delete_track_job.Register ();
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Sources/Source.cs b/src/Core/Banshee.Services/Banshee.Sources/Source.cs
index 198e148..a1b065a 100644
--- a/src/Core/Banshee.Services/Banshee.Sources/Source.cs
+++ b/src/Core/Banshee.Services/Banshee.Sources/Source.cs
@@ -713,8 +713,8 @@ namespace Banshee.Sources
}
public virtual int CurrentStatusFormat {
- get { return ConfigurationClient.Instance.Get<int> (String.Format ("sources.{0}", ParentConfigurationId), "status_format", 0); }
- set { ConfigurationClient.Instance.Set<int> (String.Format ("sources.{0}", ParentConfigurationId), "status_format", value); }
+ get { return ConfigurationClient.Get<int> (String.Format ("sources.{0}", ParentConfigurationId), "status_format", 0); }
+ set { ConfigurationClient.Set<int> (String.Format ("sources.{0}", ParentConfigurationId), "status_format", value); }
}
public SchemaEntry<T> CreateSchema<T> (string name)
diff --git a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
index dabc750..bcb556d 100644
--- a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
@@ -100,6 +100,11 @@ namespace Banshee.Sources
AddinManager.RemoveExtensionNodeHandler ("/Banshee/SourceManager/Source", OnExtensionChanged);
} catch {}
+ active_source = null;
+ default_source = null;
+ music_library = null;
+ video_library = null;
+
// Do dispose extension sources
foreach (Source source in extension_sources.Values) {
RemoveSource (source, true);
@@ -112,11 +117,6 @@ namespace Banshee.Sources
sources.Clear ();
extension_sources.Clear ();
-
- active_source = null;
- default_source = null;
- music_library = null;
- video_library = null;
}
}
@@ -133,9 +133,7 @@ namespace Banshee.Sources
AddSource (source);
}
Log.DebugFormat ("Extension source loaded: {0}", source.Name);
- } catch (Exception e) {
- Log.Exception (e);
- }
+ } catch {}
} else if (args.Change == ExtensionChange.Remove && extension_sources.ContainsKey (node.Id)) {
Source source = extension_sources[node.Id];
extension_sources.Remove (node.Id);
diff --git a/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs b/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
index cb7324d..4c5807e 100644
--- a/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
@@ -292,14 +292,14 @@ namespace Banshee.Streaming
try {
PlaylistParser parser = new PlaylistParser();
if (parser.Parse(new SafeUri(uri))) {
- foreach (PlaylistElement element in parser.Elements) {
- if (element.Uri != null) {
+ foreach(Dictionary<string, object> element in parser.Elements) {
+ if(element.ContainsKey("uri")) {
// mms can be a nested link
- string element_uri = element.Uri.ToString ();
+ string element_uri = element["uri"].ToString();
if(element_uri.StartsWith("mms:", StringComparison.CurrentCultureIgnoreCase)){
LoadStreamUri("http" + element_uri.Substring(element_uri.IndexOf(":")));
}
- stream_uris.Add (new SafeUri (element.Uri.AbsoluteUri));
+ stream_uris.Add(new SafeUri(((Uri)element["uri"]).AbsoluteUri));
}
}
} else {
diff --git a/src/Core/Banshee.Services/Makefile.am b/src/Core/Banshee.Services/Makefile.am
index f2aac96..3bf10ae 100644
--- a/src/Core/Banshee.Services/Makefile.am
+++ b/src/Core/Banshee.Services/Makefile.am
@@ -69,7 +69,6 @@ SOURCES = \
Banshee.Equalizer/EqualizerManager.cs \
Banshee.Equalizer/EqualizerSetting.cs \
Banshee.Hardware/DeviceCommand.cs \
- Banshee.Hardware/FileSystem.cs \
Banshee.Hardware/HardwareManager.cs \
Banshee.Hardware/IBlockDevice.cs \
Banshee.Hardware/ICdromDevice.cs \
@@ -158,7 +157,6 @@ SOURCES = \
Banshee.Playlists.Formats/InvalidPlaylistException.cs \
Banshee.Playlists.Formats/IPlaylistFormat.cs \
Banshee.Playlists.Formats/M3uPlaylistFormat.cs \
- Banshee.Playlists.Formats/PlaylistElement.cs \
Banshee.Playlists.Formats/PlaylistFormatBase.cs \
Banshee.Playlists.Formats/PlaylistFormatDescription.cs \
Banshee.Playlists.Formats/PlaylistParser.cs \
diff --git a/src/Core/Banshee.Services/Makefile.in b/src/Core/Banshee.Services/Makefile.in
index ba42498..ea40493 100644
--- a/src/Core/Banshee.Services/Makefile.in
+++ b/src/Core/Banshee.Services/Makefile.in
@@ -207,15 +207,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -224,6 +233,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -238,6 +249,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -245,6 +258,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -496,7 +511,6 @@ SOURCES = \
Banshee.Equalizer/EqualizerManager.cs \
Banshee.Equalizer/EqualizerSetting.cs \
Banshee.Hardware/DeviceCommand.cs \
- Banshee.Hardware/FileSystem.cs \
Banshee.Hardware/HardwareManager.cs \
Banshee.Hardware/IBlockDevice.cs \
Banshee.Hardware/ICdromDevice.cs \
@@ -585,7 +599,6 @@ SOURCES = \
Banshee.Playlists.Formats/InvalidPlaylistException.cs \
Banshee.Playlists.Formats/IPlaylistFormat.cs \
Banshee.Playlists.Formats/M3uPlaylistFormat.cs \
- Banshee.Playlists.Formats/PlaylistElement.cs \
Banshee.Playlists.Formats/PlaylistFormatBase.cs \
Banshee.Playlists.Formats/PlaylistFormatDescription.cs \
Banshee.Playlists.Formats/PlaylistParser.cs \
@@ -679,14 +692,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -801,7 +815,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -809,7 +823,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -817,7 +830,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -836,7 +849,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -876,7 +889,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Banshee.Services.dll.config
all: all-am
@@ -1151,12 +1163,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs b/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs
index 16cc4bf..47d7ef0 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs
@@ -47,7 +47,7 @@ namespace Banshee.Addins.Gui
var hbox = new HBox () { Spacing = 6 };
var filter_label = new Label (Catalog.GetString ("Show:"));
- var filter_combo = new ComboBoxText ();
+ var filter_combo = ComboBox.NewText ();
filter_combo.AppendText (Catalog.GetString ("All"));
filter_combo.AppendText (Catalog.GetString ("Enabled"));
filter_combo.AppendText (Catalog.GetString ("Not Enabled"));
@@ -129,7 +129,7 @@ namespace Banshee.Addins.Gui
bool enabled = (bool) model.GetValue (iter, 1);
addin.Enabled = !enabled;
model.SetValue (iter, 1, addin.Enabled);
- model.Foreach (delegate (ITreeModel current_model, TreePath path, TreeIter current_iter) {
+ model.Foreach (delegate (TreeModel current_model, TreePath path, TreeIter current_iter) {
var an = current_model.GetValue (current_iter, 3) as Addin;
if (an != null) {
current_model.SetValue (current_iter, 1, an.Enabled);
@@ -152,7 +152,7 @@ namespace Banshee.Addins.Gui
PackStart (hbox, false, false, 0);
PackStart (tree_scroll, true, true, 0);
ShowAll ();
- search_entry.GrabFocus ();
+ search_entry.InnerEntry.GrabFocus ();
txt_cell.WrapWidth = 300;
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.CairoGlyphs/BansheeLineLogo.cs b/src/Core/Banshee.ThickClient/Banshee.CairoGlyphs/BansheeLineLogo.cs
index f2efd0c..3ea41b4 100644
--- a/src/Core/Banshee.ThickClient/Banshee.CairoGlyphs/BansheeLineLogo.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.CairoGlyphs/BansheeLineLogo.cs
@@ -84,14 +84,14 @@ namespace Banshee.CairoGlyphs
cr.LineJoin = LineJoin.Round;
// inner 'b' note
- cr.SetSourceColor (innerColor);
+ cr.Color = innerColor;
cr.MoveTo (0, 2);
cr.LineTo (2, 0);
cr.Arc (4, 8, 2, Math.PI, Math.PI * 3);
cr.Stroke ();
// outer 'cut' circle
- cr.SetSourceColor (outerColor);
+ cr.Color = outerColor;
cr.Arc (4, 8, 4, Math.PI * 1.5, Math.PI * 1.12);
cr.Stroke ();
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs
index 865b332..26dfaab 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs
@@ -83,13 +83,10 @@ namespace Banshee.Collection.Gui
protected AlbumListView (IntPtr ptr) : base () {}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
- Banshee.Metadata.MetadataService.Instance.ArtworkUpdated -= OnArtworkUpdated;
- }
- base.Dispose (disposing);
+ ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
+ Banshee.Metadata.MetadataService.Instance.ArtworkUpdated -= OnArtworkUpdated;
}
private void ToggleAlbumGrid ()
@@ -99,11 +96,7 @@ namespace Banshee.Collection.Gui
return;
}
- if (DisableAlbumGrid.Get ()) {
- SwitchToAlbumList ();
- } else {
- SwitchToAlbumGrid ();
- }
+ DisabledAlbumGrid = DisableAlbumGrid.Get ();
}
private PreferenceBase disable_album_grid;
@@ -121,7 +114,7 @@ namespace Banshee.Collection.Gui
private void InstallPreferences ()
{
music_lib = ServiceManager.SourceManager.MusicLibrary;
- disable_album_grid = music_lib.PreferencesPage["misc"].FindOrAdd (DisableAlbumGridPref);
+ disable_album_grid = music_lib.PreferencesPage["misc"].Add (DisableAlbumGridPref);
ServiceManager.SourceManager.SourceAdded -= InstallPreferences;
}
@@ -138,25 +131,24 @@ namespace Banshee.Collection.Gui
ServiceManager.SourceManager.SourceRemoved -= UninstallPreferences;
}
- protected void SwitchToAlbumList ()
- {
- ViewLayout = null;
- if (classic_layout_column == null) {
- classic_layout_column = new Column ("Album", renderer, 1.0);
- }
- column_controller.Add (classic_layout_column);
- ColumnController = column_controller;
- album_grid_rendered = false;
- }
-
- protected void SwitchToAlbumGrid ()
- {
- if (classic_layout_column != null) {
- column_controller.Remove (classic_layout_column);
+ private bool DisabledAlbumGrid {
+ get { return DisableAlbumGrid.Get (); }
+ set {
+ DisableAlbumGrid.Set (value);
+ if (value) {
+ ViewLayout = null;
+ if (classic_layout_column == null)
+ classic_layout_column = new Column ("Album", renderer, 1.0);
+ column_controller.Add (classic_layout_column);
+ ColumnController = column_controller;
+ } else {
+ if (classic_layout_column != null)
+ column_controller.Remove (classic_layout_column);
+ ColumnController = null;
+ ViewLayout = grid_layout;
+ }
+ album_grid_rendered = !value;
}
- ColumnController = null;
- ViewLayout = grid_layout;
- album_grid_rendered = true;
}
private static SchemaPreference<bool> DisableAlbumGridPref = null;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
index d3da931..6e1aa47 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
@@ -1,12 +1,10 @@
//
// ArtworkManager.cs
//
-// Authors:
+// Author:
// Aaron Bockover <abockover at novell.com>
-// Andrés G. Aragoneses <knocte at gmail.com>
//
// Copyright (C) 2007-2008 Novell, Inc.
-// Copyright (C) 2013 Andrés G. Aragoneses
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -30,6 +28,9 @@
using System;
using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using Mono.Unix;
using Gdk;
@@ -67,11 +68,6 @@ namespace Banshee.Collection.Gui
public ArtworkManager ()
{
- Init ();
- }
-
- protected virtual void Init ()
- {
AddCachedSize (36);
AddCachedSize (40);
AddCachedSize (42);
@@ -126,9 +122,13 @@ namespace Banshee.Collection.Gui
return surface;
}
+ if (null_artwork_ids.Contains (id)) {
+ return null;
+ }
+
Pixbuf pixbuf = LookupScalePixbuf (id, size);
if (pixbuf == null || pixbuf.Handle == IntPtr.Zero) {
- // no need to add to null_artwork_ids here, LookupScalePixbuf already did it
+ null_artwork_ids.Add (id);
return null;
}
@@ -165,8 +165,6 @@ namespace Banshee.Collection.Gui
public Pixbuf LookupScalePixbuf (string id, int size)
{
if (id == null || (size != 0 && size < 10)) {
- // explicitly don't add this id into null_artwork_ids here,
- // otherwise it would blacklist all other non-invalid sizes
return null;
}
@@ -234,9 +232,6 @@ namespace Banshee.Collection.Gui
}
DisposePixbuf (pixbuf);
- if (scaled_pixbuf == null || scaled_pixbuf.Handle == IntPtr.Zero) {
- null_artwork_ids.Add (id);
- }
return scaled_pixbuf;
} catch {}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkRenderer.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkRenderer.cs
index 698d13c..f1ce05c 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkRenderer.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkRenderer.cs
@@ -74,7 +74,7 @@ namespace Banshee.Collection.Gui
if (image != null) {
if (fill) {
CairoExtensions.RoundedRectangle (cr, x, y, width, height, radius, corners);
- cr.SetSourceColor (fillColor);
+ cr.Color = fillColor;
cr.Fill ();
}
@@ -85,12 +85,12 @@ namespace Banshee.Collection.Gui
CairoExtensions.RoundedRectangle (cr, x, y, width, height, radius, corners);
if (fill) {
- using (var grad = new LinearGradient (x, y, x, y + height)) {
- grad.AddColorStop (0, fillColor);
- grad.AddColorStop (1, CairoExtensions.ColorShade (fillColor, 1.3));
- cr.SetSource (grad);
- cr.Fill ();
- }
+ var grad = new LinearGradient (x, y, x, y + height);
+ grad.AddColorStop (0, fillColor);
+ grad.AddColorStop (1, CairoExtensions.ColorShade (fillColor, 1.3));
+ cr.Pattern = grad;
+ cr.Fill ();
+ grad.Destroy ();
}
Banshee.CairoGlyphs.BansheeLineLogo.Render (cr,
@@ -112,12 +112,12 @@ namespace Banshee.Collection.Gui
cr.Antialias = Antialias.None;
CairoExtensions.RoundedRectangle (cr, x + 1.5, y + 1.5, width - 3, height - 3, radius, corners);
- cr.SetSourceColor (cover_border_light_color);
+ cr.Color = cover_border_light_color;
cr.Stroke ();
}
CairoExtensions.RoundedRectangle (cr, x + 0.5, y + 0.5, width - 1, height - 1, radius, corners);
- cr.SetSourceColor (cover_border_dark_color);
+ cr.Color = cover_border_dark_color;
cr.Stroke ();
if (dispose && image != null) {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs
index 54dddf2..5886ed7 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs
@@ -69,7 +69,7 @@ namespace Banshee.Collection.Gui
int x, y;
GetPointer (out x, out y);
bool inside_list = (x >= 0 && y >= 0) && (x < Allocation.Width && y < Allocation.Height);
- if (inside_list && a.Result == DragResult.NoTarget) {
+ if (inside_list && a.DragResult == DragResult.NoTarget) {
PlaylistSource playlist = ServiceManager.SourceManager.ActiveSource as PlaylistSource;
if (playlist != null && !IsReorderable) {
Hyena.Log.Information (
@@ -215,7 +215,7 @@ namespace Banshee.Collection.Gui
sb.Append ("\r\n");
}
byte [] data = System.Text.Encoding.UTF8.GetBytes (sb.ToString ());
- selection_data.Set (context.ListTargets ()[0], 8, data, data.Length);
+ selection_data.Set (context.Targets[0], 8, data, data.Length);
}
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
index 507c01c..bbae65e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
@@ -74,7 +74,7 @@ namespace Banshee.Collection.Gui
return new ColumnCellAlbumAccessible (BoundObject, this, parent);
}
- public override void Render (CellContext context, StateFlags state, double cellWidth, double cellHeight)
+ public override void Render (CellContext context, StateType state, double cellWidth, double cellHeight)
{
if (BoundObject == null) {
return;
@@ -104,10 +104,7 @@ namespace Banshee.Collection.Gui
image_render_size, image_render_size, !is_default, context.Theme.Context.Radius);
int fl_width = 0, fl_height = 0, sl_width = 0, sl_height = 0;
- context.Widget.StyleContext.Save ();
- context.Widget.StyleContext.AddClass ("entry");
- Cairo.Color text_color = CairoExtensions.GdkRGBAToCairoColor (context.Widget.StyleContext.GetColor (StateFlags.Selected));
- context.Widget.StyleContext.Restore ();
+ Cairo.Color text_color = context.Theme.Colors.GetWidgetColor (GtkColorClass.Text, state);
text_color.A = 0.75;
Pango.Layout layout = context.Layout;
@@ -136,7 +133,7 @@ namespace Banshee.Collection.Gui
// Render the second line first since we have that state already
if (!String.IsNullOrEmpty (album.ArtistName)) {
context.Context.MoveTo (x, y + fl_height);
- context.Context.SetSourceColor (text_color);
+ context.Context.Color = text_color;
PangoCairoHelper.ShowLayout (context.Context, layout);
}
@@ -150,7 +147,7 @@ namespace Banshee.Collection.Gui
context.Context.MoveTo (x, y);
text_color.A = 1;
- context.Context.SetSourceColor (text_color);
+ context.Context.Color = text_color;
PangoCairoHelper.ShowLayout (context.Context, layout);
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellCreativeCommons.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellCreativeCommons.cs
index ce10661..62665ca 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellCreativeCommons.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellCreativeCommons.cs
@@ -56,7 +56,7 @@ namespace Banshee.Collection.Gui
LoadPixbufs ();
}
- public override void Render (CellContext context, StateFlags state, double cellWidth, double cellHeight)
+ public override void Render (CellContext context, StateType state, double cellWidth, double cellHeight)
{
context.Context.Translate (0, 0.5);
int draw_x = 0;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
index 65f7965..d667a65 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
@@ -42,7 +42,7 @@ using Banshee.ServiceStack;
namespace Banshee.Collection.Gui
{
- class ColumnCellStatusIndicatorAccessible : ColumnCellAccessible, Atk.IImageImplementor
+ class ColumnCellStatusIndicatorAccessible : ColumnCellAccessible, Atk.ImageImplementor
{
private string image_description;
@@ -229,7 +229,7 @@ namespace Banshee.Collection.Gui
LoadPixbufs ();
}
- public override void Render (CellContext context, StateFlags state, double cellWidth, double cellHeight)
+ public override void Render (CellContext context, StateType state, double cellWidth, double cellHeight)
{
TrackInfo track = BoundTrack;
if (track == null) {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
index 8d8b414..b39e27f 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
@@ -54,7 +54,7 @@ namespace Banshee.Collection.Gui
}
}
- public override void Render (CellContext context, StateFlags state, double cellWidth, double cellHeight)
+ public override void Render (CellContext context, StateType state, double cellWidth, double cellHeight)
{
if (BoundObject == null) {
return;
@@ -78,12 +78,10 @@ namespace Banshee.Collection.Gui
context.Layout.GetPixelSize (out text_width, out text_height);
context.Context.MoveTo (4, ((int)cellHeight - text_height) / 2);
- context.Widget.StyleContext.Save ();
- context.Widget.StyleContext.AddClass ("entry");
- Cairo.Color color = CairoExtensions.GdkRGBAToCairoColor (context.Widget.StyleContext.GetColor (StateFlags.Selected));
- context.Widget.StyleContext.Restore ();
+ Cairo.Color color = context.Theme.Colors.GetWidgetColor (
+ context.TextAsForeground ? GtkColorClass.Foreground : GtkColorClass.Text, state);
color.A = (!context.Opaque) ? 0.3 : 1.0;
- context.Context.SetSourceColor (color);
+ context.Context.Color = color;
PangoCairoHelper.ShowLayout (context.Context, context.Layout);
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs
index 24ed18c..538e66b 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs
@@ -56,7 +56,7 @@ namespace Banshee.Collection.Gui
public static Widget For (Widget widget, Func<int, int, bool> is_sensitive, Func<TrackInfo> get_track, System.Action on_updated)
{
return new EditorBox (widget) {
- IsBoxSensitive = is_sensitive,
+ IsSensitive = is_sensitive,
GetTrack = get_track,
OnUpdated = on_updated
};
@@ -64,7 +64,7 @@ namespace Banshee.Collection.Gui
private class EditorBox : EventBox
{
- public Func<int, int, bool> IsBoxSensitive;
+ public Func<int, int, bool> IsSensitive;
public Func<TrackInfo> GetTrack;
public System.Action OnUpdated;
@@ -74,7 +74,7 @@ namespace Banshee.Collection.Gui
VisibleWindow = false;
ButtonPressEvent += (o, a) => {
- if (a.Event.Button == 3 && IsBoxSensitive ((int)a.Event.X, (int)a.Event.Y)) {
+ if (a.Event.Button == 3 && IsSensitive ((int)a.Event.X, (int)a.Event.Y)) {
var menu = new Menu ();
var choose = new MenuItem (Catalog.GetString ("Choose New Cover Art..."));
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/PersistentColumnController.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/PersistentColumnController.cs
index 5c887f9..497d466 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/PersistentColumnController.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/PersistentColumnController.cs
@@ -181,26 +181,26 @@ namespace Banshee.Collection.Gui
T result;
if (source_ns != parent_source_ns) {
- if (!ConfigurationClient.Instance.TryGet<T> (conf_ns, key, out result) && val != null &&
- val.Equals (ConfigurationClient.Instance.Get<T> (parent_source_ns + ns, key, default (T)))) {
+ if (!ConfigurationClient.TryGet<T> (conf_ns, key, out result) &&
+ val != null && val.Equals (ConfigurationClient.Get<T> (parent_source_ns + ns, key, default(T)))) {
conf_ns = null;
}
}
if (conf_ns != null) {
- ConfigurationClient.Instance.Set<T> (conf_ns, key, val);
+ ConfigurationClient.Set<T> (conf_ns, key, val);
}
}
private T Get<T> (string ns, string key, T fallback)
{
T result;
- if (ConfigurationClient.Instance.TryGet<T> (source_ns + ns, key, out result)) {
+ if (ConfigurationClient.TryGet<T> (source_ns + ns, key, out result)) {
return result;
}
if (source_ns != parent_source_ns) {
- return ConfigurationClient.Instance.Get<T> (parent_source_ns + ns, key, fallback);
+ return ConfigurationClient.Get<T> (parent_source_ns + ns, key, fallback);
}
return fallback;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs
deleted file mode 100644
index e29658e..0000000
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// ArtworkManagerTests.cs
-//
-// Author:
-// Andrés G. Aragoneses <knocte at gmail.com>
-//
-// Copyright 2013 Andrés G. Aragoneses
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#if ENABLE_TESTS
-
-using Banshee.Base;
-using Hyena.Tests;
-
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Reflection;
-using System.IO;
-using Gdk;
-
-namespace Banshee.Collection.Gui.Tests
-{
- class CustomArtworkManager : ArtworkManager
- {
- internal static int SizeTest = 36;
- protected override void Init ()
- {
- AddCachedSize (SizeTest);
- }
- }
-
- [TestFixture]
- public class ArtworkManagerTests : TestBase
- {
- static string ExtractPngFromResource ()
- {
- var first_image = Assembly.GetExecutingAssembly ().GetManifestResourceNames ().Where (n => n.EndsWith (".png")).First ();
- var temp_png = Path.Combine (Path.GetTempPath (), first_image);
- Stream s = Assembly.GetExecutingAssembly ().GetManifestResourceStream (first_image);
- using (FileStream file = new FileStream (temp_png, FileMode.Create)) {
- byte[] b = new byte[s.Length + 1];
- s.Read (b, 0, Convert.ToInt32 (s.Length));
- file.Write (b, 0, Convert.ToInt32 (b.Length - 1));
- file.Flush ();
- }
- return temp_png;
- }
-
- static ArtworkManagerTests ()
- {
- GLib.GType.Init ();
- Mono.Addins.AddinManager.Initialize (BinDir);
- Banshee.IO.Provider.SetProvider (new Banshee.IO.SystemIO.Provider ());
- }
-
- [Test]
- public void TestSizePath ()
- {
- var png_file_path = ExtractPngFromResource ();
- string jpg_file_path = null;
-
- try {
- var artist_album_id = CoverArtSpec.CreateArtistAlbumId ("Metallica", "Master Of Puppets");
- jpg_file_path = CoverArtSpec.GetPathForSize (artist_album_id, CustomArtworkManager.SizeTest); // i.e.: /home/knocte/.cache/media-art/36/album-d33f25dbd7dfb4817a7e99f6bc2de49e.jpg"
- var pixbuf = new Pixbuf (png_file_path);
- pixbuf.Save (jpg_file_path, "jpeg");
-
- var artwork_manager = new CustomArtworkManager ();
- Assert.IsNull (artwork_manager.LookupScaleSurface (artist_album_id, 1, false),
- "Should have got null at the first request, with an invalid size");
- Assert.IsNotNull (artwork_manager.LookupScaleSurface (artist_album_id, CustomArtworkManager.SizeTest, false),
- "Null at the second request, was null cached incorrectly?");
-
- } finally {
- File.Delete (png_file_path);
- if (File.Exists (jpg_file_path)) {
- File.Delete (jpg_file_path);
- }
- }
- }
- }
-}
-
-#endif
\ No newline at end of file
diff --git a/src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs b/src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs
index 71dd9f6..da9abc3 100644
--- a/src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs
@@ -48,6 +48,8 @@ namespace Banshee.ContextPane
{
public class ContextPane : Gtk.HBox
{
+ private object tooltip_host = TooltipSetter.CreateHost ();
+
private Gtk.Notebook notebook;
private VBox vbox;
private bool large = false;
@@ -114,11 +116,11 @@ namespace Banshee.ContextPane
HBox hbox = new HBox ();
var max = new Button (new Image (IconThemeUtils.LoadIcon ("context-pane-maximize", 7)));
max.Clicked += (o, a) => { large = !large; expand_handler (large); };
- max.TooltipText = Catalog.GetString ("Make the context pane larger or smaller");
+ TooltipSetter.Set (tooltip_host, max, Catalog.GetString ("Make the context pane larger or smaller"));
var close = new Button (new Image (IconThemeUtils.LoadIcon ("context-pane-close", 7)));
close.Clicked += (o, a) => ShowAction.Activate ();
- close.TooltipText = Catalog.GetString ("Hide context pane");
+ TooltipSetter.Set (tooltip_host, close, Catalog.GetString ("Hide context pane"));
max.Relief = close.Relief = ReliefStyle.None;
hbox.PackStart (max, false, false, 0);
@@ -266,7 +268,7 @@ namespace Banshee.ContextPane
DrawIndicator = false,
Relief = ReliefStyle.None
};
- toggle_button.TooltipText = page.Name;
+ TooltipSetter.Set (tooltip_host, toggle_button, page.Name);
toggle_button.Clicked += (s, e) => {
if (pane_pages.ContainsKey (page)) {
if (page.State == ContextState.Loaded) {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs
index 3b3359c..248a85f 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs
@@ -36,6 +36,7 @@ namespace Banshee.Equalizer.Gui
private uint band;
private Scale scale;
private Label label;
+ private object tooltip_host;
public event EventHandler ValueChanged;
@@ -60,6 +61,8 @@ namespace Banshee.Equalizer.Gui
PackStart (scale, false, false, 0);
PackStart (label, false, false, 0);
+
+ tooltip_host = Hyena.Gui.TooltipSetter.CreateHost ();
}
private void OnValueChanged (object o, EventArgs args)
@@ -69,7 +72,7 @@ namespace Banshee.Equalizer.Gui
handler(this, new EventArgs ());
}
- scale.TooltipText = ((int)Math.Round (scale.Value / 10.0)).ToString ();
+ Hyena.Gui.TooltipSetter.Set (tooltip_host, scale, ((int)Math.Round (scale.Value / 10.0)).ToString ());
}
public int Value {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs
index f3113cb..acd1a23 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs
@@ -61,8 +61,8 @@ namespace Banshee.Equalizer.Gui
Label label = new Label ();
label.Xalign = 1.0f;
label.Markup = String.Format ("<small>{0}</small>", GLib.Markup.EscapeText (value));
- label.OverrideColor (StateFlags.Normal, Hyena.Gui.GtkUtilities.ColorBlend (
- StyleContext.GetColor (StateFlags.Normal), StyleContext.GetBackgroundColor (StateFlags.Normal)));
+ label.ModifyFg (StateType.Normal, Hyena.Gui.GtkUtilities.ColorBlend (
+ Style.Foreground (StateType.Normal), Style.Background (StateType.Normal)));
label.Show ();
return label;
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs
index 629f7e8..c2c248c 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs
@@ -32,7 +32,7 @@ using Hyena;
namespace Banshee.Equalizer.Gui
{
- public class EqualizerPresetComboBox : Gtk.ComboBox
+ public class EqualizerPresetComboBox : Gtk.ComboBoxEntry
{
private EqualizerManager manager;
private ListStore store;
@@ -44,7 +44,7 @@ namespace Banshee.Equalizer.Gui
{
}
- public EqualizerPresetComboBox (EqualizerManager manager) : base (true)
+ public EqualizerPresetComboBox (EqualizerManager manager) : base ()
{
if (manager == null) {
throw new ArgumentNullException ("provide an EqualizerManager or use default constructor");
@@ -58,7 +58,7 @@ namespace Banshee.Equalizer.Gui
{
store = new ListStore (typeof (string), typeof (EqualizerSetting));
Model = store;
- EntryTextColumn = 0;
+ TextColumn = 0;
store.DefaultSortFunc = (model, ia, ib) => {
var a = GetEqualizerSettingForIter (ia);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs
index c634d7c..9675b0f 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs
@@ -61,8 +61,9 @@ namespace Banshee.Equalizer.Gui
TypeHint = Gdk.WindowTypeHint.Dialog;
SkipPagerHint = true;
SkipTaskbarHint = true;
+ AppPaintable = true;
- SetDefaultSize (-1, 230);
+ SetDefaultSize (-1, 180);
VBox box = new VBox ();
header_box = new HBox ();
@@ -102,24 +103,14 @@ namespace Banshee.Equalizer.Gui
box.PackStart (eq_view, true, true, 0);
- var button_box = new ButtonBox (Orientation.Horizontal);
- button_box.Layout = ButtonBoxStyle.End;
- button_box.BorderWidth = 12;
- var button = new Button (Stock.Close) { UseStock = true };
- button.Clicked += delegate { Destroy (); };
- button_box.Add (button);
- box.PackEnd (button_box, false, true, 0);
-
eq_enabled_checkbox.Active = EqualizerManager.Instance.IsActive;
eq_enabled_checkbox.Clicked += OnEnableDisable;
eq_preset_combo.ActiveEqualizer = EqualizerManager.Instance.SelectedEqualizer;
- int minimum_height, natural_height;
- GetPreferredHeight (out minimum_height, out natural_height);
Gdk.Geometry limits = new Gdk.Geometry ();
limits.MinWidth = -1;
limits.MaxWidth = -1;
- limits.MinHeight = minimum_height;
+ limits.MinHeight = SizeRequest ().Height;
limits.MaxHeight = Gdk.Screen.Default.Height;
SetGeometryHints (this, limits, Gdk.WindowHints.MaxSize);
@@ -142,6 +133,12 @@ namespace Banshee.Equalizer.Gui
base.OnDestroyed ();
}
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+ {
+ GdkWindow.DrawRectangle (Style.BackgroundGC (StateType.Active), true, header_box.Allocation);
+ return base.OnExposeEvent (evnt);
+ }
+
private void OnNewPreset (object o, EventArgs args)
{
var eq = new EqualizerSetting (EqualizerManager.Instance, Catalog.GetString ("New Preset"));
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs
index a466aa9..33324ce 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs
@@ -79,6 +79,10 @@ namespace Banshee.Gui.Dialogs
translation_credits.Append ("\n");
}
+ SetUrlHook (delegate (Gtk.AboutDialog dialog, string link) {
+ Banshee.Web.Browser.Open (link);
+ });
+
// TODO: We should really use ProgramName in the future rather
// than plain Name, since it's been depreciated. We can't do that
// yet though since it breaks stuff for other people.
@@ -107,12 +111,6 @@ namespace Banshee.Gui.Dialogs
WrapLicense = true;
Response += OnResponse;
}
-
- protected override bool OnActivateLink (string uri)
- {
- return Banshee.Web.Browser.Open (uri);
- }
-
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
index 2ec158c..d21d74e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
@@ -65,17 +65,18 @@ namespace Banshee.Gui.Dialogs
// inner_vbox 5 => total = 12
// ActionArea 5 => total = 12
BorderWidth = 5;
- ContentArea.BorderWidth = 0;
+ base.VBox.BorderWidth = 0;
// This spacing is 2 b/c the inner_vbox and ActionArea should be
// 12 apart, and they already have BorderWidth 5 each
- ContentArea.Spacing = 2;
+ base.VBox.Spacing = 2;
inner_vbox = new VBox () { Spacing = 12, BorderWidth = 5, Visible = true };
- ContentArea.PackStart (inner_vbox, true, true, 0);
+ base.VBox.PackStart (inner_vbox, true, true, 0);
Visible = false;
-
+ HasSeparator = false;
+
if (parent == null) {
GtkElementsService service = ServiceManager.Get<GtkElementsService> ();
if (service != null) {
@@ -94,7 +95,7 @@ namespace Banshee.Gui.Dialogs
AddAccelGroup (accel_group);
}
- public VBox VBox { get { return inner_vbox; } }
+ public new VBox VBox { get { return inner_vbox; } }
public new ResponseType Run ()
{
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs
index 3f942bd..316aed3 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs
@@ -93,17 +93,13 @@ namespace Banshee.Gui.Dialogs
private void OnConfigureGeometry (object o, EventArgs args)
{
- Requisition minimum_size, natural_size;
- GetPreferredSize (out minimum_size, out natural_size);
var limits = new Gdk.Geometry () {
- MinWidth = minimum_size.Width,
+ MinWidth = SizeRequest ().Width,
MaxWidth = Gdk.Screen.Default.Width
};
if (details_expander.Expanded) {
- int list_min_height, list_natural_height;
- list_view.GetPreferredHeight (out list_min_height, out list_natural_height);
- limits.MinHeight = minimum_size.Height + list_min_height;
+ limits.MinHeight = SizeRequest ().Height + list_view.SizeRequest ().Height;
limits.MaxHeight = Gdk.Screen.Default.Height;
} else {
limits.MinHeight = -1;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs
index bdca9dd..0fa992e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs
@@ -38,7 +38,7 @@ namespace Banshee.Gui.Dialogs
{
public class OpenLocationDialog : BansheeDialog
{
- private ComboBoxText address_entry;
+ private ComboBoxEntry address_entry;
private List<string> history = new List<string>();
@@ -48,7 +48,7 @@ namespace Banshee.Gui.Dialogs
Spacing = 6
};
- address_entry = ComboBoxText.NewWithEntry ();
+ address_entry = ComboBoxEntry.NewText();
address_entry.Entry.Activated += (o, e) => Respond (ResponseType.Ok);
var browse_button = new Button(Catalog.GetString("Browse..."));
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/SeekDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/SeekDialog.cs
index 95dab11..42fc5f0 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/SeekDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/SeekDialog.cs
@@ -47,11 +47,10 @@ namespace Banshee.Gui.Dialogs
seek_slider.StreamPositionLabel.FormatString = "<big>{0}</big>";
seek_slider.ShowAll ();
- VBox.PackStart (seek_slider, true, true, 0);
+ VBox.PackStart (seek_slider, false, false, 0);
AddDefaultCloseButton ();
- // FIXME: We shouldn't have to set a minimum height here
- SetSizeRequest (300, 120);
+ SetSizeRequest (300, -1);
}
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs
index cde9841..988c14a 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs
@@ -40,6 +40,7 @@ namespace Banshee.Gui.TrackEditor
private CheckButton enable_compilation = new CheckButton ();
private TextEntry entry = new TextEntry ("CoreAlbums", "ArtistName");
+ private object tooltip_host = Hyena.Gui.TooltipSetter.CreateHost ();
private Button track_artist_sync_button;
private PageNavigationEntry track_artist_entry;
@@ -52,10 +53,10 @@ namespace Banshee.Gui.TrackEditor
enable_compilation.Label = Catalog.GetString ("Com_pilation Album Artist:");
enable_compilation.UseUnderline = true;
- enable_compilation.TooltipText = Catalog.GetString (
- "Check this if this track is part of an album with tracks by various artists");
- entry.TooltipText = Catalog.GetString (
- "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'.");
+ Hyena.Gui.TooltipSetter.Set (tooltip_host, enable_compilation,
+ Catalog.GetString ("Check this if this track is part of an album with tracks by various artists"));
+ Hyena.Gui.TooltipSetter.Set (tooltip_host, entry,
+ Catalog.GetString ("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'."));
PackStart (enable_compilation, false, false, 0);
PackStart (entry, false, false, 0);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs
index d84c97a..60934d8 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs
@@ -34,7 +34,7 @@ using Hyena.Gui;
namespace Banshee.Gui.TrackEditor
{
- public class EditorEditableUndoAdapter<T> where T : Widget, IEditable
+ public class EditorEditableUndoAdapter<T> where T : Widget, Editable
{
private Dictionary<EditorTrackInfo, EditableUndoAdapter<T>> undo_adapters
= new Dictionary<EditorTrackInfo, EditableUndoAdapter<T>> ();
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/FieldPage.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/FieldPage.cs
index 2c563af..32bf23e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/FieldPage.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/FieldPage.cs
@@ -66,6 +66,8 @@ namespace Banshee.Gui.TrackEditor
public System.Action Sync;
}
+ private object tooltip_host;
+
private List<FieldSlot> field_slots = new List<FieldSlot> ();
public IEnumerable<FieldSlot> FieldSlots {
get { return field_slots; }
@@ -74,6 +76,7 @@ namespace Banshee.Gui.TrackEditor
public FieldPage ()
{
Spacing = EditorUtilities.RowSpacing;
+ tooltip_host = TooltipSetter.CreateHost ();
}
public void Initialize (TrackEditorDialog dialog)
@@ -158,7 +161,7 @@ namespace Banshee.Gui.TrackEditor
if (MultipleTracks && (options & FieldOptions.NoSync) == 0 && (options & FieldOptions.NoShowSync) == 0) {
slot.SyncButton = new SyncButton ();
if (syncTooltip != null) {
- slot.SyncButton.TooltipText = syncTooltip;
+ TooltipSetter.Set (tooltip_host, slot.SyncButton, syncTooltip);
}
slot.SyncButton.Clicked += delegate { slot.Sync (); };
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/GenreEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/GenreEntry.cs
index 0f857c5..ff086f6 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/GenreEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/GenreEntry.cs
@@ -36,23 +36,23 @@ using Banshee.Collection.Database;
namespace Banshee.Gui.TrackEditor
{
- public class GenreEntry : ComboBox, ICanUndo, IEditorField
+ public class GenreEntry : ComboBoxEntry, ICanUndo, IEditorField
{
private ListStore genre_model;
private EditorEditableUndoAdapter<Entry> undo_adapter = new EditorEditableUndoAdapter<Entry> ();
- public GenreEntry () : base (true)
+ public GenreEntry ()
{
genre_model = new ListStore (typeof (string));
Model = genre_model;
- EntryTextColumn = 0;
+ TextColumn = 0;
EntryCompletion c = new EntryCompletion ();
c.Model = genre_model;
- c.TextColumn = EntryTextColumn;
+ c.TextColumn = TextColumn;
c.PopupCompletion = true;
c.InlineCompletion = true;
- c.InlineSelection = true;
+ //c.InlineSelection = true; // requires 2.12
c.PopupSingleMatch = false;
Entry.Completion = c;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs
index 5b4c71e..56d8497 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs
@@ -58,11 +58,7 @@ namespace Banshee.Gui.TrackEditor
public void LoadTrack (EditorTrackInfo track)
{
- Notebook.NotebookChild notebook_child = dialog.Notebook [this] as Notebook.NotebookChild;
- if (notebook_child == null)
- return;
- notebook_child.TabFill = false;
- notebook_child.TabExpand = false;
+ dialog.Notebook.SetTabLabelPacking (this, false, false, PackType.End);
}
public int Order {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/LicenseEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/LicenseEntry.cs
index b448f25..29149aa 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/LicenseEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/LicenseEntry.cs
@@ -37,23 +37,23 @@ using Banshee.Collection.Database;
namespace Banshee.Gui.TrackEditor
{
- public class LicenseEntry : ComboBox, ICanUndo, IEditorField
+ public class LicenseEntry : ComboBoxEntry, ICanUndo, IEditorField
{
private ListStore license_model;
private EditorEditableUndoAdapter<Entry> undo_adapter = new EditorEditableUndoAdapter<Entry> ();
- public LicenseEntry () : base (true)
+ public LicenseEntry ()
{
license_model = new ListStore (typeof (string));
Model = license_model;
- EntryTextColumn = 0;
+ TextColumn = 0;
EntryCompletion c = new EntryCompletion ();
c.Model = license_model;
- c.TextColumn = EntryTextColumn;
+ c.TextColumn = TextColumn;
c.PopupCompletion = true;
c.InlineCompletion = true;
- c.InlineSelection = true;
+ //c.InlineSelection = true; // requires 2.12
c.PopupSingleMatch = false;
Entry.Completion = c;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs
index dfdaf10..6d80d78 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs
@@ -70,7 +70,8 @@ namespace Banshee.Gui.TrackEditor
forward_button.Sensitive = dialog.CanGoForward;
};
forward_button = EditorUtilities.CreateSmallStockButton (Stock.GoForward);
- forward_button.TooltipText = Catalog.GetString ("Advance to the next track and edit its title");
+ object tooltip_host = Hyena.Gui.TooltipSetter.CreateHost ();
+ Hyena.Gui.TooltipSetter.Set (tooltip_host, forward_button, Catalog.GetString ("Advance to the next track and edit its title"));
forward_button.Sensitive = dialog.CanGoForward;
forward_button.Show ();
forward_button.Clicked += EditNextTitle;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/RangeEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/RangeEntry.cs
index 257783e..2d8e012 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/RangeEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/RangeEntry.cs
@@ -63,7 +63,7 @@ namespace Banshee.Gui.TrackEditor
PackStart (auto_order_button = new AutoOrderButton (), false, false, 1);
auto_order_button.Clicked += delegate { orderClosure (this); };
if (orderTooltip != null) {
- auto_order_button.TooltipText = orderTooltip;
+ TooltipSetter.Set (TooltipSetter.CreateHost (), auto_order_button, orderTooltip);
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
index 4d99aec..6285e48 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
@@ -104,7 +104,7 @@ namespace Banshee.Gui.TrackEditor
if (view.IsRealized && model != null) {
var width = GetValueWidth ();
- model.Foreach ((ITreeModel m, TreePath path, TreeIter iter) => {
+ model.Foreach ((TreeModel m, TreePath path, TreeIter iter) => {
if ((Pango.EllipsizeMode) model.GetValue (iter, 3) != Pango.EllipsizeMode.End) {
model.SetValue (iter, 5, width);
}
@@ -116,7 +116,7 @@ namespace Banshee.Gui.TrackEditor
public CellRendererText NameRenderer { get { return name_renderer; } }
public CellRendererText ValueRenderer { get { return value_renderer; } }
- private bool RowSeparatorFunc (ITreeModel model, TreeIter iter)
+ private bool RowSeparatorFunc (TreeModel model, TreeIter iter)
{
return (bool)model.GetValue (iter, 2);
}
@@ -163,10 +163,10 @@ namespace Banshee.Gui.TrackEditor
}
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
- base.OnStyleUpdated ();
- name_renderer.CellBackgroundRgba = StyleContext.GetBackgroundColor (StateFlags.Normal);
+ base.OnStyleSet (previous_style);
+ name_renderer.CellBackgroundGdk = Style.Background (StateType.Normal);
}
public void Initialize (TrackEditorDialog dialog)
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TextViewEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TextViewEntry.cs
index d2f2935..7e95f37 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TextViewEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TextViewEntry.cs
@@ -60,15 +60,16 @@ namespace Banshee.Gui.TrackEditor
entry.AcceptsTab = false;
entry.Show ();
entry.Buffer.Changed += OnChanged;
+
+ entry.SizeRequested += OnTextViewSizeRequested;
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ private void OnTextViewSizeRequested (object o, SizeRequestedArgs args)
{
- Pango.FontMetrics metrics = PangoContext.GetMetrics (
- entry.StyleContext.GetFont (StateFlags.Normal), PangoContext.Language);
+ Pango.FontMetrics metrics = PangoContext.GetMetrics (entry.Style.FontDescription, PangoContext.Language);
int line_height = ((int)(metrics.Ascent + metrics.Descent) + 512) >> 10; // PANGO_PIXELS(d)
metrics.Dispose ();
- minimum_height = natural_height = (line_height + 2) * 2;
+ HeightRequest = (line_height + 2) * 2;
}
public void DisconnectUndo ()
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
index ba34025..5fc5048 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
@@ -64,6 +64,7 @@ namespace Banshee.Gui.TrackEditor
private Label header_artist_label;
private Label header_album_label;
private Label edit_notif_label;
+ private object tooltip_host;
private DateTime dialog_launch_datetime = DateTime.Now;
@@ -114,6 +115,8 @@ namespace Banshee.Gui.TrackEditor
AddStockButton (Stock.Close, ResponseType.Close, true);
}
+ tooltip_host = TooltipSetter.CreateHost ();
+
AddNavigationButtons ();
main_vbox = new VBox ();
@@ -143,15 +146,15 @@ namespace Banshee.Gui.TrackEditor
nav_backward_button = new Button (Stock.GoBack);
nav_backward_button.UseStock = true;
- nav_backward_button.TooltipText = Catalog.GetString ("Show the previous track");
nav_backward_button.Clicked += delegate { NavigateBackward (); };
nav_backward_button.Show ();
+ TooltipSetter.Set (tooltip_host, nav_backward_button, Catalog.GetString ("Show the previous track"));
nav_forward_button = new Button (Stock.GoForward);
nav_forward_button.UseStock = true;
- nav_forward_button.TooltipText = Catalog.GetString ("Show the next track");
nav_forward_button.Clicked += delegate { NavigateForward (); };
nav_forward_button.Show ();
+ TooltipSetter.Set (tooltip_host, nav_forward_button, Catalog.GetString ("Show the next track"));
ActionArea.PackStart (nav_backward_button, false, false, 0);
ActionArea.PackStart (nav_forward_button, false, false, 0);
@@ -312,9 +315,9 @@ namespace Banshee.Gui.TrackEditor
alignment.Add (box);
sync_all_button.Add (alignment);
- sync_all_button.TooltipText = Catalog.GetString (
- "Apply the values of all common fields set for this track to all of the tracks selected in this editor");
-
+ TooltipSetter.Set (tooltip_host, sync_all_button, Catalog.GetString (
+ "Apply the values of all common fields set for this track to all of the tracks selected in this editor"));
+
button_box.PackStart (sync_all_button, false, false, 0);
foreach (Widget child in ActionArea.Children) {
@@ -596,7 +599,7 @@ namespace Banshee.Gui.TrackEditor
public void Save ()
{
- List<long> primary_sources = new List<long> ();
+ List<int> primary_sources = new List<int> ();
// TODO: wrap in db transaction
try {
@@ -613,7 +616,7 @@ namespace Banshee.Gui.TrackEditor
if (track.SourceTrack is DatabaseTrackInfo) {
// If the source track is from the database, save its parent for notification later
- long id = (track.SourceTrack as DatabaseTrackInfo).PrimarySourceId;
+ int id = (track.SourceTrack as DatabaseTrackInfo).PrimarySourceId;
if (!primary_sources.Contains (id)) {
primary_sources.Add (id);
}
@@ -621,7 +624,7 @@ namespace Banshee.Gui.TrackEditor
}
// Finally, notify the affected primary sources
- foreach (long id in primary_sources) {
+ foreach (int id in primary_sources) {
PrimarySource psrc = PrimarySource.GetById (id);
if (psrc != null) {
psrc.NotifyTracksChanged ();
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ArtworkPopup.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ArtworkPopup.cs
index b02307c..69dadf6 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ArtworkPopup.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ArtworkPopup.cs
@@ -52,14 +52,10 @@ namespace Banshee.Gui.Widgets
label.CanFocus = false;
label.Wrap = true;
- var bg_color = new RGBA ();
- bg_color.Red = bg_color.Green = bg_color.Blue = 0;
- var fg_color = new RGBA ();
- fg_color.Red = bg_color.Green = bg_color.Blue = 160.0 / 255;
- label.OverrideBackgroundColor (StateFlags.Normal, bg_color);
- label.OverrideColor (StateFlags.Normal, fg_color);
- OverrideBackgroundColor (StateFlags.Normal, bg_color);
- OverrideColor (StateFlags.Normal, fg_color);
+ label.ModifyBg(StateType.Normal, new Color(0, 0, 0));
+ label.ModifyFg(StateType.Normal, new Color(160, 160, 160));
+ ModifyBg(StateType.Normal, new Color(0, 0, 0));
+ ModifyFg(StateType.Normal, new Color(160, 160, 160));
vbox.PackStart(image, true, true, 0);
vbox.PackStart(label, false, false, 0);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs
index 1fdb6e8..78b5011 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs
@@ -57,12 +57,10 @@ namespace Banshee.Gui.Widgets
{
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- HidePopup ();
- }
- base.Dispose (disposing);
+ base.Dispose ();
+ HidePopup ();
}
protected override int ArtworkSizeRequest {
@@ -89,7 +87,7 @@ namespace Banshee.Gui.Widgets
attributes.Y = Allocation.Y;
attributes.Width = Allocation.Width;
attributes.Height = Allocation.Height;
- attributes.Wclass = WindowWindowClass.InputOnly;
+ attributes.Wclass = WindowClass.InputOnly;
attributes.EventMask = (int)(
EventMask.PointerMotionMask |
EventMask.EnterNotifyMask |
@@ -99,15 +97,16 @@ namespace Banshee.Gui.Widgets
WindowAttributesType attributes_mask =
WindowAttributesType.X | WindowAttributesType.Y | WindowAttributesType.Wmclass;
- event_window = new Gdk.Window (Window, attributes, attributes_mask);
+ event_window = new Gdk.Window (GdkWindow, attributes, attributes_mask);
event_window.UserData = Handle;
}
protected override void OnUnrealized ()
{
- IsRealized = false;
+ WidgetFlags ^= WidgetFlags.Realized;
+
event_window.UserData = IntPtr.Zero;
- event_window.Destroy ();
+ Hyena.Gui.GtkWorkarounds.WindowDestroy (event_window);
event_window = null;
base.OnUnrealized ();
@@ -134,10 +133,9 @@ namespace Banshee.Gui.Widgets
}
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ protected override void OnSizeRequested (ref Requisition requisition)
{
- minimum_height = ComputeWidgetHeight ();
- natural_height = minimum_height;
+ requisition.Height = ComputeWidgetHeight ();
}
private int ComputeWidgetHeight ()
@@ -176,7 +174,7 @@ namespace Banshee.Gui.Widgets
}
double offset = ArtworkSizeRequest + ArtworkSpacing, y = 0;
- double x = offset;
+ double x = Allocation.X + offset;
double width = Allocation.Width - offset;
int fl_width, fl_height, sl_width, sl_height;
int pango_width = (int)(width * Pango.Scale.PangoScale);
@@ -205,14 +203,14 @@ namespace Banshee.Gui.Widgets
SetSizeRequest (-1, fl_height + sl_height);
}
- y = (Allocation.Height - (fl_height + sl_height)) / 2;
+ y = Allocation.Y + (Allocation.Height - (fl_height + sl_height)) / 2;
// Render the layouts
cr.Antialias = Cairo.Antialias.Default;
if (renderTrack) {
cr.MoveTo (x, y);
- cr.SetSourceColor (TextColor);
+ cr.Color = TextColor;
PangoCairoHelper.ShowLayout (cr, first_line_layout);
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs
index 8841a59..c5bc0a7 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs
@@ -113,8 +113,8 @@ namespace Banshee.Gui.Widgets
seek_slider.SetSizeRequest (175, -1);
- box.PackStart (seek_slider, false, false, 0);
- box.PackStart (stream_position_label, true, true, 0);
+ box.PackStart (seek_slider, true, true, 0);
+ box.PackStart (stream_position_label, false, false, 0);
hbox.PackStart (box, true, true, 0);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/CoverArtDisplay.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/CoverArtDisplay.cs
index 311c048..a557f09 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/CoverArtDisplay.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/CoverArtDisplay.cs
@@ -53,14 +53,14 @@ namespace Banshee.Gui.Widgets
{
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
var disposable = idle_album as IDisposable;
if (disposable != null) {
disposable.Dispose ();
}
- base.Dispose (disposing);
+ base.Dispose ();
}
protected override int ArtworkSizeRequest {
@@ -80,7 +80,7 @@ namespace Banshee.Gui.Widgets
idle_album = idle_album ?? PixbufImageSurface.Create (Banshee.Gui.IconThemeUtils.LoadIcon (
ArtworkSizeRequest, MissingAudioIconName), true);
- ArtworkRenderer.RenderThumbnail (cr, idle_album, false, 0, 0,
+ ArtworkRenderer.RenderThumbnail (cr, idle_album, false, Allocation.X, Allocation.Y,
ArtworkSizeRequest, ArtworkSizeRequest,
false, 0, true, BackgroundColor);
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs
index da6a7b1..3b4c8d2 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs
@@ -129,7 +129,7 @@ namespace Banshee.Gui.Widgets
}
cr.Rectangle (x, y, asr, alloc.Height);
- cr.SetSourceColor (BackgroundColor);
+ cr.Color = BackgroundColor;
cr.Fill ();
x += (asr - surface_w) / 2;
@@ -141,42 +141,40 @@ namespace Banshee.Gui.Widgets
private Surface CreateScene (Cairo.Context window_cr, ImageSurface image, int reflect)
{
- var target = window_cr.GetTarget ();
- Surface surface = target.CreateSimilar (target.Content,
+ Surface surface = window_cr.Target.CreateSimilar (window_cr.Target.Content,
image.Width, image.Height + reflect);
- using (var cr = new Context (surface)) {
+ Cairo.Context cr = new Context (surface);
- cr.Save ();
+ cr.Save ();
- cr.SetSource (image);
- cr.Paint ();
+ cr.SetSource (image);
+ cr.Paint ();
- cr.Rectangle (0, image.Height, image.Width, reflect);
- cr.Clip ();
+ cr.Rectangle (0, image.Height, image.Width, reflect);
+ cr.Clip ();
- Matrix matrix = new Matrix ();
- matrix.InitScale (1, -1);
- matrix.Translate (0, -(2 * image.Height) + 1);
- cr.Transform (matrix);
+ Matrix matrix = new Matrix ();
+ matrix.InitScale (1, -1);
+ matrix.Translate (0, -(2 * image.Height) + 1);
+ cr.Transform (matrix);
- cr.SetSource (image);
- cr.Paint ();
+ cr.SetSource (image);
+ cr.Paint ();
- cr.Restore ();
+ cr.Restore ();
- Color bg_transparent = BackgroundColor;
- bg_transparent.A = 0.65;
+ Color bg_transparent = BackgroundColor;
+ bg_transparent.A = 0.65;
- using (var mask = new LinearGradient (0, image.Height, 0, image.Height + reflect)) {
- mask.AddColorStop (0, bg_transparent);
- mask.AddColorStop (1, BackgroundColor);
+ LinearGradient mask = new LinearGradient (0, image.Height, 0, image.Height + reflect);
+ mask.AddColorStop (0, bg_transparent);
+ mask.AddColorStop (1, BackgroundColor);
- cr.Rectangle (0, image.Height, image.Width, reflect);
- cr.SetSource (mask);
- cr.Fill ();
- }
+ cr.Rectangle (0, image.Height, image.Width, reflect);
+ cr.Pattern = mask;
+ cr.Fill ();
- }
+ ((IDisposable)cr).Dispose ();
return surface;
}
@@ -256,7 +254,7 @@ namespace Banshee.Gui.Widgets
if (render_track) {
cr.MoveTo (track_info_alloc.X, track_info_alloc.Y);
- cr.SetSourceColor (TextColor);
+ cr.Color = TextColor;
PangoCairoHelper.ShowLayout (cr, first_line_layout);
RenderTrackRating (cr, track);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TitledList.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TitledList.cs
index 1c02946..c85affb 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TitledList.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TitledList.cs
@@ -60,9 +60,9 @@ namespace Banshee.Gui.Widgets
PackStart (title, false, false, 0);
title.Show ();
- StyleUpdated += delegate {
- title.OverrideBackgroundColor (StateFlags.Normal, StyleContext.GetBackgroundColor (StateFlags.Normal));
- title.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
+ StyleSet += delegate {
+ title.ModifyBg (StateType.Normal, Style.Base (StateType.Normal));
+ title.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
};
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
index f95784e..3d72be0 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
@@ -121,7 +121,8 @@ namespace Banshee.Gui.Widgets
}
Connected = true;
- HasWindow = false;
+
+ WidgetFlags |= WidgetFlags.NoWindow;
}
private bool connected;
@@ -155,27 +156,25 @@ namespace Banshee.Gui.Widgets
);
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- if (idle_timeout_id > 0) {
- GLib.Source.Remove (idle_timeout_id);
- }
+ if (idle_timeout_id > 0) {
+ GLib.Source.Remove (idle_timeout_id);
+ }
- Connected = false;
+ Connected = false;
- stage.Iteration -= OnStageIteration;
- stage = null;
+ stage.Iteration -= OnStageIteration;
+ stage = null;
- InvalidateCache ();
- }
+ InvalidateCache ();
- base.Dispose (disposing);
+ base.Dispose ();
}
protected override void OnRealized ()
{
- Window = Parent.Window;
+ GdkWindow = Parent.GdkWindow;
base.OnRealized ();
}
@@ -198,12 +197,12 @@ namespace Banshee.Gui.Widgets
}
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (previous);
- text_color = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetColor (StateFlags.Normal));
- BackgroundColor = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetBackgroundColor (StateFlags.Normal));
+ text_color = CairoExtensions.GdkColorToCairoColor (Style.Foreground (StateType.Normal));
+ BackgroundColor = CairoExtensions.GdkColorToCairoColor (Style.Background (StateType.Normal));
text_light_color = Hyena.Gui.Theming.GtkTheme.GetCairoTextMidColor (this);
ResetMissingImages ();
@@ -242,19 +241,30 @@ namespace Banshee.Gui.Widgets
{
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
bool idle = incoming_track == null && current_track == null;
if (!Visible || !IsMapped || (idle && !CanRenderIdle)) {
return true;
}
- if (idle) {
- RenderIdle (cr);
- } else {
- RenderAnimation (cr);
+ Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
+
+ foreach (Gdk.Rectangle damage in evnt.Region.GetRectangles ()) {
+ cr.Rectangle (damage.X, damage.Y, damage.Width, damage.Height);
+ cr.Clip ();
+
+ if (idle) {
+ RenderIdle (cr);
+ } else {
+ RenderAnimation (cr);
+ }
+
+ cr.ResetClip ();
}
+ CairoExtensions.DisposeContext (cr);
+
return true;
}
@@ -331,7 +341,7 @@ namespace Banshee.Gui.Widgets
protected virtual void RenderCoverArt (Cairo.Context cr, ImageSurface image)
{
ArtworkRenderer.RenderThumbnail (cr, image, false,
- 0, ArtworkOffset,
+ Allocation.X, Allocation.Y + ArtworkOffset,
ArtworkSizeRequest, ArtworkSizeRequest,
!IsMissingImage (image), 0.0,
IsMissingImage (image), BackgroundColor);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs
index b8176ab..e175d98 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs
@@ -54,6 +54,7 @@ namespace Banshee.Gui.Widgets
private Button cancel_button;
private uint update_delay_id;
private uint progress_bounce_id;
+ private object tooltips;
Hyena.Widgets.HigMessageDialog cancel_dialog;
@@ -74,6 +75,7 @@ namespace Banshee.Gui.Widgets
icon = new Image ();
+ tooltips = TooltipSetter.CreateHost ();
title_label = new Label ();
title_label.Xalign = 0.0f;
title_label.Ellipsize = Pango.EllipsizeMode.End;
@@ -113,9 +115,9 @@ namespace Banshee.Gui.Widgets
AttachOptions.Shrink | AttachOptions.Fill, 0, 0);
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style style)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (style);
UpdateIcons ();
}
@@ -192,7 +194,7 @@ namespace Banshee.Gui.Widgets
} else {
never_had_status = false;
status_label.Markup = String.Format ("<small>{0}</small>", GLib.Markup.EscapeText (job.Status ?? String.Empty));
- status_label.TooltipText = job.Status ?? String.Empty;
+ TooltipSetter.Set (tooltips, status_label, job.Status ?? String.Empty);
status_label.Show ();
}
status = job.Status;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
index a801c2f..cf7c2f9 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
@@ -61,14 +61,14 @@ namespace Banshee.Gui
{
}
- public BaseClientWindow (string title, WindowConfiguration windowConfiguration) : base (title)
+ public BaseClientWindow (string title, string configNameSpace, int defaultWidth, int defaultHeight) : base (title)
{
elements_service = ServiceManager.Get<GtkElementsService> ();
action_service = ServiceManager.Get<InterfaceActionService> ();
ConfigureWindow ();
- window_controller = new PersistentWindowController (this, windowConfiguration, WindowPersistOptions.All);
+ window_controller = new PersistentWindowController (this, configNameSpace, defaultWidth, defaultHeight, WindowPersistOptions.All);
window_controller.Restore ();
elements_service.PrimaryWindow = this;
@@ -86,15 +86,15 @@ namespace Banshee.Gui
}
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
+ base.Dispose ();
+
try {
Gtk.AccelMap.Save (accel_map_file);
} catch (Exception e) {
Hyena.Log.Exception ("Failed to save custom AccelMap", e);
}
-
- base.Dispose (disposing);
}
protected void InitialShowPresent ()
@@ -211,5 +211,21 @@ namespace Banshee.Gui
OnTitleChanged ();
}
+
+ protected void OnToolbarExposeEvent (object o, ExposeEventArgs args)
+ {
+ Toolbar toolbar = (Toolbar)o;
+
+ // This forces the toolbar to look like it's just a regular part
+ // of the window since the stock toolbar look makes Banshee look ugly.
+ Style.ApplyDefaultBackground (toolbar.GdkWindow, true, State,
+ args.Event.Area, toolbar.Allocation.X, toolbar.Allocation.Y,
+ toolbar.Allocation.Width, toolbar.Allocation.Height);
+
+ // Manually expose all the toolbar's children
+ foreach (Widget child in toolbar.Children) {
+ toolbar.PropagateExpose (child, args.Event);
+ }
+ }
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
index d196637..48d10bc 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
@@ -57,6 +57,12 @@ namespace Banshee.Gui
Catalog.GetString ("Import _Playlist..."), null,
Catalog.GetString ("Import a playlist"), OnImportPlaylist),
+ new ActionEntry ("RescanAction", null,
+ Catalog.GetString ("Rescan Music Library"), null,
+ Catalog.GetString ("Rescan the Music Library folder"), delegate {
+ new Banshee.Collection.RescanPipeline (ServiceManager.SourceManager.MusicLibrary);
+ }),
+
new ActionEntry ("OpenLocationAction", null,
Catalog.GetString ("Open _Location..."), "<control>L",
Catalog.GetString ("Open a remote location for playback"), OnOpenLocation),
@@ -77,23 +83,6 @@ namespace Banshee.Gui
new ActionEntry ("ToolsMenuAction", null,
Catalog.GetString ("_Tools"), null, null, null),
- new ActionEntry ("RescanAction", null,
- Catalog.GetString ("Rescan Music Library"), null,
- Catalog.GetString ("Rescan the Music Library folder"), delegate {
- new Banshee.Collection.RescanPipeline (ServiceManager.SourceManager.MusicLibrary, tracks => {
-
- string msg = String.Format (
- Catalog.GetPluralString (
- // singular form unused b/c we know it's > 1, but we still need GetPlural
- "The rescan operation will remove one track from your music library.",
- "The rescan operation will remove {0} tracks from your music library.",
- tracks),
- tracks);
-
- return TrackActions.ConfirmRemove (msg);
- });
- }),
-
// Help Menu
new ActionEntry ("HelpMenuAction", null,
Catalog.GetString ("_Help"), null, null, null),
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
index e056768..c3891c1 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
@@ -46,20 +46,24 @@ namespace Banshee.Gui
{
static GtkBaseClient () {
Application.InitializePaths ();
- user_css = Path.Combine (Paths.ApplicationData, "gtk.css");
+ user_gtkrc = Path.Combine (Paths.ApplicationData, "gtkrc");
}
private static Type client_type;
- private static string user_css;
-
- private Gtk.CssProvider custom_provider;
+ private static string user_gtkrc;
public static void Startup<T> (string [] args) where T : GtkBaseClient
{
Hyena.Log.InformationFormat ("Running Banshee {0}: [{1}]", Application.Version,
Application.BuildDisplayInfo);
+ // This could go into GtkBaseClient, but it's probably something we
+ // should really only support at each client level
+ if (File.Exists (user_gtkrc) && !ApplicationContext.CommandLine.Contains ("no-gtkrc")) {
+ Gtk.Rc.AddDefaultFile (user_gtkrc);
+ }
+
// Boot the client
Banshee.Gui.GtkBaseClient.Startup<T> ();
}
@@ -116,22 +120,12 @@ namespace Banshee.Gui
Gtk.Application.Init ();
- // This could go into GtkBaseClient, but it's probably something we
- // should really only support at each client level
- if (File.Exists (user_css) && !ApplicationContext.CommandLine.Contains ("no-gtkcss")) {
- custom_provider = new Gtk.CssProvider ();
- custom_provider.LoadFromPath (user_css);
- Gtk.StyleContext.AddProviderForScreen (Gdk.Screen.Default, (Gtk.IStyleProvider)custom_provider,
- 600 /* GTK_STYLE_PROVIDER_PRIORITY_APPLICATION*/ );
- }
-
- if (ApplicationContext.CommandLine.Contains ("debug-gtkcss")) {
- Log.Information ("Note: gtk.css file will be checked for reload every 5 seconds!");
+ if (ApplicationContext.CommandLine.Contains ("debug-gtkrc")) {
+ Log.Information ("Note: gtkrc files will be checked for reload every 5 seconds!");
GLib.Timeout.Add (5000, delegate {
- if (custom_provider != null) {
- custom_provider.LoadFromPath (user_css);
- Gtk.StyleContext.ResetWidgets (Gdk.Screen.Default);
- Log.Information ("gtk.css has been reloaded");
+ if (Gtk.Rc.ReparseAll ()) {
+ Gtk.Rc.ResetStyles (Gtk.Settings.Default);
+ Log.Information ("gtkrc has been reloaded");
}
return true;
});
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs
index f6245a5..5234dd2 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkElementsService.cs
@@ -53,23 +53,21 @@ namespace Banshee.Gui
{
}
- private void OnStyleUpdated (object o, EventArgs args)
+ private void OnStyleSet (object o, StyleSetArgs args)
{
SourceInvalidateIconPixbuf (ServiceManager.SourceManager.Sources);
- // Ugly hack to avoid having this being set to 0, causing a huge
+ // Ugly hack to avoid stupid themes that set this to 0, causing a huge
// bug when constructing the "add to playlist" popup menu (BGO #524706)
- if (Gtk.Settings.Default.MenuPopupDelay < 1) {
- Gtk.Settings.Default.MenuPopupDelay = 225;
- }
+ Gtk.Rc.ParseString ("gtk-menu-popup-delay = 225");
OnThemeChanged ();
}
private void OnPrimaryWindowRealized (object o, EventArgs args)
{
- if (primary_window != null && primary_window.Window != null) {
- property_store.Set<IntPtr> ("PrimaryWindow.RawHandle", primary_window.Window.Handle);
+ if (primary_window != null && primary_window.GdkWindow != null) {
+ property_store.Set<IntPtr> ("PrimaryWindow.RawHandle", primary_window.GdkWindow.Handle);
} else {
property_store.Remove ("PrimaryWindow.RawHandle");
}
@@ -95,7 +93,7 @@ namespace Banshee.Gui
get { return primary_window; }
set {
if (primary_window != null) {
- primary_window.StyleUpdated -= OnStyleUpdated;
+ primary_window.StyleSet -= OnStyleSet;
primary_window.Realized -= OnPrimaryWindowRealized;
}
@@ -104,7 +102,7 @@ namespace Banshee.Gui
if (primary_window != null) {
property_store.Set<BaseClientWindow> ("PrimaryWindow", primary_window);
- primary_window.StyleUpdated += OnStyleUpdated;
+ primary_window.StyleSet += OnStyleSet;
primary_window.Realized += OnPrimaryWindowRealized;
} else {
property_store.Remove ("PrimaryWindow");
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/PersistentPaneController.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/PersistentPaneController.cs
index ac712ad..d49b30b 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/PersistentPaneController.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/PersistentPaneController.cs
@@ -35,8 +35,6 @@ namespace Banshee.Gui
{
public class PersistentPaneController
{
- public const string NamespacePrefix = "interface.panes";
-
private static Dictionary<string, PersistentPaneController> controllers = new Dictionary<string, PersistentPaneController> ();
private string @namespace;
@@ -49,7 +47,7 @@ namespace Banshee.Gui
public static void Control (Paned pane, string name)
{
- Control (pane, String.Format ("{0}.{1}", NamespacePrefix, name), "position", pane.Position);
+ Control (pane, String.Format ("interface.panes.{0}", name), "position", pane.Position);
}
public static void Control (Paned pane, SchemaEntry<int> entry)
@@ -86,7 +84,7 @@ namespace Banshee.Gui
}
pane = value;
- pane.Position = ConfigurationClient.Instance.Get<int> (@namespace, key, fallback);
+ pane.Position = ConfigurationClient.Get<int> (@namespace, key, fallback);
//pane.MoveHandle += OnPaneMoved;
//pane.AcceptPosition += delegate { Console.WriteLine ("accept pos called, pos = {0}", pane.Position); };
pane.SizeAllocated += OnPaneMoved;
@@ -114,7 +112,7 @@ namespace Banshee.Gui
return true;
} else {
if (pane.Position != last_position) {
- ConfigurationClient.Instance.Set<int> (@namespace, key, pane.Position);
+ ConfigurationClient.Set<int> (@namespace, key, pane.Position);
last_position = pane.Position;
}
timer_id = 0;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/PersistentWindowController.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/PersistentWindowController.cs
index 07e73cb..e5adf2b 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/PersistentWindowController.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/PersistentWindowController.cs
@@ -47,11 +47,45 @@ namespace Banshee.Gui
private uint timer_id = 0;
private bool pending_changes;
- public PersistentWindowController (Gtk.Window window, WindowConfiguration windowConfig, WindowPersistOptions options)
+ public PersistentWindowController (Gtk.Window window, string configNameSpace, int defaultWidth, int defaultHeight, WindowPersistOptions options)
{
this.window = window;
this.options = options;
- this.window_config = windowConfig;
+
+ WidthSchema = new SchemaEntry<int>(
+ configNameSpace, "width",
+ defaultWidth,
+ "Window Width",
+ "Width of the main interface window."
+ );
+
+ HeightSchema = new SchemaEntry<int>(
+ configNameSpace, "height",
+ defaultHeight,
+ "Window Height",
+ "Height of the main interface window."
+ );
+
+ XPosSchema = new SchemaEntry<int>(
+ configNameSpace, "x_pos",
+ 0,
+ "Window Position X",
+ "Pixel position of Main Player Window on the X Axis"
+ );
+
+ YPosSchema = new SchemaEntry<int>(
+ configNameSpace, "y_pos",
+ 0,
+ "Window Position Y",
+ "Pixel position of Main Player Window on the Y Axis"
+ );
+
+ MaximizedSchema = new SchemaEntry<bool>(
+ configNameSpace, "maximized",
+ false,
+ "Window Maximized",
+ "True if main window is to be maximized, false if it is not."
+ );
window.ConfigureEvent += OnChanged;
window.WindowStateEvent += OnChanged;
@@ -74,8 +108,8 @@ namespace Banshee.Gui
public void Restore ()
{
if ((options & WindowPersistOptions.Size) != 0) {
- int width = window_config.WidthSchema.Get ();
- int height = window_config.HeightSchema.Get ();
+ int width = WidthSchema.Get ();
+ int height = HeightSchema.Get ();
if (width != 0 && height != 0) {
window.Resize (width, height);
@@ -83,8 +117,8 @@ namespace Banshee.Gui
}
if ((options & WindowPersistOptions.Position) != 0) {
- int x = window_config.XPosSchema.Get ();
- int y = window_config.YPosSchema.Get ();
+ int x = XPosSchema.Get ();
+ int y = YPosSchema.Get ();
if (x == 0 && y == 0) {
window.SetPosition (Gtk.WindowPosition.Center);
@@ -94,7 +128,7 @@ namespace Banshee.Gui
}
if ((options & WindowPersistOptions.Size) != 0) {
- if (window_config.MaximizedSchema.Get ()) {
+ if (MaximizedSchema.Get ()) {
window.Maximize ();
} else {
window.Unmaximize ();
@@ -107,11 +141,11 @@ namespace Banshee.Gui
public void Save ()
{
- if (window == null || !window.Visible || !window.IsMapped || window.Window == null) {
+ if (window == null || !window.Visible || !window.IsMapped || window.GdkWindow == null) {
return;
}
- maximized = (window.Window.State & Gdk.WindowState.Maximized) != 0;
+ maximized = (window.GdkWindow.State & Gdk.WindowState.Maximized) != 0;
window.GetPosition (out x, out y);
window.GetSize (out width, out height);
@@ -138,7 +172,7 @@ namespace Banshee.Gui
private void InnerSave ()
{
if (maximized) {
- window_config.MaximizedSchema.Set (true);
+ MaximizedSchema.Set (true);
return;
}
@@ -146,13 +180,17 @@ namespace Banshee.Gui
return;
}
- window_config.MaximizedSchema.Set (false);
- window_config.XPosSchema.Set (x);
- window_config.YPosSchema.Set (y);
- window_config.WidthSchema.Set (width);
- window_config.HeightSchema.Set (height);
+ MaximizedSchema.Set (false);
+ XPosSchema.Set (x);
+ YPosSchema.Set (y);
+ WidthSchema.Set (width);
+ HeightSchema.Set (height);
}
- private WindowConfiguration window_config;
+ private SchemaEntry<int> WidthSchema;
+ private SchemaEntry<int> HeightSchema;
+ private SchemaEntry<int> XPosSchema;
+ private SchemaEntry<int> YPosSchema;
+ private SchemaEntry<bool> MaximizedSchema;
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
index 1bd6d4a..3eb266e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
@@ -420,7 +420,7 @@ namespace Banshee.Gui
private static bool ConfirmUnmap (IUnmapableSource source)
{
string key = "no_confirm_unmap_" + source.GetType ().Name.ToLower ();
- bool do_not_ask = ConfigurationClient.Instance.Get<bool> ("sources", key, false);
+ bool do_not_ask = ConfigurationClient.Get<bool> ("sources", key, false);
if (do_not_ask) {
return true;
@@ -450,7 +450,7 @@ namespace Banshee.Gui
try {
if (dialog.Run () == (int)Gtk.ResponseType.Ok) {
- ConfigurationClient.Instance.Set<bool> ("sources", key, do_not_ask);
+ ConfigurationClient.Set<bool> ("sources", key, do_not_ask);
return true;
}
@@ -463,7 +463,7 @@ namespace Banshee.Gui
private Menu BuildSortMenu (Source source)
{
Menu menu = new Menu ();
- RadioMenuItem [] group = null;
+ GLib.SList group = null;
foreach (SourceSortType sort_type in source.ChildSortTypes) {
RadioMenuItem item = new RadioMenuItem (group, sort_type.Label);
group = item.Group;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
index 609a5d1..bd4b97e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
@@ -639,32 +639,5 @@ namespace Banshee.Gui
}
return ret;
}
-
- public static bool ConfirmRemove (string header)
- {
- string message = Catalog.GetString ("Are you sure you want to continue?");
-
- bool remove_tracks = false;
- ThreadAssist.BlockingProxyToMain (() => {
-
- var md = new HigMessageDialog (
- ServiceManager.Get<GtkElementsService> ().PrimaryWindow,
- DialogFlags.DestroyWithParent, MessageType.Warning,
- ButtonsType.None, header, message
- );
- md.AddButton ("gtk-cancel", ResponseType.No, true);
- md.AddButton (Catalog.GetString ("Remove tracks"), ResponseType.Yes, false);
-
- try {
- if (md.Run () == (int) ResponseType.Yes) {
- remove_tracks = true;
- }
- } finally {
- md.Destroy ();
- }
- });
- return remove_tracks;
- }
-
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
index aceaca4..b30d4e0 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
@@ -50,7 +50,7 @@ namespace Banshee.Gui
GtkElementsService service = ServiceManager.Get<GtkElementsService> ();
Gtk.ToggleAction action = this["FullScreenAction"] as Gtk.ToggleAction;
if (service != null && action != null && value == null) {
- action.Active = (service.PrimaryWindow.Window.State & Gdk.WindowState.Fullscreen) != 0;
+ action.Active = (service.PrimaryWindow.GdkWindow.State & Gdk.WindowState.Fullscreen) != 0;
}
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/WindowConfiguration.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/WindowConfiguration.cs
deleted file mode 100644
index 73481af..0000000
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/WindowConfiguration.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// WindowConfiguration.cs
-//
-// Author:
-// Andres G. Aragoneses <knocte at gmail.com>
-//
-// Copyright 2012 Andres G. Aragoneses
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using Banshee.Configuration;
-
-namespace Banshee.Gui
-{
- public class WindowConfiguration
- {
- public SchemaEntry<int> WidthSchema { get; private set; }
- public SchemaEntry<int> HeightSchema { get; private set; }
- public SchemaEntry<int> XPosSchema { get; private set; }
- public SchemaEntry<int> YPosSchema { get; private set; }
- public SchemaEntry<bool> MaximizedSchema { get; private set; }
-
- public WindowConfiguration (SchemaEntry<int> widthSchema,
- SchemaEntry<int> heightSchema,
- SchemaEntry<int> xPosSchema,
- SchemaEntry<int> yPosSchema,
- SchemaEntry<bool> maximizedSchema)
- {
- WidthSchema = widthSchema;
- HeightSchema = heightSchema;
- XPosSchema = xPosSchema;
- YPosSchema = yPosSchema;
- MaximizedSchema = maximizedSchema;
- }
-
- public static SchemaEntry<int> NewWidthSchema (string configNamespace, int defaultWidth)
- {
- return new SchemaEntry <int> (
- configNamespace, "width",
- defaultWidth,
- "Window Width",
- "Width of the main interface window."
- );
- }
-
- public static SchemaEntry<int> NewHeightSchema (string configNamespace, int defaultHeight)
- {
- return new SchemaEntry <int> (
- configNamespace, "height",
- defaultHeight,
- "Window Height",
- "Height of the main interface window."
- );
- }
-
- public static SchemaEntry<int> NewXPosSchema (string configNamespace)
- {
- return new SchemaEntry <int> (
- configNamespace, "x_pos",
- 0,
- "Window Position X",
- "Pixel position of Main Player Window on the X Axis"
- );
- }
-
- public static SchemaEntry<int> NewYPosSchema (string configNamespace)
- {
- return new SchemaEntry <int> (
- configNamespace, "y_pos",
- 0,
- "Window Position Y",
- "Pixel position of Main Player Window on the Y Axis"
- );
- }
-
- public static SchemaEntry<bool> NewMaximizedSchema (string configNamespace)
- {
- return new SchemaEntry <bool> (
- configNamespace, "maximized",
- false,
- "Window Maximized",
- "True if main window is to be maximized, false if it is not."
- );
- }
- }
-}
-
diff --git a/src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs
index de3f14e..0de0d6d 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs
@@ -118,9 +118,9 @@ namespace Banshee.Library.Gui
ServiceManager.SourceManager.SourceUpdated += OnSourceUpdated;
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (previous_style);
UpdateIcons ();
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs b/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs
index c835ab1..53bb31c 100644
--- a/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs
@@ -80,6 +80,7 @@ namespace Banshee.MediaProfiles.Gui
{
this.profile = profile;
+ HasSeparator = false;
BorderWidth = 5;
AccelGroup accel_group = new AccelGroup();
@@ -157,14 +158,12 @@ namespace Banshee.MediaProfiles.Gui
box.PackStart(scroll, false, false, 0);
}
- ContentArea.PackStart(box, false, false, 0);
+ VBox.PackStart(box, false, false, 0);
SetSizeRequest(350, -1);
Gdk.Geometry limits = new Gdk.Geometry();
- int minimum_width, natural_width;
- GetPreferredWidth (out minimum_width, out natural_width);
- limits.MinWidth = minimum_width;
+ limits.MinWidth = SizeRequest().Width;
limits.MaxWidth = Gdk.Screen.Default.Width;
limits.MinHeight = -1;
limits.MaxHeight = -1;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/NotebookPage.cs b/src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/NotebookPage.cs
index bd5b14d..7b89d76 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/NotebookPage.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/NotebookPage.cs
@@ -114,7 +114,7 @@ namespace Banshee.Preferences.Gui
frame.LabelWidget = label;
frame.LabelXalign = 0.0f;
frame.LabelYalign = 0.5f;
- frame.ShadowType = ShadowType.None;
+ frame.Shadow = ShadowType.None;
frame.Show ();
PackStart (frame, false, false, 0);
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/SectionBox.cs b/src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/SectionBox.cs
index 3c8fad9..d104966 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/SectionBox.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/SectionBox.cs
@@ -36,6 +36,8 @@ namespace Banshee.Preferences.Gui
{
public class SectionBox : Table
{
+ private object tp_host;
+
public SectionBox (Section section) : base (1, 2, false)
{
ColumnSpacing = 10;
@@ -73,9 +75,13 @@ namespace Banshee.Preferences.Gui
}
if (!String.IsNullOrEmpty (preference.Description)) {
- widget.TooltipText = preference.Description;
+ if (tp_host == null) {
+ tp_host = TooltipSetter.CreateHost ();
+ }
+
+ TooltipSetter.Set (tp_host, widget, preference.Description);
if (label != null) {
- label.TooltipText = preference.Description;
+ TooltipSetter.Set (tp_host, label, preference.Description);
}
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Query.Gui/PlaybackErrorQueryValueEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Query.Gui/PlaybackErrorQueryValueEntry.cs
index 631f51c..2fc5bde 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Query.Gui/PlaybackErrorQueryValueEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Query.Gui/PlaybackErrorQueryValueEntry.cs
@@ -40,7 +40,7 @@ namespace Banshee.Query.Gui
{
public class PlaybackErrorQueryValueEntry : QueryValueEntry
{
- protected ComboBoxText combo;
+ protected ComboBox combo;
protected PlaybackErrorQueryValue query_value;
protected Dictionary<int, int> combo_error_id_map = new Dictionary<int, int> ();
@@ -55,7 +55,7 @@ namespace Banshee.Query.Gui
Remove (combo);
}
- combo = new ComboBoxText ();
+ combo = ComboBox.NewText();
combo.WidthRequest = DefaultWidth;
Add (combo);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Query.Gui/PlaylistQueryValueEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Query.Gui/PlaylistQueryValueEntry.cs
index 8d5c482..ff9b229 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Query.Gui/PlaylistQueryValueEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Query.Gui/PlaylistQueryValueEntry.cs
@@ -43,14 +43,14 @@ namespace Banshee.Query.Gui
{
public class PlaylistQueryValueEntry : QueryValueEntry
{
- protected ComboBoxText combo;
+ protected ComboBox combo;
protected PlaylistQueryValue query_value;
protected Dictionary<int, int> playlist_id_combo_map = new Dictionary<int, int> ();
protected Dictionary<int, int> combo_playlist_id_map = new Dictionary<int, int> ();
public PlaylistQueryValueEntry () : base ()
{
- combo = new ComboBoxText ();
+ combo = ComboBox.NewText();
combo.WidthRequest = DefaultWidth;
int count = 0;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Query.Gui/SmartPlaylistQueryValueEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Query.Gui/SmartPlaylistQueryValueEntry.cs
index f37ba7c..86e7493 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Query.Gui/SmartPlaylistQueryValueEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Query.Gui/SmartPlaylistQueryValueEntry.cs
@@ -44,14 +44,14 @@ namespace Banshee.Query.Gui
{
public class SmartPlaylistQueryValueEntry : QueryValueEntry
{
- protected ComboBoxText combo;
+ protected ComboBox combo;
protected SmartPlaylistQueryValue query_value;
protected Dictionary<int, int> playlist_id_combo_map = new Dictionary<int, int> ();
protected Dictionary<int, int> combo_playlist_id_map = new Dictionary<int, int> ();
public SmartPlaylistQueryValueEntry () : base ()
{
- combo = new ComboBoxText ();
+ combo = ComboBox.NewText();
combo.WidthRequest = DefaultWidth;
int count = 0;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
index 1c9c9e5..f669f3b 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
@@ -31,7 +31,7 @@ using Gtk;
namespace Banshee.Sources.Gui
{
- internal class CellEditEntry : Entry, ICellEditable
+ internal class CellEditEntry : Entry, CellEditable
{
public string path;
private bool fired_edit_done = false;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs
index 8cf6890..658b377 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs
@@ -61,23 +61,6 @@ namespace Banshee.Sources.Gui
private InterfaceActionService action_service;
private ActionGroup configure_browser_actions;
- private static readonly string name = "albumartist";
-
- public static readonly SchemaEntry<int> PaneTopPosition = new SchemaEntry<int> (
- String.Format ("{0}.{1}.browser.top", PersistentPaneController.NamespacePrefix, name),
- "position",
- DEFAULT_PANE_TOP_POSITION,
- "Artist/Album Browser Container Top Position",
- "The position of the Artist/Album browser pane container, when placed at the top"
- );
-
- public static readonly SchemaEntry<int> PaneLeftPosition = new SchemaEntry<int> (
- String.Format ("{0}.{1}.browser.left", PersistentPaneController.NamespacePrefix, name),
- "position",
- DEFAULT_PANE_LEFT_POSITION,
- "Artist/Album Browser Container Left Position",
- "The position of the Artist/Album browser pane container, when placed on the left"
- );
private static string menu_xml = @"
<ui>
@@ -100,7 +83,7 @@ namespace Banshee.Sources.Gui
</ui>
";
- public CompositeTrackSourceContents () : base (name, PaneTopPosition, PaneLeftPosition)
+ public CompositeTrackSourceContents () : base ("albumartist")
{
if (ServiceManager.Contains ("InterfaceActionService")) {
action_service = ServiceManager.Get<InterfaceActionService> ();
@@ -200,15 +183,9 @@ namespace Banshee.Sources.Gui
private void OnArtistFilterChanged (object o, ChangedArgs args)
{
- var new_artist_view = args.Current.Value == 0 ? artist_view : albumartist_view;
- var old_artist_view = args.Current.Value == 1 ? artist_view : albumartist_view;
+ Widget new_artist_view = args.Current.Value == 0 ? artist_view : albumartist_view;
+ Widget old_artist_view = args.Current.Value == 1 ? artist_view : albumartist_view;
- SwapView (old_artist_view, new_artist_view);
- ArtistFilterType.Set (args.Current.Value == 1 ? "albumartist" : "artist");
- }
-
- private void SwapView<T> (ListView<T> oldView, ListView<T> newView)
- {
List<ScrolledWindow> new_filter_list = new List<ScrolledWindow> ();
List<ScrolledWindow> old_filter_list = new List<ScrolledWindow> (filter_scrolled_windows);
@@ -216,15 +193,15 @@ namespace Banshee.Sources.Gui
{
bool contains = false;
foreach (Widget child in fw.AllChildren) {
- if (child == oldView) {
+ if (child == old_artist_view) {
contains = true;
}
}
if (contains) {
- Widget view_widget = (Widget)newView;
+ Widget view_widget = (Widget)new_artist_view;
if (view_widget.Parent == null) {
- SetupFilterView (newView);
+ SetupFilterView (new_artist_view as ArtistListView);
}
ScrolledWindow win = (ScrolledWindow)view_widget.Parent;
@@ -240,6 +217,8 @@ namespace Banshee.Sources.Gui
ClearFilterSelections ();
Layout ();
+
+ ArtistFilterType.Set (args.Current.Value == 1 ? "albumartist" : "artist");
}
protected override void InitializeViews ()
@@ -252,18 +231,18 @@ namespace Banshee.Sources.Gui
genre_view_widget.Parent.Visible = GenreFilterVisible.Get ();
};
- artist_view = new ArtistListView ();
- albumartist_view = new ArtistListView ();
if (ArtistFilterType.Get ().Equals ("artist")) {
- SetupFilterView (artist_view);
+ SetupFilterView (artist_view = new ArtistListView ());
artist_view.Parent.Shown += delegate {
artist_view.Parent.Visible = ArtistFilterVisible.Get ();
};
+ albumartist_view = new ArtistListView ();
} else {
- SetupFilterView (albumartist_view);
+ SetupFilterView (albumartist_view = new ArtistListView ());
albumartist_view.Parent.Shown += delegate {
albumartist_view.Parent.Visible = ArtistFilterVisible.Get ();
};
+ artist_view = new ArtistListView ();
}
SetupFilterView (year_view = new YearListView ());
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs
index 2dc84cf..20daec3 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs
@@ -1,5 +1,5 @@
//
-// FilteredListSourceContents.cs
+// ListBrowserSourceContents.cs
//
// Authors:
// Aaron Bockover <abockover at novell.com>
@@ -60,9 +60,6 @@ namespace Banshee.Sources.Gui
private List<object> filter_views = new List<object> ();
protected List<ScrolledWindow> filter_scrolled_windows = new List<ScrolledWindow> ();
- protected static readonly int DEFAULT_PANE_TOP_POSITION = 375;
- protected static readonly int DEFAULT_PANE_LEFT_POSITION = 275;
-
private Dictionary<object, double> model_positions = new Dictionary<object, double> ();
private Paned container;
@@ -70,9 +67,6 @@ namespace Banshee.Sources.Gui
private InterfaceActionService action_service;
private ActionGroup browser_view_actions;
- private readonly SchemaEntry<int> pane_top_position;
- private readonly SchemaEntry<int> pane_left_position;
-
private static string menu_xml = @"
<ui>
<menubar name=""MainMenu"">
@@ -89,14 +83,9 @@ namespace Banshee.Sources.Gui
</ui>
";
- public FilteredListSourceContents (string name,
- SchemaEntry<int> pane_top_position,
- SchemaEntry<int> pane_left_position)
+ public FilteredListSourceContents (string name)
{
this.name = name;
- this.pane_top_position = pane_top_position;
- this.pane_left_position = pane_left_position;
-
InitializeViews ();
string position = Layout ();
@@ -228,8 +217,6 @@ namespace Banshee.Sources.Gui
//Hyena.Log.Information ("ListBrowser LayoutLeft");
Reset ();
- SchemaEntry<int> current_entry = top ? pane_top_position : pane_left_position;
-
container = GetPane (!top);
Paned filter_box = GetPane (top);
filter_box.PositionSet = true;
@@ -260,22 +247,17 @@ namespace Banshee.Sources.Gui
container.Pack2 (main_scrolled_window, true, false);
browser_container = filter_box;
- if (current_entry.Equals (SchemaEntry<int>.Zero)) {
- throw new InvalidOperationException (String.Format ("No SchemaEntry found for {0} position of {1}",
- top ? "top" : "left", this.GetType ().FullName));
- }
- container.Position = current_entry.DefaultValue;
- PersistentPaneController.Control (container, current_entry);
+ container.Position = top ? 375 : 275;
+ PersistentPaneController.Control (container, ControllerName (top, -1));
ShowPack ();
}
private string ControllerName (bool top, int filter)
{
- if (filter < 0) {
- throw new ArgumentException ("filter should be positive", "filter");
- }
-
- return String.Format ("{0}.browser.{1}.{2}", name, top ? "top" : "left", filter);
+ if (filter == -1)
+ return String.Format ("{0}.browser.{1}", name, top ? "top" : "left");
+ else
+ return String.Format ("{0}.browser.{1}.{2}", name, top ? "top" : "left", filter);
}
private Paned GetPane (bool hpane)
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceModel.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceModel.cs
index 6569317..f2ce25e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceModel.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceModel.cs
@@ -84,13 +84,11 @@ namespace Banshee.Sources.Gui
ServiceManager.SourceManager.SourceRemoved += OnSourceRemoved;
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- ServiceManager.SourceManager.SourceAdded -= OnSourceAdded;
- ServiceManager.SourceManager.SourceRemoved -= OnSourceRemoved;
- }
- base.Dispose (disposing);
+ ServiceManager.SourceManager.SourceAdded -= OnSourceAdded;
+ ServiceManager.SourceManager.SourceRemoved -= OnSourceRemoved;
+ base.Dispose ();
}
private void OnSourceAdded (SourceAddedArgs args)
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
index 6ba962c..85c61aa 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs
@@ -46,7 +46,7 @@ namespace Banshee.Sources.Gui
{
}
- public static void CellDataHandler (ICellLayout layout, CellRenderer cell, ITreeModel model, TreeIter iter)
+ public static void CellDataHandler (CellLayout layout, CellRenderer cell, TreeModel model, TreeIter iter)
{
SourceRowRenderer renderer = cell as SourceRowRenderer;
if (renderer == null) {
@@ -102,19 +102,19 @@ namespace Banshee.Sources.Gui
{
}
- private StateFlags RendererStateToWidgetState (Widget widget, CellRendererState flags)
+ private StateType RendererStateToWidgetState (Widget widget, CellRendererState flags)
{
if (!Sensitive) {
- return StateFlags.Insensitive;
+ return StateType.Insensitive;
} else if ((flags & CellRendererState.Selected) == CellRendererState.Selected) {
- return widget.HasFocus ? StateFlags.Selected : StateFlags.Active;
+ return widget.HasFocus ? StateType.Selected : StateType.Active;
} else if ((flags & CellRendererState.Prelit) == CellRendererState.Prelit) {
ComboBox box = parent_widget as ComboBox;
- return box != null && box.PopupShown ? StateFlags.Prelight : StateFlags.Normal;
- } else if (widget.StateFlags == StateFlags.Insensitive) {
- return StateFlags.Insensitive;
+ return box != null && box.PopupShown ? StateType.Prelight : StateType.Normal;
+ } else if (widget.State == StateType.Insensitive) {
+ return StateType.Insensitive;
} else {
- return StateFlags.Normal;
+ return StateType.Normal;
}
}
@@ -124,22 +124,23 @@ namespace Banshee.Sources.Gui
}
}
- protected override void OnGetPreferredWidth (Widget widget, out int minimum_width, out int natural_width)
+ public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area,
+ out int x_offset, out int y_offset, out int width, out int height)
{
+ int text_x, text_y, text_w, text_h;
+
+ base.GetSize (widget, ref cell_area, out text_x, out text_y, out text_w, out text_h);
+
+ x_offset = 0;
+ y_offset = 0;
+
if (!(widget is TreeView)) {
- minimum_width = natural_width = 200;
+ width = 200;
} else {
- minimum_width = natural_width = 0;
+ width = 0;
}
- }
- protected override void OnGetPreferredHeight (Widget widget, out int minimum_height, out int natural_height)
- {
- int minimum_text_h, natural_text_h;
- base.GetPreferredHeight (widget, out minimum_text_h, out natural_text_h);
-
- minimum_height = (int)Math.Max (RowHeight, minimum_text_h);
- natural_height = (int)Math.Max (RowHeight, natural_text_h);
+ height = (int)Math.Max (RowHeight, text_h);
}
private int expander_right_x;
@@ -148,8 +149,8 @@ namespace Banshee.Sources.Gui
return x < expander_right_x;
}
- protected override void OnRender (Cairo.Context cr, Widget widget, Gdk.Rectangle background_area,
- Gdk.Rectangle cell_area, CellRendererState flags)
+ protected override void Render (Gdk.Drawable drawable, Widget widget, Gdk.Rectangle background_area,
+ Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
{
if (source == null || source is SourceManager.GroupSource) {
return;
@@ -157,9 +158,9 @@ namespace Banshee.Sources.Gui
view = widget as SourceView;
bool selected = view != null && view.Selection.IterIsSelected (iter);
- StateFlags state = RendererStateToWidgetState (widget, flags);
+ StateType state = RendererStateToWidgetState (widget, flags);
- RenderSelection (cr, background_area, selected, state);
+ RenderSelection (drawable, background_area, selected, state);
int title_layout_width = 0, title_layout_height = 0;
int count_layout_width = 0, count_layout_height = 0;
@@ -176,13 +177,14 @@ namespace Banshee.Sources.Gui
x += Math.Max (0, (int)Xpad - 2);
}
+ Gdk.GC main_gc = widget.Style.TextGC (state);
+
// Draw the expander if the source has children
- double exp_h = (cell_area.Height - 2.0*Ypad) / 2.0;
+ double exp_h = (cell_area.Height - 2.0*Ypad) / 3.2;
double exp_w = exp_h * 1.6;
- int y = Middle (cell_area, (int)exp_h);
- if (view != null && source.Children != null && source.Children.Count > 0) {
- var r = new Gdk.Rectangle (x, y, (int)exp_w, (int)exp_h);
- view.Theme.DrawArrow (cr, r, source.Expanded ? Math.PI/2.0 : 0.0);
+ if (view != null && view.Cr != null && source.Children != null && source.Children.Count > 0) {
+ var r = new Gdk.Rectangle (x, cell_area.Y + (int)((cell_area.Height - exp_h) / 2.0), (int)exp_w, (int)exp_h);
+ view.Theme.DrawArrow (view.Cr, r, source.Expanded ? Math.PI/2.0 : 0.0);
}
if (!np_etc) {
@@ -195,7 +197,7 @@ namespace Banshee.Sources.Gui
Pixbuf icon = SourceIconResolver.ResolveIcon (source, RowHeight);
bool dispose_icon = false;
- if (state == StateFlags.Insensitive) {
+ if (state == StateType.Insensitive) {
// Code ported from gtk_cell_renderer_pixbuf_render()
var icon_source = new IconSource () {
Pixbuf = icon,
@@ -203,7 +205,8 @@ namespace Banshee.Sources.Gui
SizeWildcarded = false
};
- icon = widget.StyleContext.RenderIconPixbuf (icon_source, (IconSize)(-1));
+ icon = widget.Style.RenderIcon (icon_source, widget.Direction, state,
+ (IconSize)(-1), widget, "SourceRowRenderer");
dispose_icon = true;
icon_source.Dispose ();
@@ -211,11 +214,9 @@ namespace Banshee.Sources.Gui
if (icon != null) {
x += expander_icon_spacing;
-
- cr.Save ();
- Gdk.CairoHelper.SetSourcePixbuf (cr, icon, x, Middle (cell_area, icon.Height));
- cr.Paint ();
- cr.Restore ();
+ drawable.DrawPixbuf (main_gc, icon, 0, 0,
+ x, Middle (cell_area, icon.Height),
+ icon.Width, icon.Height, RgbDither.None, 0, 0);
x += icon.Width;
@@ -261,21 +262,21 @@ namespace Banshee.Sources.Gui
title_layout.GetPixelSize (out title_layout_width, out title_layout_height);
x += img_padding;
- widget.StyleContext.RenderLayout (cr, x, Middle (cell_area, title_layout_height), title_layout);
+ drawable.DrawLayout (main_gc, x, Middle (cell_area, title_layout_height), title_layout);
title_layout.Dispose ();
// Draw the count
if (!hide_count) {
- if (view != null) {
- cr.SetSourceColor (state == StateFlags.Normal || (view != null && state == StateFlags.Prelight)
+ if (view != null && view.Cr != null) {
+ view.Cr.Color = state == StateType.Normal || (view != null && state == StateType.Prelight)
? view.Theme.TextMidColor
- : CairoExtensions.GdkRGBAToCairoColor (view.Theme.Widget.StyleContext.GetColor (state)));
+ : view.Theme.Colors.GetWidgetColor (GtkColorClass.Text, state);
- cr.MoveTo (
+ view.Cr.MoveTo (
cell_area.X + cell_area.Width - count_layout_width - 2,
cell_area.Y + 0.5 + (double)(cell_area.Height - count_layout_height) / 2.0);
- PangoCairoHelper.ShowLayout (cr, count_layout);
+ PangoCairoHelper.ShowLayout (view.Cr, count_layout);
}
count_layout.Dispose ();
@@ -284,39 +285,36 @@ namespace Banshee.Sources.Gui
fd.Dispose ();
}
- private void RenderSelection (Cairo.Context cr, Gdk.Rectangle background_area,
- bool selected, StateFlags state)
+ private void RenderSelection (Gdk.Drawable drawable, Gdk.Rectangle background_area,
+ bool selected, StateType state)
{
if (view == null) {
return;
}
- if (selected) {
+ if (selected && view.Cr != null) {
Gdk.Rectangle rect = background_area;
rect.X -= 2;
rect.Width += 4;
// clear the standard GTK selection and focus
- Gdk.RGBA rgba = view.StyleContext.GetBackgroundColor (StateFlags.Normal);
- cr.SetSourceRGBA (rgba.Red, rgba.Green, rgba.Blue, rgba.Alpha);
- cr.Rectangle (rect.X, rect.Y, rect.Width, rect.Height);
- cr.Fill ();
+ drawable.DrawRectangle (view.Style.BaseGC (StateType.Normal), true, rect);
// draw the hot cairo selection
if (!view.EditingRow) {
- view.Theme.DrawRowSelection (cr, background_area.X + 1, background_area.Y + 1,
+ view.Theme.DrawRowSelection (view.Cr, background_area.X + 1, background_area.Y + 1,
background_area.Width - 2, background_area.Height - 2);
}
- } else if (!TreeIter.Zero.Equals (iter) && iter.Equals (view.HighlightedIter)) {
- view.Theme.DrawRowSelection (cr, background_area.X + 1, background_area.Y + 1,
+ } else if (!TreeIter.Zero.Equals (iter) && iter.Equals (view.HighlightedIter) && view.Cr != null) {
+ view.Theme.DrawRowSelection (view.Cr, background_area.X + 1, background_area.Y + 1,
background_area.Width - 2, background_area.Height - 2, false);
- } else if (view.NotifyStage.ActorCount > 0) {
+ } else if (view.NotifyStage.ActorCount > 0 && view.Cr != null) {
if (!TreeIter.Zero.Equals (iter) && view.NotifyStage.Contains (iter)) {
Actor<TreeIter> actor = view.NotifyStage[iter];
- Cairo.Color color = CairoExtensions.GdkRGBAToCairoColor (view.StyleContext.GetBackgroundColor (StateFlags.Active));
+ Cairo.Color color = view.Theme.Colors.GetWidgetColor (GtkColorClass.Background, StateType.Active);
color.A = Math.Sin (actor.Percent * Math.PI);
- view.Theme.DrawRowSelection (cr, background_area.X + 1, background_area.Y + 1,
+ view.Theme.DrawRowSelection (view.Cr, background_area.X + 1, background_area.Y + 1,
background_area.Width - 2, background_area.Height - 2, true, true, color);
}
}
@@ -327,7 +325,7 @@ namespace Banshee.Sources.Gui
return area.Y + (int)Math.Round ((double)(area.Height - height) / 2.0, MidpointRounding.AwayFromZero);
}
- protected override ICellEditable OnStartEditing (Gdk.Event evnt, Widget widget, string path,
+ public override CellEditable StartEditing (Gdk.Event evnt, Widget widget, string path,
Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
{
CellEditEntry text = new CellEditEntry ();
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceSwitcherEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceSwitcherEntry.cs
index 6d0840a..2376d3d 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceSwitcherEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceSwitcherEntry.cs
@@ -118,7 +118,7 @@ namespace Banshee.Sources.Gui
} catch {}
};
- Position (view.Window);
+ Position (view.GdkWindow);
HasFocus = true;
Show ();
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
index f4e6bb9..8b86739 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
@@ -58,6 +58,7 @@ namespace Banshee.Sources.Gui
private SourceRowRenderer source_renderer;
private CellRendererText header_renderer;
private Theme theme;
+ private Cairo.Context cr;
private Stage<TreeIter> notify_stage = new Stage<TreeIter> (2000);
@@ -224,9 +225,9 @@ namespace Banshee.Sources.Gui
#region Gtk.Widget Overrides
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style old_style)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (old_style);
theme = Hyena.Gui.Theming.ThemeEngine.CreateTheme (this);
var light_text = Hyena.Gui.Theming.GtkTheme.GetCairoTextMidColor (this);
@@ -339,7 +340,7 @@ namespace Banshee.Sources.Gui
return true;
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
if (need_resort) {
need_resort = false;
@@ -358,12 +359,18 @@ namespace Banshee.Sources.Gui
QueueDraw ();
}
- base.OnDrawn (cr);
- if (Hyena.PlatformDetection.IsMeeGo) {
- theme.DrawFrameBorder (cr, new Gdk.Rectangle (0, 0,
- Allocation.Width, Allocation.Height));
+ try {
+ cr = Gdk.CairoHelper.Create (evnt.Window);
+ base.OnExposeEvent (evnt);
+ if (Hyena.PlatformDetection.IsMeeGo) {
+ theme.DrawFrameBorder (cr, new Gdk.Rectangle (0, 0,
+ Allocation.Width, Allocation.Height));
+ }
+ return true;
+ } finally {
+ CairoExtensions.DisposeContext (cr);
+ cr = null;
}
- return true;
}
private bool IncrementPathForKeyPress (Gdk.EventKey press, TreePath path)
@@ -408,7 +415,7 @@ namespace Banshee.Sources.Gui
private bool OnCursorChangedTimeout ()
{
TreeIter iter;
- ITreeModel model;
+ TreeModel model;
current_timeout = -1;
@@ -463,13 +470,13 @@ namespace Banshee.Sources.Gui
QueueDraw ();
}
- internal new void Expand (Source src)
+ internal void Expand (Source src)
{
Expand (store.FindSource (src));
src.Expanded = true;
}
- private new void Expand (TreeIter iter)
+ private void Expand (TreeIter iter)
{
using (var path = store.GetPath (iter)) {
ExpandRow (path, true);
@@ -587,6 +594,10 @@ namespace Banshee.Sources.Gui
get { return highlight_iter; }
}
+ internal Cairo.Context Cr {
+ get { return cr; }
+ }
+
internal Theme Theme {
get { return theme; }
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
index d2de148..a5a9a31 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
@@ -63,6 +63,7 @@ namespace Banshee.Sources.Gui
private bool new_playlist_visible = false;
private Source final_drag_source = null;
+ private uint final_drag_start_time = 0;
private void ConfigureDragAndDrop ()
{
@@ -91,9 +92,9 @@ namespace Banshee.Sources.Gui
// Scroll if within 20 pixels of the top or bottom
if (y < 20)
- ((IScrollable)this).Vadjustment.Value -= 30;
+ Vadjustment.Value -= 30;
else if ((Allocation.Height - y) < 20)
- ((IScrollable)this).Vadjustment.Value += 30;
+ Vadjustment.Value += 30;
ShowNewPlaylistUnder (parent_source, active_source);
@@ -180,6 +181,7 @@ namespace Banshee.Sources.Gui
final_drag_source = store.GetSource (path);
}
+ final_drag_start_time = context.StartTime;
HideNewPlaylistRow ();
SetDragDestRow (null, TreeViewDropPosition.Before);
}
@@ -201,7 +203,7 @@ namespace Banshee.Sources.Gui
Gtk.SelectionData data, uint info, uint time)
{
try {
- if (final_drag_source == null) {
+ if (final_drag_start_time != context.StartTime || final_drag_source == null) {
Gtk.Drag.Finish (context, false, false, time);
return;
}
@@ -253,7 +255,7 @@ namespace Banshee.Sources.Gui
switch ((DragDropTargetType)info) {
case DragDropTargetType.Source:
new DragDropList<Source> (ServiceManager.SourceManager.ActiveSource,
- selectionData, context.ListTargets ()[0]);
+ selectionData, context.Targets[0]);
break;
default:
return;
diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am
index ed2363b..bdcea43 100644
--- a/src/Core/Banshee.ThickClient/Makefile.am
+++ b/src/Core/Banshee.ThickClient/Makefile.am
@@ -35,7 +35,6 @@ SOURCES = \
Banshee.Collection.Gui/QueryFilterView.cs \
Banshee.Collection.Gui/SearchableListView.cs \
Banshee.Collection.Gui/TerseTrackListView.cs \
- Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs \
Banshee.Collection.Gui/TrackFilterListView.cs \
Banshee.Collection.Gui/TrackListView.cs \
Banshee.Collection.Gui/XmlColumnController.cs \
@@ -131,7 +130,6 @@ SOURCES = \
Banshee.Gui/SourceActions.cs \
Banshee.Gui/TrackActions.cs \
Banshee.Gui/ViewActions.cs \
- Banshee.Gui/WindowConfiguration.cs \
Banshee.Library.Gui/FileImportSource.cs \
Banshee.Library.Gui/FolderImportSource.cs \
Banshee.Library.Gui/ImportDialog.cs \
diff --git a/src/Core/Banshee.ThickClient/Makefile.in b/src/Core/Banshee.ThickClient/Makefile.in
index 71d7244..1b964fb 100644
--- a/src/Core/Banshee.ThickClient/Makefile.in
+++ b/src/Core/Banshee.ThickClient/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -457,7 +472,6 @@ SOURCES = \
Banshee.Collection.Gui/QueryFilterView.cs \
Banshee.Collection.Gui/SearchableListView.cs \
Banshee.Collection.Gui/TerseTrackListView.cs \
- Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs \
Banshee.Collection.Gui/TrackFilterListView.cs \
Banshee.Collection.Gui/TrackListView.cs \
Banshee.Collection.Gui/XmlColumnController.cs \
@@ -553,7 +567,6 @@ SOURCES = \
Banshee.Gui/SourceActions.cs \
Banshee.Gui/TrackActions.cs \
Banshee.Gui/ViewActions.cs \
- Banshee.Gui/WindowConfiguration.cs \
Banshee.Library.Gui/FileImportSource.cs \
Banshee.Library.Gui/FolderImportSource.cs \
Banshee.Library.Gui/ImportDialog.cs \
@@ -612,14 +625,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -734,7 +748,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -742,7 +756,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -750,7 +763,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -769,7 +782,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -809,7 +822,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Banshee.ThickClient.dll.config
all: all-am
@@ -1063,12 +1075,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs b/src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs
index b62ccc2..b7c5bed 100644
--- a/src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs
+++ b/src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs
@@ -92,8 +92,13 @@ namespace Banshee.WebSource
AttachOptions.Shrink,
0, 0);
+ //search_entry.EmptyMessage = String.Format (Catalog.GetString ("Search the Amazon MP3 Store"));
search_entry.SetSizeRequest (260, -1);
- search_entry.ShowSearchIcon = true;
+ // FIXME: dummy option to make the "search" icon show up;
+ // we should probably fix this in the SearchEntry, but also
+ // add real filter options for searching Amazon MP3 (artist,
+ // album, genre, etc.)
+ search_entry.AddFilterOption (0, name);
search_entry.Show ();
search_entry.Activated += (o, e) => {
view.GoSearch (search_entry.Query);
diff --git a/src/Core/Banshee.WebBrowser/Makefile.in b/src/Core/Banshee.WebBrowser/Makefile.in
index 5979777..10327dd 100644
--- a/src/Core/Banshee.WebBrowser/Makefile.in
+++ b/src/Core/Banshee.WebBrowser/Makefile.in
@@ -245,15 +245,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -262,6 +271,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -276,6 +287,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -283,6 +296,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -522,14 +537,15 @@ RESOURCES = \
# External libraries to link against, generated from configure
@HAVE_LIBWEBKIT_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_LIBWEBKIT_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_LIBWEBKIT_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -644,7 +660,7 @@ RESOURCES = \
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -652,7 +668,6 @@ RESOURCES = \
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -660,7 +675,7 @@ RESOURCES = \
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -679,7 +694,7 @@ RESOURCES = \
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -738,7 +753,6 @@ RESOURCES = \
@ENABLE_TESTS_TRUE@@HAVE_LIBWEBKIT_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_LIBWEBKIT_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_LIBWEBKIT_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_LIBWEBKIT_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_LIBWEBKIT_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_LIBWEBKIT_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-recursive
@@ -1153,12 +1167,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_LIBWEBKIT_TRUE at build-debug:
@HAVE_LIBWEBKIT_TRUE@ @echo $(DEP_LINK)
- at HAVE_LIBWEBKIT_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_LIBWEBKIT_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_LIBWEBKIT_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_LIBWEBKIT_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_LIBWEBKIT_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Core/Banshee.WebBrowser/libossifer/Makefile.in b/src/Core/Banshee.WebBrowser/libossifer/Makefile.in
index 09ecb05..48ccd02 100644
--- a/src/Core/Banshee.WebBrowser/libossifer/Makefile.in
+++ b/src/Core/Banshee.WebBrowser/libossifer/Makefile.in
@@ -232,15 +232,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -249,6 +258,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -263,6 +274,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -270,6 +283,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
index cbf1af4..d28a505 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
@@ -117,9 +117,8 @@ namespace Banshee.Widgets
}
}
- var activatable = item as IActivatable;
- if (activatable != null) {
- activatable.RelatedAction = action;
+ if (item != null) {
+ action.ConnectProxy (item);
}
}
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
index 519a54a..fceb774 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
@@ -33,170 +33,166 @@ using Gtk;
namespace Banshee.Widgets
{
- public class DateButton : ToggleButton
- {
- private Window popup;
- private DateTime date;
- private Calendar cal;
- private string displayFormat;
-
- private const uint CURRENT_TIME = 0;
- private Gdk.Device pointer, keyboard;
-
- public DateButton (string text) : base (text)
- {
- Toggled += OnToggled;
- popup = null;
- date = DateTime.Now;
- displayFormat = "yyyy/MM/dd";
- }
-
- private void ShowCalendar ()
- {
- popup = new Window (WindowType.Popup);
- popup.Screen = this.Screen;
-
- Frame frame = new Frame ();
- frame.ShadowType = ShadowType.Out;
- frame.Show ();
-
- popup.Add (frame);
-
- VBox box = new VBox (false, 0);
- box.Show ();
- frame.Add (box);
-
- cal = new Calendar ();
- cal.DisplayOptions = CalendarDisplayOptions.ShowHeading
- | CalendarDisplayOptions.ShowDayNames
- | CalendarDisplayOptions.ShowWeekNumbers;
-
- cal.KeyPressEvent += OnCalendarKeyPressed;
- popup.ButtonPressEvent += OnButtonPressed;
-
- cal.Show ();
-
- Alignment calAlignment = new Alignment (0.0f, 0.0f, 1.0f, 1.0f);
- calAlignment.Show ();
- calAlignment.SetPadding (4, 4, 4, 4);
- calAlignment.Add (cal);
-
- box.PackStart (calAlignment, false, false, 0);
-
- int minimum_height, natural_height;
- GetPreferredHeight (out minimum_height, out natural_height);
- int x = 0, y = 0;
- Window.GetOrigin (out x, out y);
- popup.Move (x + Allocation.X, y + Allocation.Y + natural_height + 3);
- popup.Show ();
- popup.GrabFocus ();
-
- Grab.Add (popup);
-
- Gdk.Device event_device = Gtk.Global.CurrentEventDevice;
- if (event_device.Source == Gdk.InputSource.Mouse) {
- pointer = event_device;
- keyboard = event_device.AssociatedDevice;
- } else {
- keyboard = event_device;
- pointer = event_device.AssociatedDevice;
- }
-
- Gdk.GrabStatus grabbed = pointer.Grab (popup.Window, Gdk.GrabOwnership.Application, true,
- Gdk.EventMask.ButtonPressMask
- | Gdk.EventMask.ButtonReleaseMask
- | Gdk.EventMask.PointerMotionMask, null, CURRENT_TIME);
-
- if (grabbed == Gdk.GrabStatus.Success) {
- grabbed = keyboard.Grab (popup.Window, Gdk.GrabOwnership.Application, true,
- Gdk.EventMask.KeyPressMask | Gdk.EventMask.KeyReleaseMask, null, CURRENT_TIME);
-
- if (grabbed != Gdk.GrabStatus.Success) {
- Grab.Remove (popup);
- popup.Destroy ();
- popup = null;
- }
- } else {
- Grab.Remove (popup);
- popup.Destroy ();
- popup = null;
- }
-
- cal.DaySelectedDoubleClick += OnCalendarDaySelected;
- cal.ButtonPressEvent += OnCalendarButtonPressed;
-
- cal.Date = date;
- }
-
- public void HideCalendar (bool update)
- {
- if (popup != null) {
- Grab.Remove (popup);
- pointer.Ungrab (CURRENT_TIME);
- keyboard.Ungrab (CURRENT_TIME);
-
- popup.Destroy ();
- popup = null;
- }
-
- if (update) {
- date = cal.GetDate ();
- Label = date.ToString (displayFormat);
- }
-
- Active = false;
- }
-
- private void OnToggled (object o, EventArgs args)
- {
- if (Active) {
- ShowCalendar ();
- } else {
- HideCalendar (false);
- }
- }
-
- private void OnButtonPressed (object o, ButtonPressEventArgs args)
- {
- if (popup != null)
- HideCalendar (false);
- }
-
- private void OnCalendarDaySelected (object o, EventArgs args)
- {
- HideCalendar (true);
- }
-
- private void OnCalendarButtonPressed (object o, ButtonPressEventArgs args)
- {
- args.RetVal = true;
- }
-
- private void OnCalendarKeyPressed (object o, KeyPressEventArgs args)
- {
- switch (args.Event.Key) {
- case Gdk.Key.Escape:
- HideCalendar (false);
- break;
- case Gdk.Key.KP_Enter:
- case Gdk.Key.ISO_Enter:
- case Gdk.Key.Key_3270_Enter:
- case Gdk.Key.Return:
- case Gdk.Key.space:
- case Gdk.Key.KP_Space:
- HideCalendar (true);
- break;
- default:
- break;
- }
- }
-
- public string DisplayFormat {
- set { displayFormat = value; }
- }
-
- public DateTime Date {
- get { return date; }
- }
- }
+ public class DateButton : ToggleButton
+ {
+ private Window popup;
+ private DateTime date;
+ private Calendar cal;
+ private string displayFormat;
+
+ private const uint CURRENT_TIME = 0;
+
+ public DateButton(string text) : base(text)
+ {
+ Toggled += OnToggled;
+ popup = null;
+ date = DateTime.Now;
+ displayFormat = "yyyy/MM/dd";
+ }
+
+ private void ShowCalendar()
+ {
+ popup = new Window(WindowType.Popup);
+ popup.Screen = this.Screen;
+
+ Frame frame = new Frame();
+ frame.Shadow = ShadowType.Out;
+ frame.Show();
+
+ popup.Add(frame);
+
+ VBox box = new VBox(false, 0);
+ box.Show();
+ frame.Add(box);
+
+ cal = new Calendar();
+ cal.DisplayOptions = CalendarDisplayOptions.ShowHeading
+ | CalendarDisplayOptions.ShowDayNames
+ | CalendarDisplayOptions.ShowWeekNumbers;
+
+ cal.KeyPressEvent += OnCalendarKeyPressed;
+ popup.ButtonPressEvent += OnButtonPressed;
+
+ cal.Show();
+
+ Alignment calAlignment = new Alignment(0.0f, 0.0f, 1.0f, 1.0f);
+ calAlignment.Show();
+ calAlignment.SetPadding(4, 4, 4, 4);
+ calAlignment.Add(cal);
+
+ box.PackStart(calAlignment, false, false, 0);
+
+ Requisition req = SizeRequest();
+ int x = 0, y = 0;
+ GdkWindow.GetOrigin(out x, out y);
+ popup.Move(x + Allocation.X, y + Allocation.Y + req.Height + 3);
+ popup.Show();
+ popup.GrabFocus();
+
+ Grab.Add(popup);
+
+ Gdk.GrabStatus grabbed = Gdk.Pointer.Grab(popup.GdkWindow, true,
+ Gdk.EventMask.ButtonPressMask
+ | Gdk.EventMask.ButtonReleaseMask
+ | Gdk.EventMask.PointerMotionMask, null, null, CURRENT_TIME);
+
+ if(grabbed == Gdk.GrabStatus.Success) {
+ grabbed = Gdk.Keyboard.Grab(popup.GdkWindow,
+ true, CURRENT_TIME);
+
+ if(grabbed != Gdk.GrabStatus.Success) {
+ Grab.Remove(popup);
+ popup.Destroy();
+ popup = null;
+ }
+ } else {
+ Grab.Remove(popup);
+ popup.Destroy();
+ popup = null;
+ }
+
+ cal.DaySelectedDoubleClick += OnCalendarDaySelected;
+ cal.ButtonPressEvent += OnCalendarButtonPressed;
+
+ cal.Date = date;
+ }
+
+ public void HideCalendar(bool update)
+ {
+ if(popup != null) {
+ Grab.Remove(popup);
+ Gdk.Pointer.Ungrab(CURRENT_TIME);
+ Gdk.Keyboard.Ungrab(CURRENT_TIME);
+
+ popup.Destroy();
+ popup = null;
+ }
+
+ if(update) {
+ date = cal.GetDate();
+ Label = date.ToString(displayFormat);
+ }
+
+ Active = false;
+ }
+
+ private void OnToggled(object o, EventArgs args)
+ {
+ if(Active) {
+ ShowCalendar();
+ } else {
+ HideCalendar(false);
+ }
+ }
+
+ private void OnButtonPressed(object o, ButtonPressEventArgs args)
+ {
+ if(popup != null)
+ HideCalendar(false);
+ }
+
+ private void OnCalendarDaySelected(object o, EventArgs args)
+ {
+ HideCalendar(true);
+ }
+
+ private void OnCalendarButtonPressed(object o,
+ ButtonPressEventArgs args)
+ {
+ args.RetVal = true;
+ }
+
+ private void OnCalendarKeyPressed(object o, KeyPressEventArgs args)
+ {
+ switch(args.Event.Key) {
+ case Gdk.Key.Escape:
+ HideCalendar(false);
+ break;
+ case Gdk.Key.KP_Enter:
+ case Gdk.Key.ISO_Enter:
+ case Gdk.Key.Key_3270_Enter:
+ case Gdk.Key.Return:
+ case Gdk.Key.space:
+ case Gdk.Key.KP_Space:
+ HideCalendar(true);
+ break;
+ default:
+ break;
+ }
+ }
+
+ public string DisplayFormat
+ {
+ set {
+ displayFormat = value;
+ }
+ }
+
+ public DateTime Date
+ {
+ get {
+ return date;
+ }
+ }
+ }
}
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs
index d76c68c..3760b56 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs
@@ -67,19 +67,15 @@ namespace Banshee.Widgets
AppPaintable = true;
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet(Gtk.Style style)
{
- Gdk.RGBA rgba = StyleContext.GetBackgroundColor (StateFlags.Selected);
- fill_color_a = new Color (rgba.Red, rgba.Green, rgba.Blue, rgba.Alpha);
- rgba = StyleContext.GetColor (StateFlags.Selected);
- fill_color_b = new Color (rgba.Red, rgba.Green, rgba.Blue, rgba.Alpha);
- rgba = StyleContext.GetColor (StateFlags.Normal);
- stroke_color = new Color (rgba.Red, rgba.Green, rgba.Blue, 0.6);
- inner_stroke_color = new Color (rgba.Red, rgba.Green, rgba.Blue, 0.4);
- text_color = new Color (rgba.Red, rgba.Green, rgba.Blue, 0.8);
- rgba = StyleContext.GetBackgroundColor (StateFlags.Normal);
- text_bg_color = new Color (rgba.Red, rgba.Green, rgba.Blue, 0.6);
- fill_color_c = new Color (rgba.Red, rgba.Green, rgba.Blue, rgba.Alpha);
+ fill_color_a = CairoExtensions.GdkColorToCairoColor(Style.Background(StateType.Selected));
+ fill_color_b = CairoExtensions.GdkColorToCairoColor(Style.Foreground(StateType.Selected));
+ fill_color_c = CairoExtensions.GdkColorToCairoColor(Style.Background(StateType.Normal));
+ stroke_color = CairoExtensions.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.6);
+ inner_stroke_color = CairoExtensions.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.4);
+ text_color = CairoExtensions.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.8);
+ text_bg_color = CairoExtensions.GdkColorToCairoColor(Style.Background(StateType.Normal), 0.6);
}
protected override void OnSizeAllocated(Gdk.Rectangle rect)
@@ -108,24 +104,31 @@ namespace Banshee.Widgets
base.OnSizeAllocated(rect);
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent(Gdk.EventExpose evnt)
{
if(!IsRealized) {
return false;
}
- DrawWidget (cr);
+ Cairo.Context cr = Gdk.CairoHelper.Create(GdkWindow);
+ foreach(Gdk.Rectangle rect in evnt.Region.GetRectangles()) {
+ cr.Rectangle(rect.X, rect.Y, rect.Width, rect.Height);
+ cr.Clip();
+ Draw(cr);
+ }
+
+ CairoExtensions.DisposeContext (cr);
return false;
}
- private void DrawWidget (Cairo.Context cr)
+ private void Draw(Cairo.Context cr)
{
cr.Antialias = Antialias.Subpixel;
cr.LineWidth = base_line_width / 1.5;
cr.Arc(x, y, radius, 0, 2 * Math.PI);
- cr.SetSource (bg_gradient);
+ cr.Pattern = bg_gradient;
cr.Fill();
/*cr.LineTo(x, y);
@@ -144,31 +147,31 @@ namespace Banshee.Widgets
cr.Arc(x, y, radius, 0, 2 * Math.PI);
}
- cr.SetSource (Fraction >= 1.0 ? fg_gradient_full : fg_gradient);
+ cr.Pattern = Fraction >= 1.0 ? fg_gradient_full : fg_gradient;
cr.FillPreserve();
- cr.SetSourceColor (stroke_color);
+ cr.Color = stroke_color;
cr.Stroke();
}
cr.Arc(x, y, radius / 2.75, 0, 2 * Math.PI);
- cr.SetSourceColor (fill_color_c);
+ cr.Color = fill_color_c;
cr.FillPreserve();
- cr.SetSourceColor (new Cairo.Color(1, 1, 1, 0.75));
+ cr.Color = new Cairo.Color(1, 1, 1, 0.75);
cr.FillPreserve();
cr.LineWidth = base_line_width / 1.5;
- cr.SetSourceColor (stroke_color);
+ cr.Color = stroke_color;
cr.Stroke();
cr.Arc(x, y, radius / 5.5, 0, 2 * Math.PI);
- cr.SetSourceColor (fill_color_c);
+ cr.Color = fill_color_c;
cr.FillPreserve();
cr.LineWidth = base_line_width / 2;
- cr.SetSourceColor (inner_stroke_color);
+ cr.Color = inner_stroke_color;
cr.Stroke();
cr.Arc(x, y, radius, 0, 2 * Math.PI);
@@ -177,11 +180,11 @@ namespace Banshee.Widgets
if(Capacity <= 0) {
// this sucks balls
cr.Rectangle(0, 0, Allocation.Width, Allocation.Height);
- cr.SetSourceColor (text_bg_color);
+ cr.Color = text_bg_color;
cr.FillPreserve();
cr.SelectFontFace("Sans", FontSlant.Normal, FontWeight.Bold);
- cr.SetSourceColor (text_color);
+ cr.Color = text_color;
cr.SetFontSize(Allocation.Width * 0.2);
DrawText(cr, Mono.Unix.Catalog.GetString("Insert\nDisc"), 3);
}
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/HoverImageButton.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/HoverImageButton.cs
new file mode 100644
index 0000000..547e063
--- /dev/null
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/HoverImageButton.cs
@@ -0,0 +1,256 @@
+/***************************************************************************
+ * HoverImageButton.cs
+ *
+ * Copyright (C) 2007 Novell, Inc.
+ * Written by Aaron Bockover <abockover at novell.com>
+ ****************************************************************************/
+
+/* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+using System;
+using Gtk;
+
+namespace Banshee.Widgets
+{
+ public class HoverImageButton : EventBox
+ {
+ private static Gdk.Cursor hand_cursor = new Gdk.Cursor(Gdk.CursorType.Hand2);
+
+ private IconSize icon_size = IconSize.Menu;
+ private string [] icon_names = { "image-missing", Stock.MissingImage };
+ private Gdk.Pixbuf normal_pixbuf;
+ private Gdk.Pixbuf active_pixbuf;
+ private Image image;
+ private bool is_hovering;
+ private bool is_pressed;
+
+ private bool draw_focus = true;
+
+ private event EventHandler clicked;
+
+ public event EventHandler Clicked {
+ add { clicked += value; }
+ remove { clicked -= value; }
+ }
+
+ public HoverImageButton()
+ {
+ CanFocus = true;
+
+ image = new Image();
+ image.Show();
+ Add(image);
+ }
+
+ public HoverImageButton(IconSize size, string icon_name) :
+ this(size, new string [] { icon_name })
+ {
+ }
+
+ public HoverImageButton(IconSize size, string [] icon_names) : this()
+ {
+ this.icon_size = size;
+ this.icon_names = icon_names;
+ }
+
+ public new void Activate()
+ {
+ EventHandler handler = clicked;
+ if(handler != null) {
+ handler(this, EventArgs.Empty);
+ }
+ }
+
+ private bool changing_style = false;
+ protected override void OnStyleSet(Style previous_style)
+ {
+ if(changing_style) {
+ return;
+ }
+
+ changing_style = true;
+ LoadPixbufs();
+ changing_style = false;
+ }
+
+ protected override bool OnEnterNotifyEvent(Gdk.EventCrossing evnt)
+ {
+ image.GdkWindow.Cursor = hand_cursor;
+ is_hovering = true;
+ UpdateImage();
+ return base.OnEnterNotifyEvent(evnt);
+ }
+
+ protected override bool OnLeaveNotifyEvent(Gdk.EventCrossing evnt)
+ {
+ is_hovering = false;
+ UpdateImage();
+ return base.OnLeaveNotifyEvent(evnt);
+ }
+
+ protected override bool OnFocusInEvent(Gdk.EventFocus evnt)
+ {
+ bool ret = base.OnFocusInEvent(evnt);
+ UpdateImage();
+ return ret;
+ }
+
+ protected override bool OnFocusOutEvent(Gdk.EventFocus evnt)
+ {
+ bool ret = base.OnFocusOutEvent(evnt);
+ UpdateImage();
+ return ret;
+ }
+
+ protected override bool OnButtonPressEvent(Gdk.EventButton evnt)
+ {
+ if(evnt.Button != 1) {
+ return base.OnButtonPressEvent(evnt);
+ }
+
+ HasFocus = true;
+ is_pressed = true;
+ QueueDraw();
+
+ return base.OnButtonPressEvent(evnt);
+ }
+
+ protected override bool OnButtonReleaseEvent(Gdk.EventButton evnt)
+ {
+ if(evnt.Button != 1) {
+ return base.OnButtonReleaseEvent(evnt);
+ }
+
+ is_pressed = false;
+ QueueDraw();
+ Activate();
+
+ return base.OnButtonReleaseEvent(evnt);
+ }
+
+ protected override bool OnExposeEvent(Gdk.EventExpose evnt)
+ {
+ base.OnExposeEvent(evnt);
+
+ PropagateExpose(Child, evnt);
+
+ if(HasFocus && draw_focus) {
+ Style.PaintFocus(Style, GdkWindow, StateType.Normal, evnt.Area, this, "button",
+ 0, 0, Allocation.Width, Allocation.Height);
+ }
+
+ return true;
+ }
+
+ private void UpdateImage()
+ {
+ image.Pixbuf = is_hovering || is_pressed || HasFocus
+ ? active_pixbuf : normal_pixbuf;
+ }
+
+ private void LoadPixbufs()
+ {
+ int width, height;
+ Icon.SizeLookup(icon_size, out width, out height);
+ IconTheme theme = IconTheme.GetForScreen(Screen);
+
+ if(normal_pixbuf != null) {
+ normal_pixbuf.Dispose();
+ normal_pixbuf = null;
+ }
+
+ if(active_pixbuf != null) {
+ active_pixbuf.Dispose();
+ active_pixbuf = null;
+ }
+
+ for(int i = 0; i < icon_names.Length; i++) {
+ try {
+ normal_pixbuf = theme.LoadIcon(icon_names[i], width, 0);
+ active_pixbuf = ColorShiftPixbuf(normal_pixbuf, 30);
+ break;
+ } catch {
+ }
+ }
+
+ UpdateImage();
+ }
+
+ private static byte PixelClamp(int val)
+ {
+ return (byte)Math.Max(0, Math.Min(255, val));
+ }
+
+ private unsafe Gdk.Pixbuf ColorShiftPixbuf(Gdk.Pixbuf src, byte shift)
+ {
+ Gdk.Pixbuf dest = new Gdk.Pixbuf(src.Colorspace, src.HasAlpha, src.BitsPerSample, src.Width, src.Height);
+
+ byte *src_pixels_orig = (byte *)src.Pixels;
+ byte *dest_pixels_orig = (byte *)dest.Pixels;
+
+ for(int i = 0; i < src.Height; i++) {
+ byte *src_pixels = src_pixels_orig + i * src.Rowstride;
+ byte *dest_pixels = dest_pixels_orig + i * dest.Rowstride;
+
+ for(int j = 0; j < src.Width; j++) {
+ *(dest_pixels++) = PixelClamp(*(src_pixels++) + shift);
+ *(dest_pixels++) = PixelClamp(*(src_pixels++) + shift);
+ *(dest_pixels++) = PixelClamp(*(src_pixels++) + shift);
+
+ if(src.HasAlpha) {
+ *(dest_pixels++) = *(src_pixels++);
+ }
+ }
+ }
+
+ return dest;
+ }
+
+ public string [] IconNames {
+ get { return icon_names; }
+ set {
+ icon_names = value;
+ LoadPixbufs();
+ }
+ }
+
+ public IconSize IconSize {
+ get { return icon_size; }
+ set {
+ icon_size = value;
+ LoadPixbufs();
+ }
+ }
+
+ public Image Image {
+ get { return image; }
+ }
+
+ public bool DrawFocus {
+ get { return draw_focus; }
+ set {
+ draw_focus = value;
+ QueueDraw();
+ }
+ }
+ }
+}
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs
index 9605834..9bcbd47 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs
@@ -35,34 +35,35 @@ namespace Banshee.Widgets
public class LinearProgress : Gtk.DrawingArea
{
private double fraction;
+ private static Gdk.GC bar_gc = null;
- public LinearProgress ()
+ public LinearProgress()
{
AppPaintable = true;
fraction = 0;
QueueDraw();
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent(Gdk.EventExpose evnt)
{
- cr.Save ();
- Gdk.RGBA color = Hyena.Gui.GtkUtilities.ColorBlend (
- StyleContext.GetBackgroundColor (StateFlags.Normal),
- StyleContext.GetColor (StateFlags.Normal));
- cr.SetSourceRGBA (color.Red, color.Green, color.Blue, color.Alpha);
- DrawCairo (cr);
- cr.Restore ();
+ if(bar_gc == null) {
+ bar_gc = new Gdk.GC(GdkWindow);
+ Gdk.Color color = Hyena.Gui.GtkUtilities.ColorBlend(Style.Background(StateType.Normal),
+ Style.Foreground(StateType.Normal));
+ bar_gc.Background = color;
+ bar_gc.Foreground = color;
+ }
+
+ DrawGdk();
return false;
}
- private void DrawCairo (Cairo.Context cr)
+ private void DrawGdk()
{
int bar_width = (int)((double)Allocation.Width * fraction - 3.0);
- cr.Rectangle (0, 0, Allocation.Width - 1, Allocation.Height - 1);
- cr.Stroke ();
- if (bar_width > 0) {
- cr.Rectangle (2, 2, bar_width, Allocation.Height - 4);
- cr.Fill ();
+ GdkWindow.DrawRectangle(bar_gc, false, 0, 0, Allocation.Width - 1, Allocation.Height - 1);
+ if(bar_width > 0) {
+ GdkWindow.DrawRectangle(bar_gc, true, 2, 2, bar_width, Allocation.Height - 4);
}
}
@@ -72,7 +73,7 @@ namespace Banshee.Widgets
}
set {
- fraction = Math.Max (0.0, Math.Min (1.0, value));
+ fraction = Math.Max(0.0, Math.Min(1.0, value));
QueueDraw();
}
}
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/LinkLabel.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/LinkLabel.cs
index 725084b..27370a2 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/LinkLabel.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/LinkLabel.cs
@@ -47,7 +47,7 @@ namespace Banshee.Widgets
private bool is_hovering;
private bool selectable;
private UriOpenHandler open_handler;
- private Gdk.RGBA link_color;
+ private Gdk.Color link_color;
private bool interior_focus;
private int focus_width;
@@ -71,17 +71,18 @@ namespace Banshee.Widgets
label = new Label(text);
label.Show();
- link_color = label.StyleContext.GetBackgroundColor (StateFlags.Selected);
+ link_color = label.Style.Background(StateType.Selected);
ActAsLink = true;
Add(label);
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (previous_style);
CheckButton check = new CheckButton ();
+ check.EnsureStyle ();
interior_focus = GtkUtilities.StyleGetProperty<bool> (check, "interior-focus", false);
focus_width = GtkUtilities.StyleGetProperty<int> (check, "focus-line-width", -1);
@@ -101,62 +102,44 @@ namespace Banshee.Widgets
}
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent(Gdk.EventExpose evnt)
{
if(!IsDrawable) {
return false;
}
- if(CairoHelper.ShouldDrawWindow (cr, Window) && HasFocus) {
+ if(evnt.Window == GdkWindow && HasFocus) {
int layout_width = 0, layout_height = 0;
label.Layout.GetPixelSize(out layout_width, out layout_height);
- StyleContext.Save ();
- StyleContext.AddClass ("check");
- StyleContext.RenderFocus (cr, 0, 0, layout_width + 2 * padding, layout_height + 2 * padding);
- StyleContext.Restore ();
+ Style.PaintFocus (Style, GdkWindow, State, evnt.Area, this, "checkbutton",
+ 0, 0, layout_width + 2 * padding, layout_height + 2 * padding);
}
if(Child != null) {
- PropagateDraw(Child, cr);
+ PropagateExpose(Child, evnt);
}
return false;
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ protected override void OnSizeRequested (ref Requisition requisition)
{
if (label == null) {
- base.OnGetPreferredHeight (out minimum_height, out natural_height);
+ base.OnSizeRequested (ref requisition);
return;
}
- minimum_height = natural_height = 0;
+ requisition.Width = 0;
+ requisition.Height = 0;
- int label_min_height, label_natural_height;
- label.GetPreferredHeight (out label_min_height, out label_natural_height);
- minimum_height += label_min_height;
- natural_height += label_natural_height;
+ Requisition child_requisition = label.SizeRequest ();
+ requisition.Width = Math.Max (requisition.Width, child_requisition.Width);
+ requisition.Height += child_requisition.Height;
- natural_height += ((int)BorderWidth + padding) * 2;
- minimum_height += ((int)BorderWidth + padding) * 2;
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- if (label == null) {
- base.OnGetPreferredWidth (out minimum_width, out natural_width);
- return;
- }
-
- minimum_width = natural_width = 0;
-
- int label_min_width, label_natural_width;
- label.GetPreferredWidth (out label_min_width, out label_natural_width);
- minimum_width = Math.Max (minimum_width, label_min_width);
- natural_width = Math.Max (natural_width, label_natural_width);
+ requisition.Width += ((int)BorderWidth + padding) * 2;
+ requisition.Height += ((int)BorderWidth + padding) * 2;
- minimum_width += ((int)BorderWidth + padding) * 2;
- natural_width += ((int)BorderWidth + padding) * 2;
+ base.OnSizeRequested (ref requisition);
}
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -213,14 +196,14 @@ namespace Banshee.Widgets
protected override bool OnEnterNotifyEvent(Gdk.EventCrossing evnt)
{
is_hovering = true;
- Window.Cursor = hand_cursor;
+ GdkWindow.Cursor = hand_cursor;
return false;
}
protected override bool OnLeaveNotifyEvent(Gdk.EventCrossing evnt)
{
is_hovering = false;
- Window.Cursor = null;
+ GdkWindow.Cursor = null;
return false;
}
@@ -289,10 +272,10 @@ namespace Banshee.Widgets
if(act_as_link) {
label.Selectable = false;
- label.OverrideColor (StateFlags.Normal, link_color);
+ label.ModifyFg(Gtk.StateType.Normal, link_color);
} else {
label.Selectable = selectable;
- label.OverrideColor (StateFlags.Normal, label.StyleContext.GetColor (StateFlags.Normal));
+ label.ModifyFg(Gtk.StateType.Normal, label.Style.Foreground(Gtk.StateType.Normal));
}
label.QueueDraw();
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/MessagePane.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/MessagePane.cs
index c18f9ce..c06ba18 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/MessagePane.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/MessagePane.cs
@@ -105,7 +105,7 @@ namespace Banshee.Widgets
label.Markup = tip;
label.SetAlignment (0.0f, 0.5f);
label.LineWrap = true;
- label.OverrideColor (StateFlags.Normal, label.StyleContext.GetColor (StateFlags.Insensitive));
+ label.ModifyFg (StateType.Normal, label.Style.Foreground (StateType.Insensitive));
label.Show ();
Attach (label, 1, 2, row, row + 1, AttachOptions.Expand | AttachOptions.Fill, 0, 0, 0);
}
@@ -130,7 +130,7 @@ namespace Banshee.Widgets
}
Attach (widget, 1, 2, row, row + 1, xoptions, yoptions, 0, 0);
- widget.OverrideBackgroundColor (StateFlags.Normal, StyleContext.GetBackgroundColor (StateFlags.Normal));
+ widget.ModifyBg (StateType.Normal, Style.Base (StateType.Normal));
}
public void Clear ()
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs
index 7f066da..9699df8 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs
@@ -4,10 +4,8 @@
// Author:
// Aaron Bockover <abockover at novell.com>
// Gabriel Burt <gburt at novell.com>
-// Bertrand Lorentz <bertrand.lorentz at gmail.com>
//
-// Copyright 2007 Novell, Inc.
-// Copyright 2011 Bertrand Lorentz
+// Copyright (C) 2007 Novell, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -34,8 +32,13 @@ using Gtk;
namespace Banshee.Widgets
{
- public class SearchEntry : Entry
+ public class SearchEntry : EventBox
{
+ private HBox box;
+ private Entry entry;
+ private HoverImageButton filter_button;
+ private HoverImageButton clear_button;
+
private Menu menu;
private int active_filter_id = -1;
@@ -47,11 +50,16 @@ namespace Banshee.Widgets
private event EventHandler filter_changed;
private event EventHandler entry_changed;
- public new event EventHandler Changed {
+ public event EventHandler Changed {
add { entry_changed += value; }
remove { entry_changed -= value; }
}
+ public event EventHandler Activated {
+ add { entry.Activated += value; }
+ remove { entry.Activated -= value; }
+ }
+
public event EventHandler FilterChanged {
add { filter_changed += value; }
remove { filter_changed -= value; }
@@ -59,8 +67,6 @@ namespace Banshee.Widgets
public uint ChangeTimeoutMs { get; set; }
- public bool ShowSearchIcon { get; set; }
-
public Menu Menu {
get { return menu; }
}
@@ -69,55 +75,106 @@ namespace Banshee.Widgets
{
}
- public SearchEntry () : base ()
+ public SearchEntry()
{
ChangeTimeoutMs = 25;
+ AppPaintable = true;
+
+ BuildWidget();
+ BuildMenu();
- menu = new Menu ();
+ NoShowAll = true;
}
- private void ShowMenu (uint time)
+ private void BuildWidget()
{
- if (menu.Children.Length > 0) {
- menu.Popup (null, null, null, 0, time);
- menu.ShowAll ();
- }
+ box = new HBox();
+ entry = new FramelessEntry(this);
+ filter_button = new HoverImageButton(IconSize.Menu, new string [] { "edit-find", Stock.Find });
+ clear_button = new HoverImageButton(IconSize.Menu, new string [] { "edit-clear", Stock.Clear });
+ clear_button.TooltipText = Mono.Unix.Catalog.GetString ("Clear search");
+
+ box.PackStart(filter_button, false, false, 0);
+ box.PackStart(entry, true, true, 0);
+ box.PackStart(clear_button, false, false, 0);
+
+ Add(box);
+ box.ShowAll();
+
+ entry.StyleSet += OnInnerEntryStyleSet;
+ entry.StateChanged += OnInnerEntryStateChanged;
+ entry.FocusInEvent += OnInnerEntryFocusEvent;
+ entry.FocusOutEvent += OnInnerEntryFocusEvent;
+ entry.Changed += OnInnerEntryChanged;
+
+ filter_button.Image.Xpad = 2;
+ clear_button.Image.Xpad = 2;
+ filter_button.CanFocus = false;
+ clear_button.CanFocus = false;
+
+ filter_button.ButtonReleaseEvent += OnButtonReleaseEvent;
+ clear_button.ButtonReleaseEvent += OnButtonReleaseEvent;
+ clear_button.Clicked += OnClearButtonClicked;
+
+ filter_button.Visible = false;
+ clear_button.Visible = false;
}
- private void ShowHideButtons ()
+ private void BuildMenu()
{
- if (ShowSearchIcon || (menu != null && menu.Children.Length > 0)) {
- SetIconFromIconName (EntryIconPosition.Primary, "edit-find");
- PrimaryIconSensitive = PrimaryIconActivatable = true;
- } else {
- SetIconFromIconName (EntryIconPosition.Primary, null);
- }
- if (Text.Length > 0) {
- SetIconFromIconName (EntryIconPosition.Secondary, "edit-clear");
- SecondaryIconSensitive = SecondaryIconActivatable = true;
- } else {
- SetIconFromIconName (EntryIconPosition.Secondary, null);
+ menu = new Menu();
+ menu.Deactivated += OnMenuDeactivated;
+ }
+
+ private void ShowMenu(uint time)
+ {
+ if(menu.Children.Length > 0) {
+ menu.Popup(null, null, OnPositionMenu, 0, time);
+ menu.ShowAll();
}
}
+ private void ShowHideButtons()
+ {
+ clear_button.Visible = entry.Text.Length > 0;
+ filter_button.Visible = menu != null && menu.Children.Length > 0;
+ }
+
+ private void OnPositionMenu(Menu menu, out int x, out int y, out bool push_in)
+ {
+ int origin_x, origin_y, tmp;
+
+ filter_button.GdkWindow.GetOrigin(out origin_x, out tmp);
+ GdkWindow.GetOrigin(out tmp, out origin_y);
+
+ x = origin_x + filter_button.Allocation.X;
+ y = origin_y + SizeRequest().Height;
+ push_in = true;
+ }
+
+ private void OnMenuDeactivated(object o, EventArgs args)
+ {
+ filter_button.QueueDraw();
+ }
+
private bool toggling = false;
- private void OnMenuItemActivated (object o, EventArgs args)
+ private void OnMenuItemToggled(object o, EventArgs args)
{
- if (toggling || !(o is FilterMenuItem)) {
+ if(toggling || !(o is FilterMenuItem)) {
return;
}
toggling = true;
FilterMenuItem item = (FilterMenuItem)o;
- foreach (MenuItem child_item in menu) {
- if (!(child_item is FilterMenuItem)) {
+ foreach(MenuItem child_item in menu) {
+ if(!(child_item is FilterMenuItem)) {
continue;
}
FilterMenuItem filter_child = (FilterMenuItem)child_item;
- if (filter_child != item) {
+ if(filter_child != item) {
filter_child.Active = false;
}
}
@@ -127,147 +184,160 @@ namespace Banshee.Widgets
toggling = false;
}
- protected override void OnChanged ()
+ private void OnInnerEntryChanged(object o, EventArgs args)
{
- ShowHideButtons ();
+ ShowHideButtons();
- if (changed_timeout_id > 0) {
- GLib.Source.Remove (changed_timeout_id);
+ if(changed_timeout_id > 0) {
+ GLib.Source.Remove(changed_timeout_id);
}
- if (Ready) {
- changed_timeout_id = GLib.Timeout.Add (ChangeTimeoutMs, OnChangedTimeout);
- }
+ if (Ready)
+ changed_timeout_id = GLib.Timeout.Add(ChangeTimeoutMs, OnChangedTimeout);
}
- private bool OnChangedTimeout ()
+ private bool OnChangedTimeout()
{
- if (!Ready) {
- return false;
- }
+ OnChanged();
+ return false;
+ }
- EventHandler handler = entry_changed;
- if (handler != null) {
- handler (this, EventArgs.Empty);
- }
+ private void UpdateStyle ()
+ {
+ Gdk.Color color = entry.Style.Base (entry.State);
+ filter_button.ModifyBg (entry.State, color);
+ clear_button.ModifyBg (entry.State, color);
- return false;
+ box.BorderWidth = (uint)entry.Style.XThickness;
}
- protected override void OnIconPress (EntryIconPosition icon_pos, Gdk.Event evnt)
+ private void OnInnerEntryStyleSet (object o, StyleSetArgs args)
{
- var evnt_button = evnt as Gdk.EventButton;
- if (evnt_button == null) {
- return;
- }
+ UpdateStyle ();
+ }
+
+ private void OnInnerEntryStateChanged (object o, EventArgs args)
+ {
+ UpdateStyle ();
+ }
+
+ private void OnInnerEntryFocusEvent(object o, EventArgs args)
+ {
+ QueueDraw();
+ }
- if (evnt_button.Button != 1) {
+ private void OnButtonReleaseEvent(object o, ButtonReleaseEventArgs args)
+ {
+ if(args.Event.Button != 1) {
return;
}
- HasFocus = true;
+ entry.HasFocus = true;
- if (icon_pos == EntryIconPosition.Primary) {
- ShowMenu (evnt_button.Time);
- } else if (icon_pos == EntryIconPosition.Secondary) {
- active_filter_id = 0;
- Text = String.Empty;
+ if(o == filter_button) {
+ ShowMenu(args.Event.Time);
}
}
+ private void OnClearButtonClicked(object o, EventArgs args)
+ {
+ active_filter_id = 0;
+ entry.Text = String.Empty;
+ }
+
protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
{
if (evnt.Key == Gdk.Key.Escape) {
active_filter_id = 0;
- Text = String.Empty;
+ entry.Text = String.Empty;
return true;
}
return base.OnKeyPressEvent (evnt);
}
- protected override void OnShown ()
+ protected override bool OnExposeEvent(Gdk.EventExpose evnt)
{
- base.OnShown ();
- ShowHideButtons ();
+ Style.PaintFlatBox (entry.Style, GdkWindow, State, ShadowType.None, evnt.Area, this,
+ "entry_bg", 0, 0, Allocation.Width, Allocation.Height);
+ PropagateExpose(Child, evnt);
+ Style.PaintShadow(entry.Style, GdkWindow, StateType.Normal,
+ ShadowType.In, evnt.Area, entry, "entry",
+ 0, 0, Allocation.Width, Allocation.Height);
+ return true;
}
- // TODO: GTK+ 3.2 adds a placeholder-text property, but for now
- // we have to handle it ourselves
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override void OnShown()
{
- bool ret = base.OnDrawn (cr);
+ base.OnShown();
+ ShowHideButtons();
+ }
- if(Text.Length > 0 || HasFocus || EmptyMessage == null) {
- return ret;
+ protected virtual void OnChanged()
+ {
+ if(!Ready) {
+ return;
}
- Layout.SetMarkup (EmptyMessage);
-
- Gdk.RGBA color;
- if (!StyleContext.LookupColor ("placeholder_text_color", out color)) {
- color = StyleContext.GetColor (StateFlags.Insensitive);
+ EventHandler handler = entry_changed;
+ if(handler != null) {
+ handler(this, EventArgs.Empty);
}
- Pango.Attribute attr = new Pango.AttrForeground (Convert.ToUInt16 (color.Red * 65535),
- Convert.ToUInt16 (color.Green * 65535), Convert.ToUInt16 (color.Blue * 65535));
- Layout.Attributes.Insert (attr);
-
- return ret;
}
- protected virtual void OnFilterChanged ()
+ protected virtual void OnFilterChanged()
{
EventHandler handler = filter_changed;
- if (handler != null) {
- handler (this, EventArgs.Empty);
+ if(handler != null) {
+ handler(this, EventArgs.Empty);
}
- if (IsQueryAvailable) {
- OnChanged ();
+ if(IsQueryAvailable) {
+ OnInnerEntryChanged(this, EventArgs.Empty);
}
}
- public void AddFilterOption (int id, string label)
+ public void AddFilterOption(int id, string label)
{
- if (id < 0) {
- throw new ArgumentException ("id", "must be >= 0");
+ if(id < 0) {
+ throw new ArgumentException("id", "must be >= 0");
}
- FilterMenuItem item = new FilterMenuItem (id, label);
- item.Activated += OnMenuItemActivated;
- menu.Append (item);
+ FilterMenuItem item = new FilterMenuItem(id, label);
+ item.Toggled += OnMenuItemToggled;
+ menu.Append(item);
- if (ActiveFilterID < 0) {
- item.Activate ();
+ if(ActiveFilterID < 0) {
+ item.Toggle();
}
- SetIconSensitive (EntryIconPosition.Primary, true);
+ filter_button.Visible = true;
}
- public void AddFilterSeparator ()
+ public void AddFilterSeparator()
{
- menu.Append (new SeparatorMenuItem ());
+ menu.Append(new SeparatorMenuItem());
}
- public void RemoveFilterOption (int id)
+ public void RemoveFilterOption(int id)
{
- FilterMenuItem item = FindFilterMenuItem (id);
- if (item != null) {
- menu.Remove (item);
+ FilterMenuItem item = FindFilterMenuItem(id);
+ if(item != null) {
+ menu.Remove(item);
}
}
- public void ActivateFilter (int id)
+ public void ActivateFilter(int id)
{
- FilterMenuItem item = FindFilterMenuItem (id);
- if (item != null) {
- item.Activate ();
+ FilterMenuItem item = FindFilterMenuItem(id);
+ if(item != null) {
+ item.Toggle();
}
}
- private FilterMenuItem FindFilterMenuItem (int id)
+ private FilterMenuItem FindFilterMenuItem(int id)
{
- foreach (MenuItem item in menu) {
- if (item is FilterMenuItem && ((FilterMenuItem)item).ID == id) {
+ foreach(MenuItem item in menu) {
+ if(item is FilterMenuItem && ((FilterMenuItem)item).ID == id) {
return (FilterMenuItem)item;
}
}
@@ -275,47 +345,47 @@ namespace Banshee.Widgets
return null;
}
- public string GetLabelForFilterID (int id)
+ public string GetLabelForFilterID(int id)
{
- FilterMenuItem item = FindFilterMenuItem (id);
- if (item == null) {
+ FilterMenuItem item = FindFilterMenuItem(id);
+ if(item == null) {
return null;
}
return item.Label;
}
- public void CancelSearch ()
+ public void CancelSearch()
{
- Text = String.Empty;
- ActivateFilter (0);
+ entry.Text = String.Empty;
+ ActivateFilter(0);
}
public int ActiveFilterID {
get { return active_filter_id; }
private set {
- if (value == active_filter_id) {
+ if(value == active_filter_id) {
return;
}
active_filter_id = value;
- OnFilterChanged ();
+ OnFilterChanged();
}
}
public string EmptyMessage {
get {
- return Sensitive ? empty_message : String.Empty;
+ return entry.Sensitive ? empty_message : String.Empty;
}
set {
empty_message = value;
- QueueDraw ();
+ entry.QueueDraw();
}
}
public string Query {
- get { return Text.Trim (); }
- set { Text = String.IsNullOrEmpty (value) ? String.Empty : value.Trim (); }
+ get { return entry.Text.Trim(); }
+ set { entry.Text = String.IsNullOrEmpty (value) ? String.Empty : value.Trim (); }
}
public bool IsQueryAvailable {
@@ -327,30 +397,134 @@ namespace Banshee.Widgets
set { ready = value; }
}
+ public new bool HasFocus {
+ get { return entry.HasFocus; }
+ set { entry.HasFocus = true; }
+ }
+
+
+ public Entry InnerEntry {
+ get { return entry; }
+ }
+
protected override void OnStateChanged (Gtk.StateType previous_state)
{
base.OnStateChanged (previous_state);
- Sensitive = State != StateType.Insensitive;
+ entry.Sensitive = State != StateType.Insensitive;
+ filter_button.Sensitive = State != StateType.Insensitive;
+ clear_button.Sensitive = State != StateType.Insensitive;
}
- private class FilterMenuItem : CheckMenuItem
+ private class FilterMenuItem : MenuItem /*CheckMenuItem*/
{
private int id;
+ private string label;
- public FilterMenuItem (int id, string label) : base(label)
+ public FilterMenuItem(int id, string label) : base(label)
{
this.id = id;
- DrawAsRadio = true;
+ this.label = label;
+ //DrawAsRadio = true;
}
- protected FilterMenuItem (IntPtr ptr) : base (ptr)
- {
- }
+ protected FilterMenuItem(IntPtr ptr) : base (ptr) {}
public int ID {
get { return id; }
}
+
+ public string Label {
+ get { return label; }
+ }
+
+ // FIXME: Remove when restored to CheckMenuItem
+ private bool active;
+ public bool Active {
+ get { return active; }
+ set { active = value; }
+ }
+
+ public new event EventHandler Toggled;
+ protected override void OnActivated ()
+ {
+ base.OnActivated ();
+ if (Toggled != null) {
+ Toggled (this, EventArgs.Empty);
+ }
+ }
+
+ }
+
+ private class FramelessEntry : Entry
+ {
+ private Gdk.Window text_window;
+ private SearchEntry parent;
+ private Pango.Layout layout;
+ private Gdk.GC text_gc;
+
+ public FramelessEntry(SearchEntry parent) : base()
+ {
+ this.parent = parent;
+ HasFrame = false;
+
+ parent.StyleSet += OnParentStyleSet;
+ WidthChars = 1;
+ }
+
+ private void OnParentStyleSet(object o, EventArgs args)
+ {
+ RefreshGC();
+ QueueDraw();
+ }
+
+ private void RefreshGC()
+ {
+ if(text_window == null) {
+ return;
+ }
+
+ text_gc = new Gdk.GC(text_window);
+ text_gc.Copy(Style.TextGC(StateType.Normal));
+ Gdk.Color color_a = parent.Style.Base(StateType.Normal);
+ Gdk.Color color_b = parent.Style.Text(StateType.Normal);
+ text_gc.RgbFgColor = Hyena.Gui.GtkUtilities.ColorBlend(color_a, color_b);
+ }
+
+ protected override bool OnExposeEvent(Gdk.EventExpose evnt)
+ {
+ // The Entry's GdkWindow is the top level window onto which
+ // the frame is drawn; the actual text entry is drawn into a
+ // separate window, so we can ensure that for themes that don't
+ // respect HasFrame, we never ever allow the base frame drawing
+ // to happen
+ if(evnt.Window == GdkWindow) {
+ return true;
+ }
+
+ bool ret = base.OnExposeEvent(evnt);
+
+ if(text_gc == null || evnt.Window != text_window) {
+ text_window = evnt.Window;
+ RefreshGC();
+ }
+
+ if(Text.Length > 0 || HasFocus || parent.EmptyMessage == null) {
+ return ret;
+ }
+
+ if (layout == null) {
+ layout = new Pango.Layout(PangoContext);
+ layout.FontDescription = PangoContext.FontDescription;
+ }
+
+ int width, height;
+ layout.SetMarkup(parent.EmptyMessage);
+ layout.GetPixelSize(out width, out height);
+ evnt.Window.DrawLayout(text_gc, 2, (SizeRequest().Height - height) / 2, layout);
+
+ return ret;
+ }
}
}
}
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs
index 380f6bd..83dc20d 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs
@@ -46,6 +46,7 @@ namespace Banshee.Widgets
public SeekSlider () : base (0.0, 0.0, 0.0)
{
+ UpdatePolicy = UpdateType.Continuous;
DrawValue = false;
raise_seek_requested = true;
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
index 17d57bf..c135f18 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
@@ -81,9 +81,9 @@ namespace Banshee.Widgets
private bool first_style_set = false;
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style old_style)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (old_style);
if (first_style_set) {
BuildLayouts ();
@@ -93,92 +93,56 @@ namespace Banshee.Widgets
first_style_set = true;
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ protected override void OnSizeRequested (ref Gtk.Requisition requisition)
{
- minimum_height = natural_height = 0;
if (!IsRealized || layout == null) {
return;
}
int width, height;
layout.GetPixelSize (out width, out height);
- minimum_height = natural_height = height;
- }
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- minimum_width = natural_width = 0;
- if (!IsRealized || layout == null) {
- return;
- }
-
- int width, height;
- layout.GetPixelSize (out width, out height);
- minimum_width = natural_width = width;
+ requisition.Width = width;
+ requisition.Height = height;
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
int bar_width = (int)((double)Allocation.Width * buffering_progress);
bool render_bar = false;
- var border = StyleContext.GetBorder (StateFlags);
if (bar_width > 0 && IsBuffering) {
- bar_width -= border.Left + border.Right;
+ bar_width -= 2 * Style.XThickness;
render_bar = true;
- StyleContext.Save ();
- StyleContext.AddClass ("trough");
- StyleContext.RenderBackground (cr, 0, 0, Allocation.Width, Allocation.Height);
- StyleContext.RenderFrame (cr, 0, 0, Allocation.Width, Allocation.Height);
- StyleContext.Restore ();
+ Gtk.Style.PaintBox (Style, GdkWindow, StateType.Normal, ShadowType.In, evnt.Area, this, null,
+ Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
if (bar_width > 0) {
- StyleContext.Save ();
- StyleContext.AddClass ("progressbar");
- StyleContext.RenderActivity (cr,
- border.Left, border.Top,
- bar_width, Allocation.Height - (border.Top + border.Bottom));
- StyleContext.Restore ();
+ Gtk.Style.PaintBox (Style, GdkWindow, StateType.Selected, ShadowType.EtchedOut,
+ evnt.Area, this, "bar",
+ Allocation.X + Style.XThickness, Allocation.Y + Style.YThickness,
+ bar_width, Allocation.Height - 2 * Style.YThickness);
}
}
int width, height;
layout.GetPixelSize (out width, out height);
- int x = (Allocation.Width - width) / 2;
- int y = (Allocation.Height - height) / 2;
- Gdk.Rectangle rect = new Gdk.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+ int x = Allocation.X + ((Allocation.Width - width) / 2);
+ int y = Allocation.Y + ((Allocation.Height - height) / 2);
+ Gdk.Rectangle rect = evnt.Area;
if (render_bar) {
- // First render the text that is on the progressbar
- int full_bar_width = bar_width + border.Left;
- rect.Width = full_bar_width;
-
- cr.Save ();
- Gdk.CairoHelper.Rectangle (cr, rect);
- cr.Clip ();
- StyleContext.Save ();
- // The entry class is need so that the text get the "selected" color
- StyleContext.AddClass ("entry");
- StyleContext.AddClass ("progressbar");
- StyleContext.RenderLayout (cr, x, y, layout);
- StyleContext.Restore ();
- cr.Restore ();
-
- // Adjust the rectangle so that the rest of the text is rendered as expected
+ width = bar_width + Style.XThickness;
+ rect = new Gdk.Rectangle (evnt.Area.X, evnt.Area.Y, width, evnt.Area.Height);
+ Gtk.Style.PaintLayout (Style, GdkWindow, StateType.Selected, true, rect, this, null, x, y, layout);
+
rect.X += rect.Width;
- rect.Width = Allocation.Width - rect.Width;
+ rect.Width = evnt.Area.Width - rect.Width;
}
- cr.Save ();
- Gdk.CairoHelper.Rectangle (cr, rect);
- cr.Clip ();
- StyleContext.Save ();
- StyleContext.AddClass ("trough");
- StyleContext.RenderLayout (cr, x, y, layout);
- StyleContext.Restore ();
- cr.Restore ();
+ Gtk.Style.PaintLayout (Style, GdkWindow, StateType.Normal, false, rect, this, null, x, y, layout);
return true;
}
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs
index cf23163..ffa38bc 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs
@@ -74,11 +74,10 @@ namespace Banshee.Widgets
SecondaryLabel.Xalign = 0.0f;
SecondaryLabel.Yalign = 0.0f;
- StyleUpdated += delegate {
- PrimaryLabel.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
- Gdk.RGBA rgba = StyleContext.GetColor (StateFlags.Normal);
- SecondaryLabel.OverrideColor (StateFlags.Normal, Hyena.Gui.GtkUtilities.ColorBlend (
- rgba, StyleContext.GetBackgroundColor (StateFlags.Normal)));
+ StyleSet += delegate {
+ PrimaryLabel.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
+ SecondaryLabel.ModifyFg (StateType.Normal, Hyena.Gui.GtkUtilities.ColorBlend (
+ Style.Foreground (StateType.Normal), Style.Background (StateType.Normal)));
};
Relief = ReliefStyle.None;
diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/TileView.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/TileView.cs
index 3f04dcc..6c922db 100644
--- a/src/Core/Banshee.Widgets/Banshee.Widgets/TileView.cs
+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/TileView.cs
@@ -106,9 +106,7 @@ namespace Banshee.Widgets
int new_column_count = RelayoutTablesIfNeeded(usable_area, current_column_count);
if(current_column_count != new_column_count) {
- // FIXME: Is that really needed ?
- Requisition minimum_size, natural_size;
- child.GetPreferredSize (out minimum_size, out natural_size);
+ child.SizeRequest();
current_column_count = new_column_count;
}
diff --git a/src/Core/Banshee.Widgets/Makefile.am b/src/Core/Banshee.Widgets/Makefile.am
index 3e61ae0..993f6c6 100644
--- a/src/Core/Banshee.Widgets/Makefile.am
+++ b/src/Core/Banshee.Widgets/Makefile.am
@@ -7,6 +7,7 @@ SOURCES = \
Banshee.Widgets/DateButton.cs \
Banshee.Widgets/DictionaryComboBox.cs \
Banshee.Widgets/DiscUsageDisplay.cs \
+ Banshee.Widgets/HoverImageButton.cs \
Banshee.Widgets/LinearProgress.cs \
Banshee.Widgets/LinkLabel.cs \
Banshee.Widgets/MenuTile.cs \
diff --git a/src/Core/Banshee.Widgets/Makefile.in b/src/Core/Banshee.Widgets/Makefile.in
index c9bfece..70de48a 100644
--- a/src/Core/Banshee.Widgets/Makefile.in
+++ b/src/Core/Banshee.Widgets/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -433,6 +448,7 @@ SOURCES = \
Banshee.Widgets/DateButton.cs \
Banshee.Widgets/DictionaryComboBox.cs \
Banshee.Widgets/DiscUsageDisplay.cs \
+ Banshee.Widgets/HoverImageButton.cs \
Banshee.Widgets/LinearProgress.cs \
Banshee.Widgets/LinkLabel.cs \
Banshee.Widgets/MenuTile.cs \
@@ -458,14 +474,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -580,7 +597,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -588,7 +605,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -596,7 +612,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -615,7 +631,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -655,7 +671,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Banshee.Widgets.dll.config
all: all-am
@@ -909,12 +924,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Core/Makefile.in b/src/Core/Makefile.in
index 22cb22e..d69fa11 100644
--- a/src/Core/Makefile.in
+++ b/src/Core/Makefile.in
@@ -211,15 +211,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -228,6 +237,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -242,6 +253,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,6 +262,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
index 27622a7..d544528 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
@@ -64,7 +64,7 @@ namespace Banshee.Dap.AppleDevice
get; set;
}
- private Dictionary<long, AppleDeviceTrackInfo> tracks_map = new Dictionary<long, AppleDeviceTrackInfo> (); // FIXME: EPIC FAIL
+ private Dictionary<int, AppleDeviceTrackInfo> tracks_map = new Dictionary<int, AppleDeviceTrackInfo> (); // FIXME: EPIC FAIL
public event EventHandler<ScrobblingBatchEventArgs> ReadyToScrobble;
@@ -183,7 +183,7 @@ namespace Banshee.Dap.AppleDevice
try {
MediaDatabase = new GPod.ITDB (Device.Mountpoint);
- } catch (Exception e) {
+ } catch (GLib.GException 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
@@ -574,7 +574,7 @@ namespace Banshee.Dap.AppleDevice
SyncTracksToAdd (progressUpdater);
- SyncTracksToUpdate (progressUpdater);
+ SyncTracksToUpdate ();
SyncTracksToRemove (progressUpdater);
@@ -615,10 +615,8 @@ namespace Banshee.Dap.AppleDevice
}
}
- void SyncTracksToUpdate (UserJob progressUpdater)
+ void SyncTracksToUpdate ()
{
- string message = Catalog.GetString ("Updating metadata in track {0} of {1}");
- int total = tracks_to_update.Count;
while (tracks_to_update.Count > 0) {
AppleDeviceTrackInfo track = null;
lock (sync_mutex) {
@@ -626,8 +624,6 @@ namespace Banshee.Dap.AppleDevice
}
try {
- UpdateProgress (progressUpdater, message, total - tracks_to_update.Count, total);
-
track.CommitToIpod (MediaDatabase);
} catch (Exception e) {
Log.Exception ("Cannot save track to iPod", e);
@@ -662,16 +658,13 @@ namespace Banshee.Dap.AppleDevice
}
}
- SyncRemovalOfInvalidTracks (progressUpdater);
+ SyncRemovalOfInvalidTracks ();
}
- void SyncRemovalOfInvalidTracks (UserJob progressUpdater)
+ void SyncRemovalOfInvalidTracks ()
{
- string message = Catalog.GetString ("Cleaning up, removing invalid track {0} of {1}");
- int total = invalid_tracks_in_device.Count;
while (invalid_tracks_in_device.Count > 0) {
try {
- UpdateProgress (progressUpdater, message, total - invalid_tracks_in_device.Count, total);
DeleteTrack (invalid_tracks_in_device.Dequeue (), false);
} catch (Exception e) {
Log.Exception ("Cannot remove invalid track from iPod", e);
@@ -699,7 +692,7 @@ namespace Banshee.Dap.AppleDevice
if (from != null && from.Count > 0) {
var playlist = new GPod.Playlist (from.Name);
MediaDatabase.Playlists.Add (playlist);
- foreach (long track_id in ServiceManager.DbConnection.QueryEnumerable<long> (String.Format (
+ foreach (int track_id in ServiceManager.DbConnection.QueryEnumerable<int> (String.Format (
"SELECT CoreTracks.TrackID FROM {0} WHERE {1}",
from.DatabaseTrackModel.ConditionFromFragment, from.DatabaseTrackModel.Condition)))
{
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Makefile.in b/src/Dap/Banshee.Dap.AppleDevice/Makefile.in
index 650b8d8..3b4c849 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Makefile.in
+++ b/src/Dap/Banshee.Dap.AppleDevice/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -446,14 +461,15 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
# External libraries to link against, generated from configure
@ENABLE_APPLEDEVICE_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_APPLEDEVICE_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_APPLEDEVICE_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_APPLEDEVICE_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_APPLEDEVICE_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_APPLEDEVICE_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_APPLEDEVICE_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_APPLEDEVICE_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_APPLEDEVICE_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_APPLEDEVICE_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_APPLEDEVICE_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_APPLEDEVICE_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_APPLEDEVICE_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_APPLEDEVICE_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -568,7 +584,7 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_APPLEDEVICE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_APPLEDEVICE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_APPLEDEVICE_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -576,7 +592,6 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_APPLEDEVICE_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -584,7 +599,7 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
@ENABLE_APPLEDEVICE_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_APPLEDEVICE_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_APPLEDEVICE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_APPLEDEVICE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_APPLEDEVICE_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -603,7 +618,7 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_APPLEDEVICE_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_APPLEDEVICE_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_APPLEDEVICE_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_APPLEDEVICE_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_APPLEDEVICE_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -662,7 +677,6 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
@ENABLE_APPLEDEVICE_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_APPLEDEVICE_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_APPLEDEVICE_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_APPLEDEVICE_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_APPLEDEVICE_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_APPLEDEVICE_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -918,12 +932,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_APPLEDEVICE_TRUE at build-debug:
@ENABLE_APPLEDEVICE_TRUE@ @echo $(DEP_LINK)
- at ENABLE_APPLEDEVICE_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_APPLEDEVICE_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_APPLEDEVICE_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_APPLEDEVICE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_APPLEDEVICE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_APPLEDEVICE_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_APPLEDEVICE_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_APPLEDEVICE_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma/KarmaSource.cs b/src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma/KarmaSource.cs
index 4a0a358..50819bc 100644
--- a/src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma/KarmaSource.cs
+++ b/src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma/KarmaSource.cs
@@ -47,8 +47,8 @@ namespace Banshee.Dap.Karma
private String mount_point;
// for getting karma track given a DatabaseTrackInfo
- private Dictionary<long, KarmaTrackInfo> track_map =
- new Dictionary<long, KarmaTrackInfo>();
+ private Dictionary<int, KarmaTrackInfo> track_map =
+ new Dictionary<int, KarmaTrackInfo>();
public override void DeviceInitialize(IDevice dev)
{
diff --git a/src/Dap/Banshee.Dap.Karma/Makefile.in b/src/Dap/Banshee.Dap.Karma/Makefile.in
index 0954177..b65ff40 100644
--- a/src/Dap/Banshee.Dap.Karma/Makefile.in
+++ b/src/Dap/Banshee.Dap.Karma/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -446,14 +461,15 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
# External libraries to link against, generated from configure
@ENABLE_KARMA_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_KARMA_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_KARMA_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_KARMA_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_KARMA_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_KARMA_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_KARMA_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_KARMA_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_KARMA_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_KARMA_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_KARMA_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_KARMA_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_KARMA_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_KARMA_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -568,7 +584,7 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
@ENABLE_KARMA_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_KARMA_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_KARMA_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_KARMA_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -576,7 +592,6 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
@ENABLE_KARMA_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_KARMA_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_KARMA_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -584,7 +599,7 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
@ENABLE_KARMA_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_KARMA_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_KARMA_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_KARMA_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_KARMA_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_KARMA_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_KARMA_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -603,7 +618,7 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
@ENABLE_KARMA_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_KARMA_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_KARMA_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_KARMA_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_KARMA_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_KARMA_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -661,7 +676,6 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
@ENABLE_KARMA_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_KARMA_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_KARMA_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_KARMA_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_KARMA_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_KARMA_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -917,12 +931,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_KARMA_TRUE at build-debug:
@ENABLE_KARMA_TRUE@ @echo $(DEP_LINK)
- at ENABLE_KARMA_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_KARMA_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_KARMA_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_KARMA_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_KARMA_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_KARMA_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_KARMA_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_KARMA_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
index 60c411f..9b69ff4 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
@@ -28,10 +28,6 @@
<MassStorageDevice class="Banshee.Dap.MassStorage.MaemoDevice"
vendor-name="Nokia" product-name="Nokia N900 Phone"
vendor-id="0x0421" product-id="0x01c7"/>
- <MassStorageDevice class="Banshee.Dap.MassStorage.SymbianDevice"
- vendor-name="Nokia" product-name="N95"
- vendor-id="0x0421" product-id="0x04ed"/>
-
<!-- 0ff9 is the HTC Desire -->
<MassStorageDevice class="Banshee.Dap.MassStorage.AndroidDevice"
vendor-name="HTC" product-name="HTC Android Phone"
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
index acc0a3e..17fdca2 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
@@ -39,6 +39,7 @@ using Banshee.Base;
using Banshee.Hardware;
using Banshee.Collection;
using Banshee.Collection.Database;
+using Folder = Banshee.IO.Directory;
namespace Banshee.Dap.MassStorage
{
@@ -116,16 +117,8 @@ namespace Banshee.Dap.MassStorage
cover_art_file_type = GetPreferredValue ("cover_art_file_type", config, DefaultCoverArtFileType);
cover_art_file_name = GetPreferredValue ("cover_art_file_name", config, DefaultCoverArtFileName);
cover_art_size = GetPreferredValue ("cover_art_size", config, DefaultCoverArtSize);
-
- var all_audio_folders = MergeValues ("audio_folders", config, DefaultAudioFolders);
- var all_video_folders = MergeValues ("video_folders", config, DefaultVideoFolders);
- if (!FileSystem.IsCaseSensitive (source.Volume)) {
- all_audio_folders = all_audio_folders.Distinct (StringComparer.CurrentCultureIgnoreCase).ToArray ();
- all_video_folders = all_video_folders.Distinct (StringComparer.CurrentCultureIgnoreCase).ToArray ();
- }
- audio_folders = all_audio_folders;
- video_folders = all_video_folders;
-
+ audio_folders = MergeValues ("audio_folders", config, DefaultAudioFolders);
+ video_folders = MergeValues ("video_folders", config, DefaultVideoFolders);
playback_mime_types = MergeValues ("output_formats", config, DefaultPlaybackMimeTypes);
playlist_formats = MergeValues ("playlist_formats", config, DefaultPlaylistFormats);
var playlist_path = GetPreferredValue ("playlist_path", config, DefaultPlaylistPath);
@@ -134,10 +127,10 @@ namespace Banshee.Dap.MassStorage
folder_depth = GetPreferredValue ("folder_depth", config, DefaultFolderDepth);
string preferred_folder_separator = GetPreferredValue ("folder_separator", config, DefaultFolderSeparator);
- if (preferred_folder_separator == Paths.Folder.DosSeparator.ToString () || preferred_folder_separator == "DOS") {
- folder_separator = Paths.Folder.DosSeparator;
+ if (preferred_folder_separator == Folder.DosSeparator.ToString () || preferred_folder_separator == "DOS") {
+ folder_separator = Folder.DosSeparator;
} else {
- folder_separator = Paths.Folder.UnixSeparator;
+ folder_separator = Folder.UnixSeparator;
}
}
@@ -217,10 +210,6 @@ namespace Banshee.Dap.MassStorage
get { return FolderDepth; }
}
- internal virtual Uri RootPath {
- get { return null; }
- }
-
protected virtual string DefaultFolderSeparator {
get { return null; }
}
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
index 3c54f36..79c1e3e 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
@@ -168,12 +168,8 @@ namespace Banshee.Dap.MassStorage
foreach (string playlist_path in PlaylistFiles) {
// playlist_path has a file:// prefix, and GetDirectoryName messes it up,
// so we need to convert it to a regular path
- string base_folder = ms_device.RootPath != null ? BaseDirectory :
- System.IO.Path.GetDirectoryName (SafeUri.UriToFilename (playlist_path));
-
- IPlaylistFormat loaded_playlist = PlaylistFileUtil.Load (playlist_path,
- new Uri (base_folder),
- ms_device.RootPath);
+ string base_folder = System.IO.Path.GetDirectoryName (SafeUri.UriToFilename (playlist_path));
+ IPlaylistFormat loaded_playlist = PlaylistFileUtil.Load (playlist_path, new Uri (base_folder));
if (loaded_playlist == null)
continue;
@@ -181,9 +177,9 @@ namespace Banshee.Dap.MassStorage
PlaylistSource playlist = new PlaylistSource (name, this);
playlist.Save ();
//Hyena.Data.Sqlite.HyenaSqliteCommand.LogAll = true;
- foreach (PlaylistElement element in loaded_playlist.Elements) {
- string track_path = element.Uri.LocalPath;
- long track_id = DatabaseTrackInfo.GetTrackIdForUri (new SafeUri (track_path), DbId);
+ foreach (Dictionary<string, object> element in loaded_playlist.Elements) {
+ string track_path = (element["uri"] as Uri).LocalPath;
+ int track_id = DatabaseTrackInfo.GetTrackIdForUri (new SafeUri (track_path), DbId);
if (track_id == 0) {
Log.DebugFormat ("Failed to find track {0} in DAP library to load it into playlist {1}", track_path, playlist_path);
} else {
@@ -370,13 +366,7 @@ namespace Banshee.Dap.MassStorage
System.IO.Stream stream = null;
try {
stream = Banshee.IO.File.OpenWrite (playlist_path, true);
-
- if (ms_device.RootPath == null) {
- playlist_format.BaseUri = new Uri (PlaylistsWritePath);
- } else {
- playlist_format.RootPath = ms_device.RootPath;
- playlist_format.BaseUri = new Uri (BaseDirectory);
- }
+ playlist_format.BaseUri = new Uri (PlaylistsWritePath);
playlist_format.Save (stream, from);
} catch (Exception e) {
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/SymbianDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/SymbianDevice.cs
deleted file mode 100644
index e2d6658..0000000
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/SymbianDevice.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// SymbianDevice.cs
-//
-// Author:
-// Nicholas Little <arealityfarbetween at googlemail.com>
-//
-// Copyright (C) 2012 Nicholas Little
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-
-using Banshee.IO;
-using Banshee.Hardware;
-using Banshee.Sources;
-using Hyena;
-
-namespace Banshee.Dap.MassStorage
-{
- public class SymbianDevice : CustomMassStorageDevice
- {
- #region MassStorageDevice Property Overrides
- private static string [] icons = {
- "phone-nokia-n95",
- DapSource.FallbackIcon
- };
- public override string [] GetIconNames ()
- {
- return icons;
- }
-
- private Uri root_path = new Uri ("E:\\");
- internal override Uri RootPath {
- get { return root_path; }
- }
-
- protected override string DefaultFolderSeparator {
- get { return Paths.Folder.DosSeparator.ToString (); }
- }
-
- private static string [] playlist_formats = { "audio/x-mpegurl" };
- protected override string[] DefaultPlaylistFormats {
- get { return playlist_formats; }
- }
-
- private static string [] audio_folders = { "Music/" };
- protected override string [] DefaultAudioFolders {
- get { return audio_folders; }
- }
-
- protected override int DefaultFolderDepth {
- get { return 2; }
- }
-
- protected override string DefaultPlaylistPath {
- get { return "Playlists/"; }
- }
-
- private static string [] video_folders = { "My Videos/" };
- protected override string [] DefaultVideoFolders {
- get { return video_folders; }
- }
-
- private static string [] playback_mime_types = {
- "audio/mp3",
- "video/mp4"
- };
- protected override string [] DefaultPlaybackMimeTypes {
- get { return playback_mime_types; }
- }
-
- private string default_name;
- protected override string DefaultName {
- get {
- if (string.IsNullOrEmpty (default_name))
- default_name = string.Format ("{0} {1}",
- VendorProductInfo.VendorName,
- VendorProductInfo.ProductName);
- return default_name;
- }
- }
-
- public override bool LoadDeviceConfiguration ()
- {
- LoadConfig (null);
- return true;
- }
- #endregion
- }
-}
-
diff --git a/src/Dap/Banshee.Dap.MassStorage/Makefile.am b/src/Dap/Banshee.Dap.MassStorage/Makefile.am
index 4b3d329..24e6490 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Makefile.am
+++ b/src/Dap/Banshee.Dap.MassStorage/Makefile.am
@@ -14,7 +14,6 @@ SOURCES = \
Banshee.Dap.MassStorage/MassStorageSource.cs \
Banshee.Dap.MassStorage/NookDevice.cs \
Banshee.Dap.MassStorage/RockBoxDevice.cs \
- Banshee.Dap.MassStorage/SymbianDevice.cs \
Banshee.Dap.MassStorage/WebOSDevice.cs
RESOURCES = Banshee.Dap.MassStorage.addin.xml
diff --git a/src/Dap/Banshee.Dap.MassStorage/Makefile.in b/src/Dap/Banshee.Dap.MassStorage/Makefile.in
index d22f33c..ec44f38 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Makefile.in
+++ b/src/Dap/Banshee.Dap.MassStorage/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -439,7 +454,6 @@ SOURCES = \
Banshee.Dap.MassStorage/MassStorageSource.cs \
Banshee.Dap.MassStorage/NookDevice.cs \
Banshee.Dap.MassStorage/RockBoxDevice.cs \
- Banshee.Dap.MassStorage/SymbianDevice.cs \
Banshee.Dap.MassStorage/WebOSDevice.cs
RESOURCES = Banshee.Dap.MassStorage.addin.xml
@@ -455,14 +469,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -577,7 +592,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -585,7 +600,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -593,7 +607,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -612,7 +626,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -651,7 +665,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -905,12 +918,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/devices/phone-nokia-n95.png b/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/devices/phone-nokia-n95.png
deleted file mode 100644
index 2f8e885..0000000
Binary files a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/devices/phone-nokia-n95.png and /dev/null differ
diff --git a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/phone-nokia-n95.png b/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/phone-nokia-n95.png
deleted file mode 100644
index 2263fa2..0000000
Binary files a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/phone-nokia-n95.png and /dev/null differ
diff --git a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/phone-nokia-n95.png b/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/phone-nokia-n95.png
deleted file mode 100644
index 487fef5..0000000
Binary files a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/phone-nokia-n95.png and /dev/null differ
diff --git a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/24x24/devices/phone-nokia-n95.png b/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/24x24/devices/phone-nokia-n95.png
deleted file mode 100644
index 05daf4c..0000000
Binary files a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/24x24/devices/phone-nokia-n95.png and /dev/null differ
diff --git a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/256x256/devices/phone-nokia-n95.png b/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/256x256/devices/phone-nokia-n95.png
deleted file mode 100644
index e1dc7a8..0000000
Binary files a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/256x256/devices/phone-nokia-n95.png and /dev/null differ
diff --git a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/phone-nokia-n95.png b/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/phone-nokia-n95.png
deleted file mode 100644
index 92408e2..0000000
Binary files a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/phone-nokia-n95.png and /dev/null differ
diff --git a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/phone-nokia-n95.png b/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/phone-nokia-n95.png
deleted file mode 100644
index 7e68786..0000000
Binary files a/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/phone-nokia-n95.png and /dev/null differ
diff --git a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
index c46274d..766f066 100644
--- a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
+++ b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
@@ -53,7 +53,7 @@ namespace Banshee.Dap.Mtp
{
private MtpDevice mtp_device;
//private bool supports_jpegs = false;
- private Dictionary<long, Track> track_map;
+ private Dictionary<int, Track> track_map;
private Dictionary<string, Album> album_cache = new Dictionary<string, Album> ();
@@ -149,7 +149,7 @@ namespace Banshee.Dap.Mtp
protected override void LoadFromDevice ()
{
- track_map = new Dictionary<long, Track> ();
+ track_map = new Dictionary<int, Track> ();
try {
List<Track> files = null;
lock (mtp_device) {
@@ -176,7 +176,7 @@ namespace Banshee.Dap.Mtp
}
foreach (Track mtp_track in files) {
- long track_id;
+ int track_id;
if ((track_id = DatabaseTrackInfo.GetTrackIdForUri (MtpTrackInfo.GetPathFromMtpTrack (mtp_track), DbId )) > 0) {
track_map[track_id] = mtp_track;
} else {
@@ -263,7 +263,7 @@ namespace Banshee.Dap.Mtp
get { return !(IsAdding || IsDeleting); }
}
- private SafeUri empty_file = new SafeUri (Paths.Combine (Paths.ApplicationCache, "mtp.mp3"));
+ private static SafeUri empty_file = new SafeUri (Paths.Combine (Paths.ApplicationCache, "mtp.mp3"));
protected override void OnTracksDeleted ()
{
// Hack to get the disk usage indicate to be accurate, which seems to
@@ -294,7 +294,7 @@ namespace Banshee.Dap.Mtp
private long bytes_used;
public override long BytesUsed {
get {
- if (mtp_device != null && Monitor.TryEnter (mtp_device)) {
+ if (Monitor.TryEnter (mtp_device)) {
try {
bytes_used = 0;
foreach (DeviceStorage s in mtp_device.GetStorage ()) {
diff --git a/src/Dap/Banshee.Dap.Mtp/Makefile.in b/src/Dap/Banshee.Dap.Mtp/Makefile.in
index e0bdfa8..998e649 100644
--- a/src/Dap/Banshee.Dap.Mtp/Makefile.in
+++ b/src/Dap/Banshee.Dap.Mtp/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -446,14 +461,15 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
# External libraries to link against, generated from configure
@ENABLE_MTP_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_MTP_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_MTP_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_MTP_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_MTP_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_MTP_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_MTP_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_MTP_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_MTP_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_MTP_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_MTP_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_MTP_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_MTP_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_MTP_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -568,7 +584,7 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
@ENABLE_MTP_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_MTP_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_MTP_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -576,7 +592,6 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
@ENABLE_MTP_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_MTP_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_MTP_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -584,7 +599,7 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
@ENABLE_MTP_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_MTP_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_MTP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_MTP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_MTP_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_MTP_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_MTP_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -603,7 +618,7 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
@ENABLE_MTP_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_MTP_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_MTP_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_MTP_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_MTP_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_MTP_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -660,7 +675,6 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
@ENABLE_MTP_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_MTP_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_MTP_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_MTP_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_MTP_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_MTP_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -916,12 +930,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_MTP_TRUE at build-debug:
@ENABLE_MTP_TRUE@ @echo $(DEP_LINK)
- at ENABLE_MTP_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_MTP_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_MTP_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_MTP_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_MTP_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_MTP_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_MTP_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_MTP_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs
index 949007c..facf99f 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs
@@ -98,5 +98,37 @@ namespace Banshee.Dap.Gui
}
}
+ internal static bool ConfirmUserAction (int tracks_to_remove)
+ {
+ string header = String.Format (
+ Catalog.GetPluralString (
+ // singular form unused b/c we know it's > 1, but we still need GetPlural
+ "The sync operation will remove one track from your device.",
+ "The sync operation will remove {0} tracks from your device.",
+ tracks_to_remove),
+ tracks_to_remove);
+ string message = Catalog.GetString ("Are you sure you want to continue?");
+
+ bool remove_tracks = false;
+ ThreadAssist.BlockingProxyToMain (() => {
+
+ var md = new HigMessageDialog (
+ ServiceManager.Get<GtkElementsService> ().PrimaryWindow,
+ DialogFlags.DestroyWithParent, MessageType.Warning,
+ ButtonsType.None, header, message
+ );
+ md.AddButton ("gtk-cancel", ResponseType.No, true);
+ md.AddButton (Catalog.GetString ("Remove tracks"), ResponseType.Yes, false);
+
+ try {
+ if (md.Run () == (int) ResponseType.Yes) {
+ remove_tracks = true;
+ }
+ } finally {
+ md.Destroy ();
+ }
+ });
+ return remove_tracks;
+ }
}
}
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs
index 81c5349..cc64f8a 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs
@@ -69,16 +69,14 @@ namespace Banshee.Dap.Gui
dap.Properties.PropertyChanged += OnPropertyChanged;
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- foreach (var opt in library_opts.Values) {
- opt.Dispose ();
- }
- library_opts.Clear ();
+ foreach (var opt in library_opts.Values) {
+ opt.Dispose ();
}
-
- base.Dispose (disposing);
+ library_opts.Clear ();
+
+ base.Dispose ();
}
private void BuildWidgets ()
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
index 65416e7..7a62e3c 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
@@ -112,15 +112,15 @@ namespace Banshee.Dap.Gui
});
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (previous_style);
SetBackground ();
}
private void SetBackground ()
{
- Cairo.Color light = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetBackgroundColor (StateFlags.Normal));
+ Cairo.Color light = CairoExtensions.GdkColorToCairoColor (Style.Background (StateType.Normal));
Cairo.Color dark = CairoExtensions.ColorShade (light, 0.85);
Cairo.LinearGradient grad = new Cairo.LinearGradient (0, Allocation.Y, 0, Allocation.Y + Allocation.Height);
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs
index 3994819..a317b67 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs
@@ -54,7 +54,7 @@ namespace Banshee.Dap
// Translators: {0} is the name assigned to a Digital Audio Player by its owner
String.Format(Catalog.GetString("{0} Properties"), source.Name),
null,
- DialogFlags.Modal,
+ DialogFlags.Modal | DialogFlags.NoSeparator,
Stock.Close,
ResponseType.Close)
{
@@ -126,7 +126,7 @@ namespace Banshee.Dap
Resizable = false;
iconbox.PackStart(box, true, true, 0);
iconbox.ShowAll();
- ContentArea.Add(iconbox);
+ VBox.Add(iconbox);
}
public void RunDialog ()
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDisplay.cs b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDisplay.cs
index a8d52ef..039f432 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDisplay.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDisplay.cs
@@ -78,15 +78,21 @@ namespace Banshee.Dap.Gui
theme = new GtkTheme (this);
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- DrawFrame (cr);
- return base.OnDrawn (cr);
+ Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
+
+ try {
+ DrawFrame (cr, evnt.Area);
+ return base.OnExposeEvent (evnt);
+ } finally {
+ CairoExtensions.DisposeContext (cr);
+ }
}
- private void DrawFrame (Cairo.Context cr)
+ private void DrawFrame (Cairo.Context cr, Gdk.Rectangle clip)
{
- Gdk.Rectangle rect = new Gdk.Rectangle (0, 0,
+ Gdk.Rectangle rect = new Gdk.Rectangle (Allocation.X, Allocation.Y,
Allocation.Width, Allocation.Height);
theme.Context.ShowStroke = true;
theme.DrawFrameBackground (cr, rect, true);
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs b/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs
index ce01167..93e6a63 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs
@@ -60,7 +60,7 @@ namespace Banshee.Dap
public void DelayedInitialize ()
{
- // This group source gives us a separator for DAPs in the source view.
+ // This group source gives us a seperator for DAPs in the source view.
SourceManager.GroupSource dap_group = new SourceManager.GroupSource (Catalog.GetString ("Devices"), 400);
ThreadAssist.ProxyToMain (delegate {
ServiceManager.SourceManager.AddSource (dap_group);
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs b/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
index eac1bd2..02492d5 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
@@ -93,7 +93,7 @@ namespace Banshee.Dap
public virtual void DeviceInitialize (IDevice device)
{
this.device = device;
- TypeUniqueId = device.Serial;
+ TypeUniqueId = device.Uuid;
}
public override void Dispose ()
@@ -347,7 +347,7 @@ namespace Banshee.Dap
// Ensure there's enough space
if (BytesAvailable - Banshee.IO.File.GetSize (fromUri) >= 0) {
// Ensure it's not already on the device
- if (ServiceManager.DbConnection.Query<long> (track_on_dap_query, DbId, track.MetadataHash) == 0) {
+ if (ServiceManager.DbConnection.Query<int> (track_on_dap_query, DbId, track.MetadataHash) == 0) {
AddTrackToDevice (track, fromUri);
}
}
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs b/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs
index 38f5a43..ceeb233 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs
@@ -45,7 +45,7 @@ using Banshee.SmartPlaylist;
using Banshee.Query;
using Banshee.Preferences;
-using Banshee.Gui;
+using Banshee.Dap.Gui;
namespace Banshee.Dap
{
@@ -357,16 +357,7 @@ namespace Banshee.Dap
library_sync.Sync ();
} catch (DapLibrarySync.PossibleUserErrorException e) {
- var tracks_to_remove = e.TracksToRemove;
- string msg = String.Format (
- Catalog.GetPluralString (
- // singular form unused b/c we know it's > 1, but we still need GetPlural
- "The sync operation will remove one track from your device.",
- "The sync operation will remove {0} tracks from your device.",
- tracks_to_remove),
- tracks_to_remove);
-
- if (TrackActions.ConfirmRemove (msg)) {
+ if (DapActions.ConfirmUserAction (e.TracksToRemove)) {
library_sync.Sync (true);
}
diff --git a/src/Dap/Banshee.Dap/Makefile.in b/src/Dap/Banshee.Dap/Makefile.in
index 874477b..c643e2c 100644
--- a/src/Dap/Banshee.Dap/Makefile.in
+++ b/src/Dap/Banshee.Dap/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -468,14 +483,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -590,7 +606,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -598,7 +614,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -606,7 +621,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -625,7 +640,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -664,7 +679,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -918,12 +932,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Dap/Makefile.in b/src/Dap/Makefile.in
index ca6c734..6969286 100644
--- a/src/Dap/Makefile.in
+++ b/src/Dap/Makefile.in
@@ -211,15 +211,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -228,6 +237,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -242,6 +253,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,6 +262,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs b/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs
index 189c396..b9362be 100644
--- a/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs
+++ b/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs
@@ -40,7 +40,6 @@ namespace Banshee.AmazonMp3.Store
{
StoreView = store_view;
- // TODO: Add real filter options for searching Amazon MP3 (artist, album, genre, etc.)
SearchEntry.EmptyMessage = String.Format (Catalog.GetString ("Search the Amazon MP3 Store"));
NavigationControl.AddLink (Catalog.GetString ("How Your Purchases Support GNOME"), StoreView.GetActionUrl ("about/"));
diff --git a/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in b/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in
index 55df617..c06ee79 100644
--- a/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in
+++ b/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -447,14 +462,15 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
# External libraries to link against, generated from configure
@HAVE_LIBWEBKIT_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_LIBWEBKIT_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_LIBWEBKIT_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -569,7 +585,7 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -577,7 +593,6 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -585,7 +600,7 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -604,7 +619,7 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -669,7 +684,6 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
@ENABLE_TESTS_TRUE@@HAVE_LIBWEBKIT_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_LIBWEBKIT_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_LIBWEBKIT_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_LIBWEBKIT_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_LIBWEBKIT_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_LIBWEBKIT_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -925,12 +939,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_LIBWEBKIT_TRUE at build-debug:
@HAVE_LIBWEBKIT_TRUE@ @echo $(DEP_LINK)
- at HAVE_LIBWEBKIT_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_LIBWEBKIT_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_LIBWEBKIT_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_LIBWEBKIT_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_LIBWEBKIT_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.AmazonMp3/Makefile.in b/src/Extensions/Banshee.AmazonMp3/Makefile.in
index 581a8d4..68bfd52 100644
--- a/src/Extensions/Banshee.AmazonMp3/Makefile.in
+++ b/src/Extensions/Banshee.AmazonMp3/Makefile.in
@@ -208,15 +208,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -225,6 +234,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -239,6 +250,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -246,6 +259,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -457,14 +472,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -579,7 +595,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -587,7 +603,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -595,7 +610,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -614,7 +629,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -654,7 +669,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -970,12 +984,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs b/src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs
index bae11ac..9335fc0 100644
--- a/src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs
+++ b/src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs
@@ -290,7 +290,7 @@ namespace Banshee.Audiobook
}
}
- public Bookmark GetLastPlayedBookmark (long book_id)
+ public Bookmark GetLastPlayedBookmark (int book_id)
{
return Bookmark.Provider.FetchFirstMatching (
"Type = ? AND TrackID IN (SELECT TrackID FROM CoreTracks WHERE PrimarySourceID = ? AND AlbumID = ?)",
diff --git a/src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs b/src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs
index f10af74..efe3eb3 100644
--- a/src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs
+++ b/src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs
@@ -129,16 +129,14 @@ namespace Banshee.Audiobook
);
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- if (cover != null) {
- cover.Dispose ();
- cover = null;
- }
+ if (cover != null) {
+ cover.Dispose ();
+ cover = null;
}
- base.Dispose (disposing);
+ base.Dispose ();
}
#region ISourceContents
@@ -151,7 +149,7 @@ namespace Banshee.Audiobook
library = source as AudiobookLibrarySource;
if (library != null) {
track_list.SetModel (library.TrackModel);
- resume_button.RelatedAction = library.Actions["AudiobookResume"];
+ library.Actions["AudiobookResume"].ConnectProxy (resume_button);
}
return library != null;
diff --git a/src/Extensions/Banshee.Audiobook/Makefile.in b/src/Extensions/Banshee.Audiobook/Makefile.in
index ac745ae..091bb28 100644
--- a/src/Extensions/Banshee.Audiobook/Makefile.in
+++ b/src/Extensions/Banshee.Audiobook/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -456,14 +471,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -578,7 +594,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -586,7 +602,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -594,7 +609,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -613,7 +628,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -652,7 +667,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -906,12 +920,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.BooScript/Makefile.in b/src/Extensions/Banshee.BooScript/Makefile.in
index f70d439..149c0df 100644
--- a/src/Extensions/Banshee.BooScript/Makefile.in
+++ b/src/Extensions/Banshee.BooScript/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -447,14 +462,15 @@ RESOURCES = \
# External libraries to link against, generated from configure
@HAVE_BOO_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_BOO_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_BOO_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_BOO_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_BOO_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_BOO_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_BOO_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_BOO_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_BOO_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_BOO_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_BOO_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_BOO_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_BOO_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_BOO_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -569,7 +585,7 @@ RESOURCES = \
@HAVE_BOO_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_BOO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_BOO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_BOO_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -577,7 +593,6 @@ RESOURCES = \
@HAVE_BOO_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_BOO_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_BOO_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -585,7 +600,7 @@ RESOURCES = \
@HAVE_BOO_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_BOO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_BOO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_BOO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_BOO_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_BOO_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_BOO_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -604,7 +619,7 @@ RESOURCES = \
@HAVE_BOO_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_BOO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_BOO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_BOO_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_BOO_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_BOO_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -661,7 +676,6 @@ RESOURCES = \
@ENABLE_TESTS_TRUE@@HAVE_BOO_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_BOO_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_BOO_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_BOO_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_BOO_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_BOO_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -917,12 +931,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_BOO_TRUE at build-debug:
@HAVE_BOO_TRUE@ @echo $(DEP_LINK)
- at HAVE_BOO_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_BOO_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_BOO_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_BOO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_BOO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_BOO_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_BOO_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_BOO_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs b/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs
index 06f519b..6cb1fbb 100644
--- a/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs
+++ b/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs
@@ -51,7 +51,7 @@ namespace Banshee.Bpm
{
public class BpmDetectJob : DbIteratorJob
{
- private long current_track_id;
+ private int current_track_id;
private IBpmDetector detector;
private PrimarySource music_library;
private ManualResetEvent result_ready_event = new ManualResetEvent (false);
@@ -111,7 +111,7 @@ namespace Banshee.Bpm
protected override void IterateCore (HyenaDataReader reader)
{
SafeUri uri = new SafeUri (reader.Get<string> (0));
- current_track_id = reader.Get<long> (1);
+ current_track_id = reader.Get<int> (1);
// Wait for the result to be ready
result_ready_event.Reset ();
diff --git a/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs b/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs
index 935b103..00d6805 100644
--- a/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs
+++ b/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs
@@ -106,9 +106,15 @@ namespace Banshee.Bpm
tap_adapter.BpmChanged += OnTapBpmChanged;
Add (tap_button);
- detect_button.TooltipText = Catalog.GetString ("Have Banshee attempt to auto-detect the BPM of this song");
- play_button.TooltipText = Catalog.GetString ("Play this song");
- tap_button.TooltipText = Catalog.GetString ("Tap this button to the beat to set the BPM for this song manually");
+ object tooltip_host = TooltipSetter.CreateHost ();
+
+ TooltipSetter.Set (tooltip_host, detect_button,
+ Catalog.GetString ("Have Banshee attempt to auto-detect the BPM of this song"));
+
+ TooltipSetter.Set (tooltip_host, play_button, Catalog.GetString ("Play this song"));
+
+ TooltipSetter.Set (tooltip_host, tap_button,
+ Catalog.GetString ("Tap this button to the beat to set the BPM for this song manually"));
ShowAll ();
}
diff --git a/src/Extensions/Banshee.Bpm/Makefile.in b/src/Extensions/Banshee.Bpm/Makefile.in
index 188ee7a..1f0394d 100644
--- a/src/Extensions/Banshee.Bpm/Makefile.in
+++ b/src/Extensions/Banshee.Bpm/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -448,14 +463,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -570,7 +586,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -578,7 +594,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -586,7 +601,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -605,7 +620,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -644,7 +659,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -898,12 +912,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
index 63d2367..f42f1f2 100644
--- a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
+++ b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
@@ -110,7 +110,7 @@ namespace Banshee.CoverArt
private class CoverartTrackInfo : DatabaseTrackInfo
{
- public long DbId {
+ public int DbId {
set { TrackId = value; }
}
}
@@ -122,8 +122,8 @@ namespace Banshee.CoverArt
ArtistName = reader.Get<string> (2),
PrimarySource = ServiceManager.SourceManager.MusicLibrary,
Uri = new SafeUri (reader.Get<string> (3)),
- DbId = reader.Get<long> (4),
- AlbumId = reader.Get<long> (0)
+ DbId = reader.Get<int> (4),
+ AlbumId = reader.Get<int> (0)
};
Status = String.Format (Catalog.GetString ("{0} - {1}"), track.ArtistName, track.AlbumTitle);
@@ -134,7 +134,8 @@ namespace Banshee.CoverArt
{
bool save = true;
try {
- if (String.IsNullOrEmpty (track.AlbumTitle) || String.IsNullOrEmpty (track.ArtistName)) {
+ if (String.IsNullOrEmpty (track.AlbumTitle) || track.AlbumTitle == Catalog.GetString ("Unknown Album") ||
+ String.IsNullOrEmpty (track.ArtistName) || track.ArtistName == Catalog.GetString ("Unknown Artist")) {
// Do not try to fetch album art for these
} else {
IMetadataLookupJob job = MetadataService.Instance.CreateJob (track);
diff --git a/src/Extensions/Banshee.CoverArt/Makefile.in b/src/Extensions/Banshee.CoverArt/Makefile.in
index 081a1e3..ae7fdb1 100644
--- a/src/Extensions/Banshee.CoverArt/Makefile.in
+++ b/src/Extensions/Banshee.CoverArt/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -445,14 +460,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -567,7 +583,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -575,7 +591,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -583,7 +598,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -602,7 +617,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -641,7 +656,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -895,12 +909,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs
index 9e0de6e..87e7fd6 100644
--- a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs
+++ b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs
@@ -46,7 +46,7 @@ namespace Banshee.Daap
public DaapLoginDialog(string shareName, bool showUsername) : base(
Catalog.GetString("Login to Music Share"),
null,
- DialogFlags.Modal,
+ DialogFlags.Modal | DialogFlags.NoSeparator,
Stock.Cancel,
ResponseType.Close)
{
@@ -61,7 +61,7 @@ namespace Banshee.Daap
private void BuildWindow()
{
BorderWidth = 5;
- ContentArea.Spacing = 12;
+ VBox.Spacing = 12;
ActionArea.Layout = Gtk.ButtonBoxStyle.End;
HBox box = new HBox();
@@ -124,7 +124,7 @@ namespace Banshee.Daap
AddButton(Catalog.GetString("Login"), ResponseType.Ok, true);
box.ShowAll();
- ContentArea.Add(box);
+ VBox.Add(box);
}
private void AddButton(string stock_id, Gtk.ResponseType response, bool is_default)
diff --git a/src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs b/src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs
index 5975134..c78644a 100644
--- a/src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs
+++ b/src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs
@@ -39,7 +39,7 @@ namespace Banshee.Daap
{
public class OpenRemoteServer : BansheeDialog
{
- private ComboBoxText address_entry;
+ private ComboBoxEntry address_entry;
private SpinButton port_entry;
private List<string> history = new List<string>();
@@ -55,7 +55,7 @@ namespace Banshee.Daap
box.Spacing = 12;
VBox.PackStart (box, false, false, 0);
- address_entry = ComboBoxText.NewWithEntry ();
+ address_entry = ComboBoxEntry.NewText ();
address_entry.Entry.Activated += OnEntryActivated;
address_entry.Entry.WidthChars = 30;
address_entry.Show ();
diff --git a/src/Extensions/Banshee.Daap/Makefile.in b/src/Extensions/Banshee.Daap/Makefile.in
index 2054de1..6a8f097 100644
--- a/src/Extensions/Banshee.Daap/Makefile.in
+++ b/src/Extensions/Banshee.Daap/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -473,14 +488,15 @@ RESOURCES = \
# External libraries to link against, generated from configure
@DAAP_ENABLED_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at DAAP_ENABLED_TRUE@LINK_CAIRO = -r:Mono.Cairo
@DAAP_ENABLED_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@DAAP_ENABLED_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@DAAP_ENABLED_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@DAAP_ENABLED_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@DAAP_ENABLED_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@DAAP_ENABLED_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at DAAP_ENABLED_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at DAAP_ENABLED_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at DAAP_ENABLED_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@DAAP_ENABLED_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@DAAP_ENABLED_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@DAAP_ENABLED_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -595,7 +611,7 @@ RESOURCES = \
@DAAP_ENABLED_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at DAAP_ENABLED_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at DAAP_ENABLED_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@DAAP_ENABLED_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -603,7 +619,6 @@ RESOURCES = \
@DAAP_ENABLED_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at DAAP_ENABLED_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@DAAP_ENABLED_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -611,7 +626,7 @@ RESOURCES = \
@DAAP_ENABLED_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@DAAP_ENABLED_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at DAAP_ENABLED_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at DAAP_ENABLED_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@DAAP_ENABLED_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@DAAP_ENABLED_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@DAAP_ENABLED_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -630,7 +645,7 @@ RESOURCES = \
@DAAP_ENABLED_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at DAAP_ENABLED_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at DAAP_ENABLED_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@DAAP_ENABLED_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@DAAP_ENABLED_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@DAAP_ENABLED_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -688,7 +703,6 @@ RESOURCES = \
@DAAP_ENABLED_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@DAAP_ENABLED_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@DAAP_ENABLED_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at DAAP_ENABLED_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@DAAP_ENABLED_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@DAAP_ENABLED_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -944,12 +958,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@DAAP_ENABLED_TRUE at build-debug:
@DAAP_ENABLED_TRUE@ @echo $(DEP_LINK)
- at DAAP_ENABLED_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at DAAP_ENABLED_TRUE@ $(MCS) -out:$@ $<
-
@DAAP_ENABLED_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at DAAP_ENABLED_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at DAAP_ENABLED_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@DAAP_ENABLED_TRUE@ @mkdir -p $(top_builddir)/bin
@DAAP_ENABLED_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@DAAP_ENABLED_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Emusic.Store/Makefile.in b/src/Extensions/Banshee.Emusic.Store/Makefile.in
index 2701bdc..a65a5be 100644
--- a/src/Extensions/Banshee.Emusic.Store/Makefile.in
+++ b/src/Extensions/Banshee.Emusic.Store/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -446,14 +461,15 @@ RESOURCES = Banshee.Emusic.Store.addin.xml
# External libraries to link against, generated from configure
@HAVE_LIBWEBKIT_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_LIBWEBKIT_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_LIBWEBKIT_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -568,7 +584,7 @@ RESOURCES = Banshee.Emusic.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -576,7 +592,6 @@ RESOURCES = Banshee.Emusic.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -584,7 +599,7 @@ RESOURCES = Banshee.Emusic.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -603,7 +618,7 @@ RESOURCES = Banshee.Emusic.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -662,7 +677,6 @@ RESOURCES = Banshee.Emusic.Store.addin.xml
@ENABLE_TESTS_TRUE@@HAVE_LIBWEBKIT_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_LIBWEBKIT_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_LIBWEBKIT_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_LIBWEBKIT_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_LIBWEBKIT_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_LIBWEBKIT_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -918,12 +932,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_LIBWEBKIT_TRUE at build-debug:
@HAVE_LIBWEBKIT_TRUE@ @echo $(DEP_LINK)
- at HAVE_LIBWEBKIT_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_LIBWEBKIT_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_LIBWEBKIT_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_LIBWEBKIT_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_LIBWEBKIT_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Emusic/Makefile.in b/src/Extensions/Banshee.Emusic/Makefile.in
index 4e2c630..aa43fac 100644
--- a/src/Extensions/Banshee.Emusic/Makefile.in
+++ b/src/Extensions/Banshee.Emusic/Makefile.in
@@ -207,15 +207,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -224,6 +233,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -238,6 +249,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -245,6 +258,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -451,14 +466,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -573,7 +589,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -581,7 +597,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -589,7 +604,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -608,7 +623,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -648,7 +663,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -923,12 +937,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs b/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs
index 7346d96..386d1b2 100644
--- a/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs
+++ b/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs
@@ -194,9 +194,9 @@ namespace Banshee.FileSystemQueue
return;
}
- long id = DatabaseTrackInfo.GetTrackIdForUri (uri, DbId);
+ int id = DatabaseTrackInfo.GetTrackIdForUri (uri, DbId);
if (id >= 0) {
- int index = (int)TrackCache.IndexOf (id);
+ int index = (int)TrackCache.IndexOf ((long)id);
if (index >= 0) {
TrackInfo track = TrackModel[index];
if (track != null) {
diff --git a/src/Extensions/Banshee.FileSystemQueue/Makefile.in b/src/Extensions/Banshee.FileSystemQueue/Makefile.in
index c77ded5..e3b925d 100644
--- a/src/Extensions/Banshee.FileSystemQueue/Makefile.in
+++ b/src/Extensions/Banshee.FileSystemQueue/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -446,14 +461,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -568,7 +584,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -576,7 +592,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -584,7 +599,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -603,7 +618,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -642,7 +657,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -896,12 +910,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/Problem.cs b/src/Extensions/Banshee.Fixup/Banshee.Fixup/Problem.cs
index 5550360..a0505c7 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/Problem.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/Problem.cs
@@ -48,11 +48,11 @@ namespace Banshee.Fixup
}
[DatabaseColumn ("ProblemID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
- public long Id { get; private set; }
+ public int Id { get; private set; }
public override long DbId {
get { return Id; }
- protected set { Id = value; }
+ protected set { Id = (int)value; }
}
[DatabaseColumn ("ProblemType")]
@@ -115,7 +115,7 @@ namespace Banshee.Fixup
public override int GetHashCode ()
{
- return ((int)Id ^ (int)(Id >> 32));
+ return Id;
}
public override string ToString ()
diff --git a/src/Extensions/Banshee.Fixup/Makefile.in b/src/Extensions/Banshee.Fixup/Makefile.in
index d62f784..2e91ddf 100644
--- a/src/Extensions/Banshee.Fixup/Makefile.in
+++ b/src/Extensions/Banshee.Fixup/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -458,14 +473,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -580,7 +596,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -588,7 +604,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -596,7 +611,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -615,7 +630,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -654,7 +669,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -908,12 +922,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs
index e1a3e0c..59fdd27 100644
--- a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs
+++ b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs
@@ -147,13 +147,13 @@ namespace Banshee.InternetArchive
Box.PackStart (arrow, false, false, 0);
Box.PackStart (label, true, true, 0);
- this.SetStateFlags (StateFlags.Selected, true);
+ State = StateType.Selected;
bool changing_style = false;
- StyleUpdated += (o, a) => {
+ StyleSet += (o, a) => {
if (!changing_style) {
changing_style = true;
- OverrideBackgroundColor (StateFlags.Normal, StyleContext.GetBackgroundColor (StateFlags.Selected));
+ ModifyBg (StateType.Normal, Style.Background (StateType.Selected));
changing_style = false;
}
};
@@ -214,9 +214,9 @@ namespace Banshee.InternetArchive
table.ValueRenderer.Scale = Pango.Scale.Medium;
// Keep the table from needing to vertically scroll
- /*table.Child.SizeRequested += (o, a) => {
+ table.Child.SizeRequested += (o, a) => {
table.SetSizeRequest (a.Requisition.Width, a.Requisition.Height);
- };*/
+ };
AddToTable (table, Catalog.GetString ("Creator:"), details.Creator);
AddToTable (table, Catalog.GetString ("Venue:"), details.Venue);
@@ -330,11 +330,13 @@ namespace Banshee.InternetArchive
frame.Child = sw;
frame.ShowAll ();
- sw.Child.OverrideBackgroundColor (StateFlags.Normal, StyleContext.GetBackgroundColor (StateFlags.Normal));
- sw.Child.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
- StyleUpdated += delegate {
- sw.Child.OverrideBackgroundColor (StateFlags.Normal, StyleContext.GetBackgroundColor (StateFlags.Normal));
- sw.Child.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
+ sw.Child.ModifyBg (StateType.Normal, Style.Base (StateType.Normal));
+ sw.Child.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
+ sw.Child.ModifyText (StateType.Normal, Style.Text (StateType.Normal));
+ StyleSet += delegate {
+ sw.Child.ModifyBg (StateType.Normal, Style.Base (StateType.Normal));
+ sw.Child.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
+ sw.Child.ModifyText (StateType.Normal, Style.Text (StateType.Normal));
};
PackStart (frame, true, true, 0);
@@ -481,7 +483,7 @@ namespace Banshee.InternetArchive
file_list.ColumnController = file_columns;
file_list.SetModel (files_model);
- var format_list = new ComboBoxText ();
+ var format_list = ComboBox.NewText ();
format_list.RowSeparatorFunc = (model, iter) => {
return (string)model.GetValue (iter, 0) == "---";
};
diff --git a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs
index 057f19e..cb99ade 100644
--- a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs
+++ b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs
@@ -41,8 +41,7 @@ namespace Banshee.InternetArchive
{
private SearchSource source;
- private ComboBoxText sort_combo;
- private ComboBox media_type_combo;
+ private ComboBox sort_combo, media_type_combo;
private TreeStore media_type_store;
private Banshee.Widgets.SearchEntry search_entry;
private Button search_button;
@@ -144,7 +143,7 @@ namespace Banshee.InternetArchive
string prev_query = entry.Query.EndsWith (":") ? null : entry.Query;
entry.Query = String.Format ("{0}:{1}", filter_fields[entry.ActiveFilterID].Id, prev_query);
- var editable = entry as IEditable;
+ var editable = entry.InnerEntry as Editable;
if (editable != null) {
editable.Position = entry.Query.Length;
}
@@ -155,7 +154,7 @@ namespace Banshee.InternetArchive
private void BuildSortCombo ()
{
- var combo = sort_combo = new ComboBoxText ();
+ var combo = sort_combo = ComboBox.NewText ();
foreach (var sort in sorts) {
combo.AppendText (sort.Name);
diff --git a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs
index e45cd2c..99521b2 100644
--- a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs
+++ b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs
@@ -103,9 +103,9 @@ namespace Banshee.InternetArchive
source.Properties.Set<SearchEntry> ("Nereid.SearchEntry", entry);
// Make the search entry text nice and big
- var font = entry.StyleContext.GetFont (StateFlags.Normal).Copy ();
+ var font = entry.InnerEntry.Style.FontDescription.Copy ();
font.Size = (int) (font.Size * Pango.Scale.XLarge);
- entry.OverrideFont (font);
+ entry.InnerEntry.ModifyFont (font);
font.Dispose ();
var button = new Hyena.Widgets.ImageButton (Catalog.GetString ("_Go"), Stock.Find);
diff --git a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Item.cs b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Item.cs
index c8242fb..e6b65c2 100644
--- a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Item.cs
+++ b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Item.cs
@@ -72,7 +72,7 @@ namespace Banshee.InternetArchive
}
[DatabaseColumn("ItemId", Constraints = DatabaseColumnConstraints.PrimaryKey)]
- private long DbId { get; set; }
+ private int DbId { get; set; }
[DatabaseColumn]
private string DetailsJson { get; set; }
diff --git a/src/Extensions/Banshee.InternetArchive/Makefile.in b/src/Extensions/Banshee.InternetArchive/Makefile.in
index 5b2cc78..5c0a2aa 100644
--- a/src/Extensions/Banshee.InternetArchive/Makefile.in
+++ b/src/Extensions/Banshee.InternetArchive/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -471,14 +486,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -593,7 +609,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -601,7 +617,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -609,7 +624,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -628,7 +643,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -667,7 +682,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -921,12 +935,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs
index 8267cb8..e0381c7 100644
--- a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs
+++ b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs
@@ -144,8 +144,6 @@ namespace Banshee.InternetRadio
radio_track.ParentTrack as DatabaseTrackInfo, a);
};
- TrackIsPlayingHandler = ServiceManager.PlayerEngine.IsPlaying;
-
var migrator = new XspfMigrator (this);
if (migrator.Migrate () | migrator.LoadDefaults ()) {
Reload ();
@@ -274,8 +272,6 @@ namespace Banshee.InternetRadio
if (destroy) {
editor.Response -= OnStationEditorResponse;
editor.Destroy ();
-
- Reload ();
}
}
}
diff --git a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs
index 547e73e..d25c6b5 100644
--- a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs
+++ b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs
@@ -44,7 +44,6 @@ using Banshee.ServiceStack;
using Banshee.Collection;
using Banshee.Collection.Database;
using Banshee.Collection.Gui;
-using Banshee.Gui;
namespace Banshee.InternetRadio
{
@@ -53,17 +52,7 @@ namespace Banshee.InternetRadio
private TrackListView track_view;
private QueryFilterView<string> genre_view;
- private static readonly string name = "iradio";
-
- public static readonly SchemaEntry<int> PaneLeftPosition = new SchemaEntry<int> (
- String.Format ("{0}.{1}.browser.left", PersistentPaneController.NamespacePrefix, name),
- "position",
- DEFAULT_PANE_LEFT_POSITION,
- "Internet Radio Browser Pane Container Position",
- "The position of the internet radio browser pane container"
- );
-
- public InternetRadioSourceContents () : base (name, SchemaEntry<int>.Zero, PaneLeftPosition)
+ public InternetRadioSourceContents () : base ("iradio")
{
}
diff --git a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs
index 6c415ae..43cda93 100644
--- a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs
+++ b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs
@@ -44,7 +44,7 @@ namespace Banshee.InternetRadio
private Entry description_entry;
private Entry stream_entry;
private Entry creator_entry;
- private ComboBoxText genre_entry;
+ private ComboBoxEntry genre_entry;
private RatingEntry rating_entry;
private Alignment error_container;
private Label error;
@@ -68,10 +68,11 @@ namespace Banshee.InternetRadio
: Catalog.GetString ("Edit radio station");
BorderWidth = 6;
+ HasSeparator = false;
DefaultResponse = ResponseType.Ok;
Modal = true;
- ContentArea.Spacing = 6;
+ VBox.Spacing = 6;
HBox split_box = new HBox ();
split_box.Spacing = 12;
@@ -102,7 +103,7 @@ namespace Banshee.InternetRadio
table.RowSpacing = 6;
table.ColumnSpacing = 6;
- genre_entry = ComboBoxText.NewWithEntry ();
+ genre_entry = ComboBoxEntry.NewText ();
foreach (string genre in ServiceManager.DbConnection.QueryEnumerable<string> ("SELECT DISTINCT Genre FROM CoreTracks ORDER BY Genre")) {
if (!String.IsNullOrEmpty (genre)) {
@@ -137,7 +138,7 @@ namespace Banshee.InternetRadio
split_box.PackStart (main_box, true, true, 0);
split_box.Show ();
- ContentArea.PackStart (split_box, true, true, 0);
+ VBox.PackStart (split_box, true, true, 0);
Button cancel_button = new Button (Stock.Cancel);
cancel_button.CanDefault = false;
diff --git a/src/Extensions/Banshee.InternetRadio/Makefile.in b/src/Extensions/Banshee.InternetRadio/Makefile.in
index 970e465..c333ff0 100644
--- a/src/Extensions/Banshee.InternetRadio/Makefile.in
+++ b/src/Extensions/Banshee.InternetRadio/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -451,14 +466,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -573,7 +589,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -581,7 +597,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -589,7 +604,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -608,7 +623,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -647,7 +662,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -901,12 +915,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
index 5ee8726..c33477f 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
@@ -9,7 +9,6 @@
// Phil Trimble <philtrimble at gmail.com>
//
// Copyright (C) 2005-2008 Novell, Inc.
-// Copyright (C) 2013 Phil Trimble
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -78,11 +77,6 @@ namespace Banshee.Lastfm.Audioscrobbler
private readonly TimeSpan MINIMUM_TRACK_DURATION = TimeSpan.FromSeconds (30);
private readonly TimeSpan MINIMUM_TRACK_PLAYTIME = TimeSpan.FromSeconds (240);
- private UserJob scrobble_job;
- private int job_tracks_count;
- private int job_tracks_total;
- private string scrobbling_progress_message = Catalog.GetString ("Processed {0} of {1} tracks");
-
public AudioscrobblerService ()
{
}
@@ -92,8 +86,8 @@ namespace Banshee.Lastfm.Audioscrobbler
account = LastfmCore.Account;
if (account.UserName == null) {
- account.UserName = LastfmSource.LastUserSchema.Get ();
- account.SessionKey = LastfmSource.LastSessionKeySchema.Get ();
+ account.UserName = LastUserSchema.Get ();
+ account.SessionKey = LastSessionKeySchema.Get ();
account.ScrobbleUrl = LastScrobbleUrlSchema.Get ();
}
@@ -114,10 +108,6 @@ namespace Banshee.Lastfm.Audioscrobbler
connection.UpdateNetworkState (network.Connected);
network.StateChanged += HandleNetworkStateChanged;
- connection.SubmissionStart += OnSubmissionStart;
- connection.SubmissionUpdate += OnSubmissionUpdate;
- connection.SubmissionEnd += OnSubmissionEnd;
-
// Update the Visit action menu item if we update our account info
LastfmCore.Account.Updated += delegate (object o, EventArgs args) {
actions["AudioscrobblerVisitAction"].Sensitive = String.IsNullOrEmpty (LastfmCore.Account.UserName);
@@ -193,10 +183,6 @@ namespace Banshee.Lastfm.Audioscrobbler
action_service.UIManager.RemoveUi (ui_manager_id);
action_service.UIManager.RemoveActionGroup (actions);
actions = null;
-
- connection.SubmissionStart -= OnSubmissionStart;
- connection.SubmissionUpdate -= OnSubmissionUpdate;
- connection.SubmissionEnd -= OnSubmissionEnd;
}
List<IBatchScrobblerSource> sources_watched;
@@ -413,84 +399,58 @@ namespace Banshee.Lastfm.Audioscrobbler
private void OnReadyToScrobble (object source, ScrobblingBatchEventArgs args)
{
- if (!connection.Started) {
- connection.Start ();
- }
-
- int added_track_count = 0;
+ var scrobble_job = new UserJob (Catalog.GetString ("Scrobbling from device"),
+ Catalog.GetString ("Scrobbling from device..."));
- foreach (var track_entry in args.ScrobblingBatch) {
- TrackInfo track = track_entry.Key;
+ scrobble_job.PriorityHints = PriorityHints.DataLossIfStopped;
+ scrobble_job.Register ();
- if (IsValidForSubmission (track)) {
- IList<DateTime> playtimes = track_entry.Value;
-
- foreach (DateTime playtime in playtimes) {
- queue.Add (track, playtime);
- added_track_count++;
+ try {
+ if (!connection.Started) {
+ connection.Start ();
+ }
+
+ int added_track_count = 0, processed_track_count = 0;
+ string message = Catalog.GetString ("Processing track {0} of {1} ...");
+ var batchCount = args.ScrobblingBatch.Count;
+
+ foreach (var track_entry in args.ScrobblingBatch) {
+ TrackInfo track = track_entry.Key;
+
+ if (IsValidForSubmission (track)) {
+ IList<DateTime> playtimes = track_entry.Value;
+
+ foreach (DateTime playtime in playtimes) {
+ queue.Add (track, playtime);
+ added_track_count++;
+ }
+ Log.DebugFormat ("Added to Last.fm queue: {0} - Number of plays: {1}", track, playtimes.Count);
+ } else {
+ Log.DebugFormat ("Track {0} failed validation check for Last.fm submission, skipping...",
+ track);
}
- Log.DebugFormat ("Added to Last.fm queue: {0} - Number of plays: {1}", track, playtimes.Count);
- } else {
- Log.DebugFormat ("Track {0} failed validation check for Last.fm submission, skipping...",
- track);
+
+ scrobble_job.Status = String.Format (message, ++processed_track_count, batchCount);
+ scrobble_job.Progress = processed_track_count / (double) batchCount;
}
- }
-
- Log.InformationFormat ("Number of played tracks from device added to Last.fm queue: {0}", added_track_count);
- }
-
- private void OnSubmissionStart (object source, SubmissionStartEventArgs args)
- {
- // We only want to display something if more than one track is being submitted
- if (args.TotalCount <= 1) {
- return;
- }
-
- if (scrobble_job == null) {
- scrobble_job = new UserJob (Catalog.GetString ("Scrobbling to Last.FM"),
- Catalog.GetString ("Scrobbling to Last.FM..."));
-
- scrobble_job.PriorityHints = PriorityHints.None;
- scrobble_job.CanCancel = true;
- scrobble_job.CancelRequested += OnScrobbleJobCancelRequest;
- scrobble_job.Register ();
+
+ Log.InformationFormat ("Number of played tracks from device added to Last.fm queue: {0}", added_track_count);
- job_tracks_count = 0;
- job_tracks_total = args.TotalCount;
- }
- UpdateJob ();
- }
-
- private void OnSubmissionUpdate (object source, SubmissionUpdateEventArgs args)
- {
- if (scrobble_job != null) {
- job_tracks_count += args.UpdateCount;
- UpdateJob ();
- }
- }
-
- private void UpdateJob ()
- {
- scrobble_job.Status = String.Format (scrobbling_progress_message, job_tracks_count, job_tracks_total);
- scrobble_job.Progress = job_tracks_count / (double) job_tracks_total;
- }
-
- private void OnSubmissionEnd (object source, EventArgs args)
- {
- if (scrobble_job != null) {
+ } finally {
scrobble_job.Finish ();
- scrobble_job = null;
}
}
- private void OnScrobbleJobCancelRequest (object source, EventArgs args)
- {
- scrobble_job.Finish ();
- scrobble_job = null;
- }
-
#endregion
+ public static readonly SchemaEntry<string> LastUserSchema = new SchemaEntry<string> (
+ "plugins.lastfm", "username", "", "Last.fm user", "Last.fm username"
+ );
+
+ public static readonly SchemaEntry<string> LastSessionKeySchema = new SchemaEntry<string> (
+ "plugins.lastfm", "session_key", "", "Last.fm session key", "Last.fm sessions key used in authenticated calls"
+ );
+
public static readonly SchemaEntry<string> LastScrobbleUrlSchema = new SchemaEntry<string> (
"plugins.audioscrobbler", "api_url",
null,
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/Queue.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/Queue.cs
index 5a41071..72bc159 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/Queue.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/Queue.cs
@@ -145,7 +145,6 @@ namespace Banshee.Lastfm.Audioscrobbler
List<IQueuedTrack> queue;
string xml_path;
bool dirty;
- int next = 0;
public event EventHandler TrackAdded;
@@ -164,20 +163,6 @@ namespace Banshee.Lastfm.Audioscrobbler
Load ();
}
- #region IEnumerable implementation
-
- IEnumerator<IQueuedTrack> IEnumerable<IQueuedTrack>.GetEnumerator ()
- {
- return queue.GetEnumerator ();
- }
-
- System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
- {
- return queue.GetEnumerator ();
- }
-
- #endregion
-
private void MigrateQueueFile ()
{
string old_xml_dir_path = Path.Combine (Hyena.Paths.ExtensionCacheRoot, "last.fm");
@@ -272,12 +257,11 @@ namespace Banshee.Lastfm.Audioscrobbler
}
}
- public IQueuedTrack GetNextTrack ()
+ public List<IQueuedTrack> GetTracks ()
{
- if (next >= queue.Count) {
- return null;
- }
- return queue [next++];
+ // Last.fm can technically handle up to 50 songs in one request
+ // but seems to throw errors if our submission is too long.
+ return queue.GetRange (0, Math.Min (queue.Count, 30));
}
public void Add (object track, DateTime started_at)
@@ -305,7 +289,6 @@ namespace Banshee.Lastfm.Audioscrobbler
{
queue.RemoveRange (first, count);
dirty = true;
- next = 0;
}
public int Count {
@@ -328,7 +311,6 @@ namespace Banshee.Lastfm.Audioscrobbler
removed_track_count
);
dirty = true;
- next = 0;
Save ();
}
}
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs
index ec8d5dc..8c78ba2 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs
@@ -226,11 +226,10 @@ namespace Banshee.Lastfm.Recommendations
SetSizeRequest (-1, args.Allocation.Height + (Allocation.Height - args.Allocation.Height));
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
- base.OnStyleUpdated ();
- similar_artists_view.OverrideBackgroundColor (StateFlags.Normal,
- StyleContext.GetBackgroundColor (StateFlags.Normal));
+ base.OnStyleSet (previous_style);
+ similar_artists_view.ModifyBg (StateType.Normal, Style.Base (StateType.Normal));
}
private class RefreshRecommendationsJob : Banshee.Kernel.Job
@@ -305,7 +304,7 @@ namespace Banshee.Lastfm.Recommendations
album_button.Relief = ReliefStyle.None;
Label label = new Label ();
- label.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
+ label.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
label.Ellipsize = Pango.EllipsizeMode.End;
label.Xalign = 0;
label.Markup = String.Format ("{0}. {1}", i+1, GLib.Markup.EscapeText (album.Name));
@@ -326,7 +325,7 @@ namespace Banshee.Lastfm.Recommendations
HBox box = new HBox ();
Label label = new Label ();
- label.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
+ label.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
label.Ellipsize = Pango.EllipsizeMode.End;
label.Xalign = 0;
label.Markup = String.Format ("{0}. {1}", i+1, GLib.Markup.EscapeText (track.Name));
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs
index cf7838b..ac27a98 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs
@@ -128,15 +128,13 @@ namespace Banshee.Lastfm
UpdateActions ();
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- Actions.UIManager.RemoveUi (actions_id);
- Actions.RemoveActionGroup (this);
- lastfm.Connection.StateChanged -= HandleConnectionStateChanged;
- ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
- }
- base.Dispose (disposing);
+ Actions.UIManager.RemoveUi (actions_id);
+ Actions.RemoveActionGroup (this);
+ lastfm.Connection.StateChanged -= HandleConnectionStateChanged;
+ ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
+ base.Dispose ();
}
#region Action Handlers
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs
index 8efc253..a6819e3 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs
@@ -1,30 +1,3 @@
-//
-// LastfmSourceContents.cs
-//
-// Authors:
-// Gabriel Burt <gburt at novell.com>
-//
-// Copyright (C) 2008-2009 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
using System;
using System.Collections.Generic;
@@ -82,9 +55,9 @@ namespace Banshee.Lastfm
viewport.Add (main_box);
- StyleUpdated += delegate {
- viewport.OverrideBackgroundColor (StateFlags.Normal, StyleContext.GetBackgroundColor (StateFlags.Normal));
- viewport.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
+ StyleSet += delegate {
+ viewport.ModifyBg (StateType.Normal, Style.Base (StateType.Normal));
+ viewport.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
};
AddWithFrame (viewport);
@@ -221,9 +194,9 @@ namespace Banshee.Lastfm
PackStart (tile_view, true, true, 0);
tile_view.Show ();
- StyleUpdated += delegate {
- tile_view.OverrideBackgroundColor (StateFlags.Normal, StyleContext.GetBackgroundColor (StateFlags.Normal));
- tile_view.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
+ StyleSet += delegate {
+ tile_view.ModifyBg (StateType.Normal, Style.Base (StateType.Normal));
+ tile_view.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
};
}
diff --git a/src/Extensions/Banshee.Lastfm/Makefile.in b/src/Extensions/Banshee.Lastfm/Makefile.in
index e451e1f..1f4e398 100644
--- a/src/Extensions/Banshee.Lastfm/Makefile.in
+++ b/src/Extensions/Banshee.Lastfm/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -459,14 +474,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -581,7 +597,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -589,7 +605,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -597,7 +612,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -616,7 +631,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -655,7 +670,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -909,12 +923,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs
index d62aafc..60120a6 100644
--- a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs
+++ b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs
@@ -118,17 +118,15 @@ namespace Banshee.LastfmStreaming.Radio
UpdateActions ();
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- Actions.UIManager.RemoveUi (actions_id);
- Actions.RemoveActionGroup (this);
- lastfm.Connection.StateChanged -= HandleConnectionStateChanged;
- Actions.SourceActions ["SourcePropertiesAction"].Activated -= OnSourceProperties;
- ServiceManager.PlaybackController.SourceChanged -= OnPlaybackSourceChanged;
- ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
- }
- base.Dispose (disposing);
+ Actions.UIManager.RemoveUi (actions_id);
+ Actions.RemoveActionGroup (this);
+ lastfm.Connection.StateChanged -= HandleConnectionStateChanged;
+ Actions.SourceActions ["SourcePropertiesAction"].Activated -= OnSourceProperties;
+ ServiceManager.PlaybackController.SourceChanged -= OnPlaybackSourceChanged;
+ ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
+ base.Dispose ();
}
#region Action Handlers
diff --git a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs
index 71bef0b..31894d4 100644
--- a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs
+++ b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs
@@ -48,7 +48,7 @@ namespace Banshee.LastfmStreaming.Radio
private LastfmSource lastfm;
private StationSource source;
- private Gtk.ComboBoxText type_combo;
+ private Gtk.ComboBox type_combo;
private Gtk.Entry arg_entry;
private Gtk.Label arg_label;
@@ -74,10 +74,8 @@ namespace Banshee.LastfmStreaming.Radio
AddStockButton (Stock.Cancel, ResponseType.Cancel);
AddStockButton (Stock.Ok, ResponseType.Ok, true);
- int minimum_width, natural_width;
- GetPreferredWidth (out minimum_width, out natural_width);
SetGeometryHints (this, new Gdk.Geometry () {
- MinWidth = minimum_width,
+ MinWidth = SizeRequest ().Width,
MaxWidth = Gdk.Screen.Default.Width,
MinHeight = -1,
MaxHeight = -1
@@ -98,7 +96,7 @@ namespace Banshee.LastfmStreaming.Radio
Xalign = 0.0f
}, 0, 1, 1, 2, AttachOptions.Fill, AttachOptions.Shrink, 0, 0);
- table.Attach (type_combo = new ComboBoxText (),
+ table.Attach (type_combo = ComboBox.NewText (),
1, 2, 0, 1, AttachOptions.Fill | AttachOptions.Expand, AttachOptions.Shrink, 0, 0);
table.Attach (arg_entry = new Entry (),
@@ -108,7 +106,7 @@ namespace Banshee.LastfmStreaming.Radio
VBox.Spacing = 12;
VBox.ShowAll ();
- type_combo.Remove (0);
+ type_combo.RemoveText (0);
int active_type = 0;
int i = 0;
foreach (StationType type in StationType.Types) {
diff --git a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs
index 376c579..3d1dcf6 100644
--- a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs
+++ b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs
@@ -113,10 +113,10 @@ namespace Banshee.LastfmStreaming.Radio
set { play_count = value; }
}
- private long dbid;
+ private int dbid;
// For StationSources that already exist in the db
- protected StationSource (LastfmSource lastfm, long dbId, string name, string type, string arg, int playCount) : base (generic_name, name, 150, dbId.ToString ())
+ protected StationSource (LastfmSource lastfm, int dbId, string name, string type, string arg, int playCount) : base (generic_name, name, 150, dbId.ToString ())
{
this.lastfm = lastfm;
dbid = dbId;
@@ -566,7 +566,7 @@ namespace Banshee.LastfmStreaming.Radio
while (reader.Read ()) {
try {
stations.Add (new StationSource (lastfm,
- Convert.ToInt64 (reader[0]),
+ Convert.ToInt32 (reader[0]),
reader[1] as string,
reader[2] as string,
reader[3] as string,
diff --git a/src/Extensions/Banshee.LastfmStreaming/Makefile.in b/src/Extensions/Banshee.LastfmStreaming/Makefile.in
index 6800895..e2ca80e 100644
--- a/src/Extensions/Banshee.LastfmStreaming/Makefile.in
+++ b/src/Extensions/Banshee.LastfmStreaming/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -454,14 +469,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -576,7 +592,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -584,7 +600,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -592,7 +607,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -611,7 +626,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -650,7 +665,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -904,12 +918,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs
index c474564..6e7558e 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs
+++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs
@@ -36,9 +36,6 @@ using Banshee.Sources;
using Banshee.ServiceStack;
using Banshee.Library;
-using Banshee.Gui;
-using Banshee.I18n;
-
namespace Banshee.LibraryWatcher
{
public class LibraryWatcherService : IExtensionService, IDisposable, IDelayedInitializeService
@@ -71,33 +68,11 @@ namespace Banshee.LibraryWatcher
AddLibrary (ServiceManager.SourceManager.VideoLibrary);
if (ServiceManager.SourceManager.MusicLibrary.Count == 0) {
- new Banshee.Collection.RescanPipeline (ServiceManager.SourceManager.MusicLibrary, tracks => {
-
- string msg = String.Format (
- Catalog.GetPluralString (
- // singular form unused b/c we know it's > 1, but we still need GetPlural
- "Library Watcher extension just detected an action that would trigger the removal of one track from your music library.",
- "Library Watcher extension just detected an action that would trigger the removal of {0} tracks from your music library.",
- tracks),
- tracks);
-
- return TrackActions.ConfirmRemove (msg);
- });
+ new Banshee.Collection.RescanPipeline (ServiceManager.SourceManager.MusicLibrary);
}
if (ServiceManager.SourceManager.VideoLibrary.Count == 0) {
- new Banshee.Collection.RescanPipeline (ServiceManager.SourceManager.VideoLibrary, tracks => {
-
- string msg = String.Format (
- Catalog.GetPluralString (
- // singular form unused b/c we know it's > 1, but we still need GetPlural
- "Library Watcher extension just detected an action that would trigger the removal of one track from your video library.",
- "Library Watcher extension just detected an action that would trigger the removal of {0} tracks from your video library.",
- tracks),
- tracks);
-
- return TrackActions.ConfirmRemove (msg);
- });
+ new Banshee.Collection.RescanPipeline (ServiceManager.SourceManager.VideoLibrary);
}
}
diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
index a874549..8bcba5d 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
+++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
@@ -298,11 +298,11 @@ namespace Banshee.LibraryWatcher
@"SELECT TrackID, MetadataHash FROM CoreTracks WHERE {0} = ? LIMIT 1",
BansheeQuery.UriField.Column
);
- long track_id = 0;
+ int track_id = 0;
string hash = null;
using (var reader = new HyenaDataReader (ServiceManager.DbConnection.Query (hash_sql, uri))) {
if (reader.Read ()) {
- track_id = reader.Get<long> (0);
+ track_id = reader.Get<int> (0);
hash = reader.Get<string> (1);
}
}
diff --git a/src/Extensions/Banshee.LibraryWatcher/Makefile.in b/src/Extensions/Banshee.LibraryWatcher/Makefile.in
index bb1b4c1..28ddb33 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Makefile.in
+++ b/src/Extensions/Banshee.LibraryWatcher/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -445,14 +460,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -567,7 +583,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -575,7 +591,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -583,7 +598,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -602,7 +617,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -641,7 +656,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -895,12 +909,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.MeeGo/Makefile.in b/src/Extensions/Banshee.MeeGo/Makefile.in
index 05b1200..c8fab6d 100644
--- a/src/Extensions/Banshee.MeeGo/Makefile.in
+++ b/src/Extensions/Banshee.MeeGo/Makefile.in
@@ -208,15 +208,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -225,6 +234,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -239,6 +250,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -246,6 +259,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -460,14 +475,15 @@ RESOURCES = Banshee.MeeGo.addin.xml
# External libraries to link against, generated from configure
@HAVE_MEEGO_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_MEEGO_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_MEEGO_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_MEEGO_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_MEEGO_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_MEEGO_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_MEEGO_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_MEEGO_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_MEEGO_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_MEEGO_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_MEEGO_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_MEEGO_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_MEEGO_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_MEEGO_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -582,7 +598,7 @@ RESOURCES = Banshee.MeeGo.addin.xml
@HAVE_MEEGO_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_MEEGO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_MEEGO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -590,7 +606,6 @@ RESOURCES = Banshee.MeeGo.addin.xml
@HAVE_MEEGO_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_MEEGO_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_MEEGO_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -598,7 +613,7 @@ RESOURCES = Banshee.MeeGo.addin.xml
@HAVE_MEEGO_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_MEEGO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_MEEGO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_MEEGO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_MEEGO_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_MEEGO_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_MEEGO_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -617,7 +632,7 @@ RESOURCES = Banshee.MeeGo.addin.xml
@HAVE_MEEGO_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_MEEGO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_MEEGO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_MEEGO_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_MEEGO_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_MEEGO_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -682,7 +697,6 @@ RESOURCES = Banshee.MeeGo.addin.xml
@ENABLE_TESTS_TRUE@@HAVE_MEEGO_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_MEEGO_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_MEEGO_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_MEEGO_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_MEEGO_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_MEEGO_TRUE at module_SCRIPTS = $(OUTPUT_FILES) \
@HAVE_MEEGO_TRUE@ Banshee.MeeGo.dll.config
@@ -1031,12 +1045,9 @@ uninstall-am: uninstall-desktopfilesDATA uninstall-moduleSCRIPTS \
@HAVE_MEEGO_TRUE at build-debug:
@HAVE_MEEGO_TRUE@ @echo $(DEP_LINK)
- at HAVE_MEEGO_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_MEEGO_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_MEEGO_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_MEEGO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_MEEGO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_MEEGO_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_MEEGO_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_MEEGO_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs b/src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs
index 16b3e81..e91fb38 100644
--- a/src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs
+++ b/src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs
@@ -44,35 +44,28 @@ using Banshee.Sources.Gui;
using Banshee.MediaEngine;
using Banshee.ServiceStack;
using Banshee.Widgets;
-using Banshee.Configuration;
namespace Banshee.MiniMode
{
public class MiniMode : Banshee.Gui.BaseClientWindow
{
- const string CONFIG_NAMESPACE = "minimode";
- static readonly SchemaEntry<int> WidthSchema = WindowConfiguration.NewWidthSchema (CONFIG_NAMESPACE, 0);
- static readonly SchemaEntry<int> HeightSchema = WindowConfiguration.NewHeightSchema (CONFIG_NAMESPACE, 0);
- static readonly SchemaEntry<int> XPosSchema = WindowConfiguration.NewXPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<int> YPosSchema = WindowConfiguration.NewYPosSchema (CONFIG_NAMESPACE);
- static readonly SchemaEntry<bool> MaximizedSchema = WindowConfiguration.NewMaximizedSchema (CONFIG_NAMESPACE);
-
private TrackInfoDisplay track_info_display;
private ConnectedVolumeButton volume_button;
private SourceComboBox source_combo_box;
private ConnectedSeekSlider seek_slider;
+ private object tooltip_host;
private BaseClientWindow default_main_window;
- public MiniMode (BaseClientWindow defaultMainWindow) :
- base (Catalog.GetString ("Banshee Media Player"),
- new WindowConfiguration (WidthSchema, HeightSchema, XPosSchema, YPosSchema, MaximizedSchema))
+ public MiniMode (BaseClientWindow defaultMainWindow) : base (Catalog.GetString ("Banshee Media Player"), "minimode", 0, 0)
{
default_main_window = defaultMainWindow;
BorderWidth = 12;
Resizable = false;
+ tooltip_host = TooltipSetter.CreateHost ();
+
Build ();
ShowAll ();
@@ -125,8 +118,8 @@ namespace Banshee.MiniMode
repeat_align.Add (repeat_toggle_button);
bot.PackEnd (repeat_align, false, false, 0);
- fullmode_button.TooltipText = Catalog.GetString ("Switch back to full mode");
- repeat_toggle_button.TooltipText = Catalog.GetString ("Change repeat playback mode");
+ SetTip (fullmode_button, Catalog.GetString ("Switch back to full mode"));
+ SetTip (repeat_toggle_button, Catalog.GetString ("Change repeat playback mode"));
Add (vbox);
}
@@ -135,16 +128,18 @@ namespace Banshee.MiniMode
{
}
+ private void SetTip (Widget widget, string tip)
+ {
+ TooltipSetter.Set (tooltip_host, widget, tip);
+ }
+
private void SetHeightLimit ()
{
Gdk.Geometry limits = new Gdk.Geometry ();
limits.MinHeight = -1;
limits.MaxHeight = -1;
-
- int minimum_width, natural_width;
- GetPreferredWidth (out minimum_width, out natural_width);
- limits.MinWidth = minimum_width;
+ limits.MinWidth = SizeRequest ().Width;
limits.MaxWidth = Gdk.Screen.Default.Width;
SetGeometryHints (this, limits, Gdk.WindowHints.MaxSize | Gdk.WindowHints.MinSize);
diff --git a/src/Extensions/Banshee.MiniMode/Makefile.in b/src/Extensions/Banshee.MiniMode/Makefile.in
index b51081a..9299940 100644
--- a/src/Extensions/Banshee.MiniMode/Makefile.in
+++ b/src/Extensions/Banshee.MiniMode/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -446,14 +461,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -568,7 +584,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -576,7 +592,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -584,7 +599,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -603,7 +618,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -642,7 +657,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -896,12 +910,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.MiroGuide/Makefile.in b/src/Extensions/Banshee.MiroGuide/Makefile.in
index 6dce036..1c787df 100644
--- a/src/Extensions/Banshee.MiroGuide/Makefile.in
+++ b/src/Extensions/Banshee.MiroGuide/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -446,14 +461,15 @@ RESOURCES = Banshee.MiroGuide.addin.xml
# External libraries to link against, generated from configure
@HAVE_LIBWEBKIT_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_LIBWEBKIT_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_LIBWEBKIT_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -568,7 +584,7 @@ RESOURCES = Banshee.MiroGuide.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -576,7 +592,6 @@ RESOURCES = Banshee.MiroGuide.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -584,7 +599,7 @@ RESOURCES = Banshee.MiroGuide.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -603,7 +618,7 @@ RESOURCES = Banshee.MiroGuide.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -662,7 +677,6 @@ RESOURCES = Banshee.MiroGuide.addin.xml
@ENABLE_TESTS_TRUE@@HAVE_LIBWEBKIT_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_LIBWEBKIT_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_LIBWEBKIT_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_LIBWEBKIT_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_LIBWEBKIT_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_LIBWEBKIT_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -918,12 +932,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_LIBWEBKIT_TRUE at build-debug:
@HAVE_LIBWEBKIT_TRUE@ @echo $(DEP_LINK)
- at HAVE_LIBWEBKIT_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_LIBWEBKIT_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_LIBWEBKIT_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_LIBWEBKIT_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_LIBWEBKIT_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Mpris/Makefile.in b/src/Extensions/Banshee.Mpris/Makefile.in
index 1ef1f87..579260b 100644
--- a/src/Extensions/Banshee.Mpris/Makefile.in
+++ b/src/Extensions/Banshee.Mpris/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -449,14 +464,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -571,7 +587,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -579,7 +595,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -587,7 +602,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -606,7 +621,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -645,7 +660,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -899,12 +913,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.MultimediaKeys/Makefile.in b/src/Extensions/Banshee.MultimediaKeys/Makefile.in
index 5826c50..03497e2 100644
--- a/src/Extensions/Banshee.MultimediaKeys/Makefile.in
+++ b/src/Extensions/Banshee.MultimediaKeys/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -442,14 +457,15 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
# External libraries to link against, generated from configure
@ENABLE_GNOME_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_GNOME_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_GNOME_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_GNOME_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_GNOME_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_GNOME_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_GNOME_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_GNOME_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_GNOME_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_GNOME_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_GNOME_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_GNOME_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_GNOME_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_GNOME_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -564,7 +580,7 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
@ENABLE_GNOME_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_GNOME_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_GNOME_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -572,7 +588,6 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
@ENABLE_GNOME_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_GNOME_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_GNOME_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -580,7 +595,7 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
@ENABLE_GNOME_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_GNOME_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_GNOME_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_GNOME_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_GNOME_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_GNOME_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_GNOME_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -599,7 +614,7 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
@ENABLE_GNOME_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_GNOME_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_GNOME_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_GNOME_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_GNOME_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_GNOME_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -657,7 +672,6 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
@ENABLE_GNOME_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_GNOME_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_GNOME_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_GNOME_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_GNOME_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_GNOME_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -913,12 +927,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_GNOME_TRUE at build-debug:
@ENABLE_GNOME_TRUE@ @echo $(DEP_LINK)
- at ENABLE_GNOME_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_GNOME_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_GNOME_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_GNOME_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_GNOME_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_GNOME_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_GNOME_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_GNOME_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
index 003ac71..533a022 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
@@ -39,14 +39,17 @@ namespace Banshee.NotificationArea
public class GtkNotificationAreaBox : StatusIcon, INotificationAreaBox
{
public event EventHandler Disconnected;
- public event EventHandler Activated;
- public event PopupMenuHandler PopupMenuEvent;
- private TrackInfoPopup popup;
- private bool can_show_popup = false;
- private bool cursor_over_trayicon = false;
- private bool hide_delay_started = false;
-
+ public event EventHandler Activated {
+ add { base.Activate += value; }
+ remove { base.Activate -= value; }
+ }
+
+ public event PopupMenuHandler PopupMenuEvent {
+ add { base.PopupMenu += value; }
+ remove { base.PopupMenu -= value; }
+ }
+
public Widget Widget {
get { return null; }
}
@@ -57,10 +60,8 @@ namespace Banshee.NotificationArea
IconName = (IconThemeUtils.HasIcon ("banshee-panel")) ?
"banshee-panel" : Banshee.ServiceStack.Application.IconName;
- HasTooltip = true;
- base.Activate += delegate {OnActivated ();};
- base.PopupMenu += delegate {OnPopupMenuEvent ();};
- popup = new TrackInfoPopup ();
+ Tooltip = window.Title;
+ window.TitleChanged += delegate { Tooltip = window.Title; };
}
public void PositionMenu (Menu menu, out int x, out int y, out bool push_in)
@@ -68,195 +69,8 @@ namespace Banshee.NotificationArea
StatusIcon.PositionMenu (menu, out x, out y, out push_in, Handle);
}
- private void HidePopup ()
- {
- if (popup == null) {
- return;
- }
-
- popup.Hide ();
- popup.EnterNotifyEvent -= OnPopupEnterNotify;
- popup.LeaveNotifyEvent -= OnPopupLeaveNotify;
- popup.Destroy ();
- popup.Dispose ();
- popup = null;
- }
-
- private void ShowPopup ()
- {
- if (popup != null) {
- return;
- }
-
- popup = new TrackInfoPopup ();
- popup.EnterNotifyEvent += OnPopupEnterNotify;
- popup.LeaveNotifyEvent += OnPopupLeaveNotify;
-
- PositionPopup ();
-
- popup.Show ();
- }
-
- private void OnPopupEnterNotify (object o, EnterNotifyEventArgs args)
- {
- hide_delay_started = false;
- }
-
- private void OnPopupLeaveNotify (object o, LeaveNotifyEventArgs args)
- {
- Gdk.Rectangle rect;
- if (!popup.Intersect (new Gdk.Rectangle ((int)args.Event.X, (int)args.Event.Y, 1, 1), out rect)) {
- OnLeaveNotifyEvent (o, args);
- }
- }
-
- private void PositionPopup ()
- {
- int x, y;
- Gdk.Screen screen;
- Gdk.Rectangle area;
- Orientation orientation;
-
- GetGeometry (out screen, out area, out orientation);
-
- Gtk.Requisition popup_min_size, popup_natural_size;
- popup.GetPreferredSize (out popup_min_size, out popup_natural_size);
-
- bool on_bottom = area.Bottom + popup_natural_size.Height >= screen.Height;
-
- y = on_bottom
- ? area.Top - popup_natural_size.Height - 5
- : area.Bottom + 5;
-
- int monitor = screen.GetMonitorAtPoint (area.Left, y);
- var monitor_rect = screen.GetMonitorGeometry(monitor);
-
- x = area.Left - (popup_natural_size.Width / 2) + (area.Width / 2);
-
- if (x + popup_natural_size.Width >= monitor_rect.Right - 5) {
- x = monitor_rect.Right - popup_natural_size.Width - 5;
- } else if (x < monitor_rect.Left + 5) {
- x = monitor_rect.Left + 5;
- }
-
- popup.Move (x, y);
- }
-
- private void OnEnterNotifyEvent (object o, EnterNotifyEventArgs args)
- {
- hide_delay_started = false;
- cursor_over_trayicon = true;
- if (can_show_popup) {
- // only show the popup when the cursor is still over the
- // tray icon after 500ms
- GLib.Timeout.Add (500, delegate {
- if (cursor_over_trayicon && can_show_popup) {
- ShowPopup ();
- }
- return false;
- });
- }
- }
-
- private void OnLeaveNotifyEvent (object o, LeaveNotifyEventArgs args)
- {
- // Give the user half a second to move the mouse cursor to the popup.
- if (!hide_delay_started) {
- hide_delay_started = true;
- cursor_over_trayicon = false;
- GLib.Timeout.Add (500, delegate {
- if (hide_delay_started) {
- hide_delay_started = false;
- HidePopup ();
- }
- return false;
- });
- }
- }
-
public void OnPlayerEvent (PlayerEventArgs args)
{
- switch (args.Event) {
- case PlayerEvent.StartOfStream:
- can_show_popup = false;
- break;
-
- case PlayerEvent.EndOfStream:
- // only hide the popup when we don't play again after 250ms
- GLib.Timeout.Add (250, delegate {
- if (ServiceManager.PlayerEngine.CurrentState != PlayerState.Playing) {
- can_show_popup = false;
- HidePopup ();
- }
- return false;
- });
- break;
- }
- }
-
- protected override bool OnScrollEvent (Gdk.EventScroll evnt)
- {
- switch (evnt.Direction) {
- case Gdk.ScrollDirection.Up:
- if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
- ServiceManager.PlayerEngine.Volume += (ushort)PlayerEngine.VolumeDelta;
- } else if((evnt.State & Gdk.ModifierType.ShiftMask) != 0) {
- ServiceManager.PlayerEngine.Position += PlayerEngine.SkipDelta;
- } else {
- ServiceManager.PlaybackController.Next ();
- }
- break;
-
- case Gdk.ScrollDirection.Down:
- if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
- if (ServiceManager.PlayerEngine.Volume < (ushort)PlayerEngine.VolumeDelta) {
- ServiceManager.PlayerEngine.Volume = 0;
- } else {
- ServiceManager.PlayerEngine.Volume -= (ushort)PlayerEngine.VolumeDelta;
- }
- } else if((evnt.State & Gdk.ModifierType.ShiftMask) != 0) {
- ServiceManager.PlayerEngine.Position -= PlayerEngine.SkipDelta;
- } else {
- ServiceManager.PlaybackController.Previous ();
- }
- break;
- }
- return true;
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton evnt)
- {
- if (evnt.Type != Gdk.EventType.ButtonPress) {
- return false;
- }
-
- switch (evnt.Button) {
- case 1:
- if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
- ServiceManager.PlaybackController.Next ();
- } else {
- OnActivated ();
- }
- break;
- case 2:
- ServiceManager.PlayerEngine.TogglePlaying ();
- break;
- case 3:
- if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
- ServiceManager.PlaybackController.Next ();
- } else {
- OnPopupMenuEvent ();
- }
- break;
- }
- return true;
- }
-
-
- protected override bool OnQueryTooltip (int x, int y, bool keyboard_mode, Tooltip tooltip)
- {
- tooltip.Custom = popup;
- return true;
}
public void Show ()
@@ -268,21 +82,5 @@ namespace Banshee.NotificationArea
{
Visible = false;
}
-
- protected virtual void OnActivated ()
- {
- EventHandler handler = Activated;
- if (handler != null) {
- handler (this, EventArgs.Empty);
- }
- }
-
- protected virtual void OnPopupMenuEvent ()
- {
- PopupMenuHandler handler = PopupMenuEvent;
- if (handler != null) {
- handler (this, new PopupMenuArgs ());
- }
- }
}
}
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
index d85acdc..2e3ce0e 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
@@ -64,8 +64,6 @@ namespace Banshee.NotificationArea
private RatingMenuItem rating_menu_item;
private BansheeActionGroup actions;
private bool? actions_supported;
- private bool? action_icons_supported;
- private bool? persistence_supported;
private int ui_manager_id;
@@ -75,6 +73,8 @@ namespace Banshee.NotificationArea
private TrackInfo current_track;
private Notification current_nf;
+ private const int icon_size = 42;
+
public NotificationAreaService ()
{
}
@@ -153,6 +153,7 @@ namespace Banshee.NotificationArea
show_notifications = ShowNotifications;
artwork_manager_service = ServiceManager.Get<ArtworkManager> ();
+ artwork_manager_service.AddCachedSize (icon_size);
}
public void Dispose ()
@@ -205,36 +206,18 @@ namespace Banshee.NotificationArea
}
}
- private bool ActionIconsSupported {
- get {
- if (!action_icons_supported.HasValue) {
- action_icons_supported = Notifications.Global.Capabilities != null &&
- Array.IndexOf (Notifications.Global.Capabilities, "action-icons") > -1;
- }
-
- return action_icons_supported.Value;
- }
- }
-
- private bool PersistenceSupported {
- get {
- if (!persistence_supported.HasValue) {
- persistence_supported = Notifications.Global.Capabilities != null &&
- Array.IndexOf (Notifications.Global.Capabilities, "persistence") > -1;
- }
-
- return persistence_supported.Value;
- }
- }
-
private bool BuildNotificationArea ()
{
- if (PersistenceSupported) {
- Log.Debug ("Notification daemon supports persistence, no status icon needed");
- return true;
+ if (Environment.OSVersion.Platform == PlatformID.Unix) {
+ try {
+ notif_area = new X11NotificationAreaBox ();
+ } catch {
+ }
}
- notif_area = new GtkNotificationAreaBox (elements_service.PrimaryWindow);
+ if (notif_area == null) {
+ notif_area = new GtkNotificationAreaBox (elements_service.PrimaryWindow);
+ }
if (notif_area == null) {
return false;
@@ -356,6 +339,9 @@ namespace Banshee.NotificationArea
try {
if (NotifyOnCloseSchema.Get ()) {
Gdk.Pixbuf image = IconThemeUtils.LoadIcon (48, Banshee.ServiceStack.Application.IconName);
+ if (image != null) {
+ image = image.ScaleSimple (icon_size, icon_size, Gdk.InterpType.Bilinear);
+ }
Notification nf = new Notification (
Catalog.GetString ("Still Running"),
@@ -394,9 +380,7 @@ namespace Banshee.NotificationArea
break;
}
- if (notif_area != null) {
- notif_area.OnPlayerEvent (args);
- }
+ notif_area.OnPlayerEvent (args);
}
private void OnRatingChanged (object o, EventArgs args)
@@ -443,33 +427,40 @@ namespace Banshee.NotificationArea
return;
}
- // If we have persistent notifications, we show a notification even if the main window has focus
- // so that the information displayed (track title, etc.) gets updated.
- if (!PersistenceSupported) {
- foreach (var window in elements_service.ContentWindows) {
- if (window.HasToplevelFocus) {
- return;
- }
+ foreach (var window in elements_service.ContentWindows) {
+ if (window.HasToplevelFocus) {
+ return;
}
}
+ bool is_notification_daemon = false;
+ try {
+ var name = Notifications.Global.ServerInformation.Name;
+ is_notification_daemon = name == "notification-daemon" || name == "Notification Daemon";
+ } catch {
+ // This will be reached if no notification daemon is running
+ return;
+ }
+
string message = GetByFrom (
current_track.ArtistName, current_track.DisplayArtistName,
current_track.AlbumTitle, current_track.DisplayAlbumTitle);
string image = null;
- image = CoverArtSpec.GetPath (current_track.ArtworkId);
+ image = is_notification_daemon
+ ? CoverArtSpec.GetPathForSize (current_track.ArtworkId, icon_size)
+ : CoverArtSpec.GetPath (current_track.ArtworkId);
if (!File.Exists (new SafeUri(image))) {
if (artwork_manager_service != null) {
// artwork does not exist, try looking up the pixbuf to trigger scaling or conversion
- Gdk.Pixbuf tmp_pixbuf = artwork_manager_service.LookupPixbuf (current_track.ArtworkId);
+ Gdk.Pixbuf tmp_pixbuf = is_notification_daemon
+ ? artwork_manager_service.LookupScalePixbuf (current_track.ArtworkId, icon_size)
+ : artwork_manager_service.LookupPixbuf (current_track.ArtworkId);
if (tmp_pixbuf == null) {
- // TODO: image should be set to "audio-x-generic", but icon names are not supported by the
- // notification daemon in GNOME Shell. See https://bugzilla.gnome.org/show_bug.cgi?id=665957
- image = null;
+ image = "audio-x-generic";
} else {
tmp_pixbuf.Dispose ();
}
@@ -479,45 +470,18 @@ namespace Banshee.NotificationArea
try {
if (current_nf == null) {
current_nf = new Notification (current_track.DisplayTrackTitle,
- message, Banshee.ServiceStack.Application.IconName);
+ message, image, notif_area.Widget);
} else {
current_nf.Summary = current_track.DisplayTrackTitle;
current_nf.Body = message;
- current_nf.IconName = Banshee.ServiceStack.Application.IconName;
- if (notif_area != null) {
- current_nf.AttachToWidget (notif_area.Widget);
- }
+ current_nf.IconName = image;
+ current_nf.AttachToWidget (notif_area.Widget);
}
current_nf.Urgency = Urgency.Low;
current_nf.Timeout = 4500;
-
if (!current_track.IsLive && ActionsSupported && interface_action_service.PlaybackActions["NextAction"].Sensitive) {
- if (ActionIconsSupported) {
- current_nf.AddHint ("action-icons", true);
-
- // We need to use an icon name as the action id, so that the notification uses that icon
- current_nf.AddAction ("media-skip-backward",
- Catalog.GetString("Previous"), OnPreviousTrack);
-
- bool is_playing = ServiceManager.PlayerEngine.IsPlaying ();
- current_nf.AddAction (is_playing ? "media-playback-pause" : "media-playback-start",
- interface_action_service.PlaybackActions["PlayPauseAction"].Label, OnPlayPause);
- }
-
- current_nf.AddAction ("media-skip-forward",
- Catalog.GetString("Skip this item"), OnNextTrack);
- }
-
- if (image == null) {
- current_nf.RemoveHint ("image-path");
- } else {
- current_nf.AddHint ("image-path", image);
- }
-
- if (PersistenceSupported) {
- current_nf.AddHint ("resident", true);
+ current_nf.AddAction ("skip-song", Catalog.GetString("Skip this item"), OnSongSkipped);
}
-
current_nf.Show ();
} catch (Exception e) {
Hyena.Log.Warning (Catalog.GetString ("Cannot show notification"), e.Message, false);
@@ -560,19 +524,11 @@ namespace Banshee.NotificationArea
return markup;
}
- private void OnPreviousTrack (object o, ActionArgs args)
+ private void OnSongSkipped (object o, ActionArgs args)
{
- ServiceManager.PlaybackController.Previous ();
- }
-
- private void OnPlayPause (object o, ActionArgs args)
- {
- ServiceManager.PlayerEngine.TogglePlaying ();
- }
-
- private void OnNextTrack (object o, ActionArgs args)
- {
- ServiceManager.PlaybackController.Next ();
+ if (args.Action == "skip-song") {
+ ServiceManager.PlaybackController.Next ();
+ }
}
public bool ShowNotifications {
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs
index c6865ac..8c5e81e 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs
@@ -67,23 +67,18 @@ namespace Banshee.NotificationArea
box.ShowAll ();
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- seek_slider.Disconnect ();
- header.Dispose ();
- }
- base.Dispose (disposing);
+ seek_slider.Disconnect ();
+ header.Dispose ();
+ base.Dispose ();
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- StyleContext.Save ();
- StyleContext.AddClass ("tooltip");
- StyleContext.RenderBackground (cr, 0, 0, Allocation.Width, Allocation.Height);
- StyleContext.RenderFrame (cr, 0, 0, Allocation.Width, Allocation.Height);
- StyleContext.Restore ();
- return base.OnDrawn (cr);
+ Gtk.Style.PaintFlatBox (Style, GdkWindow, StateType.Normal, ShadowType.Out, evnt.Area, this, "tooltip",
+ 0, 0, Allocation.Width, Allocation.Height);
+ return base.OnExposeEvent (evnt);
}
}
}
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs
new file mode 100644
index 0000000..57edd92
--- /dev/null
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs
@@ -0,0 +1,647 @@
+//
+// X11NotificationArea.cs
+//
+// Authors:
+// Todd Berman <tberman at off.net>
+// Ed Catmur <ed at catmur.co.uk>
+// Miguel de Icaza <miguel at novell.com>
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright (C) 2005 Todd Berman
+// Copyright (C) 2005 Ed Catmur
+// Copyright (C) 2005-2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+// NOTE: throughout IntPtr is used for the Xlib long type, as this tends to
+// have the correct width and does not require any configure checks.
+
+using System;
+using System.Runtime.InteropServices;
+
+using Gtk;
+using Gdk;
+
+#pragma warning disable 0169, 0414
+
+public class X11NotificationArea : Plug
+{
+ private uint stamp;
+ private Orientation orientation;
+ private Visual visual;
+ private bool visual_is_rgba;
+
+ private IntPtr selection_atom;
+ private IntPtr manager_atom;
+ private IntPtr system_tray_opcode_atom;
+ private IntPtr orientation_atom;
+ private IntPtr visual_atom;
+ private IntPtr message_data_atom;
+ private IntPtr manager_window;
+ private FilterFunc filter;
+
+ public X11NotificationArea (string name)
+ {
+ Title = name;
+ Init ();
+ }
+
+ public X11NotificationArea (string name, Gdk.Screen screen)
+ {
+ Title = name;
+ Screen = screen;
+ Init ();
+ }
+
+ [DllImport ("libc")]
+ private static extern IntPtr memcpy (ref XClientMessageEvent.DataUnion dest, IntPtr src, IntPtr len);
+
+ public uint SendMessage (uint timeout, string message)
+ {
+ if (manager_window == IntPtr.Zero) {
+ return 0;
+ }
+
+ byte[] arr = System.Text.Encoding.UTF8.GetBytes (message);
+ IntPtr unmanaged_arr = Marshal.AllocHGlobal (arr.Length);
+ Marshal.Copy (arr, 0, unmanaged_arr, arr.Length);
+
+ SendManagerMessage (SystemTrayMessage.BeginMessage, (IntPtr) Id, timeout, (uint) arr.Length, ++stamp);
+
+ gdk_error_trap_push ();
+
+ for (int index = 0; index < message.Length; index += 20) {
+ XClientMessageEvent ev = new XClientMessageEvent ();
+
+ IntPtr display = gdk_x11_display_get_xdisplay (Display.Handle);
+
+ ev.type = XEventName.ClientMessage;
+ ev.window = (IntPtr) Id;
+ ev.format = 8;
+ ev.message_type = message_data_atom;
+
+ int len = Math.Min (arr.Length - index, 20);
+ memcpy (ref ev.data, (IntPtr)((int)unmanaged_arr + index), (IntPtr)len);
+
+ XSendEvent (display, manager_window, false, (IntPtr) EventMask.StructureNotifyMask, ref ev);
+ XSync (display, false);
+ }
+
+ gdk_error_trap_pop ();
+
+ return stamp;
+ }
+
+ public void CancelMessage (uint id)
+ {
+ if (id == 0) {
+ return;
+ }
+
+ SendManagerMessage (SystemTrayMessage.CancelMessage, (IntPtr) Id, id, 0, 0);
+ }
+
+ private void Init ()
+ {
+ stamp = 1;
+ orientation = Orientation.Horizontal;
+ AddEvents ((int)EventMask.PropertyChangeMask);
+ filter = new FilterFunc (ManagerFilter);
+
+ Display display = Screen.Display;
+ IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
+ selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
+ manager_atom = XInternAtom (xdisplay, "MANAGER", false);
+ system_tray_opcode_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_OPCODE", false);
+ orientation_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_ORIENTATION", false);
+ visual_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_VISUAL", false);
+ message_data_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_MESSAGE_DATA", false);
+
+ Screen.RootWindow.AddFilter (filter);
+ UpdateManagerWindow (false);
+ }
+
+ [GLib.ConnectBefore]
+ private void TransparentExposeEvent (object obj, Gtk.ExposeEventArgs args)
+ {
+ Gtk.Widget widget = (Gtk.Widget)obj;
+ Gdk.Rectangle area = args.Event.Area;
+
+ if (visual_is_rgba) {
+ Cairo.Context cr = Gdk.CairoHelper.Create (widget.GdkWindow);
+ cr.SetSourceRGBA (0, 0, 0, 0);
+ cr.Operator = Cairo.Operator.Source;
+ Gdk.CairoHelper.Region (cr, args.Event.Region);
+ cr.Fill ();
+
+ ((IDisposable)cr.Target).Dispose ();
+ ((IDisposable)cr).Dispose ();
+ } else {
+ widget.GdkWindow.ClearArea (area.X, area.Y, area.Width, area.Height);
+ }
+ }
+
+ private void MakeTransparentAgain (object obj, Gtk.StyleSetArgs args)
+ {
+ Gtk.Widget widget = (Gtk.Widget)obj;
+
+ if (visual_is_rgba) {
+ widget.GdkWindow.Background = Gdk.Color.Zero;
+ } else {
+ widget.GdkWindow.SetBackPixmap (null, true);
+ }
+ }
+
+ private void MakeTransparent (object obj, EventArgs args)
+ {
+ Gtk.Widget widget = (Gtk.Widget)obj;
+ if (widget.IsNoWindow || widget.IsAppPaintable)
+ return;
+
+ widget.AppPaintable = true;
+ if (visual_is_rgba) {
+ widget.GdkWindow.Background = Gdk.Color.Zero;
+ } else {
+ widget.DoubleBuffered = false;
+ widget.GdkWindow.SetBackPixmap (null, true);
+ }
+ widget.ExposeEvent += TransparentExposeEvent;
+ widget.StyleSet += MakeTransparentAgain;
+ }
+
+ private void SetColormap ()
+ {
+ Gtk.Widget widget = (Gtk.Widget)this;
+
+ if (visual == null || visual == Screen.SystemVisual) {
+ widget.Colormap = Screen.SystemColormap;
+ } else if (visual == Screen.RgbVisual) {
+ widget.Colormap = Screen.RgbColormap;
+ } else if (visual == Screen.RgbaVisual) {
+ widget.Colormap = Screen.RgbaColormap;
+ } else {
+ widget.Colormap = new Colormap (visual, false);
+ }
+ }
+
+ protected override void OnRealized ()
+ {
+ SetColormap ();
+ base.OnRealized ();
+ MakeTransparent (this, EventArgs.Empty);
+ SendDockRequest ();
+ }
+
+ protected override void OnAdded (Gtk.Widget child)
+ {
+ child.Realized += MakeTransparent;
+ base.OnAdded (child);
+ }
+
+ protected override void OnUnrealized ()
+ {
+ if (manager_window != IntPtr.Zero) {
+ Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
+ if (gdkwin != null) {
+ gdkwin.RemoveFilter (filter);
+ }
+ }
+
+ Screen.RootWindow.RemoveFilter (filter);
+ base.OnUnrealized ();
+ }
+
+ private void UpdateManagerWindow (bool dock_if_realized)
+ {
+ if(Handle == IntPtr.Zero || Display == null || Display.Handle == IntPtr.Zero) {
+ return;
+ }
+
+ IntPtr xdisplay = gdk_x11_display_get_xdisplay (Display.Handle);
+
+ if (manager_window != IntPtr.Zero) {
+ return;
+ }
+
+ XGrabServer (xdisplay);
+
+ manager_window = XGetSelectionOwner (xdisplay, selection_atom);
+ if (manager_window != IntPtr.Zero) {
+ XSelectInput (xdisplay, manager_window, (IntPtr) (EventMask.StructureNotifyMask | EventMask.PropertyChangeMask));
+ }
+
+ XUngrabServer (xdisplay);
+ XFlush (xdisplay);
+
+ if (manager_window != IntPtr.Zero) {
+ Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
+ if (gdkwin != null) {
+ gdkwin.AddFilter (filter);
+ }
+
+ GetOrientationProperty ();
+ GetVisualProperty ();
+
+ if (IsRealized) {
+ if ((visual == null && Visual == Screen.SystemVisual)
+ || visual == Visual) {
+ // Already have the right visual, can just dock
+ if (dock_if_realized) {
+ SendDockRequest ();
+ }
+ } else {
+ // Need to re-realize the widget to get the right visual
+ Hide ();
+ Unrealize ();
+ Show ();
+ }
+ }
+ }
+ }
+
+ private void SendDockRequest ()
+ {
+ SendManagerMessage (SystemTrayMessage.RequestDock, manager_window, Id, 0, 0);
+ }
+
+ private void SendManagerMessage (SystemTrayMessage message, IntPtr window, uint data1, uint data2, uint data3)
+ {
+ XClientMessageEvent ev = new XClientMessageEvent ();
+ IntPtr display;
+
+ ev.type = XEventName.ClientMessage;
+ ev.window = window;
+ ev.message_type = system_tray_opcode_atom;
+ ev.format = 32;
+ ev.data.ptr1 = (IntPtr)gdk_x11_get_server_time (GdkWindow.Handle);
+ ev.data.ptr2 = (IntPtr)message;
+ ev.data.ptr3 = (IntPtr)data1;
+ ev.data.ptr4 = (IntPtr)data2;
+ ev.data.ptr5 = (IntPtr)data3;
+
+ display = gdk_x11_display_get_xdisplay (Display.Handle);
+ gdk_error_trap_push ();
+ XSendEvent (display, manager_window, false, (IntPtr) EventMask.NoEventMask, ref ev);
+ XSync (display, false);
+ gdk_error_trap_pop ();
+ }
+
+ private FilterReturn ManagerFilter (IntPtr xevent, Event evnt)
+ {
+ XAnyEvent xev = (XAnyEvent) Marshal.PtrToStructure (xevent, typeof(XAnyEvent));
+
+ if (xev.type == XEventName.ClientMessage){
+ XClientMessageEvent xclient = (XClientMessageEvent) Marshal.PtrToStructure (xevent, typeof(XClientMessageEvent));
+
+ if (xclient.message_type == manager_atom && xclient.data.ptr2 == selection_atom) {
+ UpdateManagerWindow (true);
+ return FilterReturn.Continue;
+ }
+ }
+
+ if (xev.window == manager_window) {
+ if (xev.type == XEventName.PropertyNotify){
+ XPropertyEvent xproperty = (XPropertyEvent) Marshal.PtrToStructure (xevent, typeof(XPropertyEvent));
+ if (xproperty.atom == orientation_atom) {
+ GetOrientationProperty();
+ return FilterReturn.Continue;
+ }
+ }
+
+ if (xev.type == XEventName.DestroyNotify) {
+ ManagerWindowDestroyed();
+ }
+ }
+
+ return FilterReturn.Continue;
+ }
+
+ private void ManagerWindowDestroyed ()
+ {
+ if (manager_window != IntPtr.Zero) {
+ Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint) manager_window);
+
+ if (gdkwin != null) {
+ gdkwin.RemoveFilter (filter);
+ }
+
+ manager_window = IntPtr.Zero;
+ UpdateManagerWindow (true);
+ }
+ }
+
+ private void GetOrientationProperty ()
+ {
+ IntPtr display;
+ IntPtr type;
+ int format;
+ IntPtr prop_return;
+ IntPtr nitems, bytes_after;
+ int error, result;
+
+ if (manager_window == IntPtr.Zero) {
+ return;
+ }
+
+ display = gdk_x11_display_get_xdisplay (Display.Handle);
+
+ gdk_error_trap_push ();
+ type = IntPtr.Zero;
+
+ result = XGetWindowProperty (display, manager_window, orientation_atom, (IntPtr) 0,
+ (IntPtr) System.Int32.MaxValue, false, (IntPtr) XAtom.Cardinal, out type, out format,
+ out nitems, out bytes_after, out prop_return);
+
+ error = gdk_error_trap_pop ();
+
+ if (error != 0 || result != 0) {
+ return;
+ }
+
+ if (type == (IntPtr) XAtom.Cardinal) {
+ orientation = ((SystemTrayOrientation) Marshal.ReadInt32 (prop_return) == SystemTrayOrientation.Horz)
+ ? Orientation.Horizontal
+ : Orientation.Vertical;
+ }
+
+ if (prop_return != IntPtr.Zero) {
+ XFree (prop_return);
+ }
+ }
+
+ private void GetVisualProperty ()
+ {
+ IntPtr display;
+ IntPtr type;
+ int format;
+ IntPtr prop_return;
+ IntPtr nitems, bytes_after;
+ int error, result;
+
+ if (manager_window == IntPtr.Zero) {
+ return;
+ }
+
+ display = gdk_x11_display_get_xdisplay (Display.Handle);
+
+ gdk_error_trap_push ();
+ type = IntPtr.Zero;
+
+ result = XGetWindowProperty (display, manager_window, visual_atom, (IntPtr) 0,
+ (IntPtr) System.Int32.MaxValue, false, (IntPtr) XAtom.VisualId, out type, out format,
+ out nitems, out bytes_after, out prop_return);
+
+ error = gdk_error_trap_pop ();
+
+ if (error != 0 || result != 0) {
+ return;
+ }
+
+ if (type == (IntPtr) XAtom.VisualId) {
+ int visual_id = Marshal.ReadInt32 (prop_return);
+ IntPtr raw_ret = gdk_x11_screen_lookup_visual (Screen.Handle, visual_id);
+ visual = GLib.Object.GetObject (raw_ret) as Gdk.Visual;
+ }
+
+#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;
+
+ if (prop_return != IntPtr.Zero) {
+ XFree (prop_return);
+ }
+ }
+
+#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);
+
+ [DllImport ("libgdk-x11-2.0.so.0")]
+ private static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
+
+ [DllImport ("libgdk-x11-2.0.so.0")]
+ private static extern int gdk_x11_get_server_time (IntPtr window);
+
+ [DllImport ("libgdk-x11-2.0.so.0")]
+ private static extern void gdk_error_trap_push ();
+
+ [DllImport ("libgdk-x11-2.0.so.0")]
+ private static extern int gdk_error_trap_pop ();
+
+ [DllImport ("libX11.so.6")]
+ private extern static IntPtr XInternAtom(IntPtr display, string atom_name, bool only_if_exists);
+
+ [DllImport ("libX11.so.6")]
+ private extern static void XGrabServer (IntPtr display);
+
+ [DllImport ("libX11.so.6")]
+ private extern static void XUngrabServer (IntPtr display);
+
+ [DllImport ("libX11.so.6")]
+ private extern static int XFlush (IntPtr display);
+
+ [DllImport ("libX11.so.6")]
+ private extern static int XSync (IntPtr display, bool discard);
+
+ [DllImport ("libX11.so.6")]
+ private extern static int XFree (IntPtr display);
+
+ [DllImport ("libX11.so.6")]
+ private extern static IntPtr XGetSelectionOwner (IntPtr display, IntPtr atom);
+
+ [DllImport ("libX11.so.6")]
+ private extern static IntPtr XSelectInput (IntPtr display, IntPtr window, IntPtr mask);
+
+ [DllImport ("libX11.so.6")]
+ private extern static int XSendEvent (IntPtr display, IntPtr window, bool propagate, IntPtr event_mask,
+ ref XClientMessageEvent send_event);
+
+ [DllImport ("libX11.so.6")]
+ private extern static int XGetWindowProperty (IntPtr display, IntPtr w, IntPtr property, IntPtr long_offset,
+ IntPtr long_length, bool deleteProp, IntPtr req_type,
+ out IntPtr actual_type_return, out int actual_format_return,
+ out IntPtr nitems_return, out IntPtr bytes_after_return,
+ out IntPtr prop_return);
+
+ [Flags]
+ private enum EventMask {
+ NoEventMask = 0,
+ KeyPressMask = 1 << 0,
+ KeyReleaseMask = 1 << 1,
+ ButtonPressMask = 1 << 2,
+ ButtonReleaseMask = 1 << 3,
+ EnterWindowMask = 1 << 4,
+ LeaveWindowMask = 1 << 5,
+ PointerMotionMask = 1 << 6,
+ PointerMotionHintMask = 1 << 7,
+ Button1MotionMask = 1 << 8,
+ Button2MotionMask = 1 << 9,
+ Button3MotionMask = 1 << 10,
+ Button4MotionMask = 1 << 11,
+ Button5MotionMask = 1 << 12,
+ ButtonMotionMask = 1 << 13,
+ KeymapStateMask = 1 << 14,
+ ExposureMask = 1 << 15,
+ VisibilityChangeMask = 1 << 16,
+ StructureNotifyMask = 1 << 17,
+ ResizeRedirectMask = 1 << 18,
+ SubstructureNotifyMask = 1 << 19,
+ SubstructureRedirectMask = 1 << 20,
+ FocusChangeMask = 1 << 21,
+ PropertyChangeMask = 1 << 22,
+ ColormapChangeMask = 1 << 23,
+ OwnerGrabButtonMask = 1 << 24
+ }
+
+ private enum SystemTrayMessage {
+ RequestDock = 0,
+ BeginMessage = 1,
+ CancelMessage = 2
+ }
+
+ private enum SystemTrayOrientation {
+ Horz = 0,
+ Vert = 1
+ }
+
+ private enum XEventName {
+ KeyPress = 2,
+ KeyRelease = 3,
+ ButtonPress = 4,
+ ButtonRelease = 5,
+ MotionNotify = 6,
+ EnterNotify = 7,
+ LeaveNotify = 8,
+ FocusIn = 9,
+ FocusOut = 10,
+ KeymapNotify = 11,
+ Expose = 12,
+ GraphicsExpose = 13,
+ NoExpose = 14,
+ VisibilityNotify = 15,
+ CreateNotify = 16,
+ DestroyNotify = 17,
+ UnmapNotify = 18,
+ MapNotify = 19,
+ MapRequest = 20,
+ ReparentNotify = 21,
+ ConfigureNotify = 22,
+ ConfigureRequest = 23,
+ GravityNotify = 24,
+ ResizeRequest = 25,
+ CirculateNotify = 26,
+ CirculateRequest = 27,
+ PropertyNotify = 28,
+ SelectionClear = 29,
+ SelectionRequest = 30,
+ SelectionNotify = 31,
+ ColormapNotify = 32,
+ ClientMessage = 33,
+ MappingNotify = 34,
+ TimerNotify = 100,
+ LASTEvent
+ }
+
+ private enum XAtom {
+ Cardinal = 6,
+ VisualId = 32,
+ LASTAtom
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
+ private struct XAnyEvent
+ {
+ internal XEventName type;
+ internal IntPtr serial;
+ internal bool send_event;
+ internal IntPtr display;
+ internal IntPtr window;
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
+ private struct XPropertyEvent
+ {
+ internal XEventName type;
+ internal IntPtr serial;
+ internal bool send_event;
+ internal IntPtr display;
+ internal IntPtr window;
+ internal IntPtr atom;
+ internal IntPtr time;
+ internal int state;
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
+ private struct XClientMessageEvent
+ {
+ internal XEventName type;
+ internal IntPtr serial;
+ internal bool send_event;
+ internal IntPtr display;
+ internal IntPtr window;
+ internal IntPtr message_type;
+ internal int format;
+
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct DataUnion
+ {
+ internal IntPtr ptr1;
+ internal IntPtr ptr2;
+ internal IntPtr ptr3;
+ internal IntPtr ptr4;
+ internal IntPtr ptr5;
+ }
+
+ internal DataUnion data;
+ }
+}
+
+#pragma warning restore 0169, 0414
+
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
similarity index 50%
copy from src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
copy to src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
index 003ac71..fabbbac 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
@@ -1,10 +1,12 @@
//
-// GtkNotificationAreaBox.cs
+// X11NotificationAreaBox.cs
//
// Author:
// Aaron Bockover <abockover at novell.com>
+// Sebastian Dröge <slomo at circular-chaos.org>
+// Alexander Hixon <hixon.alexander at mediati.org>
//
-// Copyright (C) 2008 Novell, Inc.
+// Copyright (C) 2005-2008 Novell, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -30,44 +32,182 @@ using System;
using Mono.Unix;
using Gtk;
-using Banshee.Gui;
-using Banshee.ServiceStack;
using Banshee.MediaEngine;
+using Banshee.ServiceStack;
+using Banshee.Gui;
namespace Banshee.NotificationArea
{
- public class GtkNotificationAreaBox : StatusIcon, INotificationAreaBox
+ public class X11NotificationAreaBox : X11NotificationArea, INotificationAreaBox
{
- public event EventHandler Disconnected;
- public event EventHandler Activated;
- public event PopupMenuHandler PopupMenuEvent;
+ private enum PanelOrientation {
+ Horizontal,
+ Vertical
+ }
+
+ private EventBox event_box;
+ private Image icon;
private TrackInfoPopup popup;
private bool can_show_popup = false;
private bool cursor_over_trayicon = false;
private bool hide_delay_started = false;
-
+ private int panel_size;
+
+ public event EventHandler Disconnected;
+ public event EventHandler Activated;
+ public event PopupMenuHandler PopupMenuEvent;
+
public Widget Widget {
- get { return null; }
+ get { return event_box; }
}
- public GtkNotificationAreaBox (BaseClientWindow window)
+ [System.Runtime.InteropServices.DllImport ("libgdk-x11-2.0.so.0")]
+ private static extern int gdk_x11_get_default_screen ();
+
+ public X11NotificationAreaBox () : base (Catalog.GetString ("Banshee"))
{
- Visible = false;
- IconName = (IconThemeUtils.HasIcon ("banshee-panel")) ?
- "banshee-panel" : Banshee.ServiceStack.Application.IconName;
+ // NOTE: this is a dummy call to ensure we're actually on X11,
+ // otherwise X11 calls won't get made until we are realized,
+ // at which point it is too late to fall back to xplat GTK tray
+ gdk_x11_get_default_screen ();
- HasTooltip = true;
- base.Activate += delegate {OnActivated ();};
- base.PopupMenu += delegate {OnPopupMenuEvent ();};
- popup = new TrackInfoPopup ();
+ event_box = new EventBox ();
+ Add (event_box);
+ icon = new Image ();
+
+ // Load a 16x16-sized icon to ensure we don't end up with a 1x1 pixel.
+ panel_size = 16;
+ event_box.Add (icon);
+
+ event_box.ButtonPressEvent += OnButtonPressEvent;
+ event_box.EnterNotifyEvent += OnEnterNotifyEvent;
+ event_box.LeaveNotifyEvent += OnLeaveNotifyEvent;
+ event_box.ScrollEvent += OnMouseScroll;
+
+ event_box.ShowAll ();
+ }
+
+ public override void Dispose ()
+ {
+ HidePopup ();
+
+ event_box.ButtonPressEvent -= OnButtonPressEvent;
+ event_box.EnterNotifyEvent -= OnEnterNotifyEvent;
+ event_box.LeaveNotifyEvent -= OnLeaveNotifyEvent;
+ event_box.ScrollEvent -= OnMouseScroll;
+
+ Destroy ();
}
public void PositionMenu (Menu menu, out int x, out int y, out bool push_in)
{
- StatusIcon.PositionMenu (menu, out x, out y, out push_in, Handle);
+ PositionWidget (menu, out x, out y, 0);
+ push_in = true;
+ }
+
+ private bool PositionWidget (Widget widget, out int x, out int y, int yPadding)
+ {
+ int button_y, panel_width, panel_height;
+ Gtk.Requisition requisition = widget.SizeRequest ();
+
+ event_box.GdkWindow.GetOrigin (out x, out button_y);
+ (event_box.Toplevel as Gtk.Window).GetSize (out panel_width, out panel_height);
+
+ bool on_bottom = button_y + panel_height + requisition.Height >= event_box.Screen.Height;
+
+ y = on_bottom
+ ? button_y - requisition.Height - yPadding
+ : button_y + panel_height + yPadding;
+
+ return on_bottom;
+ }
+
+#region Panel Icon Sizing
+
+ // This code has been shamelessly ripped off from
+ // Tomboy, the wonderful life organizer!
+
+ private void ConfigureIconSize ()
+ {
+ // For some reason, the first time we ask for the allocation,
+ // it's a 1x1 pixel. Prevent against this by returning a
+ // reasonable default. Setting the icon causes OnSizeAllocated
+ // to be called again anyhow. (--Boyd)
+ int icon_size = panel_size;
+ if (icon_size < 16) {
+ icon_size = 16;
+ }
+
+ // Control specifically which icon is used at the smaller sizes
+ // so that no scaling occurs. See bug #403500 for more info (--Boyd)
+ if (icon_size <= 21) {
+ icon_size = 16;
+ } else if (icon_size <= 31) {
+ icon_size = 22;
+ } else if (icon_size <= 47) {
+ icon_size = 32;
+ }
+
+ icon.IconName = (IconThemeUtils.HasIcon ("banshee-panel")) ?
+ "banshee-panel" : Banshee.ServiceStack.Application.IconName;
+ icon.PixelSize = icon_size;
+ }
+
+ private PanelOrientation GetPanelOrientation ()
+ {
+ // Determine whether the tray is inside a horizontal or vertical
+ // panel so the size of the icon can adjust correctly.
+
+ if (event_box.ParentWindow == null) {
+ return PanelOrientation.Horizontal;
+ }
+
+ Gdk.Window top_level_window = event_box.ParentWindow.Toplevel;
+
+ Gdk.Rectangle rect = top_level_window.FrameExtents;
+ if (rect.Width < rect.Height) {
+ return PanelOrientation.Vertical;
+ }
+
+ return PanelOrientation.Horizontal;
+ }
+
+ private bool first_alloc = true;
+
+ protected override void OnSizeAllocated (Gdk.Rectangle rect)
+ {
+ // Ignore the first allocation dimensions (typically 200x200) and use only
+ // the allocation's position and the default icon size for dimension (16x16).
+ // A proper size request will be queued later through ConfigureIconSize ().
+ // Fix for BGO #540885
+ if (first_alloc) {
+ base.OnSizeAllocated (new Gdk.Rectangle (rect.X, rect.Y, panel_size, panel_size));
+ first_alloc = false;
+ return;
+ }
+
+ base.OnSizeAllocated (rect);
+
+ if (GetPanelOrientation () == PanelOrientation.Horizontal) {
+ if (panel_size == Allocation.Height) {
+ return;
+ }
+
+ panel_size = Allocation.Height;
+ } else {
+ if (panel_size == Allocation.Width) {
+ return;
+ }
+
+ panel_size = Allocation.Width;
+ }
+
+ ConfigureIconSize ();
}
+#endregion
+
private void HidePopup ()
{
if (popup == null) {
@@ -113,28 +253,18 @@ namespace Banshee.NotificationArea
private void PositionPopup ()
{
int x, y;
- Gdk.Screen screen;
- Gdk.Rectangle area;
- Orientation orientation;
-
- GetGeometry (out screen, out area, out orientation);
+ Gtk.Requisition event_box_req = event_box.SizeRequest ();
+ Gtk.Requisition popup_req = popup.SizeRequest ();
- Gtk.Requisition popup_min_size, popup_natural_size;
- popup.GetPreferredSize (out popup_min_size, out popup_natural_size);
+ PositionWidget (popup, out x, out y, 5);
- bool on_bottom = area.Bottom + popup_natural_size.Height >= screen.Height;
+ int monitor = event_box.Screen.GetMonitorAtPoint (x, y);
+ var monitor_rect = event_box.Screen.GetMonitorGeometry(monitor);
- y = on_bottom
- ? area.Top - popup_natural_size.Height - 5
- : area.Bottom + 5;
-
- int monitor = screen.GetMonitorAtPoint (area.Left, y);
- var monitor_rect = screen.GetMonitorGeometry(monitor);
-
- x = area.Left - (popup_natural_size.Width / 2) + (area.Width / 2);
+ x = x - (popup_req.Width / 2) + (event_box_req.Width / 2);
- if (x + popup_natural_size.Width >= monitor_rect.Right - 5) {
- x = monitor_rect.Right - popup_natural_size.Width - 5;
+ if (x + popup_req.Width >= monitor_rect.Right - 5) {
+ x = monitor_rect.Right - popup_req.Width - 5;
} else if (x < monitor_rect.Left + 5) {
x = monitor_rect.Left + 5;
}
@@ -142,6 +272,62 @@ namespace Banshee.NotificationArea
popup.Move (x, y);
}
+ private void OnButtonPressEvent (object o, ButtonPressEventArgs args)
+ {
+ if (args.Event.Type != Gdk.EventType.ButtonPress) {
+ return;
+ }
+
+ switch (args.Event.Button) {
+ case 1:
+ if ((args.Event.State & Gdk.ModifierType.ControlMask) != 0) {
+ ServiceManager.PlaybackController.Next ();
+ } else {
+ OnActivated ();
+ }
+ break;
+ case 2:
+ ServiceManager.PlayerEngine.TogglePlaying ();
+ break;
+ case 3:
+ if ((args.Event.State & Gdk.ModifierType.ControlMask) != 0) {
+ ServiceManager.PlaybackController.Next ();
+ } else {
+ OnPopupMenuEvent ();
+ }
+ break;
+ }
+ }
+
+ private void OnMouseScroll (object o, ScrollEventArgs args)
+ {
+ switch (args.Event.Direction) {
+ case Gdk.ScrollDirection.Up:
+ if ((args.Event.State & Gdk.ModifierType.ControlMask) != 0) {
+ ServiceManager.PlayerEngine.Volume += (ushort)PlayerEngine.VolumeDelta;
+ } else if((args.Event.State & Gdk.ModifierType.ShiftMask) != 0) {
+ ServiceManager.PlayerEngine.Position += PlayerEngine.SkipDelta;
+ } else {
+ ServiceManager.PlaybackController.Next ();
+ }
+ break;
+
+ case Gdk.ScrollDirection.Down:
+ if ((args.Event.State & Gdk.ModifierType.ControlMask) != 0) {
+ if (ServiceManager.PlayerEngine.Volume < (ushort)PlayerEngine.VolumeDelta) {
+ ServiceManager.PlayerEngine.Volume = 0;
+ } else {
+ ServiceManager.PlayerEngine.Volume -= (ushort)PlayerEngine.VolumeDelta;
+ }
+ } else if((args.Event.State & Gdk.ModifierType.ShiftMask) != 0) {
+ ServiceManager.PlayerEngine.Position -= PlayerEngine.SkipDelta;
+ } else {
+ ServiceManager.PlaybackController.Previous ();
+ }
+ break;
+ }
+ }
+
private void OnEnterNotifyEvent (object o, EnterNotifyEventArgs args)
{
hide_delay_started = false;
@@ -178,7 +364,7 @@ namespace Banshee.NotificationArea
{
switch (args.Event) {
case PlayerEvent.StartOfStream:
- can_show_popup = false;
+ can_show_popup = true;
break;
case PlayerEvent.EndOfStream:
@@ -194,81 +380,6 @@ namespace Banshee.NotificationArea
}
}
- protected override bool OnScrollEvent (Gdk.EventScroll evnt)
- {
- switch (evnt.Direction) {
- case Gdk.ScrollDirection.Up:
- if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
- ServiceManager.PlayerEngine.Volume += (ushort)PlayerEngine.VolumeDelta;
- } else if((evnt.State & Gdk.ModifierType.ShiftMask) != 0) {
- ServiceManager.PlayerEngine.Position += PlayerEngine.SkipDelta;
- } else {
- ServiceManager.PlaybackController.Next ();
- }
- break;
-
- case Gdk.ScrollDirection.Down:
- if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
- if (ServiceManager.PlayerEngine.Volume < (ushort)PlayerEngine.VolumeDelta) {
- ServiceManager.PlayerEngine.Volume = 0;
- } else {
- ServiceManager.PlayerEngine.Volume -= (ushort)PlayerEngine.VolumeDelta;
- }
- } else if((evnt.State & Gdk.ModifierType.ShiftMask) != 0) {
- ServiceManager.PlayerEngine.Position -= PlayerEngine.SkipDelta;
- } else {
- ServiceManager.PlaybackController.Previous ();
- }
- break;
- }
- return true;
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton evnt)
- {
- if (evnt.Type != Gdk.EventType.ButtonPress) {
- return false;
- }
-
- switch (evnt.Button) {
- case 1:
- if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
- ServiceManager.PlaybackController.Next ();
- } else {
- OnActivated ();
- }
- break;
- case 2:
- ServiceManager.PlayerEngine.TogglePlaying ();
- break;
- case 3:
- if ((evnt.State & Gdk.ModifierType.ControlMask) != 0) {
- ServiceManager.PlaybackController.Next ();
- } else {
- OnPopupMenuEvent ();
- }
- break;
- }
- return true;
- }
-
-
- protected override bool OnQueryTooltip (int x, int y, bool keyboard_mode, Tooltip tooltip)
- {
- tooltip.Custom = popup;
- return true;
- }
-
- public void Show ()
- {
- Visible = true;
- }
-
- public void Hide ()
- {
- Visible = false;
- }
-
protected virtual void OnActivated ()
{
EventHandler handler = Activated;
@@ -284,5 +395,17 @@ namespace Banshee.NotificationArea
handler (this, new PopupMenuArgs ());
}
}
+
+ protected override bool OnDestroyEvent (Gdk.Event evnt)
+ {
+ bool result = base.OnDestroyEvent (evnt);
+
+ EventHandler handler = Disconnected;
+ if (handler != null) {
+ handler (this, EventArgs.Empty);
+ }
+
+ return result;
+ }
}
}
diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.am b/src/Extensions/Banshee.NotificationArea/Makefile.am
index 5c64a80..ef855bb 100644
--- a/src/Extensions/Banshee.NotificationArea/Makefile.am
+++ b/src/Extensions/Banshee.NotificationArea/Makefile.am
@@ -5,6 +5,10 @@ GMCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
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)
@@ -15,6 +19,8 @@ SOURCES = \
Banshee.NotificationArea/INotificationAreaBox.cs \
Banshee.NotificationArea/NotificationAreaService.cs \
Banshee.NotificationArea/TrackInfoPopup.cs \
+ Banshee.NotificationArea/X11NotificationArea.cs \
+ Banshee.NotificationArea/X11NotificationAreaBox.cs \
Notifications/Notification.cs \
Notifications/Notifications.cs
diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.in b/src/Extensions/Banshee.NotificationArea/Makefile.in
index 588e583..86b6e27 100644
--- a/src/Extensions/Banshee.NotificationArea/Makefile.in
+++ b/src/Extensions/Banshee.NotificationArea/Makefile.in
@@ -52,12 +52,13 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@EXTERNAL_NOTIFY_SHARP_FALSE at am__append_1 = "-define:INTERNAL_NOTIFY_SHARP"
+ at 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.dist.mk \
$(top_srcdir)/build/build.environment.mk \
$(top_srcdir)/build/build.mk \
$(top_srcdir)/build/build.rules.mk
- at ENABLE_TESTS_TRUE@@PLATFORM_DARWIN_FALSE at am__append_2 = " $(NUNIT_LIBS)"
+ at ENABLE_TESTS_TRUE@@PLATFORM_DARWIN_FALSE at 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 \
@@ -206,23 +207,34 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
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@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -237,6 +249,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -244,6 +258,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -430,13 +446,15 @@ top_srcdir = @top_srcdir@
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 \
Banshee.NotificationArea/INotificationAreaBox.cs \
Banshee.NotificationArea/NotificationAreaService.cs \
Banshee.NotificationArea/TrackInfoPopup.cs \
+ Banshee.NotificationArea/X11NotificationArea.cs \
+ Banshee.NotificationArea/X11NotificationAreaBox.cs \
Notifications/Notification.cs \
Notifications/Notifications.cs
@@ -500,14 +518,15 @@ RESOURCES = \
# External libraries to link against, generated from configure
@PLATFORM_DARWIN_FALSE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at PLATFORM_DARWIN_FALSE@LINK_CAIRO = -r:Mono.Cairo
@PLATFORM_DARWIN_FALSE at LINK_MONO_POSIX = -r:Mono.Posix
@PLATFORM_DARWIN_FALSE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@PLATFORM_DARWIN_FALSE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@PLATFORM_DARWIN_FALSE at LINK_GLIB = $(GLIBSHARP_LIBS)
@PLATFORM_DARWIN_FALSE at LINK_GTK = $(GTKSHARP_LIBS)
@PLATFORM_DARWIN_FALSE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at PLATFORM_DARWIN_FALSE@LINK_GIO = $(GIOSHARP_LIBS)
+ at PLATFORM_DARWIN_FALSE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at PLATFORM_DARWIN_FALSE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@PLATFORM_DARWIN_FALSE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@PLATFORM_DARWIN_FALSE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@PLATFORM_DARWIN_FALSE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -622,7 +641,7 @@ RESOURCES = \
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at PLATFORM_DARWIN_FALSE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at PLATFORM_DARWIN_FALSE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_FALSE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -630,7 +649,6 @@ RESOURCES = \
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at PLATFORM_DARWIN_FALSE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -638,7 +656,7 @@ RESOURCES = \
@PLATFORM_DARWIN_FALSE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@PLATFORM_DARWIN_FALSE@ $(LINK_EXTENSION_PLAYQUEUE)
- at PLATFORM_DARWIN_FALSE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at PLATFORM_DARWIN_FALSE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@PLATFORM_DARWIN_FALSE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -657,7 +675,7 @@ RESOURCES = \
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at PLATFORM_DARWIN_FALSE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at PLATFORM_DARWIN_FALSE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@PLATFORM_DARWIN_FALSE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@PLATFORM_DARWIN_FALSE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@PLATFORM_DARWIN_FALSE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -678,7 +696,6 @@ RESOURCES = \
@ENABLE_TESTS_TRUE@@PLATFORM_DARWIN_FALSE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@PLATFORM_DARWIN_FALSE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@PLATFORM_DARWIN_FALSE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at PLATFORM_DARWIN_FALSE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@PLATFORM_DARWIN_FALSE at moduledir = $(INSTALL_DIR_RESOLVED)
@PLATFORM_DARWIN_FALSE at module_SCRIPTS = $(OUTPUT_FILES) \
@PLATFORM_DARWIN_FALSE@ Banshee.NotificationArea.dll.config
@@ -935,12 +952,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@PLATFORM_DARWIN_FALSE at build-debug:
@PLATFORM_DARWIN_FALSE@ @echo $(DEP_LINK)
- at PLATFORM_DARWIN_FALSE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at PLATFORM_DARWIN_FALSE@ $(MCS) -out:$@ $<
-
@PLATFORM_DARWIN_FALSE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at PLATFORM_DARWIN_FALSE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at PLATFORM_DARWIN_FALSE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@PLATFORM_DARWIN_FALSE@ @mkdir -p $(top_builddir)/bin
@PLATFORM_DARWIN_FALSE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@PLATFORM_DARWIN_FALSE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs b/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs
index 9b6eecc..c7afafd 100644
--- a/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs
+++ b/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs
@@ -264,7 +264,7 @@ namespace Notifications {
public void AttachToWidget (Gtk.Widget widget) {
int x, y;
- widget.Window.GetOrigin (out x, out y);
+ widget.GdkWindow.GetOrigin (out x, out y);
if (widget.GetType() != typeof (Gtk.Window) || ! widget.GetType().IsSubclassOf(typeof (Gtk.Window))) {
x += widget.Allocation.X;
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenWindow.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenWindow.cs
index 280d864..97b89c6 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenWindow.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenWindow.cs
@@ -56,14 +56,10 @@ namespace Banshee.NowPlaying
SetupWidget ();
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- cr.Save ();
- cr.SetSourceRGB (0.0, 0.0, 0.0);
- cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
- cr.Fill ();
- cr.Restore ();
- return base.OnDrawn (cr);
+ evnt.Window.DrawRectangle (Style.BlackGC, true, Allocation);
+ return base.OnExposeEvent (evnt);
}
protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
@@ -158,7 +154,7 @@ namespace Banshee.NowPlaying
private void ConfigureWindow ()
{
Gdk.Screen screen = Screen;
- int monitor = screen.GetMonitorAtWindow (parent.Window);
+ int monitor = screen.GetMonitorAtWindow (parent.GdkWindow);
Gdk.Rectangle bounds = screen.GetMonitorGeometry (monitor);
Move (bounds.X, bounds.Y);
Resize (bounds.Width, bounds.Height);
@@ -178,7 +174,7 @@ namespace Banshee.NowPlaying
base.OnRealized ();
- Window.OverrideRedirect = true;
+ GdkWindow.OverrideRedirect = true;
Screen.SizeChanged += OnScreenSizeChanged;
}
@@ -224,12 +220,12 @@ namespace Banshee.NowPlaying
// If our parent window is ever somehow activated while we are
// visible, this will ensure we merge back into the parent
if (parent.IsActive) {
- parent.Window.SkipPagerHint = false;
- parent.Window.SkipTaskbarHint = false;
+ parent.GdkWindow.SkipPagerHint = false;
+ parent.GdkWindow.SkipTaskbarHint = false;
parent.RemoveNotification ("is-active", ParentActiveNotification);
} else {
- parent.Window.SkipPagerHint = true;
- parent.Window.SkipTaskbarHint = true;
+ parent.GdkWindow.SkipPagerHint = true;
+ parent.GdkWindow.SkipTaskbarHint = true;
}
}
@@ -273,7 +269,7 @@ namespace Banshee.NowPlaying
int cursor_x, cursor_y;
int window_x, window_y;
- controls.Window.Screen.Display.GetPointer (out cursor_x, out cursor_y);
+ controls.GdkWindow.Screen.Display.GetPointer (out cursor_x, out cursor_y);
controls.GetPosition (out window_x, out window_y);
Gdk.Rectangle box = new Gdk.Rectangle (window_x, window_y,
@@ -349,19 +345,29 @@ namespace Banshee.NowPlaying
private void ShowCursor ()
{
cursor_is_hidden = false;
- Window.Cursor = null;
+ GdkWindow.Cursor = null;
}
private void HideCursor ()
{
- if (Window == null) {
+ if (GdkWindow == null) {
return;
}
- Gdk.Cursor cursor = new Gdk.Cursor (Gdk.CursorType.BlankCursor);
+ Gdk.Pixmap pixmap = Gdk.Pixmap.CreateBitmapFromData (GdkWindow, "0x0", 1, 1);
+ if (pixmap == null) {
+ return;
+ }
+
+ UpdateHiddenCursorPosition ();
+ cursor_is_hidden = true;
+
+ Gdk.Color color = new Gdk.Color (0, 0, 0);
+ Gdk.Cursor cursor = new Gdk.Cursor (pixmap, pixmap, color, color, 0, 0);
- Window.Cursor = cursor;
+ GdkWindow.Cursor = cursor;
+ pixmap.Dispose ();
cursor.Dispose ();
}
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs
index 0a1000e..0b89c4a 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs
@@ -110,25 +110,23 @@ namespace Banshee.NowPlaying
CheckIdle ();
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- video_event.ButtonPressEvent -= OnButtonPress;
- video_event.ButtonReleaseEvent -= OnButtonRelease;
- video_event.MotionNotifyEvent -= OnMouseMove;
- video_event.KeyPressEvent -= OnKeyPress;
+ video_event.ButtonPressEvent -= OnButtonPress;
+ video_event.ButtonReleaseEvent -= OnButtonRelease;
+ video_event.MotionNotifyEvent -= OnMouseMove;
+ video_event.KeyPressEvent -= OnKeyPress;
- IVideoDisplay ivideo_display = video_display as IVideoDisplay;
- if (ivideo_display != null) {
- ivideo_display.IdleStateChanged -= OnVideoDisplayIdleStateChanged;
- }
+ IVideoDisplay ivideo_display = video_display as IVideoDisplay;
+ if (ivideo_display != null) {
+ ivideo_display.IdleStateChanged -= OnVideoDisplayIdleStateChanged;
+ }
- if (video_display != null) {
- video_display = null;
- }
+ if (video_display != null) {
+ video_display = null;
}
- base.Dispose (disposing);
+ base.Dispose ();
}
protected override void OnShown ()
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingInterface.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingInterface.cs
index 8335faf..be8a5c2 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingInterface.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingInterface.cs
@@ -79,14 +79,12 @@ namespace Banshee.NowPlaying
screensaver = new ScreensaverManager ();
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- fullscreen_adapter.SuggestUnfullscreen -= OnAdapterSuggestUnfullscreen;
- fullscreen_adapter.Dispose ();
- screensaver.Dispose ();
- }
- base.Dispose (disposing);
+ base.Dispose ();
+ fullscreen_adapter.SuggestUnfullscreen -= OnAdapterSuggestUnfullscreen;
+ fullscreen_adapter.Dispose ();
+ screensaver.Dispose ();
}
private void MoveVideoExternal (bool hidden)
@@ -141,7 +139,7 @@ namespace Banshee.NowPlaying
}
previous_fullscreen_handler = service.ViewActions.Fullscreen;
- primary_window_is_fullscreen = (primary_window.Window.State & Gdk.WindowState.Fullscreen) != 0;
+ primary_window_is_fullscreen = (primary_window.GdkWindow.State & Gdk.WindowState.Fullscreen) != 0;
service.ViewActions.Fullscreen = FullscreenHandler;
DisableFullscreenAction ();
}
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs
index 4ddf305..0f6ba0e 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs
@@ -62,7 +62,7 @@ namespace Banshee.NowPlaying
Decorated = false;
DestroyWithParent = true;
- Resizable = true;
+ AllowGrow = true;
KeepAbove = true;
TransientFor = toplevel;
@@ -76,12 +76,12 @@ namespace Banshee.NowPlaying
protected override void OnRealized ()
{
- composited = Screen.IsComposited && CompositeUtils.SetRgbaVisual (this);
+ composited = CompositeUtils.IsComposited (Screen) && CompositeUtils.SetRgbaColormap (this);
AppPaintable = composited;
base.OnRealized ();
- Window.OverrideRedirect = true;
+ GdkWindow.OverrideRedirect = true;
ShapeWindow ();
Relocate ();
@@ -98,27 +98,16 @@ namespace Banshee.NowPlaying
return base.OnConfigureEvent (evnt);
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ protected override void OnSizeRequested (ref Requisition requisition)
{
- minimum_height = natural_height = 0;
-
if (Child != null) {
- Child.GetPreferredHeight (out minimum_height, out natural_height);
- }
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- minimum_width = natural_width = 0;
-
- if (Child != null) {
- Child.GetPreferredWidth (out minimum_width, out natural_width);
+ requisition = Child.SizeRequest ();
}
if (width_scale > 0 && width_scale <= 1 && TransientFor != null) {
- int monitor_num = Screen.GetMonitorAtWindow (TransientFor.Window);
+ int monitor_num = Screen.GetMonitorAtWindow (TransientFor.GdkWindow);
Gdk.Rectangle monitor = Screen.GetMonitorGeometry (monitor_num < 0 ? 0 : monitor_num);
- minimum_width = natural_width = (int)(monitor.Width * width_scale);
+ requisition.Width = (int)(monitor.Width * width_scale);
}
}
@@ -142,26 +131,32 @@ namespace Banshee.NowPlaying
Relocate ();
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- if (!composited) {
- return base.OnDrawn (cr);
+ if (!composited || evnt.Window != GdkWindow) {
+ return base.OnExposeEvent (evnt);
}
- Gdk.RGBA color = StyleContext.GetBackgroundColor (StateFlags);
+ Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
- ShapeSurface (cr, new Cairo.Color (color.Red, color.Blue, color.Green, 0.85));
+ Gdk.Color color = Style.Background (State);
- return base.OnDrawn (cr);
+ ShapeSurface (cr, new Cairo.Color (color.Red / (double) ushort.MaxValue,
+ color.Blue / (double) ushort.MaxValue,
+ color.Green / (double) ushort.MaxValue,
+ 0.85));
+
+ CairoExtensions.DisposeContext (cr);
+ return base.OnExposeEvent (evnt);
}
protected virtual void ShapeSurface (Cairo.Context cr, Cairo.Color color)
{
cr.Operator = Cairo.Operator.Source;
- using (var pattern = new Cairo.SolidPattern (color, false)) {
- cr.SetSource (pattern);
- cr.Paint ();
- }
+ Cairo.Pattern pattern = new Cairo.SolidPattern (color, false);
+ cr.Source = pattern;
+ pattern.Destroy ();
+ cr.Paint ();
}
private void ShapeWindow ()
@@ -176,7 +171,7 @@ namespace Banshee.NowPlaying
int x, y;
- toplevel.Window.GetOrigin (out x, out y);
+ toplevel.GdkWindow.GetOrigin (out x, out y);
int x_origin = x;
int y_origin = y;
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/VideoDisplay.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/VideoDisplay.cs
index b34f336..3c5e1c8 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/VideoDisplay.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/VideoDisplay.cs
@@ -56,7 +56,7 @@ namespace Banshee.NowPlaying
protected abstract Gdk.Window RenderWindow { get; }
- protected abstract void ExposeVideo ();
+ protected abstract void ExposeVideo (Gdk.EventExpose evnt);
protected override void OnDestroyed ()
{
@@ -64,21 +64,17 @@ namespace Banshee.NowPlaying
ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- // We want to draw on RenderWindow so we need another Cairo.Context
- using (var cr_window = Gdk.CairoHelper.Create (RenderWindow)) {
- cr_window.SetSourceRGB (0.0, 0.0, 0.0);
- cr_window.Rectangle (0, 0, Allocation.Width, Allocation.Height);
- cr_window.Paint ();
- }
+ RenderWindow.DrawRectangle (Style.BlackGC, true,
+ new Gdk.Rectangle (0, 0, Allocation.Width, Allocation.Height));
if (RenderWindow == null || !RenderWindow.IsVisible) {
return true;
}
if (!is_idle && ServiceManager.PlayerEngine.VideoDisplayContextType != VideoDisplayContextType.Unsupported) {
- ExposeVideo ();
+ ExposeVideo (evnt);
}
return true;
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/XOverlayVideoDisplay.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/XOverlayVideoDisplay.cs
index c9db112..de924f5 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/XOverlayVideoDisplay.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/XOverlayVideoDisplay.cs
@@ -43,16 +43,16 @@ namespace Banshee.NowPlaying
public XOverlayVideoDisplay () : base ()
{
- HasWindow = false;
+ WidgetFlags = WidgetFlags.NoWindow;
CreateVideoWindow ();
}
protected override void OnRealized ()
{
- IsRealized = true;
+ WidgetFlags |= WidgetFlags.Realized;
CreateVideoWindow ();
- Window = Parent.Window;
- video_window.Reparent (Window, 0, 0);
+ GdkWindow = Parent.GdkWindow;
+ video_window.Reparent (GdkWindow, 0, 0);
video_window.MoveResize (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
video_window.ShowUnraised ();
}
@@ -70,19 +70,21 @@ namespace Banshee.NowPlaying
Width = 0,
Height = 0,
Visual = Visual,
- Wclass = Gdk.WindowWindowClass.InputOutput,
+ Wclass = Gdk.WindowClass.InputOutput,
+ Colormap = Colormap,
EventMask = (int)(Gdk.EventMask.ExposureMask | Gdk.EventMask.VisibilityNotifyMask)
};
Gdk.WindowAttributesType attributes_mask =
Gdk.WindowAttributesType.X |
Gdk.WindowAttributesType.Y |
- Gdk.WindowAttributesType.Visual;
+ Gdk.WindowAttributesType.Visual |
+ Gdk.WindowAttributesType.Colormap;
video_window = new Gdk.Window (null, attributes, attributes_mask);
video_window.UserData = Handle;
- video_window.BackgroundPattern = null;
+ video_window.SetBackPixmap (null, false);
if (ServiceManager.PlayerEngine.VideoDisplayContextType == VideoDisplayContextType.GdkWindow) {
ServiceManager.PlayerEngine.VideoDisplayContext = video_window.Handle;
@@ -135,7 +137,7 @@ namespace Banshee.NowPlaying
return false;
}
- protected override void ExposeVideo ()
+ protected override void ExposeVideo (Gdk.EventExpose evnt)
{
if (ServiceManager.PlayerEngine.VideoDisplayContextType == VideoDisplayContextType.GdkWindow) {
ServiceManager.PlayerEngine.VideoExpose (video_window.Handle, true);
diff --git a/src/Extensions/Banshee.NowPlaying/Makefile.in b/src/Extensions/Banshee.NowPlaying/Makefile.in
index 71cdc31..e78197e 100644
--- a/src/Extensions/Banshee.NowPlaying/Makefile.in
+++ b/src/Extensions/Banshee.NowPlaying/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -459,14 +474,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -581,7 +597,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -589,7 +605,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -597,7 +612,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -616,7 +631,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -655,7 +670,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -909,12 +923,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs
index a93bf10..842ec2b 100644
--- a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs
+++ b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs
@@ -98,8 +98,8 @@ namespace Banshee.OpticalDisc.AudioCd
track.TrackCount = n;
track.DiscNumber = 1;
track.Duration = durations[i];
- track.ArtistName = ArtistInfo.UnknownArtistName;
- track.AlbumTitle = AlbumInfo.UnknownAlbumTitle;
+ track.ArtistName = Catalog.GetString ("Unknown Artist");
+ track.AlbumTitle = Catalog.GetString ("Unknown Album");
track.TrackTitle = String.Format (Catalog.GetString ("Track {0}"), track.TrackNumber);
track.FileSize = PCM_FACTOR * (uint)track.Duration.TotalSeconds;
Add (track);
diff --git a/src/Extensions/Banshee.OpticalDisc/Makefile.in b/src/Extensions/Banshee.OpticalDisc/Makefile.in
index fa95a1c..921d937 100644
--- a/src/Extensions/Banshee.OpticalDisc/Makefile.in
+++ b/src/Extensions/Banshee.OpticalDisc/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -462,14 +477,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -584,7 +600,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -592,7 +608,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -600,7 +615,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -619,7 +634,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -658,7 +673,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -912,12 +926,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs
index 94c54ca..1a8caa9 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs
@@ -117,13 +117,11 @@ namespace Banshee.PlayQueue
Register ();
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- playqueue.Updated -= OnUpdated;
- ServiceManager.SourceManager.ActiveSourceChanged -= OnSourceUpdated;
- }
- base.Dispose (disposing);
+ playqueue.Updated -= OnUpdated;
+ ServiceManager.SourceManager.ActiveSourceChanged -= OnSourceUpdated;
+ base.Dispose ();
}
#region Action Handlers
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
index a85059a..a62d8ed 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
@@ -237,7 +237,7 @@ namespace Banshee.PlayQueue
}
}
- private void EnqueueId (long trackId, bool prepend, bool generated)
+ private void EnqueueId (int trackId, bool prepend, bool generated)
{
if (trackId <= 0) {
return;
@@ -549,7 +549,7 @@ namespace Banshee.PlayQueue
private void BindToDatabase ()
{
- long result = ServiceManager.DbConnection.Query<long> (
+ int result = ServiceManager.DbConnection.Query<int> (
"SELECT PlaylistID FROM CorePlaylists WHERE Special = 1 AND Name = ? LIMIT 1",
special_playlist_name
);
@@ -1015,7 +1015,7 @@ namespace Banshee.PlayQueue
public static readonly SchemaEntry<string> PopulateFromSchema = new SchemaEntry<string> (
"plugins.play_queue", "populate_from",
- MusicLibrarySource.SourceName,
+ ServiceManager.SourceManager.MusicLibrary.Name,
"Source to poplulate from",
"Name of the source to populate the the Play Queue from"
);
diff --git a/src/Extensions/Banshee.PlayQueue/Makefile.in b/src/Extensions/Banshee.PlayQueue/Makefile.in
index d3c2065..f3d3c5d 100644
--- a/src/Extensions/Banshee.PlayQueue/Makefile.in
+++ b/src/Extensions/Banshee.PlayQueue/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -454,14 +469,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -576,7 +592,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -584,7 +600,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -592,7 +607,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -611,7 +626,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -650,7 +665,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -904,12 +918,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs
index 18dece8..1aaf514 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs
@@ -67,8 +67,8 @@ namespace Banshee.PlayerMigration
Title = Catalog.GetString ("iTunes Importer");
Resizable = false;
- ContentArea.BorderWidth = 8;
- ContentArea.Spacing = 8;
+ VBox.BorderWidth = 8;
+ VBox.Spacing = 8;
Button cancel_button = new Button (Stock.Cancel);
cancel_button.Clicked += delegate { Respond (ResponseType.Cancel); };
@@ -99,7 +99,7 @@ namespace Banshee.PlayerMigration
PackCheckboxes (vbox);
- ContentArea.ShowAll ();
+ VBox.ShowAll ();
}
protected virtual void PackCheckboxes (VBox vbox)
@@ -123,12 +123,12 @@ namespace Banshee.PlayerMigration
hbox.PackStart (label1, false, false, 0);
Button browse_button = new Button (hbox);
browse_button.Clicked += OnBrowseButtonClicked;
- ContentArea.PackStart (browse_button, false, false, 0);
+ VBox.PackStart (browse_button, false, false, 0);
ratings.Sensitive = stats.Sensitive = playlists.Sensitive = import_button.Sensitive = false;
}
- ContentArea.PackStart (vbox, false, false, 0);
+ VBox.PackStart (vbox, false, false, 0);
}
private void OnBrowseButtonClicked (object o, EventArgs args)
@@ -207,11 +207,11 @@ namespace Banshee.PlayerMigration
chooser.ShowAll ();
vbox.PackStart (chooser, true, true, 0);
- ContentArea.PackStart (vbox, true, true, 0);
+ VBox.PackStart (vbox, true, true, 0);
DefaultResponse = ResponseType.Cancel;
- ContentArea.ShowAll ();
+ VBox.ShowAll ();
}
}
}
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs
index db7f2aa..0034c0d 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs
@@ -62,7 +62,7 @@ namespace Banshee.PlayerMigration
public string[] query_dirs;
public bool get_ratings, get_stats, get_playlists, user_provided_prefix, empty_library;
public int total_songs, total_processed;
- public Dictionary<int, long> track_ids = new Dictionary<int, long> (); // key=itunes_id, value=banshee_id
+ public Dictionary<int, int> track_ids = new Dictionary<int, int> (); // key=itunes_id, value=banshee_id
}
private readonly object mutex = new object ();
@@ -574,7 +574,7 @@ namespace Banshee.PlayerMigration
while (xml_reader.ReadToFollowing ("integer") && !CheckForCanceled ()) {
xml_reader.Read ();
int itunes_id = Int32.Parse (xml_reader.ReadContentAsString ());
- long track_id;
+ int track_id;
if (data.track_ids.TryGetValue (itunes_id, out track_id)) {
try {
ServiceManager.DbConnection.Execute (
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
index 060f939..b915f2e 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
@@ -347,7 +347,7 @@ namespace Banshee.PlayerMigration
continue;
}
- long track_id = ServiceManager.SourceManager.MusicLibrary.GetTrackIdForUri (entry.InnerText);
+ int track_id = ServiceManager.SourceManager.MusicLibrary.GetTrackIdForUri (entry.InnerText);
if (track_id > 0) {
ServiceManager.DbConnection.Execute (insert_command, track_id);
}
diff --git a/src/Extensions/Banshee.PlayerMigration/Makefile.in b/src/Extensions/Banshee.PlayerMigration/Makefile.in
index 4031024..ac02742 100644
--- a/src/Extensions/Banshee.PlayerMigration/Makefile.in
+++ b/src/Extensions/Banshee.PlayerMigration/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -447,14 +462,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -569,7 +585,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -577,7 +593,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -585,7 +600,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -604,7 +619,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -643,7 +658,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -897,12 +911,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackListModel.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackListModel.cs
index 7cc2a58..50e0b6e 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackListModel.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackListModel.cs
@@ -61,7 +61,7 @@ namespace Banshee.Podcasting.Gui
{
From = String.Format ("{0}, {1}, {2}, {3}", provider.From, Feed.Provider.TableName, FeedItem.Provider.TableName, FeedEnclosure.Provider.TableName);
- long podcast_library_dbid = (source as PodcastSource ?? source.Parent as PodcastSource).DbId;
+ int podcast_library_dbid = (source as PodcastSource ?? source.Parent as PodcastSource).DbId;
AddCondition (From, String.Format (
"CoreTracks.PrimarySourceID = {3} AND {0}.FeedID = {1}.FeedID AND CoreTracks.ExternalID = {1}.ItemID AND {1}.ItemID = {2}.ItemID",
Feed.Provider.TableName, FeedItem.Provider.TableName, FeedEnclosure.Provider.TableName, podcast_library_dbid
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
index d84618b..f81266f 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
@@ -60,7 +60,7 @@ namespace Banshee.Podcasting.Gui
artwork_manager = ServiceManager.Get<ArtworkManager> ();
}
- public override void Render (CellContext context, StateFlags state, double cellWidth, double cellHeight)
+ public override void Render (CellContext context, StateType state, double cellWidth, double cellHeight)
{
if (BoundObject == null) {
return;
@@ -90,10 +90,7 @@ namespace Banshee.Podcasting.Gui
image_render_size, image_render_size, !is_default, context.Theme.Context.Radius);
int fl_width = 0, fl_height = 0, sl_width = 0, sl_height = 0;
- context.Widget.StyleContext.Save ();
- context.Widget.StyleContext.AddClass ("entry");
- Cairo.Color text_color = CairoExtensions.GdkRGBAToCairoColor (context.Widget.StyleContext.GetColor (state));
- context.Widget.StyleContext.Restore ();
+ Cairo.Color text_color = context.Theme.Colors.GetWidgetColor (GtkColorClass.Text, state);
text_color.A = 0.75;
Pango.Layout layout = context.Layout;
@@ -129,7 +126,7 @@ namespace Banshee.Podcasting.Gui
// Render the second line first since we have that state already
if (feed.DbId > 0) {
context.Context.MoveTo (x, y + fl_height);
- context.Context.SetSourceColor (text_color);
+ context.Context.Color = text_color;
PangoCairoHelper.ShowLayout (context.Context, layout);
}
@@ -143,7 +140,7 @@ namespace Banshee.Podcasting.Gui
context.Context.MoveTo (x, y);
text_color.A = 1;
- context.Context.SetSourceColor (text_color);
+ context.Context.Color = text_color;
PangoCairoHelper.ShowLayout (context.Context, layout);
}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs
index 587cb49..77c1832 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs
@@ -85,7 +85,7 @@ namespace Banshee.Podcasting.Gui
return i;
}
- public override void Render (CellContext context, StateFlags state, double cellWidth, double cellHeight)
+ public override void Render (CellContext context, StateType state, double cellWidth, double cellHeight)
{
PodcastTrackInfo podcast = PodcastTrackInfo.From (BoundTrack);
if (podcast != null) {
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs
index f77f749..619a4a0 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs
@@ -176,14 +176,12 @@ namespace Banshee.Podcasting.Gui
OnSelectionChanged (null, null);
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
- if (disposing) {
- ServiceManager.SourceManager.ActiveSourceChanged -= HandleActiveSourceChanged;
- Actions.UIManager.RemoveUi (actions_id);
- Actions.RemoveActionGroup (this);
- }
- base.Dispose (disposing);
+ ServiceManager.SourceManager.ActiveSourceChanged -= HandleActiveSourceChanged;
+ Actions.UIManager.RemoveUi (actions_id);
+ Actions.RemoveActionGroup (this);
+ base.Dispose ();
}
#region State Event Handlers
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs
index f5bac17..f16345d 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs
@@ -54,6 +54,8 @@ namespace Banshee.Podcasting.Gui
CheckButton subscribed_check, download_check, archive_check;
+ private VBox main_box;
+
public PodcastFeedPropertiesDialog (PodcastSource source, Feed feed)
{
this.source = source;
@@ -61,6 +63,7 @@ namespace Banshee.Podcasting.Gui
fake_track.Feed = feed;
Title = feed.Title;
+ HasSeparator = false;
BorderWidth = 12;
WidthRequest = 525;
//IconThemeUtils.SetWindowIcon (this);
@@ -88,7 +91,8 @@ namespace Banshee.Podcasting.Gui
private void BuildWindow()
{
- ContentArea.Spacing = 12;
+ VBox.Spacing = 12;
+ main_box = VBox;
var save_button = new Button ("gtk-save") { CanDefault = true };
@@ -158,7 +162,7 @@ namespace Banshee.Podcasting.Gui
});
header_box.PackStart (table, true, true, 0);
- ContentArea.PackStart (header_box, false, false, 0);
+ main_box.PackStart (header_box, false, false, 0);
Add (Catalog.GetString ("Subscription Options"), subscribed_check, download_check, archive_check);
@@ -200,7 +204,7 @@ namespace Banshee.Podcasting.Gui
vbox.PackStart (align, filled, filled, 0);
}
- ContentArea.PackStart (vbox, filled, filled, 0);
+ main_box.PackStart (vbox, filled, filled, 0);
}
private void OnResponse (object sender, ResponseArgs args)
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs
index 191f0e0..823b7be 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs
@@ -60,7 +60,8 @@ namespace Banshee.Podcasting.Gui
private void BuildWindow()
{
BorderWidth = 6;
- ContentArea.Spacing = 12;
+ VBox.Spacing = 12;
+ HasSeparator = false;
HBox content_box = new HBox();
content_box.BorderWidth = 6;
@@ -178,7 +179,7 @@ namespace Banshee.Podcasting.Gui
ActionArea.Layout = ButtonBoxStyle.End;
content_box.ShowAll ();
- ContentArea.Add (content_box);
+ VBox.Add (content_box);
Response += OnResponse;
}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs
index a1d72f7..fe50871 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs
@@ -61,7 +61,7 @@ namespace Banshee.Podcasting.Gui
get { return archive_check.Active ? 1 : 0; }
}
- public PodcastSubscribeDialog () : base (Catalog.GetString("Subscribe"), null, DialogFlags.Modal)
+ public PodcastSubscribeDialog () : base (Catalog.GetString("Subscribe"), null, DialogFlags.Modal | DialogFlags.NoSeparator)
{
accelGroup = new Gtk.AccelGroup();
AddAccelGroup (accelGroup);
@@ -73,7 +73,7 @@ namespace Banshee.Podcasting.Gui
DefaultWidth = 475;
BorderWidth = 6;
- ContentArea.Spacing = 12;
+ VBox.Spacing = 12;
ActionArea.Layout = Gtk.ButtonBoxStyle.End;
HBox box = new HBox();
@@ -147,7 +147,7 @@ namespace Banshee.Podcasting.Gui
AddButton (Catalog.GetString ("Subscribe"), ResponseType.Ok, true);
box.ShowAll ();
- ContentArea.Add (box);
+ VBox.Add (box);
}
private void AddButton (string stock_id, Gtk.ResponseType response, bool is_default)
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs
index b5d3759..d0dd457 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs
@@ -47,7 +47,6 @@ using Banshee.Collection.Database;
using Banshee.Collection.Gui;
using Banshee.Podcasting.Data;
-using Banshee.Gui;
namespace Banshee.Podcasting.Gui
@@ -57,17 +56,8 @@ namespace Banshee.Podcasting.Gui
private Grid track_view;
private PodcastFeedView feed_view;
private PodcastUnheardFilterView unheard_view;
- private static readonly string name = "podcast";
-
- public static readonly SchemaEntry<int> PaneLeftPosition = new SchemaEntry<int> (
- String.Format ("{0}.{1}.browser.left", PersistentPaneController.NamespacePrefix, name),
- "position",
- DEFAULT_PANE_LEFT_POSITION,
- "Podcast Browser Pane Container Position",
- "The position of the podcast browser pane container"
- );
- public PodcastSourceContents () : base (name, SchemaEntry<int>.Zero, PaneLeftPosition)
+ public PodcastSourceContents () : base ("podcast")
{
}
@@ -94,7 +84,7 @@ namespace Banshee.Podcasting.Gui
}
protected override string ForcePosition {
- get { return "left"; }
+ get { return "Left"; }
}
#region Implement ISourceContents
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
index c45a7d1..5131f2b 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
@@ -132,7 +132,7 @@ namespace Banshee.Podcasting
int moved = 0;
foreach (FeedEnclosure enclosure in FeedEnclosure.Provider.FetchAllMatching ("LocalPath IS NOT NULL AND LocalPath != ''")) {
SafeUri uri = new SafeUri (enclosure.LocalPath);
- long track_id = DatabaseTrackInfo.GetTrackIdForUri (uri, ServiceManager.SourceManager.MusicLibrary.DbId);
+ int track_id = DatabaseTrackInfo.GetTrackIdForUri (uri, ServiceManager.SourceManager.MusicLibrary.DbId);
if (track_id > 0) {
PodcastTrackInfo pi = new PodcastTrackInfo (DatabaseTrackInfo.Provider.FetchSingle (track_id));
diff --git a/src/Extensions/Banshee.Podcasting/Makefile.in b/src/Extensions/Banshee.Podcasting/Makefile.in
index 595e206..ed380bd 100644
--- a/src/Extensions/Banshee.Podcasting/Makefile.in
+++ b/src/Extensions/Banshee.Podcasting/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -478,14 +493,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -600,7 +616,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -608,7 +624,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -616,7 +631,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -635,7 +650,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -674,7 +689,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -928,12 +942,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.RemoteAudio/Makefile.in b/src/Extensions/Banshee.RemoteAudio/Makefile.in
index 7f8cc8a..fba3380 100644
--- a/src/Extensions/Banshee.RemoteAudio/Makefile.in
+++ b/src/Extensions/Banshee.RemoteAudio/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -451,14 +466,15 @@ RESOURCES = \
# External libraries to link against, generated from configure
@REMOTE_AUDIO_ENABLED_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at REMOTE_AUDIO_ENABLED_TRUE@LINK_CAIRO = -r:Mono.Cairo
@REMOTE_AUDIO_ENABLED_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@REMOTE_AUDIO_ENABLED_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@REMOTE_AUDIO_ENABLED_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at REMOTE_AUDIO_ENABLED_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at REMOTE_AUDIO_ENABLED_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at REMOTE_AUDIO_ENABLED_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -573,7 +589,7 @@ RESOURCES = \
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -581,7 +597,6 @@ RESOURCES = \
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at REMOTE_AUDIO_ENABLED_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -589,7 +604,7 @@ RESOURCES = \
@REMOTE_AUDIO_ENABLED_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@REMOTE_AUDIO_ENABLED_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -608,7 +623,7 @@ RESOURCES = \
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at REMOTE_AUDIO_ENABLED_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at REMOTE_AUDIO_ENABLED_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@REMOTE_AUDIO_ENABLED_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@REMOTE_AUDIO_ENABLED_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@REMOTE_AUDIO_ENABLED_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -667,7 +682,6 @@ RESOURCES = \
@ENABLE_TESTS_TRUE@@REMOTE_AUDIO_ENABLED_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@REMOTE_AUDIO_ENABLED_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@REMOTE_AUDIO_ENABLED_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at REMOTE_AUDIO_ENABLED_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@REMOTE_AUDIO_ENABLED_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@REMOTE_AUDIO_ENABLED_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -928,12 +942,9 @@ run:
@REMOTE_AUDIO_ENABLED_TRUE at build-debug:
@REMOTE_AUDIO_ENABLED_TRUE@ @echo $(DEP_LINK)
- at REMOTE_AUDIO_ENABLED_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at REMOTE_AUDIO_ENABLED_TRUE@ $(MCS) -out:$@ $<
-
@REMOTE_AUDIO_ENABLED_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at REMOTE_AUDIO_ENABLED_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at REMOTE_AUDIO_ENABLED_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@REMOTE_AUDIO_ENABLED_TRUE@ @mkdir -p $(top_builddir)/bin
@REMOTE_AUDIO_ENABLED_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@REMOTE_AUDIO_ENABLED_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Sample/Makefile.in b/src/Extensions/Banshee.Sample/Makefile.in
index dc3dab5..fa1067c 100644
--- a/src/Extensions/Banshee.Sample/Makefile.in
+++ b/src/Extensions/Banshee.Sample/Makefile.in
@@ -171,15 +171,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -188,6 +197,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -202,6 +213,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -209,6 +222,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
index 762be28..381d4c5 100644
--- a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
+++ b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
@@ -76,6 +76,15 @@ namespace Banshee.SoundMenu
public void Register (bool startup)
{
+#if HAVE_INDICATESHARP
+ Log.Debug ("Registering with sound indicator through libindicate");
+ var server = Indicate.Server.RefDefault ();
+ server.SetType ("music.banshee");
+ string desktop_file = Paths.Combine (Paths.InstalledApplicationDataRoot,
+ "applications", desktop_name + ".desktop");
+ server.DesktopFile (desktop_file);
+ server.Show ();
+#endif
if (SoundMenu != null && !startup) {
// We don't have to do anything to register on startup
try {
@@ -89,6 +98,10 @@ namespace Banshee.SoundMenu
public void Unregister ()
{
+#if HAVE_INDICATESHARP
+ var server = Indicate.Server.RefDefault ();
+ server.Hide ();
+#endif
if (SoundMenu != null) {
try {
SoundMenu.BlacklistMediaPlayer (desktop_name, true);
diff --git a/src/Extensions/Banshee.SoundMenu/Makefile.am b/src/Extensions/Banshee.SoundMenu/Makefile.am
index db4825a..4c7ac25 100644
--- a/src/Extensions/Banshee.SoundMenu/Makefile.am
+++ b/src/Extensions/Banshee.SoundMenu/Makefile.am
@@ -2,7 +2,11 @@ if EXTERNAL_NOTIFY_SHARP
NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
else
GMCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
-NOTIFY_SHARP_LIBS = $(LINK_EXTENSION_NOTIFICATIONAREA)
+NOTIFY_SHARP_LIBS =
+endif
+
+if HAVE_INDICATESHARP
+GMCS_FLAGS+= "-define:HAVE_INDICATESHARP"
endif
ASSEMBLY = Banshee.SoundMenu
diff --git a/src/Extensions/Banshee.SoundMenu/Makefile.in b/src/Extensions/Banshee.SoundMenu/Makefile.in
index a48b56b..09265ef 100644
--- a/src/Extensions/Banshee.SoundMenu/Makefile.in
+++ b/src/Extensions/Banshee.SoundMenu/Makefile.in
@@ -52,12 +52,13 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@EXTERNAL_NOTIFY_SHARP_FALSE at am__append_1 = "-define:INTERNAL_NOTIFY_SHARP"
+ at HAVE_INDICATESHARP_TRUE@am__append_2 = "-define:HAVE_INDICATESHARP"
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/build/build.dist.mk \
$(top_srcdir)/build/build.environment.mk \
$(top_srcdir)/build/build.mk \
$(top_srcdir)/build/build.rules.mk
- at ENABLE_SOUNDMENU_TRUE@@ENABLE_TESTS_TRUE at am__append_2 = " $(NUNIT_LIBS)"
+ at ENABLE_SOUNDMENU_TRUE@@ENABLE_TESTS_TRUE at am__append_3 = " $(NUNIT_LIBS)"
subdir = src/Extensions/Banshee.SoundMenu
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
@@ -206,23 +207,34 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
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@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -237,6 +249,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -244,6 +258,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -324,7 +340,7 @@ MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
- at EXTERNAL_NOTIFY_SHARP_FALSE@NOTIFY_SHARP_LIBS = $(LINK_EXTENSION_NOTIFICATIONAREA)
+ at EXTERNAL_NOTIFY_SHARP_FALSE@NOTIFY_SHARP_LIBS =
@EXTERNAL_NOTIFY_SHARP_TRUE at NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
@@ -429,7 +445,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ASSEMBLY = Banshee.SoundMenu
TARGET = library
-LINK = $(REF_EXTENSION_SOUNDMENU) $(NOTIFY_SHARP_LIBS) $(am__append_2)
+LINK = $(REF_EXTENSION_SOUNDMENU) $(NOTIFY_SHARP_LIBS) $(am__append_3)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
SOURCES = \
Banshee.SoundMenu/SoundMenuProxy.cs \
@@ -448,14 +464,15 @@ RESOURCES = Banshee.SoundMenu.addin.xml
# External libraries to link against, generated from configure
@ENABLE_SOUNDMENU_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_SOUNDMENU_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_SOUNDMENU_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_SOUNDMENU_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_SOUNDMENU_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_SOUNDMENU_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_SOUNDMENU_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_SOUNDMENU_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_SOUNDMENU_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_SOUNDMENU_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_SOUNDMENU_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_SOUNDMENU_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -570,7 +587,7 @@ RESOURCES = Banshee.SoundMenu.addin.xml
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_SOUNDMENU_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -578,7 +595,6 @@ RESOURCES = Banshee.SoundMenu.addin.xml
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_SOUNDMENU_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -586,7 +602,7 @@ RESOURCES = Banshee.SoundMenu.addin.xml
@ENABLE_SOUNDMENU_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_SOUNDMENU_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_SOUNDMENU_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -605,7 +621,7 @@ RESOURCES = Banshee.SoundMenu.addin.xml
@ENABLE_SOUNDMENU_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_SOUNDMENU_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_SOUNDMENU_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_SOUNDMENU_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -664,7 +680,6 @@ RESOURCES = Banshee.SoundMenu.addin.xml
@ENABLE_SOUNDMENU_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_SOUNDMENU_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_SOUNDMENU_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_SOUNDMENU_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_SOUNDMENU_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_SOUNDMENU_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -920,12 +935,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_SOUNDMENU_TRUE at build-debug:
@ENABLE_SOUNDMENU_TRUE@ @echo $(DEP_LINK)
- at ENABLE_SOUNDMENU_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_SOUNDMENU_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_SOUNDMENU_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_SOUNDMENU_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_SOUNDMENU_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_SOUNDMENU_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_SOUNDMENU_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_SOUNDMENU_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.SqlDebugConsole/Makefile.in b/src/Extensions/Banshee.SqlDebugConsole/Makefile.in
index 173bc54..b534f92 100644
--- a/src/Extensions/Banshee.SqlDebugConsole/Makefile.in
+++ b/src/Extensions/Banshee.SqlDebugConsole/Makefile.in
@@ -171,15 +171,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -188,6 +197,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -202,6 +213,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -209,6 +222,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Extensions/Banshee.Torrent/Makefile.in b/src/Extensions/Banshee.Torrent/Makefile.in
index de6e5e5..ed67fe2 100644
--- a/src/Extensions/Banshee.Torrent/Makefile.in
+++ b/src/Extensions/Banshee.Torrent/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -447,14 +462,15 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
# External libraries to link against, generated from configure
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_MONOTORRENT_DBUS_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_MONOTORRENT_DBUS_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_MONOTORRENT_DBUS_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_MONOTORRENT_DBUS_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -569,7 +585,7 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -577,7 +593,6 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_MONOTORRENT_DBUS_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -585,7 +600,7 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_MONOTORRENT_DBUS_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -604,7 +619,7 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_MONOTORRENT_DBUS_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_MONOTORRENT_DBUS_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -663,7 +678,6 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
@ENABLE_TESTS_TRUE@@HAVE_MONOTORRENT_DBUS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_MONOTORRENT_DBUS_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_MONOTORRENT_DBUS_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_MONOTORRENT_DBUS_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_MONOTORRENT_DBUS_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_MONOTORRENT_DBUS_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -919,12 +933,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_MONOTORRENT_DBUS_TRUE at build-debug:
@HAVE_MONOTORRENT_DBUS_TRUE@ @echo $(DEP_LINK)
- at HAVE_MONOTORRENT_DBUS_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_MONOTORRENT_DBUS_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_MONOTORRENT_DBUS_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_MONOTORRENT_DBUS_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_MONOTORRENT_DBUS_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_MONOTORRENT_DBUS_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_MONOTORRENT_DBUS_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_MONOTORRENT_DBUS_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.UPnPClient/Makefile.in b/src/Extensions/Banshee.UPnPClient/Makefile.in
index e885b1d..d07a6dd 100644
--- a/src/Extensions/Banshee.UPnPClient/Makefile.in
+++ b/src/Extensions/Banshee.UPnPClient/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -450,14 +465,15 @@ EXTRA_BUNDLE = $(MONOUPNP_ASSEMBLIES)
# External libraries to link against, generated from configure
@UPNP_ENABLED_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at UPNP_ENABLED_TRUE@LINK_CAIRO = -r:Mono.Cairo
@UPNP_ENABLED_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@UPNP_ENABLED_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@UPNP_ENABLED_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@UPNP_ENABLED_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@UPNP_ENABLED_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@UPNP_ENABLED_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at UPNP_ENABLED_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at UPNP_ENABLED_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at UPNP_ENABLED_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@UPNP_ENABLED_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@UPNP_ENABLED_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@UPNP_ENABLED_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -572,7 +588,7 @@ EXTRA_BUNDLE = $(MONOUPNP_ASSEMBLIES)
@UPNP_ENABLED_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@UPNP_ENABLED_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@UPNP_ENABLED_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at UPNP_ENABLED_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at UPNP_ENABLED_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@UPNP_ENABLED_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@UPNP_ENABLED_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@UPNP_ENABLED_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -580,7 +596,6 @@ EXTRA_BUNDLE = $(MONOUPNP_ASSEMBLIES)
@UPNP_ENABLED_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@UPNP_ENABLED_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@UPNP_ENABLED_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at UPNP_ENABLED_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@UPNP_ENABLED_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@UPNP_ENABLED_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@UPNP_ENABLED_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -588,7 +603,7 @@ EXTRA_BUNDLE = $(MONOUPNP_ASSEMBLIES)
@UPNP_ENABLED_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@UPNP_ENABLED_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at UPNP_ENABLED_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at UPNP_ENABLED_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@UPNP_ENABLED_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@UPNP_ENABLED_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@UPNP_ENABLED_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -607,7 +622,7 @@ EXTRA_BUNDLE = $(MONOUPNP_ASSEMBLIES)
@UPNP_ENABLED_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at UPNP_ENABLED_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at UPNP_ENABLED_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@UPNP_ENABLED_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@UPNP_ENABLED_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@UPNP_ENABLED_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -665,7 +680,6 @@ EXTRA_BUNDLE = $(MONOUPNP_ASSEMBLIES)
@ENABLE_TESTS_TRUE@@UPNP_ENABLED_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@UPNP_ENABLED_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@UPNP_ENABLED_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at UPNP_ENABLED_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@UPNP_ENABLED_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@UPNP_ENABLED_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -921,12 +935,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@UPNP_ENABLED_TRUE at build-debug:
@UPNP_ENABLED_TRUE@ @echo $(DEP_LINK)
- at UPNP_ENABLED_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at UPNP_ENABLED_TRUE@ $(MCS) -out:$@ $<
-
@UPNP_ENABLED_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at UPNP_ENABLED_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at UPNP_ENABLED_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@UPNP_ENABLED_TRUE@ @mkdir -p $(top_builddir)/bin
@UPNP_ENABLED_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@UPNP_ENABLED_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
index dcb8086..8b06017 100644
--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
@@ -104,6 +104,7 @@ namespace Banshee.UbuntuOneMusicStore
string http_url = uri.Replace ("u1ms://", "http://");
custom_view.Store.LoadStoreLink (http_url);
GLib.Idle.Add (delegate { ServiceManager.SourceManager.SetActiveSource (this); return false; });
+
}
}
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.in b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.in
index 9582e9c..1ad3df1 100644
--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.in
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -445,14 +460,15 @@ RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
# External libraries to link against, generated from configure
@ENABLE_UBUNTUONE_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_UBUNTUONE_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_UBUNTUONE_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_UBUNTUONE_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_UBUNTUONE_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_UBUNTUONE_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_UBUNTUONE_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_UBUNTUONE_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_UBUNTUONE_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_UBUNTUONE_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_UBUNTUONE_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_UBUNTUONE_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -567,7 +583,7 @@ RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_UBUNTUONE_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -575,7 +591,6 @@ RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_UBUNTUONE_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -583,7 +598,7 @@ RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
@ENABLE_UBUNTUONE_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_UBUNTUONE_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_UBUNTUONE_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -602,7 +617,7 @@ RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
@ENABLE_UBUNTUONE_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_UBUNTUONE_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_UBUNTUONE_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_UBUNTUONE_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -661,7 +676,6 @@ RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
@ENABLE_TESTS_TRUE@@ENABLE_UBUNTUONE_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_UBUNTUONE_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_UBUNTUONE_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_UBUNTUONE_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_UBUNTUONE_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_UBUNTUONE_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -917,12 +931,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_UBUNTUONE_TRUE at build-debug:
@ENABLE_UBUNTUONE_TRUE@ @echo $(DEP_LINK)
- at ENABLE_UBUNTUONE_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_UBUNTUONE_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_UBUNTUONE_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_UBUNTUONE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_UBUNTUONE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_UBUNTUONE_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_UBUNTUONE_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_UBUNTUONE_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.Wikipedia/Makefile.in b/src/Extensions/Banshee.Wikipedia/Makefile.in
index 2e919bd..e511f6c 100644
--- a/src/Extensions/Banshee.Wikipedia/Makefile.in
+++ b/src/Extensions/Banshee.Wikipedia/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -445,14 +460,15 @@ RESOURCES = Banshee.Wikipedia.addin.xml
# External libraries to link against, generated from configure
@HAVE_LIBWEBKIT_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at HAVE_LIBWEBKIT_TRUE@LINK_CAIRO = -r:Mono.Cairo
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@HAVE_LIBWEBKIT_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -567,7 +583,7 @@ RESOURCES = Banshee.Wikipedia.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -575,7 +591,6 @@ RESOURCES = Banshee.Wikipedia.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at HAVE_LIBWEBKIT_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -583,7 +598,7 @@ RESOURCES = Banshee.Wikipedia.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -602,7 +617,7 @@ RESOURCES = Banshee.Wikipedia.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at HAVE_LIBWEBKIT_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@HAVE_LIBWEBKIT_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -661,7 +676,6 @@ RESOURCES = Banshee.Wikipedia.addin.xml
@ENABLE_TESTS_TRUE@@HAVE_LIBWEBKIT_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@HAVE_LIBWEBKIT_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@HAVE_LIBWEBKIT_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at HAVE_LIBWEBKIT_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@HAVE_LIBWEBKIT_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@HAVE_LIBWEBKIT_TRUE at module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -917,12 +931,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@HAVE_LIBWEBKIT_TRUE at build-debug:
@HAVE_LIBWEBKIT_TRUE@ @echo $(DEP_LINK)
- at HAVE_LIBWEBKIT_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at HAVE_LIBWEBKIT_TRUE@ $(MCS) -out:$@ $<
-
@HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at HAVE_LIBWEBKIT_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@HAVE_LIBWEBKIT_TRUE@ @mkdir -p $(top_builddir)/bin
@HAVE_LIBWEBKIT_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@HAVE_LIBWEBKIT_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs b/src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs
index 39b89bf..2b8a069 100644
--- a/src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs
+++ b/src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs
@@ -102,10 +102,10 @@ namespace Banshee.YouTube.Gui
rating.AlwaysShowEmptyStars = true;
try {
- StyleUpdated += delegate {
- primary_label.OverrideColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
- secondary_label.OverrideColor (StateFlags.Normal, Hyena.Gui.GtkUtilities.ColorBlend (
- StyleContext.GetColor (StateFlags.Normal), StyleContext.GetBackgroundColor (StateFlags.Normal)));
+ StyleSet += delegate {
+ primary_label.ModifyFg (StateType.Normal, Style.Text (StateType.Normal));
+ secondary_label.ModifyFg (StateType.Normal, Hyena.Gui.GtkUtilities.ColorBlend (
+ Style.Foreground (StateType.Normal), Style.Background (StateType.Normal)));
};
} catch (Exception e) {
Log.DebugException (e);
diff --git a/src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs b/src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs
index af78cdf..cb8275a 100644
--- a/src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs
+++ b/src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs
@@ -146,10 +146,10 @@ namespace Banshee.YouTube
ShowAll ();
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
- base.OnStyleUpdated ();
- results_tv.OverrideBackgroundColor (StateFlags.Normal, StyleContext.GetColor (StateFlags.Normal));
+ base.OnStyleSet (previous_style);
+ results_tv.ModifyBg (StateType.Normal, Style.Base (StateType.Normal));
}
private class RefreshVideosJob : SimpleAsyncJob
diff --git a/src/Extensions/Banshee.YouTube/Makefile.am b/src/Extensions/Banshee.YouTube/Makefile.am
index 485ed1c..4ccd165 100644
--- a/src/Extensions/Banshee.YouTube/Makefile.am
+++ b/src/Extensions/Banshee.YouTube/Makefile.am
@@ -13,7 +13,7 @@ SOURCES = \
RESOURCES = Banshee.YouTube.addin.xml
-if ENABLE_YOUTUBE
+if HAVE_GDATA
include $(top_srcdir)/build/build.mk
else
include $(top_srcdir)/build/build.dist.mk
diff --git a/src/Extensions/Banshee.YouTube/Makefile.in b/src/Extensions/Banshee.YouTube/Makefile.in
index c066205..3d530bc 100644
--- a/src/Extensions/Banshee.YouTube/Makefile.in
+++ b/src/Extensions/Banshee.YouTube/Makefile.in
@@ -56,7 +56,7 @@ 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
- at ENABLE_TESTS_TRUE@@ENABLE_YOUTUBE_TRUE at am__append_1 = " $(NUNIT_LIBS)"
+ at ENABLE_TESTS_TRUE@@HAVE_GDATA_TRUE at am__append_1 = " $(NUNIT_LIBS)"
@HAVE_GDATASHARP_1_5_TRUE at am__append_2 = "-define:HAVE_GDATASHARP_1_5"
subdir = src/Extensions/Banshee.YouTube
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -206,15 +206,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -223,6 +232,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@ $(am__append_2)
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -237,6 +248,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -244,6 +257,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -440,235 +455,232 @@ SOURCES = \
RESOURCES = Banshee.YouTube.addin.xml
# Initializers
- at ENABLE_YOUTUBE_TRUE@MONO_BASE_PATH =
- at ENABLE_YOUTUBE_TRUE@MONO_ADDINS_PATH =
+ at HAVE_GDATA_TRUE@MONO_BASE_PATH =
+ at HAVE_GDATA_TRUE@MONO_ADDINS_PATH =
# Install Paths
- at ENABLE_YOUTUBE_TRUE@DEFAULT_INSTALL_DIR = $(pkglibdir)
- at ENABLE_YOUTUBE_TRUE@BACKENDS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Backends
- at ENABLE_YOUTUBE_TRUE@EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
+ at HAVE_GDATA_TRUE@DEFAULT_INSTALL_DIR = $(pkglibdir)
+ at HAVE_GDATA_TRUE@BACKENDS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Backends
+ at HAVE_GDATA_TRUE@EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
- at ENABLE_YOUTUBE_TRUE@LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
- at ENABLE_YOUTUBE_TRUE@LINK_MONO_POSIX = -r:Mono.Posix
- at ENABLE_YOUTUBE_TRUE@LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
- at ENABLE_YOUTUBE_TRUE@LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_GLIB = $(GLIBSHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_GTK = $(GTKSHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_GUDEV = $(GUDEV_SHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_BOO = $(BOO_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_GDATA = $(GDATASHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_MONO_UPNP = $(MONO_UPNP_LIBS)
- at ENABLE_YOUTUBE_TRUE@DIR_BIN = $(top_builddir)/bin
+ at HAVE_GDATA_TRUE@LINK_SYSTEM = -r:System
+ at HAVE_GDATA_TRUE@LINK_CAIRO = -r:Mono.Cairo
+ at HAVE_GDATA_TRUE@LINK_MONO_POSIX = -r:Mono.Posix
+ at HAVE_GDATA_TRUE@LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
+ at HAVE_GDATA_TRUE@LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
+ at HAVE_GDATA_TRUE@LINK_GLIB = $(GLIBSHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_GTK = $(GTKSHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_GCONF = $(GCONFSHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_GUDEV = $(GUDEV_SHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
+ at HAVE_GDATA_TRUE@LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_BOO = $(BOO_LIBS)
+ at HAVE_GDATA_TRUE@LINK_GDATA = $(GDATASHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
+ at HAVE_GDATA_TRUE@LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
+ at HAVE_GDATA_TRUE@LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_MONO_UPNP = $(MONO_UPNP_LIBS)
+ at HAVE_GDATA_TRUE@DIR_BIN = $(top_builddir)/bin
# Hyena
- at ENABLE_YOUTUBE_TRUE@REF_HYENA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
- at ENABLE_YOUTUBE_TRUE@LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll -r:$(DIR_BIN)/Hyena.Data.Sqlite.dll
- at ENABLE_YOUTUBE_TRUE@LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA)
+ at HAVE_GDATA_TRUE@REF_HYENA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at HAVE_GDATA_TRUE@LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll -r:$(DIR_BIN)/Hyena.Data.Sqlite.dll
+ at HAVE_GDATA_TRUE@LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA)
# Hyena.Gui
- at ENABLE_YOUTUBE_TRUE@REF_HYENA_GUI = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_CAIRO) $(LINK_GTK)
- at ENABLE_YOUTUBE_TRUE@LINK_HYENA_GUI = -r:$(DIR_BIN)/Hyena.Gui.dll
- at ENABLE_YOUTUBE_TRUE@LINK_HYENA_GUI_DEPS = $(REF_HYENA_GUI) $(LINK_HYENA_GUI)
+ at HAVE_GDATA_TRUE@REF_HYENA_GUI = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_CAIRO) $(LINK_GTK)
+ at HAVE_GDATA_TRUE@LINK_HYENA_GUI = -r:$(DIR_BIN)/Hyena.Gui.dll
+ at HAVE_GDATA_TRUE@LINK_HYENA_GUI_DEPS = $(REF_HYENA_GUI) $(LINK_HYENA_GUI)
# Lastfm
- at ENABLE_YOUTUBE_TRUE@REF_LASTFM = $(LINK_SYSTEM) $(LINK_MONO_MEDIA) $(LINK_MONO_POSIX) $(LINK_HYENA) $(LINK_ICSHARP_ZIP_LIB)
- at ENABLE_YOUTUBE_TRUE@LINK_LASTFM = -r:$(DIR_BIN)/Lastfm.dll
- at ENABLE_YOUTUBE_TRUE@LINK_LASTFM_DEPS = $(REF_LASTFM) $(LINK_LASTFM)
+ at HAVE_GDATA_TRUE@REF_LASTFM = $(LINK_SYSTEM) $(LINK_MONO_MEDIA) $(LINK_MONO_POSIX) $(LINK_HYENA) $(LINK_ICSHARP_ZIP_LIB)
+ at HAVE_GDATA_TRUE@LINK_LASTFM = -r:$(DIR_BIN)/Lastfm.dll
+ at HAVE_GDATA_TRUE@LINK_LASTFM_DEPS = $(REF_LASTFM) $(LINK_LASTFM)
# Lastfm.Gui
- at ENABLE_YOUTUBE_TRUE@REF_LASTFM_GUI = $(LINK_GLIB) $(LINK_GTK) $(LINK_LASTFM_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_LASTFM_GUI = -r:$(DIR_BIN)/Lastfm.Gui.dll
- at ENABLE_YOUTUBE_TRUE@LINK_LASTFM_GUI_DEPS = $(REF_LASTFM_GUI) $(LINK_LASTFM_GUI)
- at ENABLE_YOUTUBE_TRUE@REF_MIGO = $(LINK_HYENA_DEPS) $(LINK_ICSHARP_ZIP_LIB)
- at ENABLE_YOUTUBE_TRUE@LINK_MIGO = -r:$(DIR_BIN)/Migo.dll
- at ENABLE_YOUTUBE_TRUE@LINK_MIGO_DEPS = $(REF_MIGO) $(LINK_MIGO)
+ at HAVE_GDATA_TRUE@REF_LASTFM_GUI = $(LINK_GLIB) $(LINK_GTK) $(LINK_LASTFM_DEPS)
+ at HAVE_GDATA_TRUE@LINK_LASTFM_GUI = -r:$(DIR_BIN)/Lastfm.Gui.dll
+ at HAVE_GDATA_TRUE@LINK_LASTFM_GUI_DEPS = $(REF_LASTFM_GUI) $(LINK_LASTFM_GUI)
+ at HAVE_GDATA_TRUE@REF_MIGO = $(LINK_HYENA_DEPS) $(LINK_ICSHARP_ZIP_LIB)
+ at HAVE_GDATA_TRUE@LINK_MIGO = -r:$(DIR_BIN)/Migo.dll
+ at HAVE_GDATA_TRUE@LINK_MIGO_DEPS = $(REF_MIGO) $(LINK_MIGO)
# Mono.Media
- at ENABLE_YOUTUBE_TRUE@REF_MONO_MEDIA = $(LINK_SYSTEM)
- at ENABLE_YOUTUBE_TRUE@LINK_MONO_MEDIA = -r:$(DIR_BIN)/Mono.Media.dll
- at ENABLE_YOUTUBE_TRUE@LINK_MONO_MEDIA_DEPS = $(REF_MONO_MEDIA) $(LINK_MONO_MEDIA)
+ at HAVE_GDATA_TRUE@REF_MONO_MEDIA = $(LINK_SYSTEM)
+ at HAVE_GDATA_TRUE@LINK_MONO_MEDIA = -r:$(DIR_BIN)/Mono.Media.dll
+ at HAVE_GDATA_TRUE@LINK_MONO_MEDIA_DEPS = $(REF_MONO_MEDIA) $(LINK_MONO_MEDIA)
# Mtp
- at ENABLE_YOUTUBE_TRUE@REF_MTP = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
- at ENABLE_YOUTUBE_TRUE@LINK_MTP = -r:$(DIR_BIN)/Mtp.dll
- at ENABLE_YOUTUBE_TRUE@LINK_MTP_DEPS = $(REF_MTP) $(LINK_MTP)
+ at HAVE_GDATA_TRUE@REF_MTP = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at HAVE_GDATA_TRUE@LINK_MTP = -r:$(DIR_BIN)/Mtp.dll
+ at HAVE_GDATA_TRUE@LINK_MTP_DEPS = $(REF_MTP) $(LINK_MTP)
# AppleDevice
- at ENABLE_YOUTUBE_TRUE@REF_APPLEDEVICE = $(LINK_SYSTEM)
- at ENABLE_YOUTUBE_TRUE@LINK_APPLEDEVICE_DEPS = $(REF_APPLEDEVICE) $(LIBGPODSHARP_LIBS)
+ at HAVE_GDATA_TRUE@REF_APPLEDEVICE = $(LINK_SYSTEM)
+ at HAVE_GDATA_TRUE@LINK_APPLEDEVICE_DEPS = $(REF_APPLEDEVICE) $(LIBGPODSHARP_LIBS)
# Karma
- at ENABLE_YOUTUBE_TRUE@REF_KARMA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
- at ENABLE_YOUTUBE_TRUE@LINK_KARMA = $(KARMASHARP_LIBS)
- at ENABLE_YOUTUBE_TRUE@LINK_KARMA_DEPS = $(REF_KARMA) $(LINK_KARMA)
+ at HAVE_GDATA_TRUE@REF_KARMA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at HAVE_GDATA_TRUE@LINK_KARMA = $(KARMASHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_KARMA_DEPS = $(REF_KARMA) $(LINK_KARMA)
# MusicBrainz
- at ENABLE_YOUTUBE_TRUE@REF_MUSICBRAINZ = $(LINK_SYSTEM)
- at ENABLE_YOUTUBE_TRUE@LINK_MUSICBRAINZ = -r:$(DIR_BIN)/MusicBrainz.dll
- at ENABLE_YOUTUBE_TRUE@LINK_MUSICBRAINZ_DEPS = $(REF_MUSICBRAINZ) $(LINK_MUSICBRAINZ)
+ at HAVE_GDATA_TRUE@REF_MUSICBRAINZ = $(LINK_SYSTEM)
+ at HAVE_GDATA_TRUE@LINK_MUSICBRAINZ = -r:$(DIR_BIN)/MusicBrainz.dll
+ at HAVE_GDATA_TRUE@LINK_MUSICBRAINZ_DEPS = $(REF_MUSICBRAINZ) $(LINK_MUSICBRAINZ)
# Core
- at ENABLE_YOUTUBE_TRUE@REF_BANSHEE_CORE = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_GLIB) \
- at ENABLE_YOUTUBE_TRUE@ $(LINK_DBUS) $(LINK_TAGLIB) $(LINK_MONO_ADDINS_DEPS)
-
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_CORE = -r:$(DIR_BIN)/Banshee.Core.dll
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_CORE_DEPS = $(REF_BANSHEE_CORE) $(LINK_BANSHEE_CORE)
- at ENABLE_YOUTUBE_TRUE@REF_BANSHEE_SERVICES = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_MEDIA_DEPS) $(LINK_LASTFM_DEPS) $(LINK_MUSICBRAINZ_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_SERVICES = -r:$(DIR_BIN)/Banshee.Services.dll
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_SERVICES_DEPS = $(REF_BANSHEE_SERVICES) $(LINK_BANSHEE_SERVICES)
- at ENABLE_YOUTUBE_TRUE@REF_BANSHEE_WIDGETS = $(LINK_MONO_POSIX) $(LINK_HYENA_GUI_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_WIDGETS = -r:$(DIR_BIN)/Banshee.Widgets.dll
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_WIDGETS_DEPS = $(REF_BANSHEE_WIDGETS) $(LINK_BANSHEE_WIDGETS)
- at ENABLE_YOUTUBE_TRUE@REF_BANSHEE_THICKCLIENT = $(LINK_BANSHEE_WIDGETS_DEPS) \
- at ENABLE_YOUTUBE_TRUE@ $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_HYENA_GUI_DEPS) $(LINK_MONO_ADDINS_SETUP_DEPS)
-
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_THICKCLIENT = -r:$(DIR_BIN)/Banshee.ThickClient.dll
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \
- at ENABLE_YOUTUBE_TRUE@ $(LINK_BANSHEE_THICKCLIENT)
-
- at ENABLE_YOUTUBE_TRUE@REF_BANSHEE_WEBBROWSER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_WEBBROWSER = -r:$(DIR_BIN)/Banshee.WebBrowser.dll
- at ENABLE_YOUTUBE_TRUE@LINK_BANSHEE_WEBBROWSER_DEPS = $(REF_BANSHEE_WEBBROWSER) $(LINK_BANSHEE_WEBBROWSER)
- at ENABLE_YOUTUBE_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID)
- at ENABLE_YOUTUBE_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO)
- at ENABLE_YOUTUBE_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_BANSHEE_COLLECTIONINDEXER = $(LINK_SYSTEM) $(LINK_DBUS_NO_GLIB) $(LINK_MONO_POSIX)
+ at HAVE_GDATA_TRUE@REF_BANSHEE_CORE = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_GLIB) \
+ at HAVE_GDATA_TRUE@ $(LINK_DBUS) $(LINK_TAGLIB) $(LINK_MONO_ADDINS_DEPS)
+
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_CORE = -r:$(DIR_BIN)/Banshee.Core.dll
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_CORE_DEPS = $(REF_BANSHEE_CORE) $(LINK_BANSHEE_CORE)
+ at HAVE_GDATA_TRUE@REF_BANSHEE_SERVICES = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_MEDIA_DEPS) $(LINK_LASTFM_DEPS) $(LINK_MUSICBRAINZ_DEPS)
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_SERVICES = -r:$(DIR_BIN)/Banshee.Services.dll
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_SERVICES_DEPS = $(REF_BANSHEE_SERVICES) $(LINK_BANSHEE_SERVICES)
+ at HAVE_GDATA_TRUE@REF_BANSHEE_WIDGETS = $(LINK_MONO_POSIX) $(LINK_HYENA_GUI_DEPS)
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_WIDGETS = -r:$(DIR_BIN)/Banshee.Widgets.dll
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_WIDGETS_DEPS = $(REF_BANSHEE_WIDGETS) $(LINK_BANSHEE_WIDGETS)
+ at HAVE_GDATA_TRUE@REF_BANSHEE_THICKCLIENT = $(LINK_BANSHEE_WIDGETS_DEPS) \
+ at HAVE_GDATA_TRUE@ $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_HYENA_GUI_DEPS) $(LINK_MONO_ADDINS_SETUP_DEPS)
+
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_THICKCLIENT = -r:$(DIR_BIN)/Banshee.ThickClient.dll
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \
+ at HAVE_GDATA_TRUE@ $(LINK_BANSHEE_THICKCLIENT)
+
+ at HAVE_GDATA_TRUE@REF_BANSHEE_WEBBROWSER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_WEBBROWSER = -r:$(DIR_BIN)/Banshee.WebBrowser.dll
+ at HAVE_GDATA_TRUE@LINK_BANSHEE_WEBBROWSER_DEPS = $(REF_BANSHEE_WEBBROWSER) $(LINK_BANSHEE_WEBBROWSER)
+ at HAVE_GDATA_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID)
+ at HAVE_GDATA_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO)
+ at HAVE_GDATA_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS)
+ at HAVE_GDATA_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS)
+ at HAVE_GDATA_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS)
+ at HAVE_GDATA_TRUE@REF_BANSHEE_COLLECTIONINDEXER = $(LINK_SYSTEM) $(LINK_DBUS_NO_GLIB) $(LINK_MONO_POSIX)
# Dap
- at ENABLE_YOUTUBE_TRUE@REF_DAP = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_DAP = -r:$(DIR_BIN)/Banshee.Dap.dll
- at ENABLE_YOUTUBE_TRUE@LINK_DAP_DEPS = $(REF_DAP) $(LINK_DAP)
- at ENABLE_YOUTUBE_TRUE@REF_DAP_APPLEDEVICE = $(LINK_DAP_DEPS) $(LINK_APPLEDEVICE_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_DAP_MASS_STORAGE = $(LINK_DAP_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_DAP_MTP = $(LINK_DAP_DEPS) $(LINK_MTP_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS)
+ at HAVE_GDATA_TRUE@REF_DAP = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@LINK_DAP = -r:$(DIR_BIN)/Banshee.Dap.dll
+ at HAVE_GDATA_TRUE@LINK_DAP_DEPS = $(REF_DAP) $(LINK_DAP)
+ at HAVE_GDATA_TRUE@REF_DAP_APPLEDEVICE = $(LINK_DAP_DEPS) $(LINK_APPLEDEVICE_DEPS)
+ at HAVE_GDATA_TRUE@REF_DAP_MASS_STORAGE = $(LINK_DAP_DEPS)
+ at HAVE_GDATA_TRUE@REF_DAP_MTP = $(LINK_DAP_DEPS) $(LINK_MTP_DEPS)
+ at HAVE_GDATA_TRUE@REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS)
# Extensions
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_AMAZONMP3 = -r:$(DIR_BIN)/Banshee.AmazonMp3.exe
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_AMAZONMP3 = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_AMAZONMP3_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_AMAZONMP3)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_BOOSCRIPT = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BOO)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_BPM = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_COVERART = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_DAAP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_ICSHARP_ZIP_LIB) $(LINK_MONO_ZEROCONF)
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_EMUSIC = -r:$(DIR_BIN)/Banshee.Emusic.dll
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_EMUSIC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MIGO_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EMUSIC)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
- at ENABLE_YOUTUBE_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
-
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_NOWPLAYING = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_NOWPLAYING = -r:$(DIR_BIN)/Banshee.NowPlaying.dll
- at ENABLE_YOUTUBE_TRUE@LINK_EXTENSION_NOWPLAYING_DEPS = $(REF_EXTENSION_NOWPLAYING) \
- at ENABLE_YOUTUBE_TRUE@ $(LINK_EXTENSION_NOWPLAYING)
-
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_NOWPLAYING_CLUTTER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_MONO_UPNP)
- at ENABLE_YOUTUBE_TRUE@REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
+ at HAVE_GDATA_TRUE@LINK_EXTENSION_AMAZONMP3 = -r:$(DIR_BIN)/Banshee.AmazonMp3.exe
+ at HAVE_GDATA_TRUE@REF_EXTENSION_AMAZONMP3 = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_AMAZONMP3_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_AMAZONMP3)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_BOOSCRIPT = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BOO)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_BPM = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_COVERART = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_DAAP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_ICSHARP_ZIP_LIB) $(LINK_MONO_ZEROCONF)
+ at HAVE_GDATA_TRUE@LINK_EXTENSION_EMUSIC = -r:$(DIR_BIN)/Banshee.Emusic.dll
+ at HAVE_GDATA_TRUE@REF_EXTENSION_EMUSIC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MIGO_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EMUSIC)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
+ at HAVE_GDATA_TRUE@LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
+ at HAVE_GDATA_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+
+ at HAVE_GDATA_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
+ at HAVE_GDATA_TRUE@LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
+ at HAVE_GDATA_TRUE@REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_NOWPLAYING = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@LINK_EXTENSION_NOWPLAYING = -r:$(DIR_BIN)/Banshee.NowPlaying.dll
+ at HAVE_GDATA_TRUE@LINK_EXTENSION_NOWPLAYING_DEPS = $(REF_EXTENSION_NOWPLAYING) \
+ at HAVE_GDATA_TRUE@ $(LINK_EXTENSION_NOWPLAYING)
+
+ at HAVE_GDATA_TRUE@REF_EXTENSION_NOWPLAYING_CLUTTER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_MONO_UPNP)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_YOUTUBE_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
- at ENABLE_YOUTUBE_TRUE@REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
- at ENABLE_YOUTUBE_TRUE@REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
- at ENABLE_YOUTUBE_TRUE@REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
- at ENABLE_YOUTUBE_TRUE@REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(MONOMAC_LIBS)
- at ENABLE_YOUTUBE_TRUE@REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS)
+ at HAVE_GDATA_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
+ at HAVE_GDATA_TRUE@REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
+ at HAVE_GDATA_TRUE@REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
+ at HAVE_GDATA_TRUE@REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
+ at HAVE_GDATA_TRUE@REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(MONOMAC_LIBS)
+ at HAVE_GDATA_TRUE@REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS)
# Cute hack to replace a space with something
- at ENABLE_YOUTUBE_TRUE@colon := :
- at ENABLE_YOUTUBE_TRUE@empty :=
- at ENABLE_YOUTUBE_TRUE@space := $(empty) $(empty)
+ at HAVE_GDATA_TRUE@colon := :
+ at HAVE_GDATA_TRUE@empty :=
+ at HAVE_GDATA_TRUE@space := $(empty) $(empty)
# Build path to allow running uninstalled
- at ENABLE_YOUTUBE_TRUE@RUN_PATH = $(subst $(space),$(colon), $(MONO_BASE_PATH))
- at ENABLE_YOUTUBE_FALSE@SOURCES_BUILD = $(addprefix $(srcdir)/, \
- at ENABLE_YOUTUBE_FALSE@ $(SOURCES)) \
- at ENABLE_YOUTUBE_FALSE@ $(top_srcdir)/src/AssemblyInfo.cs
- at ENABLE_YOUTUBE_TRUE@SOURCES_BUILD = $(addprefix $(srcdir)/, \
- at ENABLE_YOUTUBE_TRUE@ $(SOURCES)) \
- at ENABLE_YOUTUBE_TRUE@ $(top_srcdir)/src/AssemblyInfo.cs
- at ENABLE_YOUTUBE_FALSE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at ENABLE_YOUTUBE_TRUE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at ENABLE_YOUTUBE_FALSE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
- at ENABLE_YOUTUBE_FALSE@ -resource:$(resource),$(notdir $(resource)))
-
- at ENABLE_YOUTUBE_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
- at ENABLE_YOUTUBE_TRUE@ -resource:$(resource),$(notdir $(resource)))
-
- at ENABLE_YOUTUBE_FALSE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
- at ENABLE_YOUTUBE_TRUE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
- at ENABLE_YOUTUBE_FALSE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
- at ENABLE_YOUTUBE_TRUE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
- at ENABLE_YOUTUBE_FALSE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
- at ENABLE_YOUTUBE_TRUE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
- at ENABLE_YOUTUBE_FALSE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
- at ENABLE_YOUTUBE_TRUE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
- at ENABLE_YOUTUBE_FALSE@OUTPUT_FILES = \
- at ENABLE_YOUTUBE_FALSE@ $(ASSEMBLY_FILE) \
- at ENABLE_YOUTUBE_FALSE@ $(ASSEMBLY_FILE).mdb
-
- at ENABLE_YOUTUBE_TRUE@OUTPUT_FILES = \
- at ENABLE_YOUTUBE_TRUE@ $(ASSEMBLY_FILE) \
- at ENABLE_YOUTUBE_TRUE@ $(ASSEMBLY_FILE).mdb
-
- at ENABLE_YOUTUBE_FALSE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
- at ENABLE_YOUTUBE_TRUE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
- at ENABLE_YOUTUBE_FALSE@CLEANFILES = $(OUTPUT_FILES)
- at ENABLE_YOUTUBE_TRUE@CLEANFILES = $(OUTPUT_FILES)
- at ENABLE_YOUTUBE_FALSE@DISTCLEANFILES = *.pidb
- at ENABLE_YOUTUBE_TRUE@DISTCLEANFILES = *.pidb
- at ENABLE_YOUTUBE_FALSE@MAINTAINERCLEANFILES = Makefile.in
- at ENABLE_YOUTUBE_TRUE@MAINTAINERCLEANFILES = Makefile.in
- at ENABLE_YOUTUBE_TRUE@UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq
- at ENABLE_YOUTUBE_TRUE@BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
- at ENABLE_YOUTUBE_TRUE@INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)"
- at ENABLE_YOUTUBE_TRUE@INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
- at ENABLE_TESTS_TRUE@@ENABLE_YOUTUBE_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
- at ENABLE_YOUTUBE_TRUE@FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
- at ENABLE_YOUTUBE_TRUE@DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_YOUTUBE_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
- at ENABLE_YOUTUBE_TRUE@moduledir = $(INSTALL_DIR_RESOLVED)
- at ENABLE_YOUTUBE_TRUE@module_SCRIPTS = $(OUTPUT_FILES)
+ at HAVE_GDATA_TRUE@RUN_PATH = $(subst $(space),$(colon), $(MONO_BASE_PATH))
+ at HAVE_GDATA_FALSE@SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES)) \
+ at HAVE_GDATA_FALSE@ $(top_srcdir)/src/AssemblyInfo.cs
+ at HAVE_GDATA_TRUE@SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES)) \
+ at HAVE_GDATA_TRUE@ $(top_srcdir)/src/AssemblyInfo.cs
+ at HAVE_GDATA_FALSE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
+ at HAVE_GDATA_TRUE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
+ at HAVE_GDATA_FALSE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_GDATA_FALSE@ -resource:$(resource),$(notdir $(resource)))
+
+ at HAVE_GDATA_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_GDATA_TRUE@ -resource:$(resource),$(notdir $(resource)))
+
+ at HAVE_GDATA_FALSE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
+ at HAVE_GDATA_TRUE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
+ at HAVE_GDATA_FALSE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
+ at HAVE_GDATA_TRUE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
+ at HAVE_GDATA_FALSE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
+ at HAVE_GDATA_TRUE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
+ at HAVE_GDATA_FALSE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
+ at HAVE_GDATA_TRUE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
+ at HAVE_GDATA_FALSE@OUTPUT_FILES = \
+ at HAVE_GDATA_FALSE@ $(ASSEMBLY_FILE) \
+ at HAVE_GDATA_FALSE@ $(ASSEMBLY_FILE).mdb
+
+ at HAVE_GDATA_TRUE@OUTPUT_FILES = \
+ at HAVE_GDATA_TRUE@ $(ASSEMBLY_FILE) \
+ at HAVE_GDATA_TRUE@ $(ASSEMBLY_FILE).mdb
+
+ at HAVE_GDATA_FALSE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
+ at HAVE_GDATA_TRUE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
+ at HAVE_GDATA_FALSE@CLEANFILES = $(OUTPUT_FILES)
+ at HAVE_GDATA_TRUE@CLEANFILES = $(OUTPUT_FILES)
+ at HAVE_GDATA_FALSE@DISTCLEANFILES = *.pidb
+ at HAVE_GDATA_TRUE@DISTCLEANFILES = *.pidb
+ at HAVE_GDATA_FALSE@MAINTAINERCLEANFILES = Makefile.in
+ at HAVE_GDATA_TRUE@MAINTAINERCLEANFILES = Makefile.in
+ at HAVE_GDATA_TRUE@UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq
+ at HAVE_GDATA_TRUE@BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
+ at HAVE_GDATA_TRUE@INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)"
+ at HAVE_GDATA_TRUE@INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
+ at ENABLE_TESTS_TRUE@@HAVE_GDATA_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
+ at HAVE_GDATA_TRUE@FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
+ at HAVE_GDATA_TRUE@DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
+ at HAVE_GDATA_TRUE@moduledir = $(INSTALL_DIR_RESOLVED)
+ at HAVE_GDATA_TRUE@module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
.SUFFIXES:
@@ -821,8 +833,8 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- at ENABLE_YOUTUBE_FALSE@install-data-hook:
- at ENABLE_YOUTUBE_FALSE@uninstall-hook:
+ at HAVE_GDATA_FALSE@install-data-hook:
+ at HAVE_GDATA_FALSE@uninstall-hook:
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
@@ -907,56 +919,53 @@ uninstall-am: uninstall-moduleSCRIPTS
uninstall-moduleSCRIPTS
- at ENABLE_YOUTUBE_TRUE@all: $(ASSEMBLY_FILE) theme-icons
-
- at ENABLE_YOUTUBE_TRUE@run:
- at ENABLE_YOUTUBE_TRUE@ @pushd $(top_builddir); \
- at ENABLE_YOUTUBE_TRUE@ make run; \
- at ENABLE_YOUTUBE_TRUE@ popd;
-
- at ENABLE_YOUTUBE_TRUE@test:
- at ENABLE_YOUTUBE_TRUE@ @pushd $(top_builddir)/tests; \
- at ENABLE_YOUTUBE_TRUE@ make $(ASSEMBLY); \
- at ENABLE_YOUTUBE_TRUE@ popd;
-
- at ENABLE_YOUTUBE_TRUE@build-debug:
- at ENABLE_YOUTUBE_TRUE@ @echo $(DEP_LINK)
-
- at ENABLE_YOUTUBE_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_YOUTUBE_TRUE@ $(MCS) -out:$@ $<
-
- at ENABLE_YOUTUBE_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-
- at ENABLE_YOUTUBE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
- at ENABLE_YOUTUBE_TRUE@ @mkdir -p $(top_builddir)/bin
- at ENABLE_YOUTUBE_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
- at ENABLE_YOUTUBE_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
- at ENABLE_YOUTUBE_TRUE@ $(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $@.config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll -ilibgtkmacintegration.dylib -iCFRelease $(SOURCES_BUILD); \
- at ENABLE_YOUTUBE_TRUE@ fi;
- at ENABLE_YOUTUBE_TRUE@ $(MCS) \
- at ENABLE_YOUTUBE_TRUE@ $(GMCS_FLAGS) \
- at ENABLE_YOUTUBE_TRUE@ $(ASSEMBLY_BUILD_FLAGS) \
- at ENABLE_YOUTUBE_TRUE@ -nowarn:0278 -nowarn:0078 $$warn \
- at ENABLE_YOUTUBE_TRUE@ -debug -target:$(TARGET) -out:$@ \
- at ENABLE_YOUTUBE_TRUE@ $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) \
- at ENABLE_YOUTUBE_TRUE@ $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
- at ENABLE_YOUTUBE_TRUE@ @if [ -e $(srcdir)/$(notdir $@.config) ]; then \
- at ENABLE_YOUTUBE_TRUE@ cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \
- at ENABLE_YOUTUBE_TRUE@ fi;
- at ENABLE_YOUTUBE_TRUE@ @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \
- at ENABLE_YOUTUBE_TRUE@ cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \
- at ENABLE_YOUTUBE_TRUE@ fi;
-
- at ENABLE_YOUTUBE_TRUE@theme-icons: $(THEME_ICONS_SOURCE)
- at ENABLE_YOUTUBE_TRUE@ @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
-
- at ENABLE_YOUTUBE_TRUE@install-data-hook: $(THEME_ICONS_SOURCE)
- at ENABLE_YOUTUBE_TRUE@ @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
- at ENABLE_YOUTUBE_TRUE@ $(EXTRA_INSTALL_DATA_HOOK)
-
- at ENABLE_YOUTUBE_TRUE@uninstall-hook: $(THEME_ICONS_SOURCE)
- at ENABLE_YOUTUBE_TRUE@ @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
- at ENABLE_YOUTUBE_TRUE@ $(EXTRA_UNINSTALL_HOOK)
+ at HAVE_GDATA_TRUE@all: $(ASSEMBLY_FILE) theme-icons
+
+ at HAVE_GDATA_TRUE@run:
+ at HAVE_GDATA_TRUE@ @pushd $(top_builddir); \
+ at HAVE_GDATA_TRUE@ make run; \
+ at HAVE_GDATA_TRUE@ popd;
+
+ at HAVE_GDATA_TRUE@test:
+ at HAVE_GDATA_TRUE@ @pushd $(top_builddir)/tests; \
+ at HAVE_GDATA_TRUE@ make $(ASSEMBLY); \
+ at HAVE_GDATA_TRUE@ popd;
+
+ at HAVE_GDATA_TRUE@build-debug:
+ at HAVE_GDATA_TRUE@ @echo $(DEP_LINK)
+
+ at HAVE_GDATA_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
+
+ at HAVE_GDATA_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
+ at HAVE_GDATA_TRUE@ @mkdir -p $(top_builddir)/bin
+ at HAVE_GDATA_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
+ at HAVE_GDATA_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
+ at HAVE_GDATA_TRUE@ $(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $@.config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll -ilibgtkmacintegration.dylib -iCFRelease $(SOURCES_BUILD); \
+ at HAVE_GDATA_TRUE@ fi;
+ at HAVE_GDATA_TRUE@ $(MCS) \
+ at HAVE_GDATA_TRUE@ $(GMCS_FLAGS) \
+ at HAVE_GDATA_TRUE@ $(ASSEMBLY_BUILD_FLAGS) \
+ at HAVE_GDATA_TRUE@ -nowarn:0278 -nowarn:0078 $$warn \
+ at HAVE_GDATA_TRUE@ -debug -target:$(TARGET) -out:$@ \
+ at HAVE_GDATA_TRUE@ $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) \
+ at HAVE_GDATA_TRUE@ $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
+ at HAVE_GDATA_TRUE@ @if [ -e $(srcdir)/$(notdir $@.config) ]; then \
+ at HAVE_GDATA_TRUE@ cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \
+ at HAVE_GDATA_TRUE@ fi;
+ at HAVE_GDATA_TRUE@ @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \
+ at HAVE_GDATA_TRUE@ cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \
+ at HAVE_GDATA_TRUE@ fi;
+
+ at HAVE_GDATA_TRUE@theme-icons: $(THEME_ICONS_SOURCE)
+ at HAVE_GDATA_TRUE@ @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+
+ at HAVE_GDATA_TRUE@install-data-hook: $(THEME_ICONS_SOURCE)
+ at HAVE_GDATA_TRUE@ @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+ at HAVE_GDATA_TRUE@ $(EXTRA_INSTALL_DATA_HOOK)
+
+ at HAVE_GDATA_TRUE@uninstall-hook: $(THEME_ICONS_SOURCE)
+ at HAVE_GDATA_TRUE@ @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+ at HAVE_GDATA_TRUE@ $(EXTRA_UNINSTALL_HOOK)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/Extensions/Makefile.in b/src/Extensions/Makefile.in
index 8170542..f5f37e7 100644
--- a/src/Extensions/Makefile.in
+++ b/src/Extensions/Makefile.in
@@ -211,15 +211,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -228,6 +237,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -242,6 +253,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,6 +262,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/HyenaSqliteConnection.cs b/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/HyenaSqliteConnection.cs
index 9394754..a87e513 100644
--- a/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/HyenaSqliteConnection.cs
+++ b/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/HyenaSqliteConnection.cs
@@ -215,26 +215,26 @@ namespace Hyena.Data.Sqlite
}
// INSERT, UPDATE, DELETE queries
- public long Execute (HyenaSqliteCommand command)
+ public int Execute (HyenaSqliteCommand command)
{
command.CommandType = HyenaCommandType.Execute;;
QueueCommand(command);
- return (long)command.WaitForResult (this);
+ return Convert.ToInt32 (command.WaitForResult (this));
}
- public long Execute (HyenaSqliteCommand command, params object [] param_values)
+ public int Execute (HyenaSqliteCommand command, params object [] param_values)
{
command.CommandType = HyenaCommandType.Execute;;
QueueCommand(command, param_values);
- return (long)command.WaitForResult (this);
+ return Convert.ToInt32 (command.WaitForResult (this));
}
- public long Execute (string command_str, params object [] param_values)
+ public int Execute (string command_str, params object [] param_values)
{
return Execute (new HyenaSqliteCommand (command_str, param_values) { ReaderDisposes = true });
}
- public long Execute (object command)
+ public int Execute (object command)
{
return Execute (new HyenaSqliteCommand (command.ToString ()) { ReaderDisposes = true });
}
diff --git a/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/SqliteModelProvider.cs b/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/SqliteModelProvider.cs
index e10ded5..28f1a5b 100644
--- a/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/SqliteModelProvider.cs
+++ b/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/SqliteModelProvider.cs
@@ -262,11 +262,6 @@ namespace Hyena.Data.Sqlite
"Multiple primary keys in the {0} table", TableName)
);
}
- if (!c.ValueType.IsAssignableFrom (typeof (long))) {
- throw new Exception (String.Format (
- "Primary key {0} in the {1} class must be of type 'long'", c.Name, typeof(T))
- );
- }
key = c;
}
}
@@ -295,7 +290,7 @@ namespace Hyena.Data.Sqlite
public virtual void Save (T target, bool force_insert)
{
try {
- if (Convert.ToInt64 (key.GetRawValue (target)) > 0 && !force_insert) {
+ if (Convert.ToInt32 (key.GetRawValue (target)) > 0 && !force_insert) {
Update (target);
} else {
key.SetValue (target, Insert (target));
@@ -327,7 +322,7 @@ namespace Hyena.Data.Sqlite
return values;
}
- protected long Insert (T target)
+ protected int Insert (T target)
{
return connection.Execute (InsertCommand, GetInsertParams (target));
}
@@ -483,7 +478,7 @@ namespace Hyena.Data.Sqlite
if (key == null || item == null)
return false;
- long id = (long) key.GetValue (item);
+ int id = (int) key.GetValue (item);
if (id < 1)
return false;
diff --git a/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/Tests/DbBoundType.cs b/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/Tests/DbBoundType.cs
index b11591b..58b7dc6 100644
--- a/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/Tests/DbBoundType.cs
+++ b/src/Hyena/Hyena.Data.Sqlite/Hyena.Data.Sqlite/Tests/DbBoundType.cs
@@ -81,7 +81,7 @@ namespace Hyena.Data.Sqlite.Tests
internal class DbBoundType
{
[DatabaseColumn ("PrimaryKey", Constraints = DatabaseColumnConstraints.PrimaryKey)]
- public long PrimaryKey;
+ public int PrimaryKey;
[DatabaseColumn ("PublicIntField")]
public int PublicIntField;
diff --git a/src/Hyena/Hyena.Data.Sqlite/Makefile.in b/src/Hyena/Hyena.Data.Sqlite/Makefile.in
index 854c916..43ddcc5 100644
--- a/src/Hyena/Hyena.Data.Sqlite/Makefile.in
+++ b/src/Hyena/Hyena.Data.Sqlite/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -467,14 +482,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -589,7 +605,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -597,7 +613,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -605,7 +620,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -624,7 +639,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -663,7 +678,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -917,12 +931,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs
index a518896..10dbc4e 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs
@@ -30,7 +30,7 @@ using System;
namespace Hyena.Data.Gui.Accessibility
{
- public class ColumnCellAccessible: Atk.Object, Atk.IComponentImplementor
+ public class ColumnCellAccessible: Atk.Object, Atk.ComponentImplementor
{
protected ColumnCell cell;
protected object bound_object;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
index e149b45..1638fa6 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
@@ -31,7 +31,7 @@ using Mono.Unix;
namespace Hyena.Data.Gui.Accessibility
{
- class ColumnHeaderCellTextAccessible: ColumnCellTextAccessible, Atk.IActionImplementor
+ class ColumnHeaderCellTextAccessible: ColumnCellTextAccessible, Atk.ActionImplementor
{
private static string [] action_descriptions = new string[] {"", Catalog.GetString ("open context menu")};
private static string [] action_names_localized = new string[] {Catalog.GetString ("click"), Catalog.GetString ("menu")};
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Selection.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Selection.cs
index 8d880da..9036788 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Selection.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Selection.cs
@@ -36,7 +36,7 @@ using Hyena.Data.Gui;
namespace Hyena.Data.Gui.Accessibility
{
- public partial class ListViewAccessible<T> : Atk.ISelectionImplementor
+ public partial class ListViewAccessible<T> : Atk.SelectionImplementor
{
public void ListViewAccessible_Selection ()
{
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
index b2a0ac1..fb27e30 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
@@ -36,7 +36,7 @@ using Hyena.Data.Gui;
namespace Hyena.Data.Gui.Accessibility
{
- public partial class ListViewAccessible<T> : Atk.ITableImplementor
+ public partial class ListViewAccessible<T> : Atk.TableImplementor
{
public void ListViewAccessible_Table ()
{
@@ -124,8 +124,15 @@ namespace Hyena.Data.Gui.Accessibility
return new Atk.NoOpObject (list_view);
}
- public int GetSelectedRows (out int row) { row = 0; return 0; }
- public int GetSelectedColumns (out int cols) { cols = 0; return 0; }
+// Ensure https://bugzilla.novell.com/show_bug.cgi?id=512477 is fixed
+ private static readonly int [] empty_int_array = new int[0];
+ public int [] SelectedColumns {
+ get { return empty_int_array; }
+ }
+
+ public int [] SelectedRows {
+ get { return list_view.Selection.ToArray (); }
+ }
public bool IsColumnSelected (int column)
{
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs
index 8da5c16..e300c20 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs
@@ -43,8 +43,8 @@ namespace Hyena.Data.Gui
public Pango.Layout Layout { get; set; }
public Pango.FontDescription FontDescription { get; set; }
public Gtk.Widget Widget { get; set; }
- public Gtk.StateFlags State { get; set; }
- public Gdk.Window Drawable { get; set; }
+ public Gtk.StateType State { get; set; }
+ public Gdk.Drawable Drawable { get; set; }
public Theme Theme { get; set; }
public Gdk.Rectangle Area { get; set; }
public Gdk.Rectangle Clip { get; set; }
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCell.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCell.cs
index 9815807..e342864 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCell.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCell.cs
@@ -84,7 +84,7 @@ namespace Hyena.Data.Gui
Render (context, context.State, cellWidth, cellHeight);
}
- public virtual void Render (CellContext context, Gtk.StateFlags state, double cellWidth, double cellHeight)
+ public virtual void Render (CellContext context, Gtk.StateType state, double cellWidth, double cellHeight)
{
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs
index 9337ae8..28b2161 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs
@@ -52,17 +52,16 @@ namespace Hyena.Data.Gui
{
int cell_width = (int)cellWidth - 2 * Xpad;
int cell_height = (int)cellHeight - 2 * Ypad;
- int x = Xpad + ((cell_width - Size) / 2);
- int y = Ypad + ((cell_height - Size) / 2);
+ int x = context.Area.X + xpad + ((cell_width - Size) / 2);
+ int y = context.Area.Y + ypad + ((cell_height - Size) / 2);
- if (context.State == StateFlags.Normal && last_hover_bound == BoundObjectParent) {
- context.State = StateFlags.Prelight;
+ if (context.State == StateType.Normal && last_hover_bound == BoundObjectParent) {
+ context.State = StateType.Prelight;
}
- context.Widget.StyleContext.Save ();
- context.Widget.StyleContext.AddClass ("check");
- context.Widget.StyleContext.State = (Value ? StateFlags.Active : StateFlags.Normal);
- context.Widget.StyleContext.RenderCheck (context.Context, x, y, Size, Size);
- context.Widget.StyleContext.Restore ();
+
+ Style.PaintCheck (context.Widget.Style, context.Drawable, context.State,
+ Value ? ShadowType.In : ShadowType.Out,
+ context.Clip, context.Widget, "cellcheck", x, y, Size, Size);
}
private object last_pressed_bound;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellRating.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellRating.cs
index 8738e97..0346389 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellRating.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellRating.cs
@@ -63,7 +63,7 @@ namespace Hyena.Data.Gui
renderer.Value = Value;
bool is_hovering = hover_bound == BoundObjectParent && hover_bound != null;
- renderer.Render (context.Context, area, CairoExtensions.GdkRGBAToCairoColor (context.Theme.Widget.StyleContext.GetColor (context.State)),
+ renderer.Render (context.Context, area, context.Theme.Colors.GetWidgetColor (GtkColorClass.Text, context.State),
is_hovering, is_hovering, hover_value, 0.8, 0.45, 0.35);
// FIXME: Something is hosed in the view when computing cell dimensions
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs
index ec0df02..4812a64 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs
@@ -109,9 +109,10 @@ namespace Hyena.Data.Gui
//context.Context.Rectangle (0, 0, cellWidth, cellHeight);
//context.Context.Clip ();
context.Context.MoveTo (Padding.Left, ((int)cellHeight - text_height) / 2);
- var color = CairoExtensions.GdkRGBAToCairoColor (context.Theme.Widget.StyleContext.GetColor (context.State));
+ Cairo.Color color = context.Theme.Colors.GetWidgetColor (
+ context.TextAsForeground ? GtkColorClass.Foreground : GtkColorClass.Text, context.State);
color.A = Alpha ?? (context.Opaque ? 1.0 : 0.5);
- context.Context.SetSourceColor (color);
+ context.Context.Color = color;
PangoCairoHelper.ShowLayout (context.Context, context.Layout);
//context.Context.ResetClip ();
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs
index 48864fe..3110bb0 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs
@@ -64,7 +64,7 @@ namespace Hyena.Data.Gui
}
Gdk.Rectangle arrow_alloc = new Gdk.Rectangle ();
- arrow_alloc.Width = (int)(cellHeight / 2.0);
+ arrow_alloc.Width = (int)(cellHeight / 3.0);
arrow_alloc.Height = (int)((double)arrow_alloc.Width / 1.6);
arrow_alloc.X = (int)cellWidth - arrow_alloc.Width - (int)Padding.Left;
arrow_alloc.Y = ((int)cellHeight - arrow_alloc.Height) / 2;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs
index b783297..e5142a1 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs
@@ -50,7 +50,6 @@ namespace Hyena.Data.Gui
QueryTooltip += OnQueryTooltip;
DirectionChanged += (o, a) => SetDirection ();
manager = new CanvasManager (this);
- OnStyleUpdated ();
}
private void OnQueryTooltip (object o, Gtk.QueryTooltipArgs args)
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
index 1aca99f..7c50e56 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
@@ -76,7 +76,7 @@ namespace Hyena.Data.Gui
return rectangle;
int origin_x, origin_y;
- Window.GetPosition (out origin_x, out origin_y);
+ GdkWindow.GetPosition (out origin_x, out origin_y);
rectangle.X += origin_x;
rectangle.Y += origin_y;
@@ -105,7 +105,7 @@ namespace Hyena.Data.Gui
return rectangle;
int origin_x, origin_y;
- Window.GetPosition (out origin_x, out origin_y);
+ GdkWindow.GetPosition (out origin_x, out origin_y);
rectangle.X += origin_x;
rectangle.Y += origin_y;
@@ -118,7 +118,7 @@ namespace Hyena.Data.Gui
int origin_x = 0;
int origin_y = 0;
if (coord_type == Atk.CoordType.Screen)
- Window.GetPosition (out origin_x, out origin_y);
+ GdkWindow.GetPosition (out origin_x, out origin_y);
x = x - ListAllocation.X - origin_x;
y = y - ListAllocation.Y - origin_y;
@@ -165,18 +165,22 @@ namespace Hyena.Data.Gui
new ListViewAccessibleFactory<T> ();
Atk.Global.DefaultRegistry.SetFactoryType ((GLib.GType)typeof (ListView<T>), (GLib.GType)typeof (ListViewAccessibleFactory<T>));
- CreateAccessibleHandler = (obj) => {
- Log.InformationFormat ("Creating Accessible for {0}", obj);
- var accessible = new ListViewAccessible<T> (obj);
- (obj as ListView<T>).accessible = accessible;
- return accessible;
- };
- GetAccessibleTypeHandler = ()=> {
- return ListViewAccessible<T>.GType;
- };
} catch (Exception ex) {
Log.Exception ("Initialization of accessibility support for ListView widgets failed", ex);
}
}
+
+ protected override Atk.Object OnCreateAccessible (GLib.Object obj)
+ {
+ Log.InformationFormat ("Creating Accessible for {0}", obj);
+ var accessible = new ListViewAccessible<T> (obj);
+ (obj as ListView<T>).accessible = accessible;
+ return accessible;
+ }
+
+ protected override GLib.GType OnGetAccessibleType ()
+ {
+ return ListViewAccessible<T>.GType;
+ }
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
index b8bcf77..0706563 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
@@ -353,7 +353,7 @@ namespace Hyena.Data.Gui
menu.ShowAll ();
menu.Popup (null, null, delegate (Menu popup, out int pos_x, out int pos_y, out bool push_in) {
int win_x, win_y;
- Window.GetOrigin (out win_x, out win_y);
+ GdkWindow.GetOrigin (out win_x, out win_y);
pos_x = win_x + x;
pos_y = win_y + y;
@@ -579,11 +579,10 @@ namespace Hyena.Data.Gui
Add (label);
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previousStyle)
{
- base.OnStyleUpdated ();
- Gdk.RGBA rgba = StyleContext.GetColor (StateFlags.Selected);
- label.OverrideColor (StateFlags.Prelight, rgba);
+ base.OnStyleSet (previousStyle);
+ label.ModifyFg (StateType.Prelight, Style.Foreground (StateType.Selected));
}
protected override void OnActivated ()
@@ -617,11 +616,10 @@ namespace Hyena.Data.Gui
Add (label);
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previousStyle)
{
- base.OnStyleUpdated ();
- Gdk.RGBA rgba = StyleContext.GetColor (StateFlags.Selected);
- label.OverrideColor (StateFlags.Prelight, rgba);
+ base.OnStyleSet (previousStyle);
+ label.ModifyFg (StateType.Prelight, Style.Foreground (StateType.Selected));
}
protected override void OnActivated ()
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs
index 602b4c4..dacf9eb 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs
@@ -6,12 +6,10 @@
// Gabriel Burt <gburt at novell.com>
// Eitan Isaacson <eitan at ascender.com>
// Alex Launi <alex.launi at canonical.com>
-// Andrés G. Aragoneses <knocte at gmail.com>
//
// Copyright (C) 2007-2009 Novell, Inc.
// Copyright (C) 2009 Eitan Isaacson
// Copyright (C) 2010 Alex Launi
-// Copyright (C) 2013 Andrés G. Aragoneses
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -42,7 +40,7 @@ using Selection = Hyena.Collections.Selection;
namespace Hyena.Data.Gui
{
- public partial class ListView<T> : ListViewBase, IScrollableImplementor
+ public partial class ListView<T> : ListViewBase
{
private enum KeyDirection {
Press,
@@ -78,37 +76,11 @@ namespace Hyena.Data.Gui
private Adjustment vadjustment;
public Adjustment Vadjustment {
get { return vadjustment; }
- set {
- if (value == vadjustment) {
- return;
- }
- if (vadjustment != null) {
- vadjustment.ValueChanged -= OnVadjustmentChanged;
- }
- vadjustment = value;
- if (vadjustment != null) {
- vadjustment.ValueChanged += OnVadjustmentChanged;
- }
- UpdateAdjustments ();
- }
}
private Adjustment hadjustment;
public Adjustment Hadjustment {
get { return hadjustment; }
- set {
- if (value == hadjustment) {
- return;
- }
- if (hadjustment != null) {
- hadjustment.ValueChanged -= OnHadjustmentChanged;
- }
- hadjustment = value;
- if (hadjustment != null) {
- hadjustment.ValueChanged += OnHadjustmentChanged;
- }
- UpdateAdjustments ();
- }
}
private SelectionProxy selection_proxy = new SelectionProxy ();
@@ -734,7 +706,7 @@ namespace Hyena.Data.Gui
if (resizing_column_index >= 0) {
pressed_column_index = -1;
resizing_column_index = -1;
- Window.Cursor = null;
+ GdkWindow.Cursor = null;
return true;
}
@@ -833,7 +805,7 @@ namespace Hyena.Data.Gui
return true;
}
- Window.Cursor = header_interaction_alloc.Contains ((int)evnt.X, (int)evnt.Y) &&
+ GdkWindow.Cursor = header_interaction_alloc.Contains ((int)evnt.X, (int)evnt.Y) &&
(resizing_column_index >= 0 || GetColumnForResizeHandle (x) != null)
? resize_x_cursor
: null;
@@ -859,7 +831,7 @@ namespace Hyena.Data.Gui
OnDragScroll (OnDragHScrollTimeout, header_interaction_alloc.Width * 0.1, header_interaction_alloc.Width, x);
- Window.Cursor = drag_cursor;
+ GdkWindow.Cursor = drag_cursor;
Column swap_column = GetColumnAt (x);
@@ -903,7 +875,7 @@ namespace Hyena.Data.Gui
protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing evnt)
{
if (evnt.Mode == Gdk.CrossingMode.Normal) {
- Window.Cursor = null;
+ GdkWindow.Cursor = null;
if (LayoutChildHandlesEvent (evnt, false)) {
return true;
}
@@ -951,7 +923,7 @@ namespace Hyena.Data.Gui
if (pressed_column_index >= 0 && pressed_column_is_dragging) {
pressed_column_is_dragging = false;
pressed_column_index = -1;
- Window.Cursor = null;
+ GdkWindow.Cursor = null;
QueueDirtyRegion ();
return true;
}
@@ -1000,55 +972,48 @@ namespace Hyena.Data.Gui
#region Adjustments & Scrolling
- public Gtk.ScrollablePolicy HscrollPolicy {
- get; set;
- }
-
- public Gtk.ScrollablePolicy VscrollPolicy {
- get; set;
+ private void UpdateAdjustments ()
+ {
+ UpdateAdjustments (null, null);
}
- private void UpdateAdjustments ()
+ private void UpdateAdjustments (Adjustment hadj, Adjustment vadj)
{
+ if (hadj != null) {
+ hadjustment = hadj;
+ }
+
+ if (vadj != null) {
+ vadjustment = vadj;
+ }
+
// FIXME: with ViewLayout, hadj and vadj should be unified
// since the layout will take the header into account...
if (hadjustment != null) {
hadjustment.Upper = header_width;
hadjustment.StepIncrement = 10.0;
if (hadjustment.Value + hadjustment.PageSize > hadjustment.Upper) {
- hadjustment.Value = Math.Max (0, hadjustment.Upper - hadjustment.PageSize);
- }
- if (hadjustment.Upper > 0 && hadjustment.Upper < hadjustment.PageSize) {
- hadjustment.Upper = hadjustment.PageSize;
+ hadjustment.Value = hadjustment.Upper - hadjustment.PageSize;
}
}
- if (vadjustment != null) {
-
- if (model != null && model.Count > 0) {
- // FIXME: hard-coded grid logic
- if (ViewLayout != null) {
- vadjustment.Upper = ViewLayout.VirtualSize.Height;
- vadjustment.StepIncrement = ViewLayout.ChildSize.Height;
- } else {
- vadjustment.Upper = ChildSize.Height * model.Count;
- vadjustment.StepIncrement = ChildSize.Height;
- }
-
- if (vadjustment.Value + vadjustment.PageSize > vadjustment.Upper) {
- vadjustment.Value = Math.Max (0, vadjustment.Upper - vadjustment.PageSize);
- }
- if (vadjustment.Upper > 0 && vadjustment.Upper < vadjustment.PageSize) {
- vadjustment.Upper = vadjustment.PageSize;
- }
+ if (vadjustment != null && model != null) {
+ // FIXME: hard-coded grid logic
+ if (ViewLayout != null) {
+ vadjustment.Upper = ViewLayout.VirtualSize.Height;
+ vadjustment.StepIncrement = ViewLayout.ChildSize.Height;
} else {
- vadjustment.Upper = 0;
- vadjustment.Lower = 0;
- vadjustment.PageSize = 0;
- vadjustment.PageIncrement = 0;
- vadjustment.StepIncrement = 0;
- vadjustment.Value = 0;
+ vadjustment.Upper = ChildSize.Height * model.Count;
+ vadjustment.StepIncrement = ChildSize.Height;
}
+
+ if (vadjustment.Value + vadjustment.PageSize > vadjustment.Upper) {
+ vadjustment.Value = vadjustment.Upper - vadjustment.PageSize;
+ }
+ } else if (vadjustment != null) {
+ // model is null
+ vadjustment.Upper = 0;
+ vadjustment.Lower = 0;
}
if (hadjustment != null) {
@@ -1127,6 +1092,18 @@ namespace Hyena.Data.Gui
}
}
+ protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
+ {
+ if (hadj == null || vadj == null) {
+ return;
+ }
+
+ hadj.ValueChanged += OnHadjustmentChanged;
+ vadj.ValueChanged += OnVadjustmentChanged;
+
+ UpdateAdjustments (hadj, vadj);
+ }
+
#endregion
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
index e15f813..dd0cca8 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
@@ -35,6 +35,7 @@ using Gdk;
using Hyena.Gui;
using Hyena.Gui.Theming;
using Hyena.Gui.Canvas;
+using GtkColorClass=Hyena.Gui.Theming.GtkColorClass;
namespace Hyena.Data.Gui
{
@@ -42,13 +43,14 @@ namespace Hyena.Data.Gui
public partial class ListView<T> : ListViewBase
{
+ private Cairo.Context cairo_context;
private CellContext cell_context;
private Pango.Layout pango_layout;
public override Pango.Layout PangoLayout {
get {
- if (pango_layout == null && Window != null && IsRealized) {
- using (var cr = Gdk.CairoHelper.Create (Window)) {
+ if (pango_layout == null && GdkWindow != null && IsRealized) {
+ using (var cr = Gdk.CairoHelper.Create (GdkWindow)) {
pango_layout = CairoExtensions.CreateLayout (this, cr);
cell_context.FontDescription = pango_layout.FontDescription;
cell_context.Layout = pango_layout;
@@ -59,7 +61,7 @@ namespace Hyena.Data.Gui
}
public override Pango.FontDescription FontDescription {
- get { return cell_context != null ? cell_context.FontDescription : null; }
+ get { return cell_context.FontDescription; }
}
private List<int> selected_rows = new List<int> ();
@@ -76,9 +78,19 @@ namespace Hyena.Data.Gui
set { do_not_render_null_model = value; }
}
- protected override void OnStyleUpdated ()
+ private bool changing_style = false;
+
+ protected override void OnStyleSet (Style old_style)
{
- base.OnStyleUpdated ();
+ if (changing_style) {
+ return;
+ }
+
+ changing_style = true;
+ GtkUtilities.AdaptGtkRcStyle (this, typeof (TreeView));
+ changing_style = false;
+
+ base.OnStyleSet (old_style);
// FIXME: legacy list foo
if (ViewLayout == null) {
@@ -88,7 +100,7 @@ namespace Hyena.Data.Gui
theme = Hyena.Gui.Theming.ThemeEngine.CreateTheme (this);
// Save the drawable so we can reuse it
- var drawable = cell_context != null ? cell_context.Drawable : null;
+ Gdk.Drawable drawable = cell_context != null ? cell_context.Drawable : null;
if (pango_layout != null) {
cell_context.FontDescription.Dispose ();
@@ -117,63 +129,65 @@ namespace Hyena.Data.Gui
}
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (EventExpose evnt)
{
if (DoNotRenderNullModel && Model == null) {
return true;
}
+ var damage = new Rectangle ();
+ foreach (Rectangle rect in evnt.Region.GetRectangles ()) {
+ damage = damage.Union (rect);
+ }
+
+ cairo_context = CairoHelper.Create (evnt.Window);
+
cell_context.Layout = PangoLayout;
- cell_context.Context = cr;
+ cell_context.Context = cairo_context;
// FIXME: legacy list foo
if (ViewLayout == null) {
- if (OnMeasure ()) {
- QueueResize ();
- }
+ OnMeasure ();
}
- // treview style
- StyleContext.Save ();
- StyleContext.AddClass ("view");
- StyleContext.RenderBackground (cr, 0, 0, Allocation.Width, Allocation.Height);
- StyleContext.RemoveClass ("view");
+ Theme.DrawFrameBackground (cairo_context, Allocation, true);
// FIXME: ViewLayout will never be null in the future but we'll need
// to deterministically render a header somehow...
if (header_visible && ViewLayout == null && column_controller != null) {
- PaintHeader (cr);
+ PaintHeader (damage);
}
-
if (Model != null) {
// FIXME: ViewLayout will never be null in
// the future, PaintList will go away
if (ViewLayout == null) {
- PaintList (cr, Allocation);
+ PaintList (damage);
} else {
- PaintView (cr, new Rect (0.0, 0.0, Allocation.Width, Allocation.Height));
+ PaintView ((Rect)damage);
}
}
- Theme.DrawFrameBorder (cr, Allocation);
+ Theme.DrawFrameBorder (cairo_context, Allocation);
+
+ PaintDraggingColumn (damage);
+
+ CairoExtensions.DisposeContext (cairo_context);
- PaintDraggingColumn (cr);
- StyleContext.Restore ();
return true;
}
#region Header Rendering
- private void PaintHeader (Cairo.Context cr)
+ private void PaintHeader (Rectangle clip)
{
- Rectangle clip = header_rendering_alloc;
- clip.Height += Theme.BorderWidth;
- clip.Intersect (new Gdk.Rectangle (0, 0, Allocation.Width, Allocation.Height));
- cr.Rectangle (clip.X, clip.Y, clip.Width, clip.Height);
- cr.Clip ();
+ Rectangle rect = header_rendering_alloc;
+ rect.Height += Theme.BorderWidth;
+ clip.Intersect (rect);
+ cairo_context.Rectangle (clip.X, clip.Y, clip.Width, clip.Height);
+ cairo_context.Clip ();
- Theme.DrawHeaderBackground (cr, header_rendering_alloc);
+ Theme.DrawHeaderBackground (cairo_context, header_rendering_alloc);
Rectangle cell_area = new Rectangle ();
cell_area.Y = header_rendering_alloc.Y;
@@ -192,64 +206,58 @@ namespace Hyena.Data.Gui
cell_area.X = column_cache[ci].X1 + Theme.TotalBorderWidth + header_rendering_alloc.X - HadjustmentValue;
cell_area.Width = column_cache[ci].Width;
- PaintHeaderCell (cr, cell_area, ci, false, ref have_drawn_separator);
+ PaintHeaderCell (cell_area, ci, false, ref have_drawn_separator);
}
if (pressed_column_is_dragging && pressed_column_index >= 0) {
- cell_area.X = pressed_column_x_drag - HadjustmentValue;
+ cell_area.X = pressed_column_x_drag + Allocation.X - HadjustmentValue;
cell_area.Width = column_cache[pressed_column_index].Width;
- PaintHeaderCell (cr, cell_area, pressed_column_index, true, ref have_drawn_separator);
+ PaintHeaderCell (cell_area, pressed_column_index, true, ref have_drawn_separator);
}
- cr.ResetClip ();
+ cairo_context.ResetClip ();
}
- private void PaintHeaderCell (Cairo.Context cr, Rectangle area, int ci, bool dragging, ref bool have_drawn_separator)
+ private void PaintHeaderCell (Rectangle area, int ci, bool dragging, ref bool have_drawn_separator)
{
if (ci < 0 || column_cache.Length <= ci)
return;
if (ci == ActiveColumn && HasFocus && HeaderFocused) {
- Theme.DrawColumnHeaderFocus (cr, area);
+ Theme.DrawColumnHeaderFocus (cairo_context, area);
}
if (dragging) {
- Cairo.Color dark_color = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetBackgroundColor (StateFlags.Normal));
- dark_color = CairoExtensions.ColorShade (dark_color, 0.7);
-
- Theme.DrawColumnHighlight (cr, area, dark_color);
+ Theme.DrawColumnHighlight (cairo_context, area,
+ CairoExtensions.ColorShade (Theme.Colors.GetWidgetColor (GtkColorClass.Dark, StateType.Normal), 0.9));
- StyleContext.Save ();
- StyleContext.AddClass ("entry");
- Cairo.Color base_color = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetBackgroundColor (StateFlags.Normal));
- StyleContext.Restore ();
-
- Cairo.Color stroke_color = CairoExtensions.ColorShade (base_color, 0.0);
+ Cairo.Color stroke_color = CairoExtensions.ColorShade (Theme.Colors.GetWidgetColor (
+ GtkColorClass.Base, StateType.Normal), 0.0);
stroke_color.A = 0.3;
- cr.SetSourceColor (stroke_color);
- cr.MoveTo (area.X + 0.5, area.Y + 1.0);
- cr.LineTo (area.X + 0.5, area.Bottom);
- cr.MoveTo (area.Right - 0.5, area.Y + 1.0);
- cr.LineTo (area.Right - 0.5, area.Bottom);
- cr.Stroke ();
+ cairo_context.Color = stroke_color;
+ cairo_context.MoveTo (area.X + 0.5, area.Y + 1.0);
+ cairo_context.LineTo (area.X + 0.5, area.Bottom);
+ cairo_context.MoveTo (area.Right - 0.5, area.Y + 1.0);
+ cairo_context.LineTo (area.Right - 0.5, area.Bottom);
+ cairo_context.Stroke ();
}
ColumnCell cell = column_cache[ci].Column.HeaderCell;
if (cell != null) {
- cr.Save ();
- cr.Translate (area.X, area.Y);
+ cairo_context.Save ();
+ cairo_context.Translate (area.X, area.Y);
cell_context.Area = area;
- cell_context.State = StateFlags.Normal;
+ cell_context.State = StateType.Normal;
cell.Render (cell_context, area.Width, area.Height);
- cr.Restore ();
+ cairo_context.Restore ();
}
if (!dragging && ci < column_cache.Length - 1 && (have_drawn_separator ||
column_cache[ci].MaxWidth != column_cache[ci].MinWidth)) {
have_drawn_separator = true;
- Theme.DrawHeaderSeparator (cr, area, area.Right);
+ Theme.DrawHeaderSeparator (cairo_context, area, area.Right);
}
}
@@ -257,7 +265,7 @@ namespace Hyena.Data.Gui
#region List Rendering
- private void PaintList (Cairo.Context cr, Rectangle clip)
+ private void PaintList (Rectangle clip)
{
if (ChildSize.Height <= 0) {
return;
@@ -267,17 +275,15 @@ namespace Hyena.Data.Gui
// Render the sort effect to the GdkWindow.
if (sort_column_index != -1 && (!pressed_column_is_dragging || pressed_column_index != sort_column_index)) {
CachedColumn col = column_cache[sort_column_index];
- StyleContext.AddRegion ("column", RegionFlags.Sorted);
- StyleContext.RenderBackground (cr,
+ Theme.DrawRowRule (cairo_context,
list_rendering_alloc.X + col.X1 - HadjustmentValue,
header_rendering_alloc.Bottom + Theme.BorderWidth,
col.Width, list_rendering_alloc.Height + Theme.InnerBorderWidth * 2);
- StyleContext.RemoveRegion ("column");
}
clip.Intersect (list_rendering_alloc);
- cr.Rectangle (clip.X, clip.Y, clip.Width, clip.Height);
- cr.Clip ();
+ cairo_context.Rectangle (clip.X, clip.Y, clip.Width, clip.Height);
+ cairo_context.Clip ();
cell_context.Clip = clip;
cell_context.TextAsForeground = false;
@@ -312,16 +318,12 @@ namespace Hyena.Data.Gui
selected_focus_alloc = single_list_alloc;
}
} else {
- StyleContext.AddClass ("cell");
- if (rules_hint) { // TODO: check also gtk_widget_style_get(widget,"allow-rules",&allow_rules,NULL);
- StyleContext.AddRegion ("row", ri % 2 != 0 ? RegionFlags.Odd : RegionFlags.Even);
+ if (rules_hint && ri % 2 != 0) {
+ Theme.DrawRowRule (cairo_context, single_list_alloc.X, single_list_alloc.Y,
+ single_list_alloc.Width, single_list_alloc.Height);
}
- StyleContext.RenderBackground (cr, single_list_alloc.X, single_list_alloc.Y,
- single_list_alloc.Width, single_list_alloc.Height);
- StyleContext.RemoveRegion ("row");
- StyleContext.RemoveClass ("cell");
- PaintReorderLine (cr, ri, single_list_alloc);
+ PaintReorderLine (ri, single_list_alloc);
if (Selection != null && Selection.FocusedIndex == ri && !Selection.Contains (ri) && HasFocus) {
CairoCorners corners = CairoCorners.All;
@@ -335,89 +337,66 @@ namespace Hyena.Data.Gui
}
if (HasFocus && !HeaderFocused) // Cursor out of selection.
- Theme.DrawRowCursor (cr, single_list_alloc.X, single_list_alloc.Y,
+ Theme.DrawRowCursor (cairo_context, single_list_alloc.X, single_list_alloc.Y,
single_list_alloc.Width, single_list_alloc.Height,
- CairoExtensions.ColorShade (CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetBackgroundColor (StateFlags.Selected)), 0.85));
+ CairoExtensions.ColorShade (Theme.Colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected), 0.85));
}
if (selection_height > 0) {
-
- StyleContext.AddClass ("cell");
- var bg_selected_color = StyleContext.GetBackgroundColor (StateFlags.Selected);
-
- if (bg_selected_color.Equals (StyleContext.GetBackgroundColor (StateFlags.Normal))) {
- // see https://bugs.launchpad.net/bugs/1211831
- Hyena.Log.Warning ("Buggy CSS theme: same background-color for .cell:selected and .cell");
- StyleContext.RemoveClass ("cell");
- bg_selected_color = StyleContext.GetBackgroundColor (StateFlags.Selected);
- StyleContext.AddClass ("cell");
- }
- Cairo.Color selection_color = CairoExtensions.GdkRGBAToCairoColor (bg_selected_color);
-
+ Cairo.Color selection_color = Theme.Colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected);
if (!HasFocus || HeaderFocused)
selection_color = CairoExtensions.ColorShade (selection_color, 1.1);
- Theme.DrawRowSelection (cr, list_rendering_alloc.X, selection_y, list_rendering_alloc.Width, selection_height,
+ Theme.DrawRowSelection (cairo_context, list_rendering_alloc.X, selection_y, list_rendering_alloc.Width, selection_height,
true, true, selection_color, CairoCorners.All);
- StyleContext.RemoveClass ("cell");
selection_height = 0;
}
- PaintRow (cr, ri, single_list_alloc, StateFlags.Normal);
+ PaintRow (ri, single_list_alloc, StateType.Normal);
}
single_list_alloc.Y += single_list_alloc.Height;
}
// In case the user is dragging to the end of the list
- PaintReorderLine (cr, last_row, single_list_alloc);
+ PaintReorderLine (last_row, single_list_alloc);
if (selection_height > 0) {
- Theme.DrawRowSelection (cr, list_rendering_alloc.X, selection_y,
+ Theme.DrawRowSelection (cairo_context, list_rendering_alloc.X, selection_y,
list_rendering_alloc.Width, selection_height);
}
if (Selection != null && Selection.Count > 1 &&
!selected_focus_alloc.Equals (Rectangle.Zero) &&
HasFocus && !HeaderFocused) { // Cursor inside selection.
- // Use entry to get text color
- StyleContext.Save ();
- StyleContext.AddClass ("entry");
- Cairo.Color text_color = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetColor (StateFlags.Selected));
- StyleContext.Restore ();
-
- Theme.DrawRowCursor (cr, selected_focus_alloc.X, selected_focus_alloc.Y,
- selected_focus_alloc.Width, selected_focus_alloc.Height, text_color);
+ Theme.DrawRowCursor (cairo_context, selected_focus_alloc.X, selected_focus_alloc.Y,
+ selected_focus_alloc.Width, selected_focus_alloc.Height,
+ Theme.Colors.GetWidgetColor (GtkColorClass.Text, StateType.Selected));
}
foreach (int ri in selected_rows) {
single_list_alloc.Y = offset + ((ri - first_row) * single_list_alloc.Height);
- PaintRow (cr, ri, single_list_alloc, StateFlags.Selected);
+ PaintRow (ri, single_list_alloc, StateType.Selected);
}
- cr.ResetClip ();
+ cairo_context.ResetClip ();
}
- private void PaintReorderLine (Cairo.Context cr, int row_index, Rectangle single_list_alloc)
+ private void PaintReorderLine (int row_index, Rectangle single_list_alloc)
{
if (row_index == drag_reorder_row_index && IsReorderable) {
- cr.Save ();
- cr.LineWidth = 1.0;
- cr.Antialias = Cairo.Antialias.None;
- cr.MoveTo (single_list_alloc.Left, single_list_alloc.Top);
- cr.LineTo (single_list_alloc.Right, single_list_alloc.Top);
-
- StyleContext.Save ();
- StyleContext.AddClass ("entry");
- cr.SetSourceColor (CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetColor (StateFlags.Normal)));
- StyleContext.Restore ();
-
- cr.Stroke ();
- cr.Restore ();
+ cairo_context.Save ();
+ cairo_context.LineWidth = 1.0;
+ cairo_context.Antialias = Cairo.Antialias.None;
+ cairo_context.MoveTo (single_list_alloc.Left, single_list_alloc.Top);
+ cairo_context.LineTo (single_list_alloc.Right, single_list_alloc.Top);
+ cairo_context.Color = Theme.Colors.GetWidgetColor (GtkColorClass.Text, StateType.Normal);
+ cairo_context.Stroke ();
+ cairo_context.Restore ();
}
}
- private void PaintRow (Cairo.Context cr, int row_index, Rectangle area, StateFlags state)
+ private void PaintRow (int row_index, Rectangle area, StateType state)
{
if (column_cache == null) {
return;
@@ -442,19 +421,19 @@ namespace Hyena.Data.Gui
cell_area.Width = column_cache[ci].Width;
cell_area.X = column_cache[ci].X1 + area.X;
- PaintCell (cr, item, ci, row_index, cell_area, opaque, bold, state, false);
+ PaintCell (item, ci, row_index, cell_area, opaque, bold, state, false);
}
if (pressed_column_is_dragging && pressed_column_index >= 0) {
cell_area.Width = column_cache[pressed_column_index].Width;
cell_area.X = pressed_column_x_drag + list_rendering_alloc.X -
list_interaction_alloc.X - HadjustmentValue;
- PaintCell (cr, item, pressed_column_index, row_index, cell_area, opaque, bold, state, true);
+ PaintCell (item, pressed_column_index, row_index, cell_area, opaque, bold, state, true);
}
}
- private void PaintCell (Cairo.Context cr, object item, int column_index, int row_index, Rectangle area, bool opaque, bool bold,
- StateFlags state, bool dragging)
+ private void PaintCell (object item, int column_index, int row_index, Rectangle area, bool opaque, bool bold,
+ StateType state, bool dragging)
{
ColumnCell cell = column_cache[column_index].Column.GetCell (0);
cell.Bind (item);
@@ -467,28 +446,25 @@ namespace Hyena.Data.Gui
}
if (dragging) {
- StyleContext.Save ();
- StyleContext.AddClass ("entry");
- Cairo.Color fill_color = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetBackgroundColor (StateFlags.Normal));
- StyleContext.Restore ();
+ Cairo.Color fill_color = Theme.Colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal);
fill_color.A = 0.5;
- cr.SetSourceColor (fill_color);
- cr.Rectangle (area.X, area.Y, area.Width, area.Height);
- cr.Fill ();
+ cairo_context.Color = fill_color;
+ cairo_context.Rectangle (area.X, area.Y, area.Width, area.Height);
+ cairo_context.Fill ();
}
- cr.Save ();
- cr.Translate (area.X, area.Y);
+ cairo_context.Save ();
+ cairo_context.Translate (area.X, area.Y);
cell_context.Area = area;
cell_context.Opaque = opaque;
- cell_context.State = dragging ? StateFlags.Normal : state;
+ cell_context.State = dragging ? StateType.Normal : state;
cell.Render (cell_context, area.Width, area.Height);
- cr.Restore ();
+ cairo_context.Restore ();
AccessibleCellRedrawn (column_index, row_index);
}
- private void PaintDraggingColumn (Cairo.Context cr)
+ private void PaintDraggingColumn (Rectangle clip)
{
if (!pressed_column_is_dragging || pressed_column_index < 0) {
return;
@@ -496,41 +472,39 @@ namespace Hyena.Data.Gui
CachedColumn column = column_cache[pressed_column_index];
- int x = pressed_column_x_drag + 1 - HadjustmentValue;
-
- StyleContext.Save ();
- StyleContext.AddClass ("entry");
- Cairo.Color fill_color = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetBackgroundColor (StateFlags.Normal));
+ int x = pressed_column_x_drag + Allocation.X + 1 - HadjustmentValue;
- Cairo.Color stroke_color = CairoExtensions.ColorShade (fill_color, 0.0);
+ Cairo.Color fill_color = Theme.Colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal);
fill_color.A = 0.45;
+
+ Cairo.Color stroke_color = CairoExtensions.ColorShade (Theme.Colors.GetWidgetColor (
+ GtkColorClass.Base, StateType.Normal), 0.0);
stroke_color.A = 0.3;
- StyleContext.Restore ();
- cr.Rectangle (x, header_rendering_alloc.Bottom + 1, column.Width - 2,
+ cairo_context.Rectangle (x, header_rendering_alloc.Bottom + 1, column.Width - 2,
list_rendering_alloc.Bottom - header_rendering_alloc.Bottom - 1);
- cr.SetSourceColor (fill_color);
- cr.Fill ();
+ cairo_context.Color = fill_color;
+ cairo_context.Fill ();
- cr.MoveTo (x - 0.5, header_rendering_alloc.Bottom + 0.5);
- cr.LineTo (x - 0.5, list_rendering_alloc.Bottom + 0.5);
- cr.LineTo (x + column.Width - 1.5, list_rendering_alloc.Bottom + 0.5);
- cr.LineTo (x + column.Width - 1.5, header_rendering_alloc.Bottom + 0.5);
+ cairo_context.MoveTo (x - 0.5, header_rendering_alloc.Bottom + 0.5);
+ cairo_context.LineTo (x - 0.5, list_rendering_alloc.Bottom + 0.5);
+ cairo_context.LineTo (x + column.Width - 1.5, list_rendering_alloc.Bottom + 0.5);
+ cairo_context.LineTo (x + column.Width - 1.5, header_rendering_alloc.Bottom + 0.5);
- cr.SetSourceColor (stroke_color);
- cr.LineWidth = 1.0;
- cr.Stroke ();
+ cairo_context.Color = stroke_color;
+ cairo_context.LineWidth = 1.0;
+ cairo_context.Stroke ();
}
#endregion
#region View Layout Rendering
- private void PaintView (Cairo.Context cr, Rect clip)
+ private void PaintView (Rect clip)
{
clip.Intersect ((Rect)list_rendering_alloc);
- cr.Rectangle ((Cairo.Rectangle)clip);
- cr.Clip ();
+ cairo_context.Rectangle ((Cairo.Rectangle)clip);
+ cairo_context.Clip ();
cell_context.Clip = (Gdk.Rectangle)clip;
cell_context.TextAsForeground = false;
@@ -548,30 +522,30 @@ namespace Hyena.Data.Gui
if (Selection != null && Selection.Contains (ViewLayout.GetModelIndex (layout_child))) {
selected_rows.Add (ViewLayout.GetModelIndex (layout_child));
- var selection_color = CairoExtensions.GdkRGBAToCairoColor (StyleContext.GetBackgroundColor (StateFlags.Selected));
+ var selection_color = Theme.Colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected);
if (!HasFocus || HeaderFocused) {
selection_color = CairoExtensions.ColorShade (selection_color, 1.1);
}
- Theme.DrawRowSelection (cr,
+ Theme.DrawRowSelection (cairo_context,
(int)child_allocation.X, (int)child_allocation.Y,
(int)child_allocation.Width, (int)child_allocation.Height,
true, true, selection_color, CairoCorners.All);
- cell_context.State = StateFlags.Selected;
+ cell_context.State = StateType.Selected;
} else {
- cell_context.State = StateFlags.Normal;
+ cell_context.State = StateType.Normal;
}
- //cr.Save ();
- //cr.Translate (child_allocation.X, child_allocation.Y);
- //cr.Rectangle (0, 0, child_allocation.Width, child_allocation.Height);
- //cr.Clip ();
+ //cairo_context.Save ();
+ //cairo_context.Translate (child_allocation.X, child_allocation.Y);
+ //cairo_context.Rectangle (0, 0, child_allocation.Width, child_allocation.Height);
+ //cairo_context.Clip ();
layout_child.Render (cell_context);
- //cr.Restore ();
+ //cairo_context.Restore ();
}
- cr.ResetClip ();
+ cairo_context.ResetClip ();
}
#endregion
@@ -637,21 +611,17 @@ namespace Hyena.Data.Gui
: new Gdk.Size (0, ColumnCellText.ComputeRowHeight (this));
}
- private bool OnMeasure ()
+ private void OnMeasure ()
{
if (!measure_pending) {
- return false;
+ return;
}
measure_pending = false;
header_height = 0;
-
- var old_child_size = child_size;
child_size = OnMeasureChild ();
UpdateAdjustments ();
-
- return old_child_size != child_size;
}
#endregion
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs
index 4c42cb8..898e73f 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs
@@ -53,11 +53,10 @@ namespace Hyena.Data.Gui
protected override void OnRealized ()
{
- IsRealized = true;
- HasWindow = false;
+ WidgetFlags |= WidgetFlags.Realized | WidgetFlags.NoWindow;
- Window = Parent.Window;
- cell_context.Drawable = Window;
+ GdkWindow = Parent.GdkWindow;
+ cell_context.Drawable = GdkWindow;
WindowAttr attributes = new WindowAttr ();
attributes.WindowType = Gdk.WindowType.Child;
@@ -65,7 +64,7 @@ namespace Hyena.Data.Gui
attributes.Y = Allocation.Y;
attributes.Width = Allocation.Width;
attributes.Height = Allocation.Height;
- attributes.Wclass = WindowWindowClass.InputOnly;
+ attributes.Wclass = WindowClass.InputOnly;
attributes.EventMask = (int)(
EventMask.PointerMotionMask |
EventMask.KeyPressMask |
@@ -78,7 +77,7 @@ namespace Hyena.Data.Gui
WindowAttributesType attributes_mask =
WindowAttributesType.X | WindowAttributesType.Y | WindowAttributesType.Wmclass;
- event_window = new Gdk.Window (Window, attributes, attributes_mask);
+ event_window = new Gdk.Window (GdkWindow, attributes, attributes_mask);
event_window.UserData = Handle;
OnDragSourceSet ();
@@ -89,10 +88,10 @@ namespace Hyena.Data.Gui
protected override void OnUnrealized ()
{
- IsRealized = false;
+ WidgetFlags &= ~WidgetFlags.Realized;
event_window.UserData = IntPtr.Zero;
- event_window.Destroy ();
+ Hyena.Gui.GtkWorkarounds.WindowDestroy (event_window);
event_window = null;
base.OnUnrealized ();
@@ -100,13 +99,13 @@ namespace Hyena.Data.Gui
protected override void OnMapped ()
{
- IsMapped = true;
+ WidgetFlags |= WidgetFlags.Mapped;
event_window.Show ();
}
protected override void OnUnmapped ()
{
- IsMapped = false;
+ WidgetFlags &= ~WidgetFlags.Mapped;
event_window.Hide ();
}
@@ -121,58 +120,39 @@ namespace Hyena.Data.Gui
return;
}
- header_rendering_alloc = new Gdk.Rectangle (0, 0, allocation.Width, allocation.Height);
+ header_rendering_alloc = allocation;
header_rendering_alloc.Height = HeaderHeight;
list_rendering_alloc.X = header_rendering_alloc.X + Theme.TotalBorderWidth;
list_rendering_alloc.Y = header_rendering_alloc.Bottom + Theme.TotalBorderWidth;
- list_rendering_alloc.Width = Math.Max (0,
- allocation.Width - Theme.TotalBorderWidth * 2);
- list_rendering_alloc.Height = Math.Max (0,
- allocation.Height - (list_rendering_alloc.Y - allocation.Y) - Theme.TotalBorderWidth);
+ list_rendering_alloc.Width = allocation.Width - Theme.TotalBorderWidth * 2;
+ list_rendering_alloc.Height = allocation.Height - (list_rendering_alloc.Y - allocation.Y) -
+ Theme.TotalBorderWidth;
header_interaction_alloc = header_rendering_alloc;
header_interaction_alloc.X = list_rendering_alloc.X;
header_interaction_alloc.Width = list_rendering_alloc.Width;
header_interaction_alloc.Height += Theme.BorderWidth;
+ header_interaction_alloc.Offset (-allocation.X, -allocation.Y);
list_interaction_alloc = list_rendering_alloc;
+ list_interaction_alloc.Offset (-allocation.X, -allocation.Y);
header_width = header_interaction_alloc.Width;
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
- {
- var requisition = SizeRequested ();
- minimum_height = natural_height = requisition.Height;
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- var requisition = SizeRequested ();
- minimum_width = natural_width = requisition.Width;
- }
-
- protected Requisition SizeRequested ()
+ protected override void OnSizeRequested (ref Requisition requisition)
{
// TODO give the minimum height of the header
if (Theme == null) {
- return Requisition.Zero;
+ return;
}
- var requisition = new Requisition ();
requisition.Width = Theme.TotalBorderWidth * 2;
requisition.Height = HeaderHeight + Theme.TotalBorderWidth * 2;
- return requisition;
}
protected override void OnSizeAllocated (Rectangle allocation)
{
- if (allocation.X < 0 || allocation.Y < 0) {
- Log.Error ("SizeAllocate call received from container with negative coordinate(s): " + allocation.ToString () + Environment.NewLine +
- "(Prevent adjustments from receiving bad values; i.e.: negative values, or upper values lower than page size/increment, or any positive Value when the upper value is zero, etc.)");
- return;
- }
-
base.OnSizeAllocated (allocation);
if (IsRealized) {
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListViewTestModule.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListViewTestModule.cs
index 09ba363..62978b2 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListViewTestModule.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListViewTestModule.cs
@@ -40,25 +40,13 @@ using Selection = Hyena.Collections.Selection;
namespace Hyena.Data.Gui.Tests
{
- [TestModule ("List View with scrollbars")]
- public class ListViewWithScrollbarsTestModule : ListViewTestModule
- {
- public ListViewWithScrollbarsTestModule () : base (1000)
- {
- }
- }
-
[TestModule ("List View")]
public class ListViewTestModule : Window
{
private View view;
private Model model;
- public ListViewTestModule () : this (10)
- {
- }
-
- public ListViewTestModule (int items) : base ("ListView")
+ public ListViewTestModule () : base ("ListView")
{
WindowPosition = WindowPosition.Center;
SetDefaultSize (800, 600);
@@ -68,7 +56,7 @@ namespace Hyena.Data.Gui.Tests
scroll.VscrollbarPolicy = PolicyType.Automatic;
view = new View ();
- model = new Model (items);
+ model = new Model ();
scroll.Add (view);
Add (scroll);
@@ -107,7 +95,7 @@ namespace Hyena.Data.Gui.Tests
SetDefaultSize (800, 600);
view = new View ();
- model = new Model (1000);
+ model = new Model ();
/*var hbox = new HBox () { Spacing = 6 };
@@ -178,10 +166,10 @@ namespace Hyena.Data.Gui.Tests
public event EventHandler Cleared;
public event EventHandler Reloaded;
- public Model (int items)
+ public Model ()
{
Random random = new Random (0);
- for (int i = 0; i < items; i++) {
+ for (int i = 0; i < 1000; i++) {
store.Add (new ModelItem (i, random));
}
}
@@ -252,7 +240,7 @@ namespace Hyena.Data.Gui.Tests
red = !red;
Cairo.Context cr = context.Context;
cr.Rectangle (0, 0, cellWidth, cellHeight);
- cr.SetSourceColor (CairoExtensions.RgbaToColor (red ? 0xff000099 : 0x00000099));
+ cr.Color = CairoExtensions.RgbaToColor (red ? 0xff000099 : 0x00000099);
cr.Fill ();
List<Gdk.Point> points = Points;
@@ -264,7 +252,7 @@ namespace Hyena.Data.Gui.Tests
}
}
- cr.SetSourceColor (CairoExtensions.RgbToColor ((uint)random.Next (0xffffff)));
+ cr.Color = CairoExtensions.RgbToColor ((uint)random.Next (0xffffff));
cr.LineWidth = 1;
cr.Stroke ();
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Brush.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Brush.cs
index 4fbe7ac..28df7b6 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Brush.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Brush.cs
@@ -53,10 +53,6 @@ namespace Hyena.Gui.Canvas
{
}
- public Brush (Gdk.RGBA rgba) : this (CairoExtensions.GdkRGBAToCairoColor (rgba))
- {
- }
-
public Brush (Cairo.Color color)
{
this.color = color;
@@ -68,7 +64,7 @@ namespace Hyena.Gui.Canvas
public virtual void Apply (Cairo.Context cr)
{
- cr.SetSourceColor (color);
+ cr.Color = color;
}
public static readonly Brush Black = new Brush (0.0, 0.0, 0.0);
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs
index 50e22f3..a0a4cea 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs
@@ -44,7 +44,7 @@ namespace Hyena.Gui.Canvas
public CanvasHost ()
{
- HasWindow = false;
+ WidgetFlags |= WidgetFlags.NoWindow;
manager = new CanvasManager (this);
}
@@ -62,7 +62,7 @@ namespace Hyena.Gui.Canvas
attributes.Y = Allocation.Y;
attributes.Width = Allocation.Width;
attributes.Height = Allocation.Height;
- attributes.Wclass = WindowWindowClass.InputOnly;
+ attributes.Wclass = WindowClass.InputOnly;
attributes.EventMask = (int)(
EventMask.PointerMotionMask |
EventMask.ButtonPressMask |
@@ -74,7 +74,7 @@ namespace Hyena.Gui.Canvas
WindowAttributesType attributes_mask =
WindowAttributesType.X | WindowAttributesType.Y | WindowAttributesType.Wmclass;
- event_window = new Gdk.Window (Window, attributes, attributes_mask);
+ event_window = new Gdk.Window (GdkWindow, attributes, attributes_mask);
event_window.UserData = Handle;
AllocateChild ();
@@ -83,10 +83,10 @@ namespace Hyena.Gui.Canvas
protected override void OnUnrealized ()
{
- IsRealized = false;
+ WidgetFlags ^= WidgetFlags.Realized;
event_window.UserData = IntPtr.Zero;
- event_window.Destroy ();
+ Hyena.Gui.GtkWorkarounds.WindowDestroy (event_window);
event_window = null;
base.OnUnrealized ();
@@ -114,21 +114,8 @@ namespace Hyena.Gui.Canvas
}
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ protected override void OnSizeRequested (ref Gtk.Requisition requisition)
{
- var requisition = SizeRequested ();
- minimum_height = natural_height = requisition.Height;
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- var requisition = SizeRequested ();
- minimum_width = natural_width = requisition.Width;
- }
-
- protected Requisition SizeRequested ()
- {
- var requisition = new Requisition ();
if (canvas_child != null) {
Size size = canvas_child.Measure (Size.Empty);
@@ -140,12 +127,11 @@ namespace Hyena.Gui.Canvas
requisition.Height = (int)Math.Ceiling (size.Height);
}
}
- return requisition;
}
private Random rand;
- protected override bool OnDamageEvent (Gdk.EventExpose evnt)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
if (canvas_child == null || !canvas_child.Visible || !Visible || !IsMapped) {
return true;
@@ -154,8 +140,7 @@ namespace Hyena.Gui.Canvas
Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
context.Context = cr;
- for (int i = 0; i < evnt.Region.NumRectangles; i++) {
- var damage = evnt.Region.GetRectangle (i);
+ foreach (Gdk.Rectangle damage in evnt.Region.GetRectangles ()) {
cr.Rectangle (damage.X, damage.Y, damage.Width, damage.Height);
cr.Clip ();
@@ -165,8 +150,8 @@ namespace Hyena.Gui.Canvas
if (Debug) {
cr.LineWidth = 1.0;
- cr.SetSourceColor (CairoExtensions.RgbToColor (
- (uint)(rand = rand ?? new Random ()).Next (0, 0xffffff)));
+ cr.Color = CairoExtensions.RgbToColor (
+ (uint)(rand = rand ?? new Random ()).Next (0, 0xffffff));
cr.Rectangle (damage.X + 0.5, damage.Y + 0.5, damage.Width - 1, damage.Height - 1);
cr.Stroke ();
}
@@ -224,7 +209,7 @@ namespace Hyena.Gui.Canvas
private bool changing_style = false;
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style old_style)
{
if (changing_style) {
return;
@@ -240,7 +225,7 @@ namespace Hyena.Gui.Canvas
changing_style = false;
- base.OnStyleUpdated ();
+ base.OnStyleSet (old_style);
}
protected override bool OnButtonPressEvent (Gdk.EventButton press)
@@ -324,11 +309,11 @@ namespace Hyena.Gui.Canvas
public Pango.Layout PangoLayout {
get {
if (layout == null) {
- if (Window == null || !IsRealized) {
+ if (GdkWindow == null || !IsRealized) {
return null;
}
- using (var cr = Gdk.CairoHelper.Create (Window)) {
+ using (var cr = Gdk.CairoHelper.Create (GdkWindow)) {
layout = CairoExtensions.CreateLayout (this, cr);
FontDescription = layout.FontDescription;
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Prelight.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Prelight.cs
index 63a0629..01c4e38 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Prelight.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Prelight.cs
@@ -41,13 +41,13 @@ namespace Hyena.Gui.Canvas
var x = rect.Width / 2.0;
var y = rect.Height / 2.0;
- using (var grad = new Cairo.RadialGradient (x, y, 0, x, y, rect.Width / 2.0)) {
- grad.AddColorStop (0, new Cairo.Color (0, 0, 0, 0.1 * opacity));
- grad.AddColorStop (1, new Cairo.Color (0, 0, 0, 0.35 * opacity));
- cr.SetSource (grad);
- CairoExtensions.RoundedRectangle (cr, rect.X, rect.Y, rect.Width, rect.Height, theme.Context.Radius);
- cr.Fill ();
- }
+ var grad = new Cairo.RadialGradient (x, y, 0, x, y, rect.Width / 2.0);
+ grad.AddColorStop (0, new Cairo.Color (0, 0, 0, 0.1 * opacity));
+ grad.AddColorStop (1, new Cairo.Color (0, 0, 0, 0.35 * opacity));
+ cr.Pattern = grad;
+ CairoExtensions.RoundedRectangle (cr, rect.X, rect.Y, rect.Width, rect.Height, theme.Context.Radius);
+ cr.Fill ();
+ grad.Destroy ();
cr.Restore ();
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/ShadowMarginStyle.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/ShadowMarginStyle.cs
index 0397d24..63648d6 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/ShadowMarginStyle.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/ShadowMarginStyle.cs
@@ -66,7 +66,7 @@ namespace Hyena.Gui.Canvas
steps - i);
color.A = opacity_step * (i + 1);
- cr.SetSourceColor (color);
+ cr.Color = color;
cr.Stroke ();
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Slider.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Slider.cs
index 2e6713e..0cef220 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Slider.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Slider.cs
@@ -153,31 +153,28 @@ namespace Hyena.Gui.Canvas
double throbber_y = (Allocation.Height - ThrobberSize) / 2.0 - Margin.Top + throbber_r;
double bar_w = RenderSize.Width * Value;
- Theme.Widget.StyleContext.Save ();
- Theme.Widget.StyleContext.AddClass ("entry");
- Theme.Widget.StyleContext.RenderBackground (cr, 0, 0, RenderSize.Width, RenderSize.Height);
- var color = CairoExtensions.GdkRGBAToCairoColor (Theme.Widget.StyleContext.GetColor (Gtk.StateFlags.Active));
- Theme.Widget.StyleContext.Restore ();
+ cr.Color = Theme.Colors.GetWidgetColor (GtkColorClass.Base, Gtk.StateType.Normal);
+ cr.Rectangle (0, 0, RenderSize.Width, RenderSize.Height);
+ cr.Fill ();
- // TODO get Dark color
+ Color color = Theme.Colors.GetWidgetColor (GtkColorClass.Dark, Gtk.StateType.Active);
Color fill_color = CairoExtensions.ColorShade (color, 0.4);
Color light_fill_color = CairoExtensions.ColorShade (color, 0.3);
fill_color.A = 1.0;
light_fill_color.A = 1.0;
- using (var fill = new LinearGradient (0, 0, 0, RenderSize.Height)) {
- fill.AddColorStop (0, light_fill_color);
- fill.AddColorStop (0.5, fill_color);
- fill.AddColorStop (1, light_fill_color);
+ LinearGradient fill = new LinearGradient (0, 0, 0, RenderSize.Height);
+ fill.AddColorStop (0, light_fill_color);
+ fill.AddColorStop (0.5, fill_color);
+ fill.AddColorStop (1, light_fill_color);
- cr.Rectangle (0, 0, bar_w, RenderSize.Height);
- cr.SetSource (fill);
- cr.Fill ();
+ cr.Rectangle (0, 0, bar_w, RenderSize.Height);
+ cr.Pattern = fill;
+ cr.Fill ();
- cr.SetSourceColor (fill_color);
- cr.Arc (throbber_x, throbber_y, throbber_r, 0, Math.PI * 2);
- cr.Fill ();
- }
+ cr.Color = fill_color;
+ cr.Arc (throbber_x, throbber_y, throbber_r, 0, Math.PI * 2);
+ cr.Fill ();
}
public override Size Measure (Size available)
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TestTile.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TestTile.cs
index 22d78ee..3d58654 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TestTile.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TestTile.cs
@@ -55,7 +55,7 @@ namespace Hyena.Gui.Canvas
}
CairoExtensions.RoundedRectangle (cr, 0, 0, RenderSize.Width, RenderSize.Height, 5);
- cr.SetSourceColor (color);
+ cr.Color = color;
cr.Fill ();
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs
index 43c9788..699463d 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs
@@ -178,13 +178,8 @@ namespace Hyena.Gui.Canvas
}
var cr = context.Context;
- context.Theme.Widget.StyleContext.Save ();
- if (context.TextAsForeground) {
- context.Theme.Widget.StyleContext.AddClass ("button");
- } else {
- context.Theme.Widget.StyleContext.AddClass ("entry");
- }
- Foreground = new Brush (context.Theme.Widget.StyleContext.GetColor (context.State));
+ Foreground = new Brush (context.Theme.Colors.GetWidgetColor (
+ context.TextAsForeground ? GtkColorClass.Foreground : GtkColorClass.Text, context.State));
Brush foreground = Foreground;
if (!foreground.IsValid) {
@@ -200,6 +195,7 @@ namespace Hyena.Gui.Canvas
cr.PushGroup ();
}
+ cr.MoveTo (text_alloc.X, text_alloc.Y);
Foreground.Apply (cr);
UpdateLayout (GetText (), RenderSize.Width, RenderSize.Height, true);
if (Hyena.PlatformDetection.IsWindows) {
@@ -210,21 +206,21 @@ namespace Hyena.Gui.Canvas
} else {
PangoCairoHelper.ShowLayout (cr, layout);
}
+ cr.Fill ();
TooltipMarkup = layout.IsEllipsized ? last_formatted_text : null;
if (fade) {
- using (var mask = new LinearGradient (RenderSize.Width - 20, 0, RenderSize.Width, 0)) {
- mask.AddColorStop (0, new Color (0, 0, 0, 1));
- mask.AddColorStop (1, new Color (0, 0, 0, 0));
+ LinearGradient mask = new LinearGradient (RenderSize.Width - 20, 0, RenderSize.Width, 0);
+ mask.AddColorStop (0, new Color (0, 0, 0, 1));
+ mask.AddColorStop (1, new Color (0, 0, 0, 0));
- cr.PopGroupToSource ();
- cr.Mask (mask);
- }
+ cr.PopGroupToSource ();
+ cr.Mask (mask);
+ mask.Destroy ();
}
cr.ResetClip ();
- context.Theme.Widget.StyleContext.Restore ();
}
private Pango.Weight GetPangoFontWeight (FontWeight weight)
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs
index 143b0b8..7150a4f 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs
@@ -46,13 +46,14 @@ namespace Hyena.Gui.Dialogs
{
debugInfo = BuildExceptionMessage(e);
+ HasSeparator = false;
BorderWidth = 5;
Resizable = false;
//Translators: {0} is substituted with the application name
Title = String.Format(Catalog.GetString("{0} Encountered a Fatal Error"),
ApplicationContext.ApplicationName);
- ContentArea.Spacing = 12;
+ VBox.Spacing = 12;
ActionArea.Layout = ButtonBoxStyle.End;
accel_group = new AccelGroup();
@@ -60,7 +61,7 @@ namespace Hyena.Gui.Dialogs
HBox hbox = new HBox(false, 12);
hbox.BorderWidth = 5;
- ContentArea.PackStart(hbox, false, false, 0);
+ VBox.PackStart(hbox, false, false, 0);
Image image = new Image(Stock.DialogError, IconSize.Dialog);
image.Yalign = 0.0f;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs
index 4c2c2c1..484dc0a 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs
@@ -74,15 +74,15 @@ namespace Hyena.Gui.Dialogs
scroll.ShadowType = ShadowType.In;
scroll.SetSizeRequest(420, 200);
- ContentArea.PackStart(scroll, true, true, 0);
- ContentArea.Spacing = 5;
+ VBox.PackStart(scroll, true, true, 0);
+ VBox.Spacing = 5;
path_label = new Label();
path_label.Ellipsize = Pango.EllipsizeMode.End;
path_label.Hide();
path_label.Xalign = 0.0f;
path_label.Yalign = 1.0f;
- ContentArea.PackStart(path_label, false, true, 0);
+ VBox.PackStart(path_label, false, true, 0);
scroll.ShowAll();
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkColors.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkColors.cs
new file mode 100644
index 0000000..4e73dec
--- /dev/null
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkColors.cs
@@ -0,0 +1,148 @@
+//
+// GtkColors.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright (C) 2007-2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using Cairo;
+using Gtk;
+
+namespace Hyena.Gui.Theming
+{
+ public enum GtkColorClass
+ {
+ Light,
+ Mid,
+ Dark,
+ Base,
+ Text,
+ Background,
+ Foreground
+ }
+
+ public class GtkColors
+ {
+ private Cairo.Color [] gtk_colors;
+ private Widget widget;
+ private bool refreshing = false;
+
+ public event EventHandler Refreshed;
+
+ public Widget Widget {
+ get { return widget; }
+ set {
+ if (widget == value) {
+ return;
+ } else if (widget != null) {
+ widget.Realized -= OnWidgetRealized;
+ widget.StyleSet -= OnWidgetStyleSet;
+ }
+
+ widget = value;
+
+ if (widget.IsRealized) {
+ RefreshColors ();
+ }
+
+ widget.Realized += OnWidgetRealized;
+ widget.StyleSet += OnWidgetStyleSet;
+ }
+ }
+
+ public GtkColors ()
+ {
+ }
+
+ private void OnWidgetRealized (object o, EventArgs args)
+ {
+ RefreshColors ();
+ }
+
+ private void OnWidgetStyleSet (object o, StyleSetArgs args)
+ {
+ RefreshColors ();
+ }
+
+ public Cairo.Color GetWidgetColor (GtkColorClass @class, StateType state)
+ {
+ if (gtk_colors == null) {
+ RefreshColors ();
+ }
+
+ return gtk_colors[(int)@class * ((int)StateType.Insensitive + 1) + (int)state];
+ }
+
+ public void RefreshColors ()
+ {
+ if (refreshing) {
+ return;
+ }
+
+ refreshing = true;
+
+ int sn = (int)StateType.Insensitive + 1;
+ int cn = (int)GtkColorClass.Foreground + 1;
+
+ if (gtk_colors == null) {
+ gtk_colors = new Cairo.Color[sn * cn];
+ }
+
+ for (int c = 0, i = 0; c < cn; c++) {
+ for (int s = 0; s < sn; s++, i++) {
+ Gdk.Color color = Gdk.Color.Zero;
+
+ if (widget != null && widget.IsRealized) {
+ switch ((GtkColorClass)c) {
+ case GtkColorClass.Light: color = widget.Style.LightColors[s]; break;
+ case GtkColorClass.Mid: color = widget.Style.MidColors[s]; break;
+ case GtkColorClass.Dark: color = widget.Style.DarkColors[s]; break;
+ case GtkColorClass.Base: color = widget.Style.BaseColors[s]; break;
+ case GtkColorClass.Text: color = widget.Style.TextColors[s]; break;
+ case GtkColorClass.Background: color = widget.Style.Backgrounds[s]; break;
+ case GtkColorClass.Foreground: color = widget.Style.Foregrounds[s]; break;
+ }
+ } else {
+ color = new Gdk.Color (0, 0, 0);
+ }
+
+ gtk_colors[c * sn + s] = CairoExtensions.GdkColorToCairoColor (color);
+ }
+ }
+
+ OnRefreshed ();
+
+ refreshing = false;
+ }
+
+ protected virtual void OnRefreshed ()
+ {
+ EventHandler handler = Refreshed;
+ if (handler != null) {
+ handler (this, EventArgs.Empty);
+ }
+ }
+ }
+}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs
index 760e759..32504d4 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs
@@ -43,11 +43,19 @@ namespace Hyena.Gui.Theming
public static Cairo.Color GetCairoTextMidColor (Widget widget)
{
- Color text_color = CairoExtensions.GdkRGBAToCairoColor (widget.StyleContext.GetColor (StateFlags.Normal));
- Color background_color = CairoExtensions.GdkRGBAToCairoColor (widget.StyleContext.GetBackgroundColor (StateFlags.Normal));
+ Cairo.Color text_color = CairoExtensions.GdkColorToCairoColor (widget.Style.Foreground (StateType.Normal));
+ Cairo.Color background_color = CairoExtensions.GdkColorToCairoColor (widget.Style.Background (StateType.Normal));
return CairoExtensions.AlphaBlend (text_color, background_color, 0.5);
}
+ public static Gdk.Color GetGdkTextMidColor (Widget widget)
+ {
+ Cairo.Color color = GetCairoTextMidColor (widget);
+ Gdk.Color gdk_color = new Gdk.Color ((byte)(color.R * 255), (byte)(color.G * 255), (byte)(color.B * 255));
+ Gdk.Colormap.System.AllocColor (ref gdk_color, true, true);
+ return gdk_color;
+ }
+
protected override void OnColorsRefreshed ()
{
base.OnColorsRefreshed ();
@@ -55,9 +63,9 @@ namespace Hyena.Gui.Theming
rule_color = CairoExtensions.ColorShade (ViewFill, 0.95);
// On Windows we use Normal b/c Active incorrectly returns black (at least on XP)
- // TODO: Check if this is still needed with GTK 3
- border_color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBorderColor (
- Hyena.PlatformDetection.IsWindows ? StateFlags.Normal : StateFlags.Active));
+ border_color = Colors.GetWidgetColor (GtkColorClass.Dark,
+ Hyena.PlatformDetection.IsWindows ? StateType.Normal : StateType.Active
+ );
}
public override void DrawPie (double fraction)
@@ -76,42 +84,77 @@ namespace Hyena.Gui.Theming
Context.Cairo.LineTo (Context.X, Context.Y);
// Fill the pie
- Color color_a = CairoExtensions.GdkRGBAToCairoColor (
- Widget.StyleContext.GetBackgroundColor (StateFlags.Selected));
+ Color color_a = Colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected);
Color color_b = CairoExtensions.ColorShade (color_a, 1.4);
- using (var fill = new RadialGradient (Context.X, Context.Y, 0, Context.X, Context.Y,
- 2.0 * Context.Radius)) {
- fill.AddColorStop (0, color_a);
- fill.AddColorStop (1, color_b);
- Context.Cairo.SetSource (fill);
+ RadialGradient fill = new RadialGradient (Context.X, Context.Y, 0,
+ Context.X, Context.Y, 2.0 * Context.Radius);
+ fill.AddColorStop (0, color_a);
+ fill.AddColorStop (1, color_b);
+ Context.Cairo.Pattern = fill;
- Context.Cairo.FillPreserve ();
- }
+ Context.Cairo.FillPreserve ();
+ fill.Destroy ();
// Stroke the pie
- Context.Cairo.SetSourceColor (CairoExtensions.ColorShade (color_a, 0.8));
+ Context.Cairo.Color = CairoExtensions.ColorShade (color_a, 0.8);
Context.Cairo.LineWidth = Context.LineWidth;
Context.Cairo.Stroke ();
}
public override void DrawArrow (Context cr, Gdk.Rectangle alloc, double rotation)
{
- // 0 means pointing to the right for us, but it means pointing to the top for RenderArrow
- rotation += Math.PI / 2.0;
+ rotation -= Math.PI / 2.0;
+
+ double x1 = alloc.X;
+ double x2 = alloc.Right;
+ double x3 = alloc.X + alloc.Width / 2.0;
+ double y1 = alloc.Y;
+ double y2 = alloc.Bottom;
+
+ double cx = x3;
+ double cy = alloc.Y + alloc.Height / 2.0;
+
+ if (rotation != 0) {
+ // Rotate about the center of the arrow
+ cr.Translate (cx, cy);
+ cr.Rotate (rotation);
+ cr.Translate (-cx, -cy);
+ }
+
+ cr.LineWidth = 1.0;
+
+ bool hz = (rotation % (Math.PI / 2.0)) == 0;
+ double dx = hz ? 0 : 0.5;
+ double dy = hz ? 0.5 : 0.5;
+ cr.Translate (dx, dy);
+
+ cr.MoveTo (x1, y1);
+ cr.LineTo (x2, y1);
+ cr.LineTo (x3, y2);
+ cr.LineTo (x1, y1);
+
+ cr.Color = Colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal);
+ cr.FillPreserve ();
+ cr.Color = Colors.GetWidgetColor (GtkColorClass.Text, StateType.Normal);
+ cr.Stroke ();
- int size = Math.Min (alloc.Height, alloc.Width);
+ cr.Translate (-dx, -dy);
- Widget.StyleContext.RenderArrow (cr, rotation, alloc.X, alloc.Y, size);
+ if (rotation != 0) {
+ cr.Translate (cx, cy);
+ cr.Rotate (-rotation);
+ cr.Translate (-cx, -cy);
+ }
}
public override void DrawFrameBackground (Cairo.Context cr, Gdk.Rectangle alloc, Cairo.Color color, Cairo.Pattern pattern)
{
color.A = Context.FillAlpha;
if (pattern != null) {
- cr.SetSource (pattern);
+ cr.Pattern = pattern;
} else {
- cr.SetSourceColor (color);
+ cr.Color = color;
}
CairoExtensions.RoundedRectangle (cr, alloc.X, alloc.Y, alloc.Width, alloc.Height, Context.Radius, CairoCorners.All);
cr.Fill ();
@@ -150,10 +193,10 @@ namespace Hyena.Gui.Theming
// FIXME Windows; shading the color by .8 makes it blend into the bg
if (Widget.HasFocus && !Hyena.PlatformDetection.IsWindows) {
cr.LineWidth = BorderWidth * 1.5;
- cr.SetSourceColor (CairoExtensions.ColorShade (border_color, 0.8));
+ cr.Color = CairoExtensions.ColorShade (border_color, 0.8);
} else {
cr.LineWidth = BorderWidth;
- cr.SetSourceColor (border_color);
+ cr.Color = border_color;
}
double offset = (double)cr.LineWidth / 2.0;
@@ -174,38 +217,37 @@ namespace Hyena.Gui.Theming
Cairo.Color light_color = CairoExtensions.ColorShade (color, 1.6);
Cairo.Color dark_color = CairoExtensions.ColorShade (color, 1.3);
- using (var grad = new LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Bottom - 1)) {
- grad.AddColorStop (0, light_color);
- grad.AddColorStop (1, dark_color);
+ LinearGradient grad = new LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Bottom - 1);
+ grad.AddColorStop (0, light_color);
+ grad.AddColorStop (1, dark_color);
- cr.SetSource (grad);
- cr.Rectangle (alloc.X + 1.5, alloc.Y + 1.5, alloc.Width - 3, alloc.Height - 2);
- cr.Fill ();
- }
+ cr.Pattern = grad;
+ cr.Rectangle (alloc.X + 1.5, alloc.Y + 1.5, alloc.Width - 3, alloc.Height - 2);
+ cr.Fill ();
+ grad.Destroy ();
}
public override void DrawHeaderBackground (Cairo.Context cr, Gdk.Rectangle alloc)
{
- Cairo.Color gtk_background_color =
- CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Normal));
+ Cairo.Color gtk_background_color = Colors.GetWidgetColor (GtkColorClass.Background, StateType.Normal);
Cairo.Color light_color = CairoExtensions.ColorShade (gtk_background_color, 1.1);
Cairo.Color dark_color = CairoExtensions.ColorShade (gtk_background_color, 0.95);
CairoCorners corners = CairoCorners.TopLeft | CairoCorners.TopRight;
- using (var grad = new LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Bottom)) {
- grad.AddColorStop (0, light_color);
- grad.AddColorStop (0.75, dark_color);
- grad.AddColorStop (0, light_color);
+ LinearGradient grad = new LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Bottom);
+ grad.AddColorStop (0, light_color);
+ grad.AddColorStop (0.75, dark_color);
+ grad.AddColorStop (0, light_color);
- cr.SetSource (grad);
- CairoExtensions.RoundedRectangle (cr, alloc.X, alloc.Y, alloc.Width, alloc.Height, Context.Radius, corners);
- cr.Fill ();
+ cr.Pattern = grad;
+ CairoExtensions.RoundedRectangle (cr, alloc.X, alloc.Y, alloc.Width, alloc.Height, Context.Radius, corners);
+ cr.Fill ();
- cr.SetSourceColor (border_color);
- cr.Rectangle (alloc.X, alloc.Bottom, alloc.Width, BorderWidth);
- cr.Fill ();
- }
+ cr.Color = border_color;
+ cr.Rectangle (alloc.X, alloc.Bottom, alloc.Width, BorderWidth);
+ cr.Fill ();
+ grad.Destroy ();
}
public override void DrawColumnHeaderFocus (Cairo.Context cr, Gdk.Rectangle alloc)
@@ -217,11 +259,10 @@ namespace Hyena.Gui.Theming
double line_width = 0.7;
Cairo.Color stroke_color = CairoExtensions.ColorShade (
- CairoExtensions.GdkRGBAToCairoColor (
- Widget.StyleContext.GetBackgroundColor (StateFlags.Selected)), 0.8);
+ Colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected), 0.8);
stroke_color.A = 0.1;
- cr.SetSourceColor (stroke_color);
+ cr.Color = stroke_color;
CairoExtensions.RoundedRectangle (cr,
alloc.X + margin + line_width + right_offset,
@@ -234,7 +275,7 @@ namespace Hyena.Gui.Theming
stroke_color.A = 1.0;
cr.LineWidth = line_width;
- cr.SetSourceColor (stroke_color);
+ cr.Color = stroke_color;
CairoExtensions.RoundedRectangle (cr,
alloc.X + margin + line_width + right_offset,
alloc.Y + margin + line_width + top_offset,
@@ -246,8 +287,7 @@ namespace Hyena.Gui.Theming
public override void DrawHeaderSeparator (Cairo.Context cr, Gdk.Rectangle alloc, int x)
{
- Cairo.Color gtk_background_color = CairoExtensions.GdkRGBAToCairoColor (
- Widget.StyleContext.GetBackgroundColor (StateFlags.Normal));
+ Cairo.Color gtk_background_color = Colors.GetWidgetColor (GtkColorClass.Background, StateType.Normal);
Cairo.Color dark_color = CairoExtensions.ColorShade (gtk_background_color, 0.80);
Cairo.Color light_color = CairoExtensions.ColorShade (gtk_background_color, 1.1);
@@ -257,12 +297,12 @@ namespace Hyena.Gui.Theming
cr.LineWidth = 1;
cr.Antialias = Cairo.Antialias.None;
- cr.SetSourceColor (dark_color);
+ cr.Color = dark_color;
cr.MoveTo (x, y_1);
cr.LineTo (x, y_2);
cr.Stroke ();
- cr.SetSourceColor (light_color);
+ cr.Color = light_color;
cr.MoveTo (x + 1, y_1);
cr.LineTo (x + 1, y_2);
cr.Stroke ();
@@ -273,7 +313,7 @@ namespace Hyena.Gui.Theming
public override void DrawListBackground (Context cr, Gdk.Rectangle alloc, Color color)
{
color.A = Context.FillAlpha;
- cr.SetSourceColor (color);
+ cr.Color = color;
cr.Rectangle (alloc.X, alloc.Y, alloc.Width, alloc.Height);
cr.Fill ();
}
@@ -282,7 +322,7 @@ namespace Hyena.Gui.Theming
Cairo.Color color, CairoCorners corners)
{
cr.LineWidth = 1.25;
- cr.SetSourceColor (color);
+ cr.Color = color;
CairoExtensions.RoundedRectangle (cr, x + cr.LineWidth/2.0, y + cr.LineWidth/2.0,
width - cr.LineWidth, height - cr.LineWidth, Context.Radius, corners, true);
cr.Stroke ();
@@ -306,7 +346,7 @@ namespace Hyena.Gui.Theming
if (filled) {
if (flat_fill) {
- cr.SetSourceColor (selection_color);
+ cr.Color = selection_color;
} else {
Cairo.Color selection_fill_light = CairoExtensions.ColorShade (selection_color, 1.12);
Cairo.Color selection_fill_dark = selection_color;
@@ -319,20 +359,20 @@ namespace Hyena.Gui.Theming
grad.AddColorStop (0.4, selection_fill_dark);
grad.AddColorStop (1, selection_fill_light);
- cr.SetSource (grad);
+ cr.Pattern = grad;
}
CairoExtensions.RoundedRectangle (cr, x, y, width, height, Context.Radius, corners, true);
cr.Fill ();
if (grad != null) {
- grad.Dispose ();
+ grad.Destroy ();
}
}
if (filled && stroked) {
cr.LineWidth = 1.0;
- cr.SetSourceColor (selection_highlight);
+ cr.Color = selection_highlight;
CairoExtensions.RoundedRectangle (cr, x + 1.5, y + 1.5, width - 3, height - 3,
Context.Radius - 1, corners, true);
cr.Stroke ();
@@ -340,7 +380,7 @@ namespace Hyena.Gui.Theming
if (stroked) {
cr.LineWidth = 1.0;
- cr.SetSourceColor (selection_stroke);
+ cr.Color = selection_stroke;
CairoExtensions.RoundedRectangle (cr, x + 0.5, y + 0.5, width - 1, height - 1,
Context.Radius, corners, true);
cr.Stroke ();
@@ -349,7 +389,7 @@ namespace Hyena.Gui.Theming
public override void DrawRowRule (Cairo.Context cr, int x, int y, int width, int height)
{
- cr.SetSourceColor (new Cairo.Color (rule_color.R, rule_color.G, rule_color.B, Context.FillAlpha));
+ cr.Color = new Cairo.Color (rule_color.R, rule_color.G, rule_color.B, Context.FillAlpha);
cr.Rectangle (x, y, width, height);
cr.Fill ();
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/Theme.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/Theme.cs
index f9adfd6..ec0207b 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/Theme.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/Theme.cs
@@ -40,6 +40,7 @@ namespace Hyena.Gui.Theming
{
private static Cairo.Color black = new Cairo.Color (0, 0, 0);
private Stack<ThemeContext> contexts = new Stack<ThemeContext> ();
+ private GtkColors colors;
private Cairo.Color selection_fill;
private Cairo.Color selection_stroke;
@@ -49,37 +50,39 @@ namespace Hyena.Gui.Theming
private Cairo.Color text_mid;
+ public GtkColors Colors {
+ get { return colors; }
+ }
+
public Widget Widget { get; private set; }
- public Theme (Widget widget)
+ public Theme (Widget widget) : this (widget, new GtkColors ())
{
- this.Widget = widget;
- if (widget.IsRealized) {
- OnColorsRefreshed ();
- }
+ }
- widget.Realized += delegate { OnColorsRefreshed (); };
- widget.StyleUpdated += delegate { OnColorsRefreshed (); };
+ public Theme (Widget widget, GtkColors colors)
+ {
+ this.Widget = widget;
+ this.colors = colors;
+ this.colors.Refreshed += delegate { OnColorsRefreshed (); };
+ this.colors.Widget = widget;
PushContext ();
}
protected virtual void OnColorsRefreshed ()
{
- selection_fill = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Active));
- selection_fill = CairoExtensions.ColorShade (selection_fill, 0.8);
- selection_stroke = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Selected));
-
- Widget.StyleContext.Save ();
- Widget.StyleContext.AddClass ("entry");
- view_fill = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Normal));
- var text_color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetColor (StateFlags.Normal));
- Widget.StyleContext.Restore ();
+ selection_fill = colors.GetWidgetColor (GtkColorClass.Dark, StateType.Active);
+ selection_stroke = colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected);
+ view_fill = colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal);
view_fill_transparent = view_fill;
view_fill_transparent.A = 0;
- text_mid = CairoExtensions.AlphaBlend (view_fill, text_color, 0.5);
+ text_mid = CairoExtensions.AlphaBlend (
+ colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal),
+ colors.GetWidgetColor (GtkColorClass.Text, StateType.Normal),
+ 0.5);
}
#region Drawing
@@ -107,17 +110,9 @@ namespace Hyena.Gui.Theming
public void DrawFrameBackground (Cairo.Context cr, Gdk.Rectangle alloc, bool baseColor)
{
- Cairo.Color fill_color;
- if (baseColor) {
- Widget.StyleContext.Save ();
- Widget.StyleContext.AddClass ("entry");
- fill_color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Normal));
- Widget.StyleContext.Restore ();
- } else {
- fill_color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Normal));
- }
-
- DrawFrameBackground (cr, alloc, fill_color);
+ DrawFrameBackground (cr, alloc, baseColor
+ ? colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal)
+ : colors.GetWidgetColor (GtkColorClass.Background, StateType.Normal));
}
public void DrawFrameBackground (Cairo.Context cr, Gdk.Rectangle alloc, Cairo.Color color)
@@ -142,16 +137,9 @@ namespace Hyena.Gui.Theming
public void DrawListBackground (Cairo.Context cr, Gdk.Rectangle alloc, bool baseColor)
{
- Cairo.Color fill_color;
- if (baseColor) {
- Widget.StyleContext.Save ();
- Widget.StyleContext.AddClass ("entry");
- fill_color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Normal));
- Widget.StyleContext.Restore ();
- } else {
- fill_color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Normal));
- }
- DrawListBackground (cr, alloc, fill_color);
+ DrawListBackground (cr, alloc, baseColor
+ ? colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal)
+ : colors.GetWidgetColor (GtkColorClass.Background, StateType.Normal));
}
public abstract void DrawListBackground (Cairo.Context cr, Gdk.Rectangle alloc, Cairo.Color color);
@@ -166,8 +154,7 @@ namespace Hyena.Gui.Theming
public void DrawColumnHighlight (Cairo.Context cr, Gdk.Rectangle alloc)
{
- Cairo.Color color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Selected));
- DrawColumnHighlight (cr, alloc, color);
+ DrawColumnHighlight (cr, alloc, colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected));
}
public abstract void DrawColumnHighlight (Cairo.Context cr, Gdk.Rectangle alloc, Cairo.Color color);
@@ -179,8 +166,8 @@ namespace Hyena.Gui.Theming
public void DrawRowSelection (Cairo.Context cr, int x, int y, int width, int height, bool filled)
{
- Cairo.Color color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Selected));
- DrawRowSelection (cr, x, y, width, height, filled, true, color, CairoCorners.All);
+ DrawRowSelection (cr, x, y, width, height, filled, true,
+ colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected), CairoCorners.All);
}
public void DrawRowSelection (Cairo.Context cr, int x, int y, int width, int height,
@@ -191,8 +178,7 @@ namespace Hyena.Gui.Theming
public void DrawRowCursor (Cairo.Context cr, int x, int y, int width, int height)
{
- Cairo.Color color = CairoExtensions.GdkRGBAToCairoColor (Widget.StyleContext.GetBackgroundColor (StateFlags.Selected));
- DrawRowCursor (cr, x, y, width, height, color);
+ DrawRowCursor (cr, x, y, width, height, colors.GetWidgetColor (GtkColorClass.Background, StateType.Selected));
}
public void DrawRowCursor (Cairo.Context cr, int x, int y, int width, int height, Cairo.Color color)
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs
index 7452520..dbf0b18 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs
@@ -73,24 +73,29 @@ namespace Hyena.Gui.Theming
{
private Theme theme;
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (previous_style);
theme = ThemeEngine.CreateTheme (this);
theme.Context.Radius = 10;
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- var alloc = new Gdk.Rectangle () {
- X = 0,
- Y = 0,
- Width = Allocation.Width,
- Height = Allocation.Height
- };
-
- theme.DrawListBackground (cr, alloc, true);
- theme.DrawFrameBorder (cr, alloc);
+ Cairo.Context cr = null;
+ try {
+ var alloc = new Gdk.Rectangle () {
+ X = Allocation.X,
+ Y = Allocation.Y,
+ Width = Allocation.Width,
+ Height = Allocation.Height
+ };
+ cr = Gdk.CairoHelper.Create (evnt.Window);
+ theme.DrawListBackground (cr, alloc, true);
+ theme.DrawFrameBorder (cr, alloc);
+ } finally {
+ CairoExtensions.DisposeContext (cr);
+ }
return true;
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
index ab6b96a..1bba6ca 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
@@ -34,7 +34,7 @@ using Atk;
namespace Hyena.Gui
{
- public class BaseWidgetAccessible : Gtk.Accessible, Atk.IComponentImplementor
+ public class BaseWidgetAccessible : Gtk.Accessible, Atk.ComponentImplementor
{
private Gtk.Widget widget;
private uint focus_id = 0;
@@ -158,7 +158,7 @@ namespace Hyena.Gui
} else {
x = 0;
y = 0;
- window = widget.Window;
+ window = widget.GdkWindow;
}
int x_window, y_window;
@@ -167,7 +167,7 @@ namespace Hyena.Gui
y += y_window;
if (coordType == Atk.CoordType.Window) {
- window = widget.Window.Toplevel;
+ window = widget.GdkWindow.Toplevel;
int x_toplevel, y_toplevel;
window.GetOrigin (out x_toplevel, out y_toplevel);
@@ -218,13 +218,13 @@ namespace Hyena.Gui
private bool SetSizeAndPosition (int x, int y, int w, int h, Atk.CoordType coordType, bool setSize)
{
- if (!widget.IsToplevel) {
+ if (!widget.IsTopLevel) {
return false;
}
if (coordType == CoordType.Window) {
int x_off, y_off;
- widget.Window.GetOrigin (out x_off, out y_off);
+ widget.GdkWindow.GetOrigin (out x_off, out y_off);
x += x_off;
y += y_off;
@@ -234,8 +234,7 @@ namespace Hyena.Gui
}
#pragma warning disable 0612
- //widget.SetUposition (x, y);
- widget.SetAllocation (new Gdk.Rectangle (x, y, w, h));
+ widget.SetUposition (x, y);
#pragma warning restore 0612
if (setSize) {
@@ -247,7 +246,7 @@ namespace Hyena.Gui
public bool SetSize (int w, int h)
{
- if (widget.IsToplevel) {
+ if (widget.IsTopLevel) {
widget.SetSizeRequest (w, h);
return true;
} else {
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/CairoDamageDebugger.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/CairoDamageDebugger.cs
index 47a44f1..8f35fa1 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/CairoDamageDebugger.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/CairoDamageDebugger.cs
@@ -49,7 +49,7 @@ namespace Hyena.Gui
{
cr.Save ();
cr.LineWidth = 1.0;
- cr.SetSourceColor (CairoExtensions.RgbToColor ((uint)rand.Next (0, 0xffffff)));
+ cr.Color = CairoExtensions.RgbToColor ((uint)rand.Next (0, 0xffffff));
cr.Rectangle (x + 0.5, y + 0.5, w - 1, h - 1);
cr.Stroke ();
cr.Restore ();
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/CairoExtensions.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/CairoExtensions.cs
index 5b29b3c..80cc29d 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/CairoExtensions.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/CairoExtensions.cs
@@ -67,12 +67,11 @@ namespace Hyena.Gui
public static Surface CreateSurfaceForPixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf)
{
- var target = cr.GetTarget ();
- Surface surface = target.CreateSimilar (target.Content, pixbuf.Width, pixbuf.Height);
- using (var surface_cr = new Context (surface)) {
- Gdk.CairoHelper.SetSourcePixbuf (surface_cr, pixbuf, 0.0, 0.0);
- surface_cr.Paint ();
- }
+ Surface surface = cr.Target.CreateSimilar (cr.Target.Content, pixbuf.Width, pixbuf.Height);
+ Cairo.Context surface_cr = new Context (surface);
+ Gdk.CairoHelper.SetSourcePixbuf (surface_cr, pixbuf, 0, 0);
+ surface_cr.Paint ();
+ ((IDisposable)surface_cr).Dispose ();
return surface;
}
@@ -98,11 +97,6 @@ namespace Hyena.Gui
alpha);
}
- public static Cairo.Color GdkRGBAToCairoColor (Gdk.RGBA rgba)
- {
- return new Cairo.Color (rgba.Red, rgba.Green, rgba.Blue, rgba.Alpha);
- }
-
public static Cairo.Color RgbToColor (uint rgbColor)
{
return RgbaToColor ((rgbColor << 8) | 0x000000ff);
@@ -325,7 +319,7 @@ namespace Hyena.Gui
public static void DisposeContext (Cairo.Context cr)
{
- ((IDisposable)cr.GetTarget ()).Dispose ();
+ ((IDisposable)cr.Target).Dispose ();
((IDisposable)cr).Dispose ();
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/CompositeUtils.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/CompositeUtils.cs
index d7989df..4d93bb8 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/CompositeUtils.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/CompositeUtils.cs
@@ -35,18 +35,60 @@ namespace Hyena.Gui
{
public static class CompositeUtils
{
- public static bool SetRgbaVisual (Widget w)
+ [DllImport ("libgdk-win32-2.0-0.dll")]
+ private static extern IntPtr gdk_screen_get_rgba_visual (IntPtr screen);
+
+ [DllImport ("libgtk-win32-2.0-0.dll")]
+ private static extern void gtk_widget_input_shape_combine_mask (IntPtr raw, IntPtr shape_mask,
+ int offset_x, int offset_y);
+
+ [DllImport ("libgdk-win32-2.0-0.dll")]
+ private static extern IntPtr gdk_screen_get_rgba_colormap (IntPtr screen);
+
+ public static Colormap GetRgbaColormap (Screen screen)
+ {
+ try {
+ IntPtr raw_ret = gdk_screen_get_rgba_colormap (screen.Handle);
+ Gdk.Colormap ret = GLib.Object.GetObject(raw_ret) as Gdk.Colormap;
+ return ret;
+ } catch {
+ Gdk.Visual visual = Gdk.Visual.GetBestWithDepth (32);
+ if (visual != null) {
+ Gdk.Colormap cmap = new Gdk.Colormap (visual, false);
+ return cmap;
+ }
+ }
+
+ return null;
+ }
+
+ public static bool SetRgbaColormap (Widget w)
{
- Visual visual = w.Screen.RgbaVisual;
+ Gdk.Colormap cmap = GetRgbaColormap (w.Screen);
- if (visual != null) {
- w.Visual = visual;
+ if (cmap != null) {
+ w.Colormap = cmap;
return true;
}
return false;
}
+ public static Visual GetRgbaVisual (Screen screen)
+ {
+ try {
+ IntPtr raw_ret = gdk_screen_get_rgba_visual (screen.Handle);
+ Gdk.Visual ret = GLib.Object.GetObject (raw_ret) as Gdk.Visual;
+ return ret;
+ } catch {
+ Gdk.Visual visual = Gdk.Visual.GetBestWithDepth (32);
+ if (visual != null) {
+ return visual;
+ }
+ }
+ return null;
+ }
+
[DllImport ("libgdk-win32-2.0-0.dll")]
private static extern void gdk_property_change (IntPtr window, IntPtr property, IntPtr type,
int format, int mode, uint [] data, int nelements);
@@ -78,14 +120,42 @@ namespace Hyena.Gui
}
}
+ [DllImport ("libgdk-win32-2.0-0.dll")]
+ private static extern bool gdk_screen_is_composited (IntPtr screen);
+
+ public static bool IsComposited (Screen screen)
+ {
+ bool composited;
+ try {
+ composited = gdk_screen_is_composited (screen.Handle);
+ } catch (EntryPointNotFoundException) {
+ Atom atom = Atom.Intern (String.Format ("_NET_WM_CM_S{0}", screen.Number), false);
+ composited = Gdk.Selection.OwnerGetForDisplay (screen.Display, atom) != null;
+ }
+
+ // FIXME check for WINDOW_OPACITY so that we support compositing on older composite manager
+ // versions before they started supporting the real check given above
+ if (!composited) {
+ composited = CompositeUtils.SupportsHint (screen, "_NET_WM_WINDOW_OPACITY");
+ }
+
+ return composited;
+ }
+
public static void SetWinOpacity (Gtk.Window win, double opacity)
{
- CompositeUtils.ChangeProperty (win.Window,
+ CompositeUtils.ChangeProperty (win.GdkWindow,
Atom.Intern ("_NET_WM_WINDOW_OPACITY", false),
Atom.Intern ("CARDINAL", false),
PropMode.Replace,
new uint [] { (uint) (0xffffffff * opacity) }
);
}
+
+ public static void InputShapeCombineMask (Widget w, Pixmap shape_mask, int offset_x, int offset_y)
+ {
+ gtk_widget_input_shape_combine_mask (w.Handle, shape_mask == null ? IntPtr.Zero : shape_mask.Handle,
+ offset_x, offset_y);
+ }
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/EditableEraseAction.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/EditableEraseAction.cs
index e3c0457..e2883d4 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/EditableEraseAction.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/EditableEraseAction.cs
@@ -35,14 +35,14 @@ namespace Hyena.Gui
{
internal class EditableEraseAction : IUndoAction
{
- private IEditable editable;
+ private Editable editable;
private string text;
private int start;
private int end;
private bool is_forward;
private bool is_cut;
- public EditableEraseAction (IEditable editable, int start, int end)
+ public EditableEraseAction (Editable editable, int start, int end)
{
this.editable = editable;
this.text = editable.GetChars (start, end);
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/EditableInsertAction.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/EditableInsertAction.cs
index da4993d..d19a4e3 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/EditableInsertAction.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/EditableInsertAction.cs
@@ -35,12 +35,12 @@ namespace Hyena.Gui
{
internal class EditableInsertAction : IUndoAction
{
- private IEditable editable;
+ private Editable editable;
private string text;
private int index;
private bool is_paste;
- public EditableInsertAction (IEditable editable, int start, string text, int length)
+ public EditableInsertAction (Editable editable, int start, string text, int length)
{
this.editable = editable;
this.text = text;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/EditableUndoAdapter.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/EditableUndoAdapter.cs
index 9116b52..fdd171d 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/EditableUndoAdapter.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/EditableUndoAdapter.cs
@@ -34,7 +34,7 @@ using Hyena;
namespace Hyena.Gui
{
- public class EditableUndoAdapter<T> where T : Widget, IEditable
+ public class EditableUndoAdapter<T> where T : Widget, Editable
{
private T editable;
private UndoManager undo_manager = new UndoManager ();
@@ -109,7 +109,7 @@ namespace Hyena.Gui
[GLib.ConnectBefore]
private void OnTextInserted (object o, TextInsertedArgs args)
{
- undo_manager.AddUndoAction (new EditableInsertAction (editable, args.Position, args.NewText, args.NewTextLength));
+ undo_manager.AddUndoAction (new EditableInsertAction (editable, args.Position, args.Text, args.Length));
}
private void OnPopulatePopup (object o, PopulatePopupArgs args)
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/GtkUtilities.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/GtkUtilities.cs
index 43b9180..5aa6fe0 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/GtkUtilities.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/GtkUtilities.cs
@@ -1,12 +1,10 @@
//
// GtkUtilities.cs
//
-// Authors:
+// Author:
// Aaron Bockover <abockover at novell.com>
-// Andrés G. Aragoneses <knocte at gmail.com>
//
// Copyright 2007-2010 Novell, Inc.
-// Copyright 2013 Andrés G. Aragoneses
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -29,7 +27,6 @@
//
using System;
-using System.Collections.Generic;
using Gtk;
namespace Hyena.Gui
@@ -69,7 +66,7 @@ namespace Hyena.Gui
return true;
}
- public static FileFilter GetFileFilter (string name, IEnumerable<string> extensions)
+ public static FileFilter GetFileFilter (string name, System.Collections.Generic.IEnumerable<string> extensions)
{
FileFilter filter = new FileFilter ();
filter.Name = name;
@@ -80,7 +77,7 @@ namespace Hyena.Gui
return filter;
}
- public static void SetChooserShortcuts (FileChooserDialog chooser, params string [] shortcuts)
+ public static void SetChooserShortcuts (Gtk.FileChooserDialog chooser, params string [] shortcuts)
{
foreach (string shortcut in shortcuts) {
if (shortcut != null) {
@@ -91,7 +88,7 @@ namespace Hyena.Gui
}
}
- public static Gdk.RGBA ColorBlend (Gdk.RGBA a, Gdk.RGBA b)
+ public static Gdk.Color ColorBlend (Gdk.Color a, Gdk.Color b)
{
// at some point, might be nice to allow any blend?
double blend = 0.5;
@@ -102,21 +99,49 @@ namespace Hyena.Gui
double blendRatio = 1.0 - blend;
- double mR = a.Red + b.Red;
- double mG = a.Green + b.Green;
- double mB = a.Blue + b.Blue;
+ int aR = a.Red >> 8;
+ int aG = a.Green >> 8;
+ int aB = a.Blue >> 8;
+
+ int bR = b.Red >> 8;
+ int bG = b.Green >> 8;
+ int bB = b.Blue >> 8;
+
+ double mR = aR + bR;
+ double mG = aG + bG;
+ double mB = aB + bB;
double blR = mR * blendRatio;
double blG = mG * blendRatio;
double blB = mB * blendRatio;
- Gdk.RGBA color = new Gdk.RGBA ();
- color.Red = blR;
- color.Green = blG;
- color.Blue = blB;
+ Gdk.Color color = new Gdk.Color ((byte)blR, (byte)blG, (byte)blB);
+ Gdk.Colormap.System.AllocColor (ref color, true, true);
return color;
}
+ public static void AdaptGtkRcStyle (Widget adaptee, Type adapter)
+ {
+ GLib.GType type = (GLib.GType)adapter;
+ string path = String.Format ("*.{0}", type);
+ AdaptGtkRcStyle (adaptee, type, path, path);
+ }
+
+ public static void AdaptGtkRcStyle (Widget adaptee, GLib.GType adapter, string widgetPath, string classPath)
+ {
+ Style style = Gtk.Rc.GetStyleByPaths (adaptee.Settings, widgetPath, classPath, adapter);
+ if (style == null) {
+ return;
+ }
+
+ foreach (StateType state in Enum.GetValues (typeof (StateType))) {
+ adaptee.ModifyBase (state, style.Base (state));
+ adaptee.ModifyBg (state, style.Background (state));
+ adaptee.ModifyFg (state, style.Foreground (state));
+ adaptee.ModifyText (state, style.Text (state));
+ }
+ }
+
public static T StyleGetProperty<T> (Widget widget, string property, T default_value)
{
object result = null;
@@ -145,31 +170,33 @@ namespace Hyena.Gui
}
}
- internal static string Dump (this Adjustment alig)
- {
- if (alig == null) {
- return "<null>";
- }
- return String.Format("Value:{0},PageSize{1},PageIncrement:{2},StepIncrement:{3},Lower:{4},Upper:{5}",
- alig.Value, alig.PageSize, alig.PageIncrement, alig.StepIncrement, alig.Lower, alig.Upper);
- }
-
- [Obsolete ("Use Gtk.Global.ShowUri() from gtk# 3.x")]
public static bool ShowUri (string uri)
{
return ShowUri (null, uri);
}
- [Obsolete ("Use Gtk.Global.ShowUri() from gtk# 3.x")]
public static bool ShowUri (Gdk.Screen screen, string uri)
{
- return ShowUri (screen, uri, Global.CurrentEventTime);
+ return ShowUri (screen, uri, Gtk.Global.CurrentEventTime);
}
- [Obsolete ("Use Gtk.Global.ShowUri() from gtk# 3.x")]
+ [System.Runtime.InteropServices.DllImport ("libgtk-win32-2.0-0.dll")]
+ private static extern unsafe bool gtk_show_uri (IntPtr screen, IntPtr uri, uint timestamp, out IntPtr error);
+
public static bool ShowUri (Gdk.Screen screen, string uri, uint timestamp)
{
- return Global.ShowUri (screen, uri, timestamp);
+ var native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
+ var native_error = IntPtr.Zero;
+
+ try {
+ return gtk_show_uri (screen == null ? IntPtr.Zero : screen.Handle,
+ native_uri, timestamp, out native_error);
+ } finally {
+ GLib.Marshaller.Free (native_uri);
+ if (native_error != IntPtr.Zero) {
+ throw new GLib.GException (native_error);
+ }
+ }
}
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs
new file mode 100644
index 0000000..fc2b1a0
--- /dev/null
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs
@@ -0,0 +1,92 @@
+//
+// GtkWorkarounds.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright (C) 2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Reflection;
+
+namespace Hyena.Gui
+{
+ public static class GtkWorkarounds
+ {
+ private static bool toggle_ref_supported;
+ private static MethodInfo g_object_ref;
+ private static MethodInfo gdk_window_destroy;
+ private static object [] invoke_args;
+
+ static GtkWorkarounds ()
+ {
+ if (!(toggle_ref_supported = Assembly.GetAssembly (typeof (GLib.Object)).GetType (
+ "GLib.ToggleRef") != null)) {
+ return;
+ }
+
+ // Find the P/Invoke signatures we need so we can avoid a dllmap
+ g_object_ref = typeof (GLib.Object).GetMethod ("g_object_ref",
+ BindingFlags.NonPublic | BindingFlags.Static);
+
+ gdk_window_destroy = typeof (Gdk.Window).GetMethod ("gdk_window_destroy",
+ BindingFlags.NonPublic | BindingFlags.Static);
+ }
+
+ public static void WindowDestroy (Gdk.Window window)
+ {
+ // There is a bug in GDK, and subsequently in Gdk# 2.8.5 through 2.12.1
+ // where the managed Gdk.Window.Destroy function does not obtain a
+ // normal reference (non-toggle) on the GdkWindow before calling
+ // _destroy on it, which the native function apparently expects.
+
+ // https://bugzilla.novell.com/show_bug.cgi?id=382186
+ // http://anonsvn.mono-project.com/viewcvs/trunk/gtk-sharp/gdk/Window.custom?rev=101734&r1=42529&r2=101734
+
+ if (window == null) {
+ return;
+ }
+
+ if (!toggle_ref_supported) {
+ window.Destroy ();
+ return;
+ }
+
+ // If this ever happens I will move out west and start farming...
+ if (g_object_ref == null || gdk_window_destroy == null) {
+ window.Destroy ();
+ return;
+ }
+
+ if (invoke_args == null) {
+ invoke_args = new object[1];
+ }
+
+ invoke_args[0] = window.Handle;
+ g_object_ref.Invoke (null, invoke_args);
+ gdk_window_destroy.Invoke (null, invoke_args);
+
+ window.Dispose ();
+ }
+ }
+}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/HyenaActionGroup.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/HyenaActionGroup.cs
index c5c299d..c650984 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/HyenaActionGroup.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/HyenaActionGroup.cs
@@ -75,7 +75,7 @@ namespace Hyena.Gui
}
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
Hyena.ThreadAssist.ProxyToMain (delegate {
UnRegister ();
@@ -87,7 +87,7 @@ namespace Hyena.Gui
}
ui_merge_ids.Clear ();
- base.Dispose (disposing);
+ base.Dispose ();
});
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/RatingRenderer.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/RatingRenderer.cs
index ef1c6a9..9600cc8 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/RatingRenderer.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/RatingRenderer.cs
@@ -93,13 +93,13 @@ namespace Hyena.Gui
if (fill || hover_fill) {
if (!isHovering || hoverValue >= Value) {
- cr.SetSourceColor (fill ? fill_color : hover_fill_color);
+ cr.Color = fill ? fill_color : hover_fill_color;
} else {
- cr.SetSourceColor (hover_fill ? fill_color : hover_fill_color);
+ cr.Color = hover_fill ? fill_color : hover_fill_color;
}
cr.Fill ();
} else {
- cr.SetSourceColor (stroke_color);
+ cr.Color = stroke_color;
cr.Stroke ();
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/ShadingTestWindow.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/ShadingTestWindow.cs
index 35e4b43..d82d67b 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui/ShadingTestWindow.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/ShadingTestWindow.cs
@@ -31,7 +31,6 @@ using Gtk;
namespace Hyena.Gui
{
- [TestModule ("Shading")]
public class ShadingTestWindow : Window
{
private int steps = 16;
@@ -41,8 +40,10 @@ namespace Hyena.Gui
SetSizeRequest (512, 512);
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
+ Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
+
double step_width = Allocation.Width / (double)steps;
double step_height = Allocation.Height / (double)steps;
double h = 1.0;
@@ -53,11 +54,11 @@ namespace Hyena.Gui
double bg_b = (double)(i / 255.0);
double fg_b = 1.0 - bg_b;
- double x = xi * step_width;
- double y = yi * step_height;
+ double x = Allocation.X + xi * step_width;
+ double y = Allocation.Y + yi * step_height;
cr.Rectangle (x, y, step_width, step_height);
- cr.SetSourceColor (CairoExtensions.ColorFromHsb (h, s, bg_b));
+ cr.Color = CairoExtensions.ColorFromHsb (h, s, bg_b);
cr.Fill ();
int tw, th;
@@ -67,12 +68,13 @@ namespace Hyena.Gui
cr.Translate (0.5, 0.5);
cr.MoveTo (x + (step_width - tw) / 2.0, y + (step_height - th) / 2.0);
- cr.SetSourceColor (CairoExtensions.ColorFromHsb (h, s, fg_b));
+ cr.Color = CairoExtensions.ColorFromHsb (h, s, fg_b);
PangoCairoHelper.ShowLayout (cr, layout);
cr.Translate (-0.5, -0.5);
}
}
+ CairoExtensions.DisposeContext (cr);
return true;
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui/TooltipSetter.cs b/src/Hyena/Hyena.Gui/Hyena.Gui/TooltipSetter.cs
new file mode 100644
index 0000000..48323e7
--- /dev/null
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui/TooltipSetter.cs
@@ -0,0 +1,87 @@
+//
+// TooltipSetter.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright (C) 2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Reflection;
+
+using Gtk;
+
+namespace Hyena.Gui
+{
+ public static class TooltipSetter
+ {
+ private static Type host_type;
+ private static MethodInfo host_set_tip_method;
+ private static PropertyInfo tooltip_text_property;
+ private static bool reflected;
+
+ public static object CreateHost ()
+ {
+ if (tooltip_text_property != null) {
+ return null;
+ }
+
+ Type type = reflected ? null : typeof (Widget);
+
+ if (type != null) {
+ tooltip_text_property = type.GetProperty ("TooltipText", BindingFlags.Instance | BindingFlags.Public);
+ if (tooltip_text_property != null) {
+ reflected = true;
+ return null;
+ }
+ }
+
+ if (host_set_tip_method == null && !reflected) {
+ reflected = true;
+ host_type = Type.GetType (String.Format ("Gtk.Tooltips, {0}", type.Assembly.FullName));
+ if (type == null) {
+ return null;
+ }
+
+ host_set_tip_method = host_type.GetMethod ("SetTip", BindingFlags.Instance |
+ BindingFlags.Public | BindingFlags.InvokeMethod);
+ if (host_set_tip_method == null) {
+ return null;
+ }
+ }
+
+ return host_set_tip_method != null ? Activator.CreateInstance (host_type) : null;
+ }
+
+ public static void Set (object host, Widget widget, string textTip)
+ {
+ if (tooltip_text_property != null) {
+ tooltip_text_property.SetValue (widget, textTip, null);
+ } else if (host != null && host_set_tip_method != null) {
+ host_set_tip_method.Invoke (host, new object [] { widget, textTip, null });
+ } else {
+ throw new ApplicationException ("You must call TooltipSetter.CreateHost before calling TooltipSetter.Set");
+ }
+ }
+ }
+}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs
index 2f11b00..ba9ea15 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs
@@ -38,7 +38,7 @@ namespace Hyena.Query.Gui
public class FileSizeQueryValueEntry : QueryValueEntry
{
protected SpinButton spin_button;
- protected ComboBoxText combo;
+ protected ComboBox combo;
protected FileSizeQueryValue query_value;
protected static readonly FileSizeFactor [] factors = new FileSizeFactor [] {
@@ -57,7 +57,7 @@ namespace Hyena.Query.Gui
spin_button.SetRange (0.0, Double.MaxValue);
Add (spin_button);
- combo = new ComboBoxText ();
+ combo = ComboBox.NewText ();
combo.AppendText (Catalog.GetString ("bytes"));
combo.AppendText (Catalog.GetString ("KB"));
combo.AppendText (Catalog.GetString ("MB"));
diff --git a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs
index 649fb7f..0fe4562 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs
@@ -52,7 +52,7 @@ namespace Hyena.Query.Gui
get { return limit_box; }
}
- private ComboBoxText terms_logic_combo;
+ private ComboBox terms_logic_combo;
private CheckButton terms_enabled_checkbox;
private Label terms_label;
private QueryFieldSet field_set;
@@ -107,7 +107,7 @@ namespace Hyena.Query.Gui
terms_enabled_checkbox.Toggled += OnMatchCheckBoxToggled;
header.PackStart (terms_enabled_checkbox, false, false, 0);
- terms_logic_combo = new ComboBoxText ();
+ terms_logic_combo = ComboBox.NewText ();
terms_logic_combo.AppendText (Catalog.GetString ("all"));
terms_logic_combo.AppendText (Catalog.GetString ("any"));
terms_logic_combo.Show ();
@@ -163,7 +163,7 @@ namespace Hyena.Query.Gui
}
} catch (ArgumentException) {
complex_query = true;
- matchesFrame.Hide ();
+ matchesFrame.HideAll ();
terms_entry.Text = value.ToUserQuery ();
terms_entry_box.ShowAll ();
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs
index b40da65..545b9e3 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs
@@ -42,8 +42,8 @@ namespace Hyena.Query.Gui
{
private CheckButton enabled_checkbox;
private SpinButton count_spin;
- private ComboBoxText limit_combo;
- private ComboBoxText order_combo;
+ private ComboBox limit_combo;
+ private ComboBox order_combo;
private QueryOrder [] orders;
private QueryLimit [] limits;
@@ -64,12 +64,12 @@ namespace Hyena.Query.Gui
count_spin.Value = 25;
count_spin.SetSizeRequest (60, -1);
- limit_combo = new ComboBoxText ();
+ limit_combo = ComboBox.NewText ();
foreach (QueryLimit limit in limits) {
limit_combo.AppendText (limit.Label);
}
- order_combo = new ComboBoxText ();
+ order_combo = ComboBox.NewText ();
order_combo.RowSeparatorFunc = IsRowSeparator;
foreach (QueryOrder order in orders) {
if (order == null) {
@@ -94,7 +94,7 @@ namespace Hyena.Query.Gui
ShowAll ();
}
- private bool IsRowSeparator (ITreeModel model, TreeIter iter)
+ private bool IsRowSeparator (TreeModel model, TreeIter iter)
{
return String.IsNullOrEmpty (model.GetValue (iter, 0) as string);
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryTermBox.cs b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryTermBox.cs
index b0a1508..f5413d7 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryTermBox.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryTermBox.cs
@@ -54,13 +54,13 @@ namespace Hyena.Query.Gui
private QueryField [] sorted_fields;
- private ComboBoxText field_chooser;
- public ComboBoxText FieldChooser {
+ private ComboBox field_chooser;
+ public ComboBox FieldChooser {
get { return field_chooser; }
}
- private ComboBoxText op_chooser;
- public ComboBoxText OpChooser {
+ private ComboBox op_chooser;
+ public ComboBox OpChooser {
get { return op_chooser; }
}
@@ -82,10 +82,10 @@ namespace Hyena.Query.Gui
private void BuildInterface ()
{
- field_chooser = new ComboBoxText ();
+ field_chooser = ComboBox.NewText ();
field_chooser.Changed += HandleFieldChanged;
- op_chooser = new ComboBoxText ();
+ op_chooser = ComboBox.NewText ();
op_chooser.RowSeparatorFunc = IsRowSeparator;
op_chooser.Changed += HandleOperatorChanged;
@@ -111,7 +111,7 @@ namespace Hyena.Query.Gui
field_chooser.Active = 0;
}
- private bool IsRowSeparator (ITreeModel model, TreeIter iter)
+ private bool IsRowSeparator (TreeModel model, TreeIter iter)
{
return String.IsNullOrEmpty (model.GetValue (iter, 0) as string);
}
@@ -156,7 +156,9 @@ namespace Hyena.Query.Gui
this.field = field;
// Remove old type's operators
- op_chooser.RemoveAll ();
+ while (op_chooser.Model.IterNChildren () > 0) {
+ op_chooser.RemoveText (0);
+ }
// Add new field's operators
int val_count = 0;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs
index 469ddb0..0158ad1 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs
@@ -38,7 +38,7 @@ namespace Hyena.Query.Gui
public class TimeSpanQueryValueEntry : QueryValueEntry
{
protected SpinButton spin_button;
- protected ComboBoxText combo;
+ protected ComboBox combo;
protected TimeSpanQueryValue query_value;
private int set_combo = 1;
@@ -55,7 +55,7 @@ namespace Hyena.Query.Gui
spin_button.SetRange (0.0, Double.MaxValue);
Add (spin_button);
- combo = new ComboBoxText ();
+ combo = ComboBox.NewText ();
combo.AppendText (Catalog.GetString ("seconds"));
combo.AppendText (Catalog.GetString ("minutes"));
combo.AppendText (Catalog.GetString ("hours"));
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs
index 098d01f..4154570 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs
@@ -61,7 +61,7 @@ namespace Hyena.Widgets
protected AnimatedBox (bool horizontal)
{
- HasWindow = false;
+ WidgetFlags |= WidgetFlags.NoWindow;
this.horizontal = horizontal;
stage.ActorStep += OnActorStep;
border_stage.Iteration += OnBorderIteration;
@@ -184,22 +184,8 @@ namespace Hyena.Widgets
PackStart (widget, duration, easing, blocking);
}
-
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
- {
- var requisition = SizeRequested ();
- minimum_height = natural_height = requisition.Height;
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
+ protected override void OnSizeRequested (ref Requisition requisition)
{
- var requisition = SizeRequested ();
- minimum_width = natural_width = requisition.Width;
- }
-
- protected Requisition SizeRequested ()
- {
- var requisition = new Requisition ();
int width = 0;
int height = 0;
@@ -210,9 +196,7 @@ namespace Hyena.Widgets
}
foreach (AnimatedWidget widget in Widgets) {
- Requisition req, nat;
- widget.GetPreferredSize (out req, out nat);
-
+ Requisition req = widget.SizeRequest ();
if (horizontal) {
width += req.Width;
height = Math.Max (height, req.Height);
@@ -224,7 +208,6 @@ namespace Hyena.Widgets
requisition.Width = width;
requisition.Height = height;
- return requisition;
}
protected override void OnSizeAllocated (Rectangle allocation)
@@ -563,4 +546,4 @@ namespace Hyena.Widgets
#endregion
}
-}
+}
\ No newline at end of file
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs
index 10ae0d0..0d59221 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs
@@ -42,85 +42,4 @@ namespace Hyena.Widgets
{
}
}
-
- [Hyena.Gui.TestModule ("Animated VBox")]
- internal class AnimatedVBoxTestModule : Gtk.Window
- {
- Table tile, tile2;
- uint timeout_id;
-
- public AnimatedVBoxTestModule () : base ("Animated VBox")
- {
- AnimatedVBox vbox = new AnimatedVBox ();
- Add (vbox);
-
- tile = BuildWidget ("Example destroyed");
- tile2 = BuildWidget ("Example removed");
-
- vbox.PackEnd (tile, 3000, Hyena.Gui.Theatrics.Easing.QuadraticOut);
- vbox.PackEnd (tile2, 3000, Hyena.Gui.Theatrics.Easing.QuadraticOut);
- ShowAll ();
-
- timeout_id = GLib.Timeout.AddSeconds (5, delegate {
- tile.Destroy ();
- vbox.Remove (tile2);
- return false;
- });
- }
-
- protected override bool OnDeleteEvent (Gdk.Event evnt)
- {
- if (timeout_id > 0) {
- GLib.Timeout.Remove (timeout_id);
- }
- return base.OnDeleteEvent (evnt);
- }
-
-
- private Table BuildWidget (string title)
- {
- var tile = new Table (3, 2, false);
-
- tile.ColumnSpacing = 5;
- tile.RowSpacing = 2;
-
- var title_label = new Label ();
- title_label.Xalign = 0.0f;
- title_label.Ellipsize = Pango.EllipsizeMode.End;
- title_label.Markup = String.Format ("<small><b>{0}</b></small>", GLib.Markup.EscapeText (title));
-
- var status_label = new Label ();
- status_label.Xalign = 0.0f;
- status_label.Ellipsize = Pango.EllipsizeMode.End;
- status_label.Markup = "<small>Testing...</small>";
-
- var progress_bar = new ProgressBar ();
- progress_bar.SetSizeRequest (0, -1);
- progress_bar.Fraction = 0.5;
- progress_bar.Text = "Doing nothing...";
-
- var cancel_button = new Button (new Image (Stock.Stop, IconSize.Menu));
- cancel_button.Relief = ReliefStyle.None;
-
- tile.Attach (title_label, 0, 3, 0, 1,
- AttachOptions.Expand | AttachOptions.Fill,
- AttachOptions.Expand | AttachOptions.Fill, 0, 0);
-
- tile.Attach (status_label, 0, 3, 1, 2,
- AttachOptions.Expand | AttachOptions.Fill,
- AttachOptions.Expand | AttachOptions.Fill, 0, 0);
-
- tile.Attach (progress_bar, 1, 2, 2, 3,
- AttachOptions.Expand | AttachOptions.Fill,
- AttachOptions.Shrink, 0, 0);
-
- tile.Attach (cancel_button, 2, 3, 2, 3,
- AttachOptions.Shrink | AttachOptions.Fill,
- AttachOptions.Shrink | AttachOptions.Fill, 0, 0);
-
- tile.ShowAll ();
-
- return tile;
- }
- }
}
\ No newline at end of file
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs
index ff77cf3..a77eadf 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs
@@ -1,5 +1,5 @@
//
-// AnimatedWidget.cs
+// AnimatedVboxActor.cs
//
// Authors:
// Scott Peterson <lunchtimemama at gmail.com>
@@ -31,7 +31,6 @@ using System.Collections.Generic;
using Gdk;
using Gtk;
-using Hyena.Gui;
using Hyena.Gui.Theatrics;
namespace Hyena.Widgets
@@ -63,7 +62,7 @@ namespace Hyena.Widgets
private readonly bool horizontal;
private double percent;
private Rectangle widget_alloc;
- private Cairo.Surface surface;
+ private Pixmap canvas;
public AnimatedWidget (Widget widget, uint duration, Easing easing, Blocking blocking, bool horizontal)
{
@@ -97,17 +96,12 @@ namespace Hyena.Widgets
return;
}
- // Copy the widget's pixels to surface, we'll use it to draw the animation
- surface = Window.CreateSimilarSurface (Cairo.Content.ColorAlpha, widget_alloc.Width, widget_alloc.Height);
- using (var cr = new Cairo.Context (surface)) {
- Gdk.CairoHelper.SetSourceWindow (cr, Window, widget_alloc.X, widget_alloc.Y);
- cr.Rectangle (0, 0, widget_alloc.Width, widget_alloc.Height);
- cr.Fill ();
-
- if (AnimationState != AnimationState.Going) {
- WidgetDestroyed (this, args);
- }
+ canvas = new Pixmap (GdkWindow, widget_alloc.Width, widget_alloc.Height);
+ canvas.DrawDrawable (Style.BackgroundGC (State), GdkWindow,
+ widget_alloc.X, widget_alloc.Y, 0, 0, widget_alloc.Width, widget_alloc.Height);
+ if (AnimationState != AnimationState.Going) {
+ WidgetDestroyed (this, args);
}
}
@@ -123,36 +117,23 @@ namespace Hyena.Widgets
protected override void OnRealized ()
{
- IsRealized = true;
+ WidgetFlags |= WidgetFlags.Realized;
Gdk.WindowAttr attributes = new Gdk.WindowAttr ();
attributes.WindowType = Gdk.WindowType.Child;
- attributes.Wclass = Gdk.WindowWindowClass.InputOutput;
+ attributes.Wclass = Gdk.WindowClass.InputOutput;
attributes.EventMask = (int)Gdk.EventMask.ExposureMask;
- Window = new Gdk.Window (Parent.Window, attributes, 0);
- Window.UserData = Handle;
- Window.BackgroundRgba = StyleContext.GetBackgroundColor (StateFlags);
- }
-
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
- {
- var requisition = SizeRequested ();
- minimum_height = natural_height = requisition.Height;
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- var requisition = SizeRequested ();
- minimum_width = natural_width = requisition.Width;
+ GdkWindow = new Gdk.Window (Parent.GdkWindow, attributes, 0);
+ GdkWindow.UserData = Handle;
+ GdkWindow.Background = Style.Background (State);
+ Style.Attach (GdkWindow);
}
- protected Requisition SizeRequested ()
+ protected override void OnSizeRequested (ref Requisition requisition)
{
- var requisition = new Requisition ();
if (Widget != null) {
- Requisition req, nat;
- Widget.GetPreferredSize (out req, out nat);
+ Requisition req = Widget.SizeRequest ();
widget_alloc.Width = req.Width;
widget_alloc.Height = req.Height;
}
@@ -167,7 +148,6 @@ namespace Hyena.Widgets
requisition.Width = Width;
requisition.Height = Height;
- return requisition;
}
protected override void OnSizeAllocated (Rectangle allocation)
@@ -194,18 +174,14 @@ namespace Hyena.Widgets
}
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (EventExpose evnt)
{
- if (surface != null) {
- cr.Save ();
- Gtk.CairoHelper.TransformToWindow (cr, this, Window);
- cr.SetSource (surface);
- cr.Rectangle (widget_alloc.X, widget_alloc.Y, widget_alloc.Width, widget_alloc.Height);
- cr.Fill ();
- cr.Restore ();
+ if (canvas != null) {
+ GdkWindow.DrawDrawable (Style.BackgroundGC (State), canvas,
+ 0, 0, widget_alloc.X, widget_alloc.Y, widget_alloc.Width, widget_alloc.Height);
return true;
} else {
- return base.OnDrawn (cr);
+ return base.OnExposeEvent (evnt);
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs
index 370c586..5d3c9c0 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs
@@ -61,11 +61,11 @@ namespace Hyena.Widgets
protected void ConnectChildExpose(Widget widget)
{
- widget.Drawn += OnDrawn;
+ widget.ExposeEvent += OnChildExposeEvent;
}
[GLib.ConnectBefore]
- private void OnDrawn(object o, DrawnArgs args)
+ private void OnChildExposeEvent(object o, ExposeEventArgs args)
{
// NOTE: This is a little insane, but it allows packing of EventBox based widgets
// into a GtkMenuItem without breaking the theme (leaving an unstyled void in the item).
@@ -81,23 +81,13 @@ namespace Hyena.Widgets
width = Allocation.Width;
height = Allocation.Height;
- StyleContext.Save ();
- StyleContext.AddClass ("menuitem");
- StyleContext.State = StateFlags.Prelight | StateFlags.Selected;
- StyleContext.RenderFrame (args.Cr, x, y, width, height);
- StyleContext.RenderBackground (args.Cr, x, y, width, height);
- StyleContext.Restore ();
+ ShadowType shadow_type = (ShadowType)StyleGetProperty("selected-shadow-type");
+ Gtk.Style.PaintBox(Style, widget.GdkWindow, StateType.Prelight, shadow_type,
+ args.Event.Area, widget, "menuitem", x, y, width, height);
} else {
-
- args.Cr.Save ();
-
- var color = Parent.StyleContext.GetBackgroundColor (StateFlags.Normal);
// Fill only the visible area in solid color, to be most efficient
- args.Cr.SetSourceRGB (color.Red, color.Green, color.Blue);
- args.Cr.Rectangle (0, 0, widget.Allocation.Width, widget.Allocation.Height);
- args.Cr.Fill ();
-
- args.Cr.Restore ();
+ widget.GdkWindow.DrawRectangle(Parent.Style.BackgroundGC(StateType.Normal),
+ true, 0, 0, widget.Allocation.Width, widget.Allocation.Height);
// FIXME: The above should not be necessary, but Clearlooks-based themes apparently
// don't provide any style for the menu background so we have to fill it first with
@@ -109,13 +99,9 @@ namespace Hyena.Widgets
y = Parent.Allocation.Y - widget.Allocation.Y;
width = Parent.Allocation.Width;
height = Parent.Allocation.Height;
-
- StyleContext.Save ();
- StyleContext.AddClass ("menuitem");
- StyleContext.State = StateFlags.Normal;
- StyleContext.RenderFrame (args.Cr, x, y, width, height);
- StyleContext.RenderBackground (args.Cr, x, y, width, height);
- StyleContext.Restore ();
+
+ Gtk.Style.PaintBox(Style, widget.GdkWindow, StateType.Normal, ShadowType.Out,
+ args.Event.Area, widget, "menu", x, y, width, height);
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/EntryPopup.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/EntryPopup.cs
index dc44d63..e8da7fb 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/EntryPopup.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/EntryPopup.cs
@@ -54,7 +54,7 @@ namespace Hyena.Widgets
Modal = true;
Frame frame = new Frame ();
- frame.ShadowType = ShadowType.EtchedIn;
+ frame.Shadow = ShadowType.EtchedIn;
Add (frame);
hbox = new HBox () { Spacing = 6 };
@@ -89,7 +89,7 @@ namespace Hyena.Widgets
text_entry.KeyPressEvent += (o, a) => OnKeyPressed (a);
text_entry.Changed += (o, a) => {
- if (Window.IsVisible) {
+ if (GdkWindow.IsVisible) {
OnChanged (a);
}
};
@@ -132,10 +132,10 @@ namespace Hyena.Widgets
set { reset_when_hiding = value; }
}
- protected override void Dispose (bool disposing)
+ public override void Dispose ()
{
text_entry.Dispose ();
- base.Dispose (disposing);
+ base.Dispose ();
}
public new void GrabFocus ()
@@ -157,8 +157,7 @@ namespace Hyena.Widgets
Gtk.Requisition popup_req;
widget_window.GetOrigin (out widget_x, out widget_y);
- widget_width = widget_window.Width;
- widget_height = widget_window.Height;
+ widget_window.GetSize (out widget_width, out widget_height);
popup_req = Requisition;
@@ -235,10 +234,10 @@ namespace Hyena.Widgets
return base.OnFocusOutEvent (evnt);
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
InitializeDelayedHide ();
- return base.OnDrawn (cr);
+ return base.OnExposeEvent (evnt);
}
protected override bool OnButtonReleaseEvent (Gdk.EventButton evnt)
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/GrabHandle.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/GrabHandle.cs
index 15725ac..82e1e90 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/GrabHandle.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/GrabHandle.cs
@@ -51,11 +51,11 @@ namespace Hyena.Widgets
EnterNotifyEvent += (o, a) => Inside = true;
LeaveNotifyEvent += (o, a) => Inside = false;
- da.Drawn += (o, a) => {
- da.StyleContext.Save ();
- da.StyleContext.AddClass ("pane-separator");
- da.StyleContext.RenderHandle (a.Cr, 0, 0, da.Allocation.Width, da.Allocation.Height);
- da.StyleContext.Restore ();
+ da.ExposeEvent += (o, a) => {
+ if (da.IsDrawable) {
+ Gtk.Style.PaintHandle (da.Style, da.GdkWindow, da.State, ShadowType.In,
+ a.Event.Area, this, "entry", 0, 0, da.Allocation.Width, da.Allocation.Height, Orientation);
+ }
};
}
@@ -74,14 +74,14 @@ namespace Hyena.Widgets
private bool Inside {
set {
inside = value;
- Window.Cursor = dragging || inside ? resize_cursor : null;
+ GdkWindow.Cursor = dragging || inside ? resize_cursor : null;
}
}
private bool Dragging {
set {
dragging = value;
- Window.Cursor = dragging || inside ? resize_cursor : null;
+ GdkWindow.Cursor = dragging || inside ? resize_cursor : null;
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/HigMessageDialog.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/HigMessageDialog.cs
index 7fd977c..abfa153 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/HigMessageDialog.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/HigMessageDialog.cs
@@ -45,18 +45,19 @@ namespace Hyena.Widgets
string msg)
: base()
{
+ HasSeparator = false;
BorderWidth = 5;
Resizable = false;
Title = "";
SkipTaskbarHint = true;
- ContentArea.Spacing = 12;
+ VBox.Spacing = 12;
ActionArea.Layout = Gtk.ButtonBoxStyle.End;
Gtk.HBox hbox = new Gtk.HBox (false, 12);
hbox.BorderWidth = 5;
hbox.Show ();
- ContentArea.PackStart (hbox, false, false, 0);
+ VBox.PackStart (hbox, false, false, 0);
image = null;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/MenuButton.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/MenuButton.cs
index 7dbc764..c5f790d 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/MenuButton.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/MenuButton.cs
@@ -54,7 +54,7 @@ namespace Hyena.Widgets
protected void Construct (Widget buttonWidget, Menu menu, bool showArrow)
{
- HasWindow = false;
+ WidgetFlags |= WidgetFlags.NoWindow;
button_widget = buttonWidget;
Menu = menu;
@@ -121,14 +121,9 @@ namespace Hyena.Widgets
set { alignment.Visible = value; }
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ protected override void OnSizeRequested (ref Requisition requisition)
{
- size_widget.GetPreferredHeight (out minimum_height, out natural_height);
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- size_widget.GetPreferredWidth (out minimum_width, out natural_width);
+ requisition = size_widget.SizeRequest ();
}
protected override void OnSizeAllocated (Rectangle allocation)
@@ -159,12 +154,11 @@ namespace Hyena.Widgets
private void PositionMenu (Menu menu, out int x, out int y, out bool push_in)
{
- Gtk.Requisition menu_req, nat_req;
- menu.GetPreferredSize (out menu_req, out nat_req);
- int monitor_num = Screen.GetMonitorAtWindow (Window);
+ Gtk.Requisition menu_req = menu.SizeRequest ();
+ int monitor_num = Screen.GetMonitorAtWindow (GdkWindow);
Gdk.Rectangle monitor = Screen.GetMonitorGeometry (monitor_num < 0 ? 0 : monitor_num);
- Window.GetOrigin (out x, out y);
+ GdkWindow.GetOrigin (out x, out y);
y += Allocation.Y;
x += Allocation.X + (Direction == TextDirection.Ltr
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/MessageBar.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/MessageBar.cs
index de46148..b83620c 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/MessageBar.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/MessageBar.cs
@@ -55,6 +55,10 @@ namespace Hyena.Widgets
{
win = new Window (WindowType.Popup);
win.Name = "gtk-tooltips";
+ win.EnsureStyle ();
+ win.StyleSet += delegate {
+ Style = win.Style;
+ };
HBox shell_box = new HBox ();
shell_box.Spacing = 10;
@@ -95,6 +99,8 @@ namespace Hyena.Widgets
Add (shell_box);
+ EnsureStyle ();
+
BorderWidth = 3;
}
@@ -126,11 +132,34 @@ namespace Hyena.Widgets
QueueDraw ();
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- Gdk.RGBA color = StyleContext.GetBackgroundColor (StateFlags.Normal);
- theme.DrawFrame (cr, new Gdk.Rectangle (0, 0, Allocation.Width, Allocation.Height), CairoExtensions.GdkRGBAToCairoColor (color));
- return base.OnDrawn (cr);
+ if (!IsDrawable) {
+ return false;
+ }
+
+ Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
+
+ try {
+ Gdk.Color color = Style.Background (StateType.Normal);
+ theme.DrawFrame (cr, Allocation, CairoExtensions.GdkColorToCairoColor (color));
+ return base.OnExposeEvent (evnt);
+ } finally {
+ CairoExtensions.DisposeContext (cr);
+ }
+ }
+
+ private bool changing_style = false;
+ protected override void OnStyleSet (Gtk.Style previousStyle)
+ {
+ if (changing_style) {
+ return;
+ }
+
+ changing_style = true;
+ Style = win.Style;
+ label.Style = Style;
+ changing_style = false;
}
public void RemoveButton (Button button)
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/PulsingButton.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/PulsingButton.cs
index 50af4ca..4ee6b8b 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/PulsingButton.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/PulsingButton.cs
@@ -82,32 +82,34 @@ namespace Hyena.Widgets
pulsator.Pulse += delegate { QueueDraw (); };
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
if (!pulsator.IsPulsing) {
- return base.OnDrawn (cr);
+ return base.OnExposeEvent (evnt);
}
- double x = Allocation.Width / 2;
- double y = Allocation.Height / 2;
+ Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow);
+
+ double x = Allocation.X + Allocation.Width / 2;
+ double y = Allocation.Y + Allocation.Height / 2;
double r = Math.Min (Allocation.Width, Allocation.Height) / 2;
double alpha = Choreographer.Compose (pulsator.Percent, Easing.Sine);
- Gdk.RGBA rgba = StyleContext.GetBackgroundColor (StateFlags.Selected);
- Cairo.Color color = CairoExtensions.GdkRGBAToCairoColor (rgba);
- using (var fill = new Cairo.RadialGradient (x, y, 0, x, y, r)) {
- color.A = alpha;
- fill.AddColorStop (0, color);
- fill.AddColorStop (0.5, color);
- color.A = 0;
- fill.AddColorStop (1, color);
-
- cr.Arc (x, y, r, 0, 2 * Math.PI);
- cr.SetSource (fill);
- cr.Fill ();
- }
-
- return base.OnDrawn (cr);
+ Cairo.Color color = CairoExtensions.GdkColorToCairoColor (Style.Background (StateType.Selected));
+ Cairo.RadialGradient fill = new Cairo.RadialGradient (x, y, 0, x, y, r);
+ color.A = alpha;
+ fill.AddColorStop (0, color);
+ fill.AddColorStop (0.5, color);
+ color.A = 0;
+ fill.AddColorStop (1, color);
+
+ cr.Arc (x, y, r, 0, 2 * Math.PI);
+ cr.Pattern = fill;
+ cr.Fill ();
+ fill.Destroy ();
+
+ CairoExtensions.DisposeContext (cr);
+ return base.OnExposeEvent (evnt);
}
public void StartPulsing ()
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/RatingEntry.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/RatingEntry.cs
index 7dedf00..3da4271 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/RatingEntry.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/RatingEntry.cs
@@ -54,7 +54,7 @@ namespace Hyena.Widgets
public RatingEntry () : this (0)
{
- HasWindow = false;
+ WidgetFlags |= Gtk.WidgetFlags.NoWindow;
}
public RatingEntry (int rating) : this (rating, new RatingRenderer ())
@@ -153,9 +153,8 @@ namespace Hyena.Widgets
protected override void OnRealized ()
{
- IsRealized = true;
- HasWindow = false;
- Window = Parent.Window;
+ WidgetFlags |= WidgetFlags.Realized | WidgetFlags.NoWindow;
+ GdkWindow = Parent.GdkWindow;
Gdk.WindowAttr attributes = new Gdk.WindowAttr ();
attributes.WindowType = Gdk.WindowType.Child;
@@ -163,7 +162,7 @@ namespace Hyena.Widgets
attributes.Y = Allocation.Y;
attributes.Width = Allocation.Width;
attributes.Height = Allocation.Height;
- attributes.Wclass = Gdk.WindowWindowClass.InputOnly;
+ attributes.Wclass = Gdk.WindowClass.InputOnly;
attributes.EventMask = (int)(
Gdk.EventMask.PointerMotionMask |
Gdk.EventMask.EnterNotifyMask |
@@ -179,21 +178,20 @@ namespace Hyena.Widgets
Gdk.WindowAttributesType.Y |
Gdk.WindowAttributesType.Wmclass;
- event_window = new Gdk.Window (Window, attributes, attributes_mask);
+ event_window = new Gdk.Window (GdkWindow, attributes, attributes_mask);
event_window.UserData = Handle;
- //TODO stylecontext is set from path and path come from name so must inherit but need to be checked!
- //Style = Gtk.Rc.GetStyleByPaths (Settings, "*.GtkEntry", "*.GtkEntry", GType);
+ Style = Gtk.Rc.GetStyleByPaths (Settings, "*.GtkEntry", "*.GtkEntry", GType);
base.OnRealized ();
}
protected override void OnUnrealized ()
{
- IsRealized = false;
+ WidgetFlags &= ~WidgetFlags.Realized;
event_window.UserData = IntPtr.Zero;
- event_window.Destroy ();
+ Hyena.Gui.GtkWorkarounds.WindowDestroy (event_window);
event_window = null;
base.OnUnrealized ();
@@ -201,24 +199,24 @@ namespace Hyena.Widgets
protected override void OnMapped ()
{
- IsMapped = true;
+ WidgetFlags |= WidgetFlags.Mapped;
event_window.Show ();
}
protected override void OnUnmapped ()
{
- IsMapped = false;
+ WidgetFlags &= ~WidgetFlags.Mapped;
event_window.Hide ();
}
private bool changing_style;
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
if (changing_style) {
return;
}
- base.OnStyleUpdated ();
+ base.OnStyleSet (previous_style);
changing_style = true;
focus_width = (int)StyleGetProperty ("focus-line-width");
@@ -235,29 +233,17 @@ namespace Hyena.Widgets
}
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ protected override void OnSizeRequested (ref Gtk.Requisition requisition)
{
- var requisition = SizeRequested ();
- minimum_height = natural_height = requisition.Height;
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- var requisition = SizeRequested ();
- minimum_width = natural_width = requisition.Width;
- }
+ EnsureStyle ();
- protected Requisition SizeRequested ()
- {
- var requisition = new Requisition ();
-
- Pango.FontMetrics metrics = PangoContext.GetMetrics (StyleContext.GetFont (StateFlags), PangoContext.Language);
+ Pango.FontMetrics metrics = PangoContext.GetMetrics (Style.FontDescription, PangoContext.Language);
renderer.Size = ((int)(metrics.Ascent + metrics.Descent) + 512) >> 10; // PANGO_PIXELS(d)
metrics.Dispose ();
if (HasFrame) {
- renderer.Xpad = MarginLeft + (interior_focus ? focus_width : 0) + 2;
- renderer.Ypad = MarginTop + (interior_focus ? focus_width : 0) + 2;
+ renderer.Xpad = Style.Xthickness + (interior_focus ? focus_width : 0) + 2;
+ renderer.Ypad = Style.Ythickness + (interior_focus ? focus_width : 0) + 2;
} else {
renderer.Xpad = 0;
renderer.Ypad = 0;
@@ -265,30 +251,30 @@ namespace Hyena.Widgets
requisition.Width = renderer.Width;
requisition.Height = renderer.Height;
- return requisition;
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- if (!CairoHelper.ShouldDrawWindow(cr, Window)) {
+ if (evnt.Window != GdkWindow) {
return true;
}
if (HasFrame) {
int y_mid = (int)Math.Round ((Allocation.Height - renderer.Height) / 2.0);
- StyleContext.Save ();
- StyleContext.AddClass ("entry");
- StyleContext.RenderBackground (cr, 0, y_mid, Allocation.Width, renderer.Height);
- StyleContext.RenderFrame (cr, 0, y_mid, Allocation.Width, renderer.Height);
- StyleContext.Restore ();
+ Gtk.Style.PaintFlatBox (Style, GdkWindow, State, ShadowType.None, evnt.Area, this, "entry",
+ Allocation.X, Allocation.Y + y_mid, Allocation.Width, renderer.Height);
+ Gtk.Style.PaintShadow (Style, GdkWindow, State, ShadowType.In,
+ evnt.Area, this, "entry", Allocation.X, Allocation.Y + y_mid, Allocation.Width, renderer.Height);
}
- renderer.Render (cr, new Gdk.Rectangle (0, 0, Allocation.Width, Allocation.Height),
- CairoExtensions.GdkRGBAToCairoColor ( Parent.StyleContext.GetColor (StateFlags)),
+ Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow);
+ renderer.Render (cr, Allocation,
+ CairoExtensions.GdkColorToCairoColor (HasFrame ? Parent.Style.Text (State) : Parent.Style.Foreground (State)),
AlwaysShowEmptyStars, PreviewOnHover && hover_value >= renderer.MinRating, hover_value,
State == StateType.Insensitive ? 1 : 0.90,
State == StateType.Insensitive ? 1 : 0.55,
State == StateType.Insensitive ? 1 : 0.45);
+ CairoExtensions.DisposeContext (cr);
return true;
}
@@ -405,7 +391,9 @@ namespace Hyena.Widgets
}
- public class RatingAccessible : Atk.Object, Atk.IValue, Atk.IValueImplementor
+#region Test Module
+
+ public class RatingAccessible : Atk.Object, Atk.Value, Atk.ValueImplementor
{
private RatingEntry rating;
@@ -460,17 +448,18 @@ namespace Hyena.Widgets
{
new RatingAccessibleFactory ();
Atk.Global.DefaultRegistry.SetFactoryType ((GLib.GType)typeof (RatingEntry), (GLib.GType)typeof (RatingAccessibleFactory));
- CreateAccessibleHandler = (obj) => {
- return new RatingAccessible (obj);
- };
- GetAccessibleTypeHandler = () => {
- return RatingAccessible.GType;
- };
+ }
+ protected override Atk.Object OnCreateAccessible (GLib.Object obj)
+ {
+ return new RatingAccessible (obj);
}
- }
-#region Test Module
+ protected override GLib.GType OnGetAccessibleType ()
+ {
+ return RatingAccessible.GType;
+ }
+ }
[Hyena.Gui.TestModule ("Rating Entry")]
internal class RatingEntryTestModule : Gtk.Window
@@ -508,7 +497,7 @@ namespace Hyena.Widgets
RatingEntry entry3 = new RatingEntry ();
Pango.FontDescription fd = entry3.PangoContext.FontDescription.Copy ();
fd.Size = (int)(fd.Size * Pango.Scale.XXLarge);
- entry3.OverrideFont (fd);
+ entry3.ModifyFont (fd);
fd.Dispose ();
box.PackStart (entry3, true, true, 0);
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs
index 5cf21e9..2c9a8f1 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs
@@ -36,7 +36,7 @@ using Hyena.Gui.Theming;
namespace Hyena.Widgets
{
- public class RoundedFrame : Bin, IScrollableImplementor
+ public class RoundedFrame : Bin
{
private Theme theme;
protected Theme Theme {
@@ -96,49 +96,19 @@ namespace Hyena.Widgets
set { draw_border = value; QueueDraw (); }
}
- public Gtk.ScrollablePolicy HscrollPolicy {
- get; set;
- }
-
- public Gtk.ScrollablePolicy VscrollPolicy {
- get; set;
- }
-
- public Gtk.Adjustment Vadjustment {
- get; set;
- }
-
- public Gtk.Adjustment Hadjustment {
- get; set;
- }
-
#region Gtk.Widget Overrides
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
- base.OnStyleUpdated ();
+ base.OnStyleSet (previous_style);
InitTheme ();
}
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
- {
- var requisition = SizeRequested ();
- minimum_height = natural_height = requisition.Height;
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
+ protected override void OnSizeRequested (ref Requisition requisition)
{
- var requisition = SizeRequested ();
- minimum_width = natural_width = requisition.Width;
- }
-
- protected Requisition SizeRequested ()
- {
- var requisition = new Requisition ();
if (child != null && child.Visible) {
// Add the child's width/height
- Requisition child_requisition, nat_requisition;
- child.GetPreferredSize (out child_requisition, out nat_requisition);
+ Requisition child_requisition = child.SizeRequest ();
requisition.Width = Math.Max (0, child_requisition.Width);
requisition.Height = child_requisition.Height;
} else {
@@ -149,7 +119,6 @@ namespace Hyena.Widgets
// Add the frame border
requisition.Width += ((int)BorderWidth + frame_width) * 2;
requisition.Height += ((int)BorderWidth + frame_width) * 2;
- return requisition;
}
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -174,18 +143,33 @@ namespace Hyena.Widgets
child.SizeAllocate (child_allocation);
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
+ {
+ // This is to satisfy the gtk_widget_set_scroll_adjustments
+ // inside of GtkScrolledWindow so it doesn't complain about
+ // its child not being scrollable.
+ }
+
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- CairoHelper.TransformToWindow (cr, this, Window);
+ if (!IsDrawable) {
+ return false;
+ }
- DrawFrame (cr);
- if (child != null) {
- PropagateDraw (child, cr);
+ Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
+
+ try {
+ DrawFrame (cr, evnt.Area);
+ if (child != null) {
+ PropagateExpose (child, evnt);
+ }
+ return false;
+ } finally {
+ CairoExtensions.DisposeContext (cr);
}
- return false;
}
- private void DrawFrame (Cairo.Context cr)
+ private void DrawFrame (Cairo.Context cr, Gdk.Rectangle clip)
{
int x = child_allocation.X - frame_width;
int y = child_allocation.Y - frame_width;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs
index bd69793..66e8fab 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs
@@ -106,25 +106,21 @@ namespace Hyena.Widgets
public SegmentedBar ()
{
- HasWindow = false;
+ WidgetFlags |= WidgetFlags.NoWindow;
}
protected override void OnRealized ()
{
- Window = Parent.Window;
+ GdkWindow = Parent.GdkWindow;
base.OnRealized ();
}
#region Size Calculations
- protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ protected override void OnSizeRequested (ref Requisition requisition)
{
- minimum_height = natural_height = 0;
- }
-
- protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
- {
- minimum_width = natural_width = 200;
+ requisition.Width = 200;
+ requisition.Height = 0;
}
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -316,81 +312,84 @@ namespace Hyena.Widgets
#region Rendering
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- if (!CairoHelper.ShouldDrawWindow (cr, Window)) {
- return base.OnDrawn (cr);
+ if (evnt.Window != GdkWindow) {
+ return base.OnExposeEvent (evnt);
}
+ Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
+
if (reflect) {
CairoExtensions.PushGroup (cr);
}
cr.Operator = Operator.Over;
- cr.Translate (h_padding, 0);
+ cr.Translate (Allocation.X + h_padding, Allocation.Y);
cr.Rectangle (0, 0, Allocation.Width - h_padding, Math.Max (2 * bar_height,
bar_height + bar_label_spacing + layout_height));
cr.Clip ();
- using (var bar = RenderBar (Allocation.Width - 2 * h_padding, bar_height)) {
+ Pattern bar = RenderBar (Allocation.Width - 2 * h_padding, bar_height);
- cr.Save ();
- cr.SetSource (bar);
- cr.Paint ();
- cr.Restore ();
+ cr.Save ();
+ cr.Source = bar;
+ cr.Paint ();
+ cr.Restore ();
- if (reflect) {
- cr.Save ();
+ if (reflect) {
+ cr.Save ();
- cr.Rectangle (0, bar_height, Allocation.Width - h_padding, bar_height);
- cr.Clip ();
+ cr.Rectangle (0, bar_height, Allocation.Width - h_padding, bar_height);
+ cr.Clip ();
- Matrix matrix = new Matrix ();
- matrix.InitScale (1, -1);
- matrix.Translate (0, -(2 * bar_height) + 1);
- cr.Transform (matrix);
+ Matrix matrix = new Matrix ();
+ matrix.InitScale (1, -1);
+ matrix.Translate (0, -(2 * bar_height) + 1);
+ cr.Transform (matrix);
- cr.SetSource (bar);
+ cr.Pattern = bar;
- using (var mask = new LinearGradient (0, 0, 0, bar_height)) {
+ LinearGradient mask = new LinearGradient (0, 0, 0, bar_height);
- mask.AddColorStop (0.25, new Color (0, 0, 0, 0));
- mask.AddColorStop (0.5, new Color (0, 0, 0, 0.125));
- mask.AddColorStop (0.75, new Color (0, 0, 0, 0.4));
- mask.AddColorStop (1.0, new Color (0, 0, 0, 0.7));
+ mask.AddColorStop (0.25, new Color (0, 0, 0, 0));
+ mask.AddColorStop (0.5, new Color (0, 0, 0, 0.125));
+ mask.AddColorStop (0.75, new Color (0, 0, 0, 0.4));
+ mask.AddColorStop (1.0, new Color (0, 0, 0, 0.7));
- cr.Mask (mask);
- }
+ cr.Mask (mask);
+ mask.Destroy ();
- cr.Restore ();
+ cr.Restore ();
- CairoExtensions.PopGroupToSource (cr);
- cr.Paint ();
- }
+ CairoExtensions.PopGroupToSource (cr);
+ cr.Paint ();
+ }
- if (show_labels) {
- cr.Translate ((reflect ? 0 : -h_padding) + (Allocation.Width - layout_width) / 2,
- bar_height + bar_label_spacing);
- RenderLabels (cr);
- }
+ if (show_labels) {
+ cr.Translate ((reflect ? Allocation.X : -h_padding) + (Allocation.Width - layout_width) / 2,
+ (reflect ? Allocation.Y : 0) + bar_height + bar_label_spacing);
+ RenderLabels (cr);
}
+ bar.Destroy ();
+ CairoExtensions.DisposeContext (cr);
+
return true;
}
private Pattern RenderBar (int w, int h)
{
- Pattern pattern;
- using (var s = new ImageSurface (Format.Argb32, w, h)) {
- using (var cr = new Context (s)) {
- RenderBar (cr, w, h, h / 2);
+ ImageSurface s = new ImageSurface (Format.Argb32, w, h);
+ Context cr = new Context (s);
+ RenderBar (cr, w, h, h / 2);
// TODO Implement the new ctor - see http://bugzilla.gnome.org/show_bug.cgi?id=561394
#pragma warning disable 0618
- pattern = new Pattern (s);
+ Pattern pattern = new Pattern (s);
#pragma warning restore 0618
- }
- }
+ s.Destroy ();
+ ((IDisposable)cr).Dispose ();
return pattern;
}
@@ -402,62 +401,63 @@ namespace Hyena.Widgets
private void RenderBarSegments (Context cr, int w, int h, int r)
{
- using (var grad = new LinearGradient (0, 0, w, 0)) {
- double last = 0.0;
-
- foreach (Segment segment in segments) {
- if (segment.Percent > 0) {
- grad.AddColorStop (last, segment.Color);
- grad.AddColorStop (last += segment.Percent, segment.Color);
- }
- }
+ LinearGradient grad = new LinearGradient (0, 0, w, 0);
+ double last = 0.0;
- CairoExtensions.RoundedRectangle (cr, 0, 0, w, h, r);
- cr.SetSource (grad);
- cr.FillPreserve ();
+ foreach (Segment segment in segments) {
+ if (segment.Percent > 0) {
+ grad.AddColorStop (last, segment.Color);
+ grad.AddColorStop (last += segment.Percent, segment.Color);
+ }
}
- using (var grad = new LinearGradient (0, 0, 0, h)) {
- grad.AddColorStop (0.0, new Color (1, 1, 1, 0.125));
- grad.AddColorStop (0.35, new Color (1, 1, 1, 0.255));
- grad.AddColorStop (1, new Color (0, 0, 0, 0.4));
+ CairoExtensions.RoundedRectangle (cr, 0, 0, w, h, r);
+ cr.Pattern = grad;
+ cr.FillPreserve ();
+ cr.Pattern.Destroy ();
- cr.SetSource (grad);
- cr.Fill ();
- }
+ grad = new LinearGradient (0, 0, 0, h);
+ grad.AddColorStop (0.0, new Color (1, 1, 1, 0.125));
+ grad.AddColorStop (0.35, new Color (1, 1, 1, 0.255));
+ grad.AddColorStop (1, new Color (0, 0, 0, 0.4));
+
+ cr.Pattern = grad;
+ cr.Fill ();
+ cr.Pattern.Destroy ();
}
private void RenderBarStrokes (Context cr, int w, int h, int r)
{
- using (var stroke = MakeSegmentGradient (h, CairoExtensions.RgbaToColor (0x00000040))) {
- using (var seg_sep_light = MakeSegmentGradient (h, CairoExtensions.RgbaToColor (0xffffff20))) {
- using (var seg_sep_dark = MakeSegmentGradient (h, CairoExtensions.RgbaToColor (0x00000020))) {
-
- cr.LineWidth = 1;
+ LinearGradient stroke = MakeSegmentGradient (h, CairoExtensions.RgbaToColor (0x00000040));
+ LinearGradient seg_sep_light = MakeSegmentGradient (h, CairoExtensions.RgbaToColor (0xffffff20));
+ LinearGradient seg_sep_dark = MakeSegmentGradient (h, CairoExtensions.RgbaToColor (0x00000020));
- double seg_w = 20;
- double x = seg_w > r ? seg_w : r;
+ cr.LineWidth = 1;
- while (x <= w - r) {
- cr.MoveTo (x - 0.5, 1);
- cr.LineTo (x - 0.5, h - 1);
- cr.SetSource (seg_sep_light);
- cr.Stroke ();
+ double seg_w = 20;
+ double x = seg_w > r ? seg_w : r;
- cr.MoveTo (x + 0.5, 1);
- cr.LineTo (x + 0.5, h - 1);
- cr.SetSource (seg_sep_dark);
- cr.Stroke ();
+ while (x <= w - r) {
+ cr.MoveTo (x - 0.5, 1);
+ cr.LineTo (x - 0.5, h - 1);
+ cr.Pattern = seg_sep_light;
+ cr.Stroke ();
- x += seg_w;
- }
+ cr.MoveTo (x + 0.5, 1);
+ cr.LineTo (x + 0.5, h - 1);
+ cr.Pattern = seg_sep_dark;
+ cr.Stroke ();
- CairoExtensions.RoundedRectangle (cr, 0.5, 0.5, w - 1, h - 1, r);
- cr.SetSource (stroke);
- cr.Stroke ();
- }
- }
+ x += seg_w;
}
+
+ CairoExtensions.RoundedRectangle (cr, 0.5, 0.5, w - 1, h - 1, r);
+ cr.Pattern = stroke;
+ cr.Stroke ();
+
+ stroke.Destroy ();
+ seg_sep_light.Destroy ();
+ seg_sep_dark.Destroy ();
}
private LinearGradient MakeSegmentGradient (int h, Color color)
@@ -481,8 +481,7 @@ namespace Hyena.Widgets
}
Pango.Layout layout = null;
- Gdk.RGBA rgba = StyleContext.GetColor (StateFlags);
- Color text_color = CairoExtensions.GdkRGBAToCairoColor (rgba);
+ Color text_color = CairoExtensions.GdkColorToCairoColor (Style.Foreground (State));
Color box_stroke_color = new Color (0, 0, 0, 0.6);
int x = 0;
@@ -490,12 +489,12 @@ namespace Hyena.Widgets
foreach (Segment segment in segments) {
cr.LineWidth = 1;
cr.Rectangle (x + 0.5, 2 + 0.5, segment_box_size - 1, segment_box_size - 1);
- using (var grad = MakeSegmentGradient (segment_box_size, segment.Color, true)) {
- cr.SetSource (grad);
- cr.FillPreserve ();
- cr.SetSourceColor (box_stroke_color);
- cr.Stroke ();
- }
+ LinearGradient grad = MakeSegmentGradient (segment_box_size, segment.Color, true);
+ cr.Pattern = grad;
+ cr.FillPreserve ();
+ cr.Color = box_stroke_color;
+ cr.Stroke ();
+ grad.Destroy ();
x += segment_box_size + segment_box_spacing;
@@ -506,7 +505,7 @@ namespace Hyena.Widgets
cr.MoveTo (x, 0);
text_color.A = 0.9;
- cr.SetSourceColor (text_color);
+ cr.Color = text_color;
PangoCairoHelper.ShowLayout (cr, layout);
cr.Fill ();
@@ -515,7 +514,7 @@ namespace Hyena.Widgets
cr.MoveTo (x, lh);
text_color.A = 0.75;
- cr.SetSourceColor (text_color);
+ cr.Color = text_color;
PangoCairoHelper.ShowLayout (cr, layout);
cr.Fill ();
@@ -625,8 +624,7 @@ namespace Hyena.Widgets
SetSizeRequest (350, -1);
Gdk.Geometry limits = new Gdk.Geometry ();
- int nat_width;
- GetPreferredWidth (out limits.MinWidth, out nat_width);
+ limits.MinWidth = SizeRequest ().Width;
limits.MaxWidth = Gdk.Screen.Default.Width;
limits.MinHeight = -1;
limits.MaxHeight = -1;
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/TextViewEditable.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/TextViewEditable.cs
index 7ac715a..5b25c80 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/TextViewEditable.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/TextViewEditable.cs
@@ -31,7 +31,7 @@ using Gtk;
namespace Hyena.Widgets
{
- public class TextViewEditable : TextView, IEditable
+ public class TextViewEditable : TextView, Editable
{
public TextViewEditable ()
{
@@ -58,8 +58,8 @@ namespace Hyena.Widgets
if (handler != null) {
TextInsertedArgs raise_args = new TextInsertedArgs ();
raise_args.Args = new object [] {
- args.NewText,
- args.NewTextLength,
+ args.Text,
+ args.Length,
args.Pos.Offset
};
handler (this, raise_args);
@@ -79,15 +79,15 @@ namespace Hyena.Widgets
}
}
- void IEditable.PasteClipboard ()
+ void Editable.PasteClipboard ()
{
}
- void IEditable.CutClipboard ()
+ void Editable.CutClipboard ()
{
}
- void IEditable.CopyClipboard ()
+ void Editable.CopyClipboard ()
{
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/WrapLabel.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/WrapLabel.cs
index 174b8c6..52d3224 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/WrapLabel.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/WrapLabel.cs
@@ -40,7 +40,7 @@ namespace Hyena.Widgets
public WrapLabel ()
{
- HasWindow = false;
+ WidgetFlags |= WidgetFlags.NoWindow;
}
private void CreateLayout ()
@@ -74,16 +74,16 @@ namespace Hyena.Widgets
QueueResize ();
}
- protected override void OnStyleUpdated ()
+ protected override void OnStyleSet (Style previous_style)
{
CreateLayout ();
UpdateLayout ();
- base.OnStyleUpdated ();
+ base.OnStyleSet (previous_style);
}
protected override void OnRealized ()
{
- Window = Parent.Window;
+ GdkWindow = Parent.GdkWindow;
base.OnRealized ();
}
@@ -100,16 +100,16 @@ namespace Hyena.Widgets
base.OnSizeAllocated (allocation);
}
- protected override bool OnDrawn (Cairo.Context cr)
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
- if (CairoHelper.ShouldDrawWindow (cr, Window)) {
+ if (evnt.Window == GdkWindow) {
// Center the text vertically
int lw, lh;
layout.GetPixelSize (out lw, out lh);
- int y = (Allocation.Height - lh) / 2;
+ int y = Allocation.Y + (Allocation.Height - lh) / 2;
- StyleContext.State = StateFlags;
- StyleContext.RenderLayout (cr, 0, y, layout);
+ Gtk.Style.PaintLayout (Style, GdkWindow, State, false,
+ evnt.Area, this, null, Allocation.X, y, layout);
}
return true;
diff --git a/src/Hyena/Hyena.Gui/Makefile.am b/src/Hyena/Hyena.Gui/Makefile.am
index 9942835..74fd6df 100644
--- a/src/Hyena/Hyena.Gui/Makefile.am
+++ b/src/Hyena/Hyena.Gui/Makefile.am
@@ -1,7 +1,7 @@
ASSEMBLY = Hyena.Gui
ASSEMBLY_BUILD_FLAGS = -unsafe
TARGET = library
-LINK = -r:ICSharpCode.SharpZipLib -r:Mono.Posix -r:System -r:System.Core \
+LINK = -r:ICSharpCode.SharpZipLib -r:Mono.Posix -r:System -r:System.Core -r:Mono.Cairo \
$(GTKSHARP_LIBS) $(GLIBSHARP_LIBS) \
-r:$(DIR_BIN)/Hyena.dll
SOURCES = \
@@ -75,6 +75,7 @@ SOURCES = \
Hyena.Gui.Theatrics/SingleActorStage.cs \
Hyena.Gui.Theatrics/Stage.cs \
Hyena.Gui.Theatrics/Tests/ChoreographerTests.cs \
+ Hyena.Gui.Theming/GtkColors.cs \
Hyena.Gui.Theming/GtkTheme.cs \
Hyena.Gui.Theming/Theme.cs \
Hyena.Gui.Theming/ThemeContext.cs \
@@ -92,6 +93,7 @@ SOURCES = \
Hyena.Gui/EditableInsertAction.cs \
Hyena.Gui/EditableUndoAdapter.cs \
Hyena.Gui/GtkUtilities.cs \
+ Hyena.Gui/GtkWorkarounds.cs \
Hyena.Gui/HyenaActionGroup.cs \
Hyena.Gui/PangoCairoHelper.cs \
Hyena.Gui/PangoExtensions.cs \
@@ -100,6 +102,7 @@ SOURCES = \
Hyena.Gui/ShadingTestWindow.cs \
Hyena.Gui/TestModuleAttribute.cs \
Hyena.Gui/TestModuleRunner.cs \
+ Hyena.Gui/TooltipSetter.cs \
Hyena.Query.Gui/DateQueryValueEntry.cs \
Hyena.Query.Gui/FileSizeQueryValueEntry.cs \
Hyena.Query.Gui/IntegerQueryValueEntry.cs \
diff --git a/src/Hyena/Hyena.Gui/Makefile.in b/src/Hyena/Hyena.Gui/Makefile.in
index a0ac7e1..1b32647 100644
--- a/src/Hyena/Hyena.Gui/Makefile.in
+++ b/src/Hyena/Hyena.Gui/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -428,8 +443,8 @@ ASSEMBLY = Hyena.Gui
ASSEMBLY_BUILD_FLAGS = -unsafe
TARGET = library
LINK = -r:ICSharpCode.SharpZipLib -r:Mono.Posix -r:System \
- -r:System.Core $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS) \
- -r:$(DIR_BIN)/Hyena.dll $(am__append_1)
+ -r:System.Core -r:Mono.Cairo $(GTKSHARP_LIBS) \
+ $(GLIBSHARP_LIBS) -r:$(DIR_BIN)/Hyena.dll $(am__append_1)
SOURCES = \
Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs \
Hyena.Data.Gui/Accessibility/ColumnCellTextAccessible.cs \
@@ -501,6 +516,7 @@ SOURCES = \
Hyena.Gui.Theatrics/SingleActorStage.cs \
Hyena.Gui.Theatrics/Stage.cs \
Hyena.Gui.Theatrics/Tests/ChoreographerTests.cs \
+ Hyena.Gui.Theming/GtkColors.cs \
Hyena.Gui.Theming/GtkTheme.cs \
Hyena.Gui.Theming/Theme.cs \
Hyena.Gui.Theming/ThemeContext.cs \
@@ -518,6 +534,7 @@ SOURCES = \
Hyena.Gui/EditableInsertAction.cs \
Hyena.Gui/EditableUndoAdapter.cs \
Hyena.Gui/GtkUtilities.cs \
+ Hyena.Gui/GtkWorkarounds.cs \
Hyena.Gui/HyenaActionGroup.cs \
Hyena.Gui/PangoCairoHelper.cs \
Hyena.Gui/PangoExtensions.cs \
@@ -526,6 +543,7 @@ SOURCES = \
Hyena.Gui/ShadingTestWindow.cs \
Hyena.Gui/TestModuleAttribute.cs \
Hyena.Gui/TestModuleRunner.cs \
+ Hyena.Gui/TooltipSetter.cs \
Hyena.Query.Gui/DateQueryValueEntry.cs \
Hyena.Query.Gui/FileSizeQueryValueEntry.cs \
Hyena.Query.Gui/IntegerQueryValueEntry.cs \
@@ -575,14 +593,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -697,7 +716,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -705,7 +724,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -713,7 +731,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -732,7 +750,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -772,7 +790,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Hyena.Gui.dll.config
all: all-am
@@ -1026,12 +1043,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Hyena/Hyena/Hyena.Data/IListModel.cs b/src/Hyena/Hyena/Hyena.Data/IListModel.cs
index f3b8670..1d0a773 100644
--- a/src/Hyena/Hyena/Hyena.Data/IListModel.cs
+++ b/src/Hyena/Hyena/Hyena.Data/IListModel.cs
@@ -28,9 +28,10 @@
using System;
+using Hyena.Collections;
+
namespace Hyena.Data
{
- //TODO: inherit from IEnumerable, so the .Any() Linq method can be used, which is more efficient than comparing Count to 0
public interface IListModel : ISelectable
{
event EventHandler Cleared;
diff --git a/src/Hyena/Hyena/Hyena/Paths.cs b/src/Hyena/Hyena/Hyena/Paths.cs
index 1fe3472..ba6e4f2 100644
--- a/src/Hyena/Hyena/Hyena/Paths.cs
+++ b/src/Hyena/Hyena/Hyena/Paths.cs
@@ -33,17 +33,8 @@ using System.Text;
namespace Hyena
{
- public static class Paths
+ public class Paths
{
- public const char UnixSeparator = ':';
- public const char DosSeparator = ';';
-
- public static class Folder
- {
- public const char UnixSeparator = '/';
- public const char DosSeparator = '\\';
- }
-
public static string GetTempFileName (string dir)
{
return GetTempFileName (dir, null);
@@ -113,15 +104,7 @@ namespace Hyena
}
// this is super lame, should handle quoting/escaping
- return path.Split (UnixSeparator);
- }
-
- public static string SwitchRoot (string path, string mountPoint, string rootPath)
- {
- if (!path.StartsWith (mountPoint)) {
- throw new ArgumentException ("mountPoint must be contained in first part of the path");
- }
- return path.Replace (mountPoint, rootPath);
+ return path.Split (':');
}
public static string MakePathRelative (string path, string to)
@@ -177,19 +160,6 @@ namespace Hyena
return relativePath.ToString ();
}
- public static string NormalizeToDos (string path)
- {
- return path.Replace (Folder.UnixSeparator, Folder.DosSeparator);
- }
-
- public static string NormalizeToUnix (string path)
- {
- if (!path.Contains (Folder.UnixSeparator.ToString ()) && path.Contains (Folder.DosSeparator.ToString ())) {
- return path.Replace (Folder.DosSeparator, Folder.UnixSeparator);
- }
- return path;
- }
-
public static string ApplicationData {
get; private set;
}
diff --git a/src/Hyena/Hyena/Makefile.in b/src/Hyena/Hyena/Makefile.in
index 364edff..2c20e17 100644
--- a/src/Hyena/Hyena/Makefile.in
+++ b/src/Hyena/Hyena/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -570,14 +585,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -692,7 +708,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -700,7 +716,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -708,7 +723,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -727,7 +742,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -767,7 +782,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES) Hyena.dll.config
all: all-am
@@ -1021,12 +1035,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Hyena/Makefile.am b/src/Hyena/Makefile.am
index 0860114..b6a3955 100644
--- a/src/Hyena/Makefile.am
+++ b/src/Hyena/Makefile.am
@@ -27,14 +27,6 @@ test:
echo "Tests not enabled. Pass --enable-tests to configure or ./autogen.sh"
endif
-hg: all
- pushd bin; \
- echo "class Entry { static void Main () { Hyena.Gui.TestModuleRunner.Run (); } }" > tester.cs; \
- $(MCS) -r:Hyena.Gui.dll tester.cs; \
- mono --debug tester.exe; \
- rm tester.*; \
- popd;
-
MAINTAINERCLEANFILES = \
compile \
INSTALL \
diff --git a/src/Hyena/Makefile.in b/src/Hyena/Makefile.in
index 637aa9f..bbc92a9 100644
--- a/src/Hyena/Makefile.in
+++ b/src/Hyena/Makefile.in
@@ -212,15 +212,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -229,6 +238,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -243,6 +254,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -250,6 +263,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -823,14 +838,6 @@ clean-local:
@ENABLE_TESTS_FALSE at test:
@ENABLE_TESTS_FALSE@ echo "Tests not enabled. Pass --enable-tests to configure or ./autogen.sh"
-hg: all
- pushd bin; \
- echo "class Entry { static void Main () { Hyena.Gui.TestModuleRunner.Run (); } }" > tester.cs; \
- $(MCS) -r:Hyena.Gui.dll tester.cs; \
- mono --debug tester.exe; \
- rm tester.*; \
- popd;
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/Hyena/build/Makefile.in b/src/Hyena/build/Makefile.in
index 9f1064f..c4ffb67 100644
--- a/src/Hyena/build/Makefile.in
+++ b/src/Hyena/build/Makefile.in
@@ -242,15 +242,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -259,6 +268,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -273,6 +284,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -280,6 +293,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Hyena/build/m4/Makefile.in b/src/Hyena/build/m4/Makefile.in
index 4c0b6a9..766f361 100644
--- a/src/Hyena/build/m4/Makefile.in
+++ b/src/Hyena/build/m4/Makefile.in
@@ -171,15 +171,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -188,6 +197,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -202,6 +213,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -209,6 +222,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Hyena/build/pkg-config/Makefile.in b/src/Hyena/build/pkg-config/Makefile.in
index d24d4e7..455eca7 100644
--- a/src/Hyena/build/pkg-config/Makefile.in
+++ b/src/Hyena/build/pkg-config/Makefile.in
@@ -201,15 +201,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -218,6 +227,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -232,6 +243,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -239,6 +252,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs b/src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs
index 6570715..e6df094 100644
--- a/src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs
+++ b/src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs
@@ -47,6 +47,7 @@ namespace Lastfm.Gui
public AccountLoginDialog (Account account, bool addCloseButton) : base ()
{
Title = Catalog.GetString ("Log in to Last.fm");
+ HasSeparator = false;
BorderWidth = 5;
IconName = "gtk-dialog-authentication";
@@ -89,15 +90,15 @@ namespace Lastfm.Gui
vbox.PackStart (login_form, true, true, 0);
- ContentArea.PackStart (hbox, true, true, 0);
- ContentArea.Remove (ActionArea);
- ContentArea.Spacing = 10;
+ VBox.PackStart (hbox, true, true, 0);
+ VBox.Remove (ActionArea);
+ VBox.Spacing = 10;
HBox bottom_box = new HBox ();
bottom_box.PackStart (new Badge (account), true, true, 5);
bottom_box.PackStart (ActionArea, false, false, 0);
bottom_box.ShowAll ();
- ContentArea.PackEnd (bottom_box, false, false, 0);
+ VBox.PackEnd (bottom_box, false, false, 0);
if (addCloseButton) {
AddButton (Stock.Cancel, ResponseType.Cancel);
diff --git a/src/Libraries/Lastfm.Gui/Makefile.in b/src/Libraries/Lastfm.Gui/Makefile.in
index 0208b55..ae61675 100644
--- a/src/Libraries/Lastfm.Gui/Makefile.in
+++ b/src/Libraries/Lastfm.Gui/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -448,14 +463,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -570,7 +586,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -578,7 +594,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -586,7 +601,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -605,7 +620,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -644,7 +659,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -898,12 +912,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs b/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
index 9b63d23..5410308 100644
--- a/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
+++ b/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
@@ -5,11 +5,8 @@
// Chris Toshok <toshok at ximian.com>
// Alexander Hixon <hixon.alexander at mediati.org>
// Phil Trimble <philtrimble at gmail.com>
-// Andres G. Aragoneses <knocte at gmail.com>
//
// Copyright (C) 2005-2008 Novell, Inc.
-// Copyright (C) 2013 Phil Trimble
-// Copyright (C) 2013 Andres G. Aragoneses
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -33,7 +30,6 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.IO;
using System.Net;
using System.Text;
@@ -44,30 +40,9 @@ using System.Web;
using Hyena;
using Hyena.Json;
using Mono.Unix;
-using System.Collections.Specialized;
namespace Lastfm
{
- public class SubmissionStartEventArgs : EventArgs
- {
- public SubmissionStartEventArgs (int total_count)
- {
- TotalCount = total_count;
- }
-
- public int TotalCount { get; private set; }
- }
-
- public class SubmissionUpdateEventArgs : EventArgs
- {
- public SubmissionUpdateEventArgs (int update_count)
- {
- UpdateCount = update_count;
- }
-
- public int UpdateCount { get; private set; }
- }
-
public class AudioscrobblerConnection
{
private enum State {
@@ -91,10 +66,6 @@ namespace Lastfm
get { return started; }
}
- public event EventHandler<SubmissionStartEventArgs> SubmissionStart;
- public event EventHandler<SubmissionUpdateEventArgs> SubmissionUpdate;
- public event EventHandler SubmissionEnd;
-
private System.Timers.Timer timer;
private DateTime next_interval;
@@ -193,15 +164,13 @@ namespace Lastfm
// and address changes in our engine state
switch (state) {
case State.Idle:
- if (queue.Any ()) {
+ if (queue.Count > 0) {
state = State.NeedTransmit;
- RaiseSubmissionStart (queue.Count);
} else if (current_now_playing_request != null) {
// Now playing info needs to be sent
NowPlaying (current_now_playing_request);
} else {
StopTransitionHandler ();
- RaiseSubmissionEnd ();
}
break;
@@ -230,30 +199,33 @@ namespace Lastfm
return;
}
- state = State.Transmitting;
current_scrobble_request = new LastfmRequest ("track.scrobble", RequestType.Write, ResponseFormat.Json);
+ IList<IQueuedTrack> tracks = queue.GetTracks ();
- int trackCount = 0;
- while (true) {
- IQueuedTrack track = queue.GetNextTrack ();
- if (track == null ||
- // Last.fm can technically handle up to 50 songs in one request
- // but let's not use the top limit
- trackCount == 40) {
- break;
- }
+ for (int i = 0; i < tracks.Count; i++) {
+ IQueuedTrack track = tracks[i];
- try {
- current_scrobble_request.AddParameters (GetTrackParameters (track, trackCount));
- trackCount++;
- } catch (MaxSizeExceededException) {
- break;
+ string str_track_number = String.Empty;
+ if (track.TrackNumber != 0) {
+ str_track_number = track.TrackNumber.ToString();
}
+
+ bool chosen_by_user = (track.TrackAuth.Length == 0);
+
+ current_scrobble_request.AddParameter (String.Format ("timestamp[{0}]", i), track.StartTime.ToString ());
+ current_scrobble_request.AddParameter (String.Format ("track[{0}]", i), track.Title);
+ current_scrobble_request.AddParameter (String.Format ("artist[{0}]", i), track.Artist);
+ current_scrobble_request.AddParameter (String.Format ("album[{0}]", i), track.Album);
+ current_scrobble_request.AddParameter (String.Format ("trackNumber[{0}]", i), str_track_number);
+ current_scrobble_request.AddParameter (String.Format ("duration[{0}]", i), track.Duration.ToString ());
+ current_scrobble_request.AddParameter (String.Format ("mbid[{0}]", i), track.MusicBrainzId);
+ current_scrobble_request.AddParameter (String.Format ("chosenByUser[{0}]", i), chosen_by_user ? "1" : "0");
}
Log.DebugFormat ("Last.fm scrobbler sending '{0}'", current_scrobble_request.ToString ());
- current_async_result = current_scrobble_request.BeginSend (OnScrobbleResponse, trackCount);
+ state = State.Transmitting;
+ current_async_result = current_scrobble_request.BeginSend (OnScrobbleResponse, tracks.Count);
state = State.WaitingForResponse;
if (!(current_async_result.AsyncWaitHandle.WaitOne (TIME_OUT, false))) {
Log.Warning ("Audioscrobbler upload failed", "The request timed out and was aborted", false);
@@ -263,26 +235,6 @@ namespace Lastfm
}
}
- private static NameValueCollection GetTrackParameters (IQueuedTrack track, int trackCount)
- {
- string str_track_number = String.Empty;
- if (track.TrackNumber != 0) {
- str_track_number = track.TrackNumber.ToString();
- }
- bool chosen_by_user = (track.TrackAuth.Length == 0);
-
- return new NameValueCollection () {
- { String.Format ("timestamp[{0}]", trackCount), track.StartTime.ToString () },
- { String.Format ("track[{0}]", trackCount), track.Title },
- { String.Format ("artist[{0}]", trackCount), track.Artist },
- { String.Format ("album[{0}]", trackCount), track.Album },
- { String.Format ("trackNumber[{0}]", trackCount), str_track_number },
- { String.Format ("duration[{0}]", trackCount), track.Duration.ToString () },
- { String.Format ("mbid[{0}]", trackCount), track.MusicBrainzId },
- { String.Format ("chosenByUser[{0}]", trackCount), chosen_by_user ? "1" : "0" }
- };
- }
-
private void OnScrobbleResponse (IAsyncResult ar)
{
int nb_tracks_scrobbled = 0;
@@ -311,10 +263,20 @@ namespace Lastfm
next_interval = DateTime.Now + new TimeSpan (0, 0, RETRY_SECONDS);
hard_failures++;
state = State.Idle;
- return;
- }
+ } else if (error != StationError.None) {
+ // TODO: If error == StationError.InvalidSessionKey,
+ // suggest to the user to (re)do the Last.fm authentication.
+ hard_failures++;
+
+ queue.RemoveInvalidTracks ();
- if (error == StationError.None) {
+ // if there are still valid tracks in the queue then retransmit on the next interval
+ if (queue.Count > 0) {
+ state = State.NeedTransmit;
+ } else {
+ state = State.Idle;
+ }
+ } else {
try {
var scrobbles = (JsonObject)response["scrobbles"];
var scrobbles_attr = (JsonObject)scrobbles["@attr"];
@@ -340,17 +302,9 @@ namespace Lastfm
// we succeeded, pop the elements off our queue
queue.RemoveRange (0, nb_tracks_scrobbled);
queue.Save ();
- RaiseSubmissionUpdate (nb_tracks_scrobbled);
- } else {
- // TODO: If error == StationError.InvalidSessionKey,
- // suggest to the user to (re)do the Last.fm authentication.
- hard_failures++;
- queue.RemoveInvalidTracks ();
+ state = State.Idle;
}
-
- // if there are still valid tracks in the queue then retransmit on the next interval
- state = queue.Any () ? State.NeedTransmit : State.Idle;
}
private void LogIfIgnored (JsonObject scrobbled_track)
@@ -444,29 +398,5 @@ namespace Lastfm
}
current_now_playing_request = null;
}
-
- private void RaiseSubmissionStart (int total_count)
- {
- var handler = SubmissionStart;
- if (handler != null) {
- handler (this, new SubmissionStartEventArgs (total_count));
- }
- }
-
- private void RaiseSubmissionUpdate (int update_count)
- {
- var handler = SubmissionUpdate;
- if (handler != null) {
- handler (this, new SubmissionUpdateEventArgs (update_count));
- }
- }
-
- private void RaiseSubmissionEnd ()
- {
- var handler = SubmissionEnd;
- if (handler != null) {
- handler (this, null);
- }
- }
}
}
diff --git a/src/Libraries/Lastfm/Lastfm/IQueue.cs b/src/Libraries/Lastfm/Lastfm/IQueue.cs
index 4548a5c..7f7b23a 100644
--- a/src/Libraries/Lastfm/Lastfm/IQueue.cs
+++ b/src/Libraries/Lastfm/Lastfm/IQueue.cs
@@ -45,7 +45,7 @@ namespace Lastfm
string TrackAuth { get; }
}
- public interface IQueue : IEnumerable<IQueuedTrack>
+ public interface IQueue
{
event EventHandler TrackAdded;
@@ -56,7 +56,7 @@ namespace Lastfm
void Save ();
void Load ();
- IQueuedTrack GetNextTrack ();
+ List<IQueuedTrack> GetTracks ();
void Add (object track, DateTime started);
void RemoveRange (int first, int count);
diff --git a/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs b/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs
index 5f04464..4b241af 100644
--- a/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs
+++ b/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs
@@ -4,11 +4,8 @@
// Authors:
// Bertrand Lorentz <bertrand.lorentz at gmail.com>
// Phil Trimble <philtrimble at gmail.com>
-// Andres G. Aragoneses <knocte at gmail.com>
//
// Copyright (C) 2009 Bertrand Lorentz
-// Copyright (C) 2013 Phil Trimble
-// Copyright (C) 2013 Andres G. Aragoneses
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -32,7 +29,6 @@
using System;
using System.Collections.Generic;
-using System.Collections.Specialized;
using System.IO;
using System.Net;
using System.Text;
@@ -58,18 +54,6 @@ namespace Lastfm
public delegate void SendRequestHandler ();
- public class MaxSizeExceededException : ApplicationException
- {
- }
-
- internal class WebRequestCreator : IWebRequestCreate
- {
- public WebRequest Create (Uri uri)
- {
- return (HttpWebRequest) HttpWebRequest.Create (uri);
- }
- }
-
public class LastfmRequest
{
private const string API_ROOT = "http://ws.audioscrobbler.com/2.0/";
@@ -77,17 +61,10 @@ namespace Lastfm
private Dictionary<string, string> parameters = new Dictionary<string, string> ();
private Stream response_stream;
private string response_string;
- IWebRequestCreate web_request_creator;
public LastfmRequest ()
{}
- internal LastfmRequest (string method, RequestType request_type, ResponseFormat response_format, IWebRequestCreate web_request_creator)
- : this (method, request_type, response_format)
- {
- this.web_request_creator = web_request_creator;
- }
-
public LastfmRequest (string method) : this (method, RequestType.Read, ResponseFormat.Json)
{}
@@ -96,86 +73,25 @@ namespace Lastfm
this.method = method;
this.request_type = request_type;
this.response_format = response_format;
- if (this.web_request_creator == null) {
- this.web_request_creator = new WebRequestCreator ();
- }
-
- Init ();
- }
-
- private void Init ()
- {
- this.incremental_data = new StringBuilder ();
-
- if (request_type != RequestType.Write) {
- incremental_data.Append (API_ROOT);
- }
- incremental_data.AppendFormat ("?method={0}", method);
- incremental_data.AppendFormat ("&api_key={0}", LastfmCore.ApiKey);
-
- if (request_type == RequestType.AuthenticatedRead || request_type == RequestType.Write) {
- AddParameter ("sk", LastfmCore.Account.SessionKey);
- }
-
- if (response_format == ResponseFormat.Json) {
- AddParameter ("format", "json");
- } else if (response_format == ResponseFormat.Raw) {
- AddParameter ("raw", "true");
- }
}
private string method;
+ public string Method { get; set; }
+
private RequestType request_type;
+ public RequestType RequestType { get; set; }
- private ResponseFormat response_format;
- private StringBuilder incremental_data;
+ private ResponseFormat response_format;
+ public ResponseFormat ResponseFormat { get; set; }
- // This is close to the max based on testing.
- private const int MAX_POST_LENGTH = 7000;
public void AddParameter (string param_name, string param_value)
{
- var chunk = String.Format ("&{0}={1}",
- param_name, param_value != null ? Uri.EscapeDataString (param_value) : null);
-
- CheckSize (chunk.Length);
-
- incremental_data.Append (chunk);
parameters.Add (param_name, param_value);
}
- public void AddParameters (NameValueCollection parms)
- {
- var chunks = new StringBuilder ();
- foreach (string key in parms) {
- var value = parms [key];
- chunks.AppendFormat ("&{0}={1}",
- key, value != null ? Uri.EscapeDataString (value) : null);
- }
-
- CheckSize (chunks.Length);
-
- incremental_data.Append (chunks.ToString ());
- foreach (string key in parms) {
- var value = parms [key];
- parameters.Add (key, value);
- }
- }
-
- private void CheckSize (int length)
- {
- var target_length = incremental_data.Length + length;
- if (request_type != RequestType.Read) {
- target_length += 9 + 32; // length of &api_sig={GetSignature()}
- }
-
- if (target_length > MAX_POST_LENGTH) {
- throw new MaxSizeExceededException ();
- }
- }
-
public Stream GetResponseStream ()
{
return response_stream;
@@ -187,6 +103,12 @@ namespace Lastfm
throw new InvalidOperationException ("The method name should be set");
}
+ if (response_format == ResponseFormat.Json) {
+ AddParameter ("format", "json");
+ } else if (response_format == ResponseFormat.Raw) {
+ AddParameter ("raw", "true");
+ }
+
if (request_type == RequestType.Write) {
response_stream = Post (API_ROOT, BuildPostData ());
} else {
@@ -266,17 +188,39 @@ namespace Lastfm
private string BuildGetUrl ()
{
+ if (request_type == RequestType.AuthenticatedRead) {
+ parameters.Add ("sk", LastfmCore.Account.SessionKey);
+ }
+
+ StringBuilder url = new StringBuilder (API_ROOT);
+ url.AppendFormat ("?method={0}", method);
+ url.AppendFormat ("&api_key={0}", LastfmCore.ApiKey);
+ foreach (KeyValuePair<string, string> param in parameters) {
+ url.AppendFormat ("&{0}={1}", param.Key, Uri.EscapeDataString (param.Value));
+ }
if (request_type == RequestType.AuthenticatedRead || request_type == RequestType.SessionRequest) {
- incremental_data.AppendFormat ("&api_sig={0}", GetSignature ());
+ url.AppendFormat ("&api_sig={0}", GetSignature ());
}
- return incremental_data.ToString ();
+ return url.ToString ();
}
private string BuildPostData ()
{
- incremental_data.AppendFormat ("&api_sig={0}", GetSignature ());
- return incremental_data.ToString ();
+ parameters.Add ("sk", LastfmCore.Account.SessionKey);
+
+ StringBuilder data = new StringBuilder ();
+ data.AppendFormat ("method={0}", method);
+ data.AppendFormat ("&api_key={0}", LastfmCore.ApiKey);
+
+ foreach (KeyValuePair<string, string> param in parameters) {
+ data.AppendFormat ("&{0}={1}",
+ param.Key, param.Value != null ? Uri.EscapeDataString (param.Value) : null);
+ }
+
+ data.AppendFormat ("&api_sig={0}", GetSignature ());
+
+ return data.ToString ();
}
private string GetSignature ()
@@ -332,7 +276,7 @@ namespace Lastfm
private Stream Get (string uri, string accept)
{
- var request = (HttpWebRequest)web_request_creator.Create (new Uri (uri));
+ HttpWebRequest request = (HttpWebRequest) WebRequest.Create (uri);
if (accept != null) {
request.Accept = accept;
}
@@ -354,7 +298,7 @@ namespace Lastfm
private Stream Post (string uri, string data)
{
// Do not trust docs : it doesn't work if parameters are in the request body
- var request = (HttpWebRequest)web_request_creator.Create (new Uri (String.Concat (uri, data)));
+ HttpWebRequest request = (HttpWebRequest) WebRequest.Create (String.Concat (uri, "?", data));
request.UserAgent = LastfmCore.UserAgent;
request.Timeout = 10000;
request.Method = "POST";
diff --git a/src/Libraries/Lastfm/Lastfm/Tests/LastfmRequestTests.cs b/src/Libraries/Lastfm/Lastfm/Tests/LastfmRequestTests.cs
deleted file mode 100644
index ac7439f..0000000
--- a/src/Libraries/Lastfm/Lastfm/Tests/LastfmRequestTests.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// LastfmRequestTests.cs
-//
-// Author:
-// Andres G Aragoneses <knocte at gmail.com>
-//
-// Copyright (C) 2013 Andres G. Aragoneses
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if ENABLE_TESTS
-
-using System;
-using System.Net;
-using System.Collections.Generic;
-using NUnit.Framework;
-
-namespace Lastfm.Tests
-{
- [TestFixture]
- public class Tests
- {
- class FakeWebRequestCreator : IWebRequestCreate
- {
- public WebRequest Create (Uri uri)
- {
- Uri = uri;
- return (HttpWebRequest)WebRequest.Create (uri);
- }
-
- internal Uri Uri { get; set; }
- }
-
- [Test]
- public void EmptyGet ()
- {
- var expected = "http://ws.audioscrobbler.com/2.0/?method=someMethod&api_key=344e9141fffeb02201e1ae455d92ae9f&format=json";
- var creator = new FakeWebRequestCreator ();
- new LastfmRequest ("someMethod", RequestType.Read, ResponseFormat.Json, creator).Send ();
- UrisAreEquivalent (expected, creator.Uri.ToString ());
- }
-
- [Test]
- public void GetWithParams ()
- {
- var expected = "http://ws.audioscrobbler.com/2.0/?method=someMethod&api_key=344e9141fffeb02201e1ae455d92ae9f&x=y&a=b&format=json";
- var creator = new FakeWebRequestCreator ();
- var req = new LastfmRequest ("someMethod", RequestType.Read, ResponseFormat.Json, creator);
- req.AddParameter ("x", "y");
- req.AddParameter ("a", "b");
- req.Send ();
- UrisAreEquivalent (expected, creator.Uri.ToString ());
- }
-
- [Test]
- public void EmptyRawGet ()
- {
- var expected = "http://ws.audioscrobbler.com/2.0/?method=someMethod&api_key=344e9141fffeb02201e1ae455d92ae9f&raw=true";
- var creator = new FakeWebRequestCreator ();
- new LastfmRequest ("someMethod", RequestType.Read, ResponseFormat.Raw, creator).Send ();
- UrisAreEquivalent (expected, creator.Uri.ToString ());
- }
-
- [Test]
- public void EmptyJsonPost ()
- {
- var expected = "http://ws.audioscrobbler.com/2.0/?method=someMethod&api_key=344e9141fffeb02201e1ae455d92ae9f&format=json&sk=&api_sig=33ca04b6d45c54eb1405b3d7cb7735ea";
- var creator = new FakeWebRequestCreator ();
- new LastfmRequest ("someMethod", RequestType.Write, ResponseFormat.Json, creator).Send ();
- UrisAreEquivalent (expected, creator.Uri.ToString ());
- }
-
- [Test]
- public void JsonPostWithParams ()
- {
- var expected = "http://ws.audioscrobbler.com/2.0/?method=someMethod&api_key=344e9141fffeb02201e1ae455d92ae9f&x=y&a=b&format=json&sk=&api_sig=6b369269588df3d3b1ac67834d703c6d";
- var creator = new FakeWebRequestCreator ();
- var req = new LastfmRequest ("someMethod", RequestType.Write, ResponseFormat.Json, creator);
- req.AddParameter ("x", "y");
- req.AddParameter ("a", "b");
- req.Send ();
- UrisAreEquivalent (expected, creator.Uri.ToString ());
- }
-
- [Test]
- public void JsonRawWithParams ()
- {
- var expected = "http://ws.audioscrobbler.com/2.0/?method=someMethod&api_key=344e9141fffeb02201e1ae455d92ae9f&x=y&a=b&raw=true&sk=&api_sig=3b419688648ce7e124c0056aba9a6438";
- var creator = new FakeWebRequestCreator ();
- var req = new LastfmRequest ("someMethod", RequestType.Write, ResponseFormat.Raw, creator);
- req.AddParameter ("x", "y");
- req.AddParameter ("a", "b");
- req.Send ();
- UrisAreEquivalent (expected, creator.Uri.ToString ());
- }
-
- private void UrisAreEquivalent (string expected, string actual)
- {
- if (String.IsNullOrEmpty (expected)) {
- throw new ArgumentNullException ("expected");
- }
-
- if (String.IsNullOrEmpty (actual)) {
- throw new ArgumentNullException ("actual");
- }
-
- if (!expected.Contains ("?") || !actual.Contains ("?")) {
- throw new ArgumentException ("uris must contain parameters, so a ? char to beging the querystring should be present");
- }
-
- string expected_without_querystring = expected.Substring (0, expected.IndexOf ("?"));
- string actual_without_querystring = actual.Substring (0, actual.IndexOf ("?"));
-
- Assert.AreEqual (expected_without_querystring, actual_without_querystring);
-
- var expected_parameters = expected.Substring (expected.IndexOf ("?")).Split (new [] {'&'});
- var actual_parameters = new List<string> (actual.Substring (actual.IndexOf ("?")).Split (new [] {'&'}));
-
- Assert.AreEqual (expected_parameters.Length, actual_parameters.Count);
- foreach (var expected_param in expected_parameters) {
- Assert.IsTrue (actual_parameters.Contains (expected_param),
- String.Format ("URI {0} is missing parameter '{1}'", actual, expected_param));
- }
- }
-
- }
-}
-
-#endif
diff --git a/src/Libraries/Lastfm/Makefile.am b/src/Libraries/Lastfm/Makefile.am
index 7b77b5e..7681cf1 100644
--- a/src/Libraries/Lastfm/Makefile.am
+++ b/src/Libraries/Lastfm/Makefile.am
@@ -17,8 +17,7 @@ SOURCES = \
Lastfm/IQueue.cs \
Lastfm/LastfmCore.cs \
Lastfm/LastfmRequest.cs \
- Lastfm/RadioConnection.cs \
- Lastfm/Tests/LastfmRequestTests.cs
+ Lastfm/RadioConnection.cs
include $(top_srcdir)/build/build.mk
diff --git a/src/Libraries/Lastfm/Makefile.in b/src/Libraries/Lastfm/Makefile.in
index 2b46a2d..2212b59 100644
--- a/src/Libraries/Lastfm/Makefile.in
+++ b/src/Libraries/Lastfm/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -442,8 +457,7 @@ SOURCES = \
Lastfm/IQueue.cs \
Lastfm/LastfmCore.cs \
Lastfm/LastfmRequest.cs \
- Lastfm/RadioConnection.cs \
- Lastfm/Tests/LastfmRequestTests.cs
+ Lastfm/RadioConnection.cs
# Initializers
@@ -457,14 +471,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -579,7 +594,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -587,7 +602,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -595,7 +609,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -614,7 +628,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -653,7 +667,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -907,12 +920,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Libraries/Makefile.in b/src/Libraries/Makefile.in
index 5c6c967..5c458a5 100644
--- a/src/Libraries/Makefile.in
+++ b/src/Libraries/Makefile.in
@@ -211,15 +211,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -228,6 +237,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -242,6 +253,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,6 +262,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Libraries/Migo/Makefile.in b/src/Libraries/Migo/Makefile.in
index fd7d247..adc609b 100644
--- a/src/Libraries/Migo/Makefile.in
+++ b/src/Libraries/Migo/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -511,14 +526,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -633,7 +649,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -641,7 +657,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -649,7 +664,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -668,7 +683,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -707,7 +722,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -961,12 +975,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Libraries/Migo/Migo.Syndication/Feed.cs b/src/Libraries/Migo/Migo.Syndication/Feed.cs
index 1396f5a..827d76d 100644
--- a/src/Libraries/Migo/Migo.Syndication/Feed.cs
+++ b/src/Libraries/Migo/Migo.Syndication/Feed.cs
@@ -560,15 +560,10 @@ namespace Migo.Syndication
public void Save (bool notify)
{
- Save (notify, true);
- }
-
- public void Save (bool notify, bool download_items)
- {
Provider.Save (this);
CheckForItemsToArchive ();
- if (download_items && (LastBuildDate > LastAutoDownload)) {
+ if (LastBuildDate > LastAutoDownload) {
CheckForItemsToDownload ();
}
@@ -614,8 +609,7 @@ namespace Migo.Syndication
if (any) {
LastAutoDownload = DateTime.Now;
- // We don't want Save to call CheckForItemsToDownload again
- Save (true, false);
+ Save ();
}
}
diff --git a/src/Libraries/Mono.Media/Makefile.in b/src/Libraries/Mono.Media/Makefile.in
index ff830f9..497455a 100644
--- a/src/Libraries/Mono.Media/Makefile.in
+++ b/src/Libraries/Mono.Media/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -449,14 +464,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -571,7 +587,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -579,7 +595,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -587,7 +602,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -606,7 +621,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -645,7 +660,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -899,12 +913,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Libraries/Mtp/Makefile.am b/src/Libraries/Mtp/Makefile.am
index 9150446..d219070 100644
--- a/src/Libraries/Mtp/Makefile.am
+++ b/src/Libraries/Mtp/Makefile.am
@@ -4,6 +4,14 @@ LINK = $(REF_MTP)
BUILD_DEFINES = ""
+if LIBMTP_TRACK_STRUCT_HAS_MODDATE
+BUILD_DEFINES += "-define:LIBMTP_TRACK_HAS_MODDATE"
+endif
+
+if LIBMTP_FILETYPE_ENUM_HAS_FOLDER
+BUILD_DEFINES += "-define:LIBMTP_FILETYPE_ENUM_HAS_FOLDER"
+endif
+
if LIBMTP_SIZEOF_TIME_T_64
BUILD_DEFINES += "-define:LIBMTP_SIZEOF_TIME_T_64"
endif
diff --git a/src/Libraries/Mtp/Makefile.in b/src/Libraries/Mtp/Makefile.in
index 5cb5cc8..3aea49d 100644
--- a/src/Libraries/Mtp/Makefile.in
+++ b/src/Libraries/Mtp/Makefile.in
@@ -51,13 +51,15 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
- at LIBMTP_SIZEOF_TIME_T_64_TRUE@am__append_1 = "-define:LIBMTP_SIZEOF_TIME_T_64"
+ at LIBMTP_TRACK_STRUCT_HAS_MODDATE_TRUE@am__append_1 = "-define:LIBMTP_TRACK_HAS_MODDATE"
+ at LIBMTP_FILETYPE_ENUM_HAS_FOLDER_TRUE@am__append_2 = "-define:LIBMTP_FILETYPE_ENUM_HAS_FOLDER"
+ at LIBMTP_SIZEOF_TIME_T_64_TRUE@am__append_3 = "-define:LIBMTP_SIZEOF_TIME_T_64"
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/Mtp.dll.config.in $(top_srcdir)/build/build.dist.mk \
$(top_srcdir)/build/build.environment.mk \
$(top_srcdir)/build/build.mk \
$(top_srcdir)/build/build.rules.mk
- at ENABLE_MTP_TRUE@@ENABLE_TESTS_TRUE at am__append_2 = " $(NUNIT_LIBS)"
+ at ENABLE_MTP_TRUE@@ENABLE_TESTS_TRUE at am__append_4 = " $(NUNIT_LIBS)"
subdir = src/Libraries/Mtp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
@@ -206,15 +208,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -223,6 +234,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -237,6 +250,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -244,6 +259,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -427,8 +444,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ASSEMBLY = Mtp
TARGET = library
-LINK = $(REF_MTP) $(am__append_2)
-BUILD_DEFINES = "" $(am__append_1)
+LINK = $(REF_MTP) $(am__append_4)
+BUILD_DEFINES = "" $(am__append_1) $(am__append_2) $(am__append_3)
SOURCES = \
Mtp/AbstractTrackList.cs \
Mtp/Album.cs \
@@ -454,14 +471,15 @@ SOURCES = \
# External libraries to link against, generated from configure
@ENABLE_MTP_TRUE at LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+ at ENABLE_MTP_TRUE@LINK_CAIRO = -r:Mono.Cairo
@ENABLE_MTP_TRUE at LINK_MONO_POSIX = -r:Mono.Posix
@ENABLE_MTP_TRUE at LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
@ENABLE_MTP_TRUE at LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
@ENABLE_MTP_TRUE at LINK_GLIB = $(GLIBSHARP_LIBS)
@ENABLE_MTP_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@ENABLE_MTP_TRUE at LINK_GCONF = $(GCONFSHARP_LIBS)
- at ENABLE_MTP_TRUE@LINK_GIO = $(GIOSHARP_LIBS)
+ at ENABLE_MTP_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_MTP_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
@ENABLE_MTP_TRUE at LINK_GUDEV = $(GUDEV_SHARP_LIBS)
@ENABLE_MTP_TRUE at LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
@ENABLE_MTP_TRUE at LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -576,7 +594,7 @@ SOURCES = \
@ENABLE_MTP_TRUE at REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_MTP_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_MTP_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -584,7 +602,6 @@ SOURCES = \
@ENABLE_MTP_TRUE at REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
- at ENABLE_MTP_TRUE@LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
@ENABLE_MTP_TRUE at REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -592,7 +609,7 @@ SOURCES = \
@ENABLE_MTP_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_MTP_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
- at ENABLE_MTP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_MTP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_MTP_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_MTP_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_MTP_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -611,7 +628,7 @@ SOURCES = \
@ENABLE_MTP_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
- at ENABLE_MTP_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+ at ENABLE_MTP_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
@ENABLE_MTP_TRUE at REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
@ENABLE_MTP_TRUE at REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
@ENABLE_MTP_TRUE at REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -670,7 +687,6 @@ SOURCES = \
@ENABLE_MTP_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
@ENABLE_MTP_TRUE at FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
@ENABLE_MTP_TRUE at DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
- at ENABLE_MTP_TRUE@DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
@ENABLE_MTP_TRUE at moduledir = $(INSTALL_DIR_RESOLVED)
@ENABLE_MTP_TRUE at module_SCRIPTS = $(OUTPUT_FILES) Mtp.dll.config
all: all-am
@@ -928,12 +944,9 @@ uninstall-am: uninstall-moduleSCRIPTS
@ENABLE_MTP_TRUE at build-debug:
@ENABLE_MTP_TRUE@ @echo $(DEP_LINK)
- at ENABLE_MTP_TRUE@$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- at ENABLE_MTP_TRUE@ $(MCS) -out:$@ $<
-
@ENABLE_MTP_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
- at ENABLE_MTP_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+ at ENABLE_MTP_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@ENABLE_MTP_TRUE@ @mkdir -p $(top_builddir)/bin
@ENABLE_MTP_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
@ENABLE_MTP_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Libraries/Mtp/Mtp/FileType.cs b/src/Libraries/Mtp/Mtp/FileType.cs
index c2e16c7..d48baba 100644
--- a/src/Libraries/Mtp/Mtp/FileType.cs
+++ b/src/Libraries/Mtp/Mtp/FileType.cs
@@ -33,7 +33,9 @@ namespace Mtp
{
public enum FileType
{
+#if LIBMTP_FILETYPE_ENUM_HAS_FOLDER
FOLDER,
+#endif
WAV,
MP3,
WMA,
diff --git a/src/Libraries/Mtp/Mtp/Track.cs b/src/Libraries/Mtp/Mtp/Track.cs
index 7b97bdc..22e15d3 100644
--- a/src/Libraries/Mtp/Mtp/Track.cs
+++ b/src/Libraries/Mtp/Mtp/Track.cs
@@ -283,11 +283,13 @@ namespace Mtp
public ushort rating; // 0 -> 100
public uint usecount;
public ulong filesize;
+#if LIBMTP_TRACK_HAS_MODDATE
#if LIBMTP_SIZEOF_TIME_T_64
public ulong modificationdate;
#else
public uint modificationdate;
#endif
+#endif
public FileType filetype;
public IntPtr next; // Track Null if last
/*
diff --git a/src/Libraries/MusicBrainz/Makefile.in b/src/Libraries/MusicBrainz/Makefile.in
index f29e1c7..a92c685 100644
--- a/src/Libraries/MusicBrainz/Makefile.in
+++ b/src/Libraries/MusicBrainz/Makefile.in
@@ -205,15 +205,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -222,6 +231,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -236,6 +247,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -243,6 +256,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -460,14 +475,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -582,7 +598,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -590,7 +606,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -598,7 +613,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -617,7 +632,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -656,7 +671,6 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: all-am
@@ -910,12 +924,9 @@ test:
build-debug:
@echo $(DEP_LINK)
-$(DLL_MAP_VERIFIER_ASSEMBLY): $(top_srcdir)/build/DllMapVerifier.cs
- $(MCS) -out:$@ $<
-
$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_VERIFIER_ASSEMBLY)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
diff --git a/src/Makefile.in b/src/Makefile.in
index 0fa5bd7..9dfccf6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -212,15 +212,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -229,6 +238,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -243,6 +254,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -250,6 +263,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/tests/Analyzer/Makefile.in b/tests/Analyzer/Makefile.in
index f74146b..cdb6d31 100644
--- a/tests/Analyzer/Makefile.in
+++ b/tests/Analyzer/Makefile.in
@@ -172,15 +172,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -189,6 +198,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -203,6 +214,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -210,6 +223,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -403,14 +418,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -525,7 +541,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -533,7 +549,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -541,7 +556,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -560,7 +575,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aad42b1..ad3cd33 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,6 @@ TEST_ASSEMBLIES = \
Hyena.dll \
Hyena.Gui.dll \
Hyena.Data.Sqlite.dll \
- Lastfm.dll \
Migo.dll \
Mono.Media.dll \
Banshee.Core.dll \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index a05bf77..d0034f7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -214,15 +214,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -231,6 +240,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -245,6 +256,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -252,6 +265,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -445,14 +460,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -567,7 +583,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -575,7 +591,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -583,7 +598,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -602,7 +617,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
@@ -621,7 +636,7 @@ DIST_SUBDIRS = \
Performance
@ENABLE_TESTS_TRUE at TEST_ASSEMBLIES = Hyena.dll Hyena.Gui.dll \
- at ENABLE_TESTS_TRUE@ Hyena.Data.Sqlite.dll Lastfm.dll Migo.dll \
+ at ENABLE_TESTS_TRUE@ Hyena.Data.Sqlite.dll Migo.dll \
@ENABLE_TESTS_TRUE@ Mono.Media.dll Banshee.Core.dll \
@ENABLE_TESTS_TRUE@ Banshee.Gnome.dll Banshee.Services.dll \
@ENABLE_TESTS_TRUE@ Banshee.ThickClient.dll Banshee.Fixup.dll \
diff --git a/tests/Performance/Makefile.in b/tests/Performance/Makefile.in
index bdbac48..542cb1e 100644
--- a/tests/Performance/Makefile.in
+++ b/tests/Performance/Makefile.in
@@ -172,15 +172,24 @@ GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
GCONFTOOL = @GCONFTOOL@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GDATASHARP_1_5_OR_HIGHER_CFLAGS = @GDATASHARP_1_5_OR_HIGHER_CFLAGS@
-GDATASHARP_1_5_OR_HIGHER_LIBS = @GDATASHARP_1_5_OR_HIGHER_LIBS@
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@
+GDK_X11_LIBS = @GDK_X11_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@@ -189,6 +198,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@
GMCS_FLAGS = @GMCS_FLAGS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
@@ -203,6 +214,8 @@ GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
GST_SHARP_LIBS = @GST_SHARP_LIBS@
GTKMACINTEGRATION_CFLAGS = @GTKMACINTEGRATION_CFLAGS@
GTKMACINTEGRATION_LIBS = @GTKMACINTEGRATION_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -210,6 +223,8 @@ GTK_LIBS = @GTK_LIBS@
GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -403,14 +418,15 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
+LINK_CAIRO = -r:Mono.Cairo
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
LINK_GLIB = $(GLIBSHARP_LIBS)
LINK_GTK = $(GTKSHARP_LIBS)
LINK_GCONF = $(GCONFSHARP_LIBS)
-LINK_GIO = $(GIOSHARP_LIBS)
+LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
@@ -525,7 +541,7 @@ REF_EXTENSION_EMUSIC_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_EM
REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
@@ -533,7 +549,6 @@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@@ -541,7 +556,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -560,7 +575,7 @@ REF_EXTENSION_UPNP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BANSHEE_SERVICES_DE
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV)
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git
More information about the Pkg-cli-apps-commits
mailing list