[banshee/gio-hardware] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit a0b5c1bcf3386eecb1c4fca8739cd862e41fdfae
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Wed Aug 4 14:44:00 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 6053 ++++++++++++++++++++++++++++++++++++++++-------------------
 po/zh_TW.po | 6066 ++++++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 8328 insertions(+), 3791 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d01c41a..04dd3dd 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -5,21 +5,515 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Banshee 1.3.3\n"
+"Project-Id-Version: Banshee 1.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-27 20:26+0800\n"
-"PO-Revision-Date: 2008-10-27 20:27+0800\n"
-"Last-Translator: Hsin-lin Cheng <lancetw gmail com>\n"
+"POT-Creation-Date: 2010-08-04 14:43+0800\n"
+"PO-Revision-Date: 2010-08-04 14:43+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: ../data/audio-profiles/base.xml.in.h:1
+#. ../src/Backends/Banshee.Gio/Banshee.Gio.addin.xml
+#: ../data/addin-xml-strings.cs:8
+msgid "GIO IO backend"
+msgstr "GIO IO �端��"
+
+#. ../src/Backends/Banshee.Gnome/Banshee.Gnome.addin.xml
+#: ../data/addin-xml-strings.cs:11
+msgid ""
+"Backend providers for the GNOME platform. Includes GConf support and general "
+"GNOME integration."
+msgstr ""
+
+#. ../src/Backends/Banshee.GStreamer/Banshee.GStreamer.addin.xml
+#. ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.addin.xml
+#: ../data/addin-xml-strings.cs:14 ../data/addin-xml-strings.cs:17
+msgid ""
+"GStreamer multimedia services including playback, CD ripping, and "
+"transcoding."
+msgstr "GStreamer å¤?åª?é«?æ??å??ï¼?å??å?®æ?­æ?¾æ?§å?¶ã??CD æ?·å??ã??è½?碼ç­?ã??"
+
+#. ../src/Backends/Banshee.Hal/Banshee.Hal.addin.xml
+#: ../data/addin-xml-strings.cs:20
+msgid "Provides hardware support through HAL."
+msgstr "é??é?? HAL æ??ä¾?硬件æ?¯æ?´ã??"
+
+#. ../src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.addin.xml
+#: ../data/addin-xml-strings.cs:23
+msgid ""
+"Provides an X11 backend for video support, which enables proper fullscreen "
+"support."
+msgstr "ç?ºè¦?å??æ?¯æ?´æ??ä¾? X11 å¾?端ç¨?å¼?ï¼?å?¯ä»¥å??ç?¨å??é?©ç??å?¨è?¢å¹?æ?¯æ?´ã??"
+
+#. ../src/Backends/Banshee.Osx/Banshee.Osx.addin.xml
+#: ../data/addin-xml-strings.cs:26
+msgid ""
+"Backend providers for the OSX platform. Includes general OSX integration."
+msgstr "OSX å¹³å?°ç??æ??ä¾?ç??å¾?端ç¨?å¼?ã??å??å?«é??ç?¨ç?? OSX æ?´å??ã??"
+
+#. ../src/Backends/Banshee.Unix/Banshee.Unix.addin.xml
+#: ../data/addin-xml-strings.cs:29
+msgid "Provides POSIX/UNIX support, including IO."
+msgstr "æ??ä¾? POSIX/UNIX æ?¯æ?´ï¼?å??æ?¬ IOã??"
+
+#. ../src/Core/Banshee.Core/Banshee.Core.addin.xml
+#: ../data/addin-xml-strings.cs:32
+msgid "Provides low level non-GUI utilities."
+msgstr "æ??ä¾?ä½?層ç´?ç??é?? GUI å?¬ç?¨ç¨?å¼?ã??"
+
+#. ../src/Core/Banshee.Services/Banshee.Services.addin.xml
+#: ../data/addin-xml-strings.cs:35
+msgid "Provides non-GUI utilities and services."
+msgstr "æ??ä¾?é?? GUI å?¬ç?¨ç¨?å¼?è??æ??å??ã??"
+
+#. ../src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml
+#: ../data/addin-xml-strings.cs:38
+msgid "Provides GUI utilities and services."
+msgstr "æ??ä¾? GUI å?¬ç?¨ç¨?å¼?è??æ??å??ã??"
+
+#. ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml
+#: ../data/addin-xml-strings.cs:41
+msgid "iPod Support"
+msgstr "iPod ��"
+
+#: ../data/addin-xml-strings.cs:42
+msgid "Support for most iPod devices."
+msgstr "æ?¯æ?´å¤§å¤?æ?¸ iPod è£?ç½®ã??"
+
+#: ../data/addin-xml-strings.cs:43 ../data/addin-xml-strings.cs:48
+#: ../data/addin-xml-strings.cs:53 ../data/addin-xml-strings.cs:58
+msgid "Device Support"
+msgstr "�置��"
+
+#. ../src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml
+#: ../data/addin-xml-strings.cs:46
+msgid "Karma Support"
+msgstr "Karma ��"
+
+#: ../data/addin-xml-strings.cs:47
+msgid "Support for Rio Karma devices."
+msgstr "æ?¯æ?´ Rio Karma è£?ç½®ã??"
+
+#. ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
+#: ../data/addin-xml-strings.cs:51
+msgid "Mass Storage Media Player Support"
+msgstr "大容é??å?²å­?åª?é«?æ?­æ?¾å?¨æ?¯æ?´"
+
+#: ../data/addin-xml-strings.cs:52
+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:56
+msgid "MTP Media Player Support"
+msgstr "MTP �������"
+
+#: ../data/addin-xml-strings.cs:57
+msgid "Support for MTP devices, including many Creative Zen devices."
+msgstr "æ?¯æ?´ MTP è£?ç½®ï¼?å??å?«è¨±å¤? Creative Zen è£?ç½®ã??"
+
+#. ../src/Dap/Banshee.Dap/Banshee.Dap.addin.xml
+#: ../data/addin-xml-strings.cs:61
+msgid "Digital Media Player Support"
+msgstr "�碼�������"
+
+#: ../data/addin-xml-strings.cs:62
+msgid "Provides general support for many kinds of media player devices."
+msgstr "æ??ä¾?å¤?種é¡?å??ç??åª?é«?æ?­æ?¾å?¨è£?ç½®ç??é??ç?¨æ?¯æ?´ã??"
+
+#. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml
+#: ../data/addin-xml-strings.cs:65
+msgid "Amazon MP3 Store Source"
+msgstr "Amazon MP3 å??åº?ä¾?æº?"
+
+#: ../data/addin-xml-strings.cs:66
+msgid "Browse, search, and purchase music from the Amazon MP3 store"
+msgstr "å¾? Amazon MP3 å??åº?ç??覽ã??æ??å°?ã??購買é?³æ¨?"
+
+#: ../data/addin-xml-strings.cs:67 ../data/addin-xml-strings.cs:72
+#: ../data/addin-xml-strings.cs:107 ../data/addin-xml-strings.cs:122
+#: ../data/addin-xml-strings.cs:132 ../data/addin-xml-strings.cs:137
+#: ../data/addin-xml-strings.cs:156
+msgid "Online Sources"
+msgstr "網���"
+
+#. ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.addin.xml
+#: ../data/addin-xml-strings.cs:70
+msgid "Amazon MP3 Import"
+msgstr "Amazon MP3 ��"
+
+#: ../data/addin-xml-strings.cs:71
+msgid "Download and import music purchased from Amazon.com"
+msgstr "ä¸?è¼?並å?¯å?¥å¾? Amazon.com 購買ç??é?³æ¨?"
+
+#. ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml
+#: ../data/addin-xml-strings.cs:75
+msgid "Audiobooks Library"
+msgstr "æ??è?²æ?¸è³?æ??庫"
+
+#: ../data/addin-xml-strings.cs:76
+msgid "Organize audiobooks, lectures, etc."
+msgstr "æ?´ç??æ??è?²æ?¸ã??æ¼?è¬?ç­?ã??"
+
+#: ../data/addin-xml-strings.cs:77 ../data/addin-xml-strings.cs:82
+#: ../data/addin-xml-strings.cs:112 ../data/addin-xml-strings.cs:127
+#: ../data/addin-xml-strings.cs:180 ../data/addin-xml-strings.cs:185
+msgid "Core"
+msgstr "核�"
+
+#. ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml
+#: ../data/addin-xml-strings.cs:80
+msgid "Audio CD Support"
+msgstr "�� CD ��"
+
+#: ../data/addin-xml-strings.cs:81
+msgid "Listen to and rip Audio CDs."
+msgstr "è??è?½ä¸¦æ?·å??é?³è¨? CDã??"
+
+#. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
+#: ../data/addin-xml-strings.cs:85
+msgid "Boo Scripting"
+msgstr "Boo æ??令稿"
+
+#: ../data/addin-xml-strings.cs:86
+msgid "Customize and extend Banshee with Boo-language scripts."
+msgstr "é??é?? Boo èª?è¨?æ??令稿ä¾?è?ªé?¸ä¸¦æ?´å±? Banshee ç??å??è?½ã??"
+
+#: ../data/addin-xml-strings.cs:87 ../data/addin-xml-strings.cs:92
+#: ../data/addin-xml-strings.cs:97 ../data/addin-xml-strings.cs:102
+#: ../data/addin-xml-strings.cs:117 ../data/addin-xml-strings.cs:142
+#: ../data/addin-xml-strings.cs:151 ../data/addin-xml-strings.cs:161
+#: ../data/addin-xml-strings.cs:166 ../data/addin-xml-strings.cs:175
+#: ../data/addin-xml-strings.cs:204
+msgid "Utilities"
+msgstr "����"
+
+#. ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml
+#: ../data/addin-xml-strings.cs:90
+msgid "BPM Detection"
+msgstr "BMP �測"
+
+#: ../data/addin-xml-strings.cs:91
+msgid "Detect the beats per minute (BPM) of your music."
+msgstr "å?µæ¸¬ä½ ç??é?³æ¨?æ¯?å??é??æ??å¹¾æ?? (beats per minute, BPM)ã??"
+
+#. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
+#: ../data/addin-xml-strings.cs:95
+msgid "Cover Art Fetching"
+msgstr "å°?é?¢è??è¡?æ?·å??"
+
+#: ../data/addin-xml-strings.cs:96
+msgid "Fetch cover art for all items in your library."
+msgstr "ç?ºä½ è³?æ??庫å?§ç??æ??æ??é ?ç?®æ?·å??å°?é?¢è??è¡?ã??"
+
+#. ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml
+#: ../data/addin-xml-strings.cs:100
+msgid "DAAP Sharing"
+msgstr "DAAP å??享"
+
+#: ../data/addin-xml-strings.cs:101
+msgid "Browse and listen to music shared over your local network."
+msgstr "ç??覽並è??è?½é??é??ä½ æ?¬å?°ç¶²çµ¡æ??å??享ç??é?³æ¨?ã??"
+
+#. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
+#: ../data/addin-xml-strings.cs:105
+msgid "eMusic Import"
+msgstr "eMusic ��"
+
+#: ../data/addin-xml-strings.cs:106
+msgid "Download and import music purchased from eMusic"
+msgstr "ä¸?è¼?並å?¯å?¥å¾? eMusic 購買ç??é?³æ¨?"
+
+#. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
+#: ../data/addin-xml-strings.cs:110
+msgid "File System Preview Queue"
+msgstr "æª?æ¡?系統é ?覽ä½?å??"
+
+#: ../data/addin-xml-strings.cs:111
+msgid "Preview files without importing to your library."
+msgstr "é ?覽æª?æ¡?è??ä¸?ç?¨å?¯å?¥è?³ä½ ç??è³?æ??庫å?§ã??"
+
+#. ../src/Extensions/Banshee.Fixup/Banshee.Fixup.addin.xml
+#: ../data/addin-xml-strings.cs:115
+#, fuzzy
+msgid "Metadata Fixup"
+msgstr "編輯�� Metadata"
+
+#: ../data/addin-xml-strings.cs:116
+msgid "Fix broken and missing metadata using bulk operations"
+msgstr ""
+
+#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
+#: ../data/addin-xml-strings.cs:120
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:58
+msgid "Internet Archive"
+msgstr "äº?è?¯ç¶²å?¸è??館"
+
+#: ../data/addin-xml-strings.cs:121
+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:125
+msgid "Internet Radio"
+msgstr "網絡��"
+
+#: ../data/addin-xml-strings.cs:126
+msgid "Listen to and organize Internet Radio stations."
+msgstr "è??è?½ä¸¦çµ?ç¹?äº?è?¯ç¶²é?»å?°ã??"
+
+#. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
+#: ../data/addin-xml-strings.cs:130
+#, fuzzy
+#| msgid "Last.fm Station"
+msgid "Last.fm Scrobbling"
+msgstr "Last.fm ��"
+
+#: ../data/addin-xml-strings.cs:131
+msgid "Last.fm scrobbling and context pane recommendations."
+msgstr ""
+
+#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
+#: ../data/addin-xml-strings.cs:135
+msgid "Last.fm Radio"
+msgstr "Last.fm ��"
+
+#: ../data/addin-xml-strings.cs:136
+msgid "Last.fm streaming radio for paid subscribers."
+msgstr "給ä»?è²»è¨?é?±è??æ?¶è?½ç?? Last.fm 串æµ?ç?¡ç·?é?»å?°ã??"
+
+#. ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
+#: ../data/addin-xml-strings.cs:140
+msgid "Library Watcher"
+msgstr "è³?æ??庫ç?£è¦?å?¨"
+
+#: ../data/addin-xml-strings.cs:141
+msgid "Automatically update music and video libraries"
+msgstr "è?ªå??æ?´æ?°é?³æ¨?è??å½±ç??è³?æ??庫"
+
+#. ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
+#: ../data/addin-xml-strings.cs:145
+msgid "MeeGo Support"
+msgstr "MeeGo ��"
+
+#: ../data/addin-xml-strings.cs:146
+msgid "Provides MeeGo integration, including a custom media panel."
+msgstr "æ??ä¾? MeeGo æ?´å??ï¼?å??å?®è?ªé?¸ç??åª?é«?é?¢æ?¿ã??"
+
+#. ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
+#: ../data/addin-xml-strings.cs:149
+msgid "Mini Mode"
+msgstr "迷你模�"
+
+#: ../data/addin-xml-strings.cs:150
+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:154
+msgid "Miro Guide Podcast Directory"
+msgstr ""
+
+#: ../data/addin-xml-strings.cs:155
+msgid "Browse and subscribe to thousands of audio and video podcasts."
+msgstr ""
+
+#. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
+#: ../data/addin-xml-strings.cs:159
+msgid "Multimedia Keys"
+msgstr "å¤?åª?é«?æ??é?µ"
+
+#: ../data/addin-xml-strings.cs:160
+msgid "Control playback via the multimedia keys on your keyboard."
+msgstr "é??é??ä½ é?µç?¤ä¸?ç??å¤?åª?é«?æ??é?µä¾?æ?§å?¶æ?­æ?¾å??è?½ã??"
+
+#. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
+#: ../data/addin-xml-strings.cs:164
+msgid "Notification Area Icon"
+msgstr "ç¨?å¼?ç??æ??é??ç?¥å??å??示"
+
+#: ../data/addin-xml-strings.cs:165
+msgid "Display an icon in the notification area for controlling Banshee."
+msgstr "å?¨é??ç?¥å??å??å?§é¡¯ç¤ºç?¨ä¾?æ?§å?¶ Banshee ç??å??示ã??"
+
+#. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
+#: ../data/addin-xml-strings.cs:169
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164
+#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50
+msgid "Now Playing"
+msgstr "����"
+
+#: ../data/addin-xml-strings.cs:170
+msgid ""
+"Provides a source that displays embedded video and provides fullscreen video "
+"playback and controls."
+msgstr "æ??ä¾?顯示å?§åµ?è¦?å??ç??ä¾?æº?ï¼?以å??å?¨è?¢å¹?ç??è¦?å??æ?­æ?¾æ?§å?¶ã??"
+
+#. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
+#: ../data/addin-xml-strings.cs:173
+msgid "Importers for Amarok, Rhythmbox and iTunes"
+msgstr "æ?¯æ?´ Amarokã??Rhythmboxã??iTunes ç??å?¯å?¥ç¨?å¼?"
+
+#: ../data/addin-xml-strings.cs:174
+msgid "Import your library from Amarok, Rhythmbox or iTunes."
+msgstr "å¾? Amarokã??Rhythomboxã??iTunes å?¯å?¥ä½ ç??è³?æ??庫ã??"
+
+#. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml
+#: ../data/addin-xml-strings.cs:178
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:58
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:79
+msgid "Play Queue"
+msgstr "æ?­æ?¾ä½?å??"
+
+#: ../data/addin-xml-strings.cs:179
+msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
+msgstr ""
+
+#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
+#: ../data/addin-xml-strings.cs:183
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:99
+msgid "Podcasts"
+msgstr "Podcasts"
+
+#: ../data/addin-xml-strings.cs:184
+msgid "Subscribe to podcasts and stream or download episodes."
+msgstr ""
+
+#. ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml
+#: ../data/addin-xml-strings.cs:188
+msgid "Remote Audio"
+msgstr "�端��"
+
+#: ../data/addin-xml-strings.cs:189
+msgid "Provides support for remote speakers like the Airport Express"
+msgstr "æ??ä¾?é? ç«¯å??å?­æ?¯æ?´ï¼?ä¾?å¦? Airport Express"
+
+#. ../src/Extensions/Banshee.Sample/Banshee.Sample.addin.xml
+#: ../data/addin-xml-strings.cs:192
+#: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40
+msgid "Sample"
+msgstr "樣å??"
+
+#: ../data/addin-xml-strings.cs:193
+msgid "A sample source useful to developers."
+msgstr "å°?é??æ³?è??ä¾?說å¾?æ??ç?¨ç??樣æ?¬ä¾?æº?ã??"
+
+#: ../data/addin-xml-strings.cs:194
+msgid "Sources"
+msgstr "��"
+
+#. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
+#: ../data/addin-xml-strings.cs:197
+msgid "SQL Debug Console"
+msgstr "SQL ��主��"
+
+#: ../data/addin-xml-strings.cs:198
+msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries."
+msgstr "æ??ä¾?ä¸?å¥? UIï¼?ç?¨ä¾?ç?£æ?§ Banshee ç?? SQL 使ç?¨ç¨?度ï¼?以å??æ?¥è©¢ã??"
+
+#: ../data/addin-xml-strings.cs:199
+msgid "Debug"
+msgstr "��"
+
+#. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
+#: ../data/addin-xml-strings.cs:202
+msgid "Torrent Downloader"
+msgstr "Torrent ����"
+
+#: ../data/addin-xml-strings.cs:203
+msgid "Support downloading BitTorrent files from podcasts."
+msgstr "æ?¯æ?´å¾? podcast ä¸?è¼? BitTorrent æª?æ¡?ã??"
+
+#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
+#: ../data/addin-xml-strings.cs:207
+#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44
+msgid "Wikipedia"
+msgstr "Wikipedia"
+
+#: ../data/addin-xml-strings.cs:208
+#, fuzzy
+msgid "View artist information from Wikipedia in the context pane."
+msgstr "å?¨æ¢?ç?®çª?æ ¼å?§æª¢è¦? Wikipedia æ??ä¾?ç??æ¼?å?ºè??è³?è¨?ã??"
+
+#: ../data/addin-xml-strings.cs:209 ../data/addin-xml-strings.cs:214
+msgid "Context Pane"
+msgstr "���格"
+
+#. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml
+#: ../data/addin-xml-strings.cs:212
+#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
+msgid "YouTube"
+msgstr "YouTube"
+
+#: ../data/addin-xml-strings.cs:213
 #, fuzzy
+msgid "Show related YouTube videos in the context pane"
+msgstr "å?¨æ¢?ç?®çª?æ ¼å?§é¡¯ç¤ºç?¸é??ç?? YouTube å½±ç??ã??"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:1
+msgid "3GPP"
+msgstr "3GPP"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:2
+msgid "AAC (Novell Encoder)"
+msgstr "AAC (Novell 編碼�)"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:3
+#: ../data/audio-profiles/mp3-lame.xml.in.h:4
+#: ../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 "ä½?å??ç??"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:4
+#, fuzzy
+#| msgid "Continue"
+msgid "Container"
+msgstr "容�"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:5
+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 "Long Term Prediction"
+msgstr ""
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:7
+msgid "Low Complexity"
+msgstr ""
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:8
+msgid "MPEG-4 ISO"
+msgstr "MPEG-4 ISO"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:9
+msgid "MPEG-4 QuickTime"
+msgstr "MPEG-4 QuickTime"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:10
+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 "é?³æ??è?²é??:"
+msgstr "è?²é??"
 
 #: ../data/audio-profiles/flac.xml.in.h:1
 msgid "Free Lossless Audio Codec"
@@ -49,36 +543,53 @@ msgstr "å¹³å??ä½?å??ç??"
 msgid "Best"
 msgstr "æ??ä½³"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:4
-#: ../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 "ä½?å??ç??"
-
 #: ../data/audio-profiles/mp3-lame.xml.in.h:5
 msgid "Constant Bitrate"
 msgstr "å?ºå®?ä½?å??ç??"
 
 #: ../data/audio-profiles/mp3-lame.xml.in.h:6
+msgid "Extreme"
+msgstr "�極"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:7
+msgid "Insane"
+msgstr ""
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:8
+msgid "LAME Preset"
+msgstr "LAME é ?å??設置"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
 msgid "MP3 (LAME Encoder)"
 msgstr "MP3 (LAME 編碼�)"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:7
+#: ../data/audio-profiles/mp3-lame.xml.in.h:10
+msgid "Medium"
+msgstr ""
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:11
+msgid "Preset"
+msgstr "é ?å??設置"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:12
+msgid "Standard"
+msgstr "��"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:13
 msgid "VBR Mode"
 msgstr "VBR 模�"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:8
+#: ../data/audio-profiles/mp3-lame.xml.in.h:14
 msgid "VBR Quality"
 msgstr "VBR å??質"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
+#: ../data/audio-profiles/mp3-lame.xml.in.h:15
 msgid "Variable Bitrate"
 msgstr "å?¯è®?ä½?å??ç??"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:10
+#: ../data/audio-profiles/mp3-lame.xml.in.h:16
 #: ../data/audio-profiles/vorbis.xml.in.h:5
-#: ../data/audio-profiles/wavpack.xml.in.h:11
+#: ../data/audio-profiles/wavpack.xml.in.h:15
 #: ../data/audio-profiles/wma.xml.in.h:7
 msgid "Worst"
 msgstr "æ??å·®"
@@ -112,26 +623,42 @@ msgid "Default"
 msgstr "�設�"
 
 #: ../data/audio-profiles/wavpack.xml.in.h:5
+msgid "Default Compression"
+msgstr "�設�縮�度"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:6
 msgid "Extra processing"
 msgstr "ç?¹å?¥è??ç??"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:6
+#: ../data/audio-profiles/wavpack.xml.in.h:7
+msgid "Fast Compression"
+msgstr "å¿«é??å£?縮"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:8
+msgid "High Compression"
+msgstr "��縮"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:9
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:7
+#: ../data/audio-profiles/wavpack.xml.in.h:10
 msgid "Lossy mode"
 msgstr "破���縮模�"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:8
+#: ../data/audio-profiles/wavpack.xml.in.h:11
 msgid "Mode"
 msgstr "模�"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:9
+#: ../data/audio-profiles/wavpack.xml.in.h:12
 msgid "Store MD5 sum in the file"
 msgstr "���中�� MD5 sum"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:10
+#: ../data/audio-profiles/wavpack.xml.in.h:13
+msgid "Very High Compression"
+msgstr "é??常é«?å£?縮"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:14
 msgid "Wavpack"
 msgstr ""
 
@@ -163,359 +690,476 @@ msgstr "使ç?¨å?¯è®?ä½?å??ç??"
 msgid "Windows Media Audio"
 msgstr "Windows Media Audio"
 
-#: ../data/banshee-1.desktop.in.in.h:1
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:72
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:76
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:162
+#: ../data/desktop-files/common.desktop.in.h:1
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:95
+#: ../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/banshee-1.desktop.in.in.h:2
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:182
+#: ../data/desktop-files/common.desktop.in.h:2
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:192
 msgid "Media Player"
 msgstr "������"
 
-#: ../data/banshee-1.desktop.in.in.h:3
+#: ../data/desktop-files/common.desktop.in.h:3
 msgid "Play and organize your media collection"
 msgstr "æ?­æ?¾ä¸¦ç®¡ç??ä½ ç??åª?é«?æ?¶è??"
 
-#: ../libbanshee/banshee-ripper.c:201
+#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
 msgid "Could not create pipeline"
 msgstr "��建�管�"
 
-#: ../libbanshee/banshee-ripper.c:207
+#: ../libbanshee/banshee-bpmdetector.c:208
+msgid "Could not create filesrc element"
+msgstr "ç?¡æ³?建ç«? filesrc å??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:214
+msgid "Could not create decodebin plugin"
+msgstr "ç?¡æ³?建ç«? decodebin æ??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:220
+msgid "Could not create audioconvert plugin"
+msgstr "ç?¡æ³?建ç«? audioconvert æ??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:226
+msgid "Could not create bpmdetect plugin"
+msgstr "ç?¡æ³?建ç«? bpmdetect æ??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:232
+msgid "Could not create fakesink plugin"
+msgstr "ç?¡æ³?建ç«? fakesink æ??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:241
+#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+msgid "Could not link pipeline elements"
+msgstr "ç?¡æ³?é?£çµ?管ç·?å??件"
+
+#: ../libbanshee/banshee-ripper.c:276
 msgid "Could not initialize element from cdda URI"
 msgstr "ç?¡æ³?å??å§?å?? cdda URI å??件"
 
-#: ../libbanshee/banshee-ripper.c:221
+#: ../libbanshee/banshee-ripper.c:290
 msgid "Could not create encoder pipeline"
 msgstr "��建�編碼�管�"
 
-#: ../libbanshee/banshee-ripper.c:227
+#: ../libbanshee/banshee-ripper.c:296
 msgid "Could not create queue plugin"
-msgstr "ç?¡æ³?建ç«?ä½?å??å¤?æ??"
+msgstr "ç?¡æ³?建ç«?ä½?å??æ??件"
 
-#: ../libbanshee/banshee-ripper.c:235
+#: ../libbanshee/banshee-ripper.c:304
 msgid "Could not create filesink plugin"
-msgstr "ç?¡æ³?建ç«? filesink å¤?æ??ç¨?å¼?"
+msgstr "ç?¡æ³?建ç«? filesink æ??件"
 
-#: ../libbanshee/banshee-ripper.c:242
-msgid "Could not link pipeline elements"
-msgstr "ç?¡æ³?é?£çµ?管ç·?å??件"
-
-#: ../libbanshee/banshee-transcoder.c:241
-msgid "Could not create 'filesrc' plugin"
-msgstr "ç?¡æ³?建ç«? 'filesrc' å¤?æ??ç¨?å¼?"
+#: ../libbanshee/banshee-transcoder.c:240
+msgid "Could not create source element"
+msgstr "ç?¡æ³?建ç«?ä¾?æº?å??件"
 
-#: ../libbanshee/banshee-transcoder.c:247
+#: ../libbanshee/banshee-transcoder.c:246
 msgid "Could not create 'decodebin' plugin"
-msgstr "ç?¡æ³?建ç«?å¤?æ??ã??decodebinã??"
+msgstr "ç?¡æ³?建ç«?ã??decodebinã??æ??件"
 
-#: ../libbanshee/banshee-transcoder.c:253
-msgid "Could not create 'filesink' plugin"
-msgstr "ç?¡æ³?建ç«? 'filesink' å¤?æ??ç¨?å¼?"
+#: ../libbanshee/banshee-transcoder.c:252
+msgid "Could not create sink element"
+msgstr "ç?¡æ³?建ç«? sink å??件"
 
-#: ../libbanshee/banshee-transcoder.c:259
+#: ../libbanshee/banshee-transcoder.c:258
 msgid "Could not create 'sinkben' plugin"
-msgstr "ç?¡æ³?建ç«?å¤?æ??ã??sinkbenã??"
+msgstr "ç?¡æ³?建ç«?ã??sinkbenã??æ??件"
 
-#: ../libbanshee/banshee-transcoder.c:265
+#: ../libbanshee/banshee-transcoder.c:264
 msgid "Could not create 'audioconvert' plugin"
-msgstr "ç?¡æ³?建ç«?å¤?æ??ã??audioconvertã??"
+msgstr "ç?¡æ³?建ç«?ã??audioconvertã??æ??件"
 
-#: ../libbanshee/banshee-transcoder.c:271
+#: ../libbanshee/banshee-transcoder.c:270
 msgid "Could not create encoding pipeline"
 msgstr "��建�編碼管�"
 
-#: ../libbanshee/banshee-transcoder.c:277
+#: ../libbanshee/banshee-transcoder.c:276
 msgid "Could not get sink pad from encoder"
 msgstr "ç?¡æ³?å¾?解碼å?¨å??å¾? sink pad"
 
-#: ../libbanshee/banshee-transcoder.c:345
+#: ../libbanshee/banshee-transcoder.c:341
 msgid "Could not construct pipeline"
 msgstr "ç?¡æ³?æ§?æ??管ç·?"
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:64
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65
 msgid "Write CD..."
 msgstr "寫� CD..."
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:66
 msgid "Write selected tracks to an audio CD"
-msgstr "å°?é?¸æ??ç??æ­?æ?²å¯«å?¥é?³æ¨? CD"
+msgstr "å°?æ??é?¸ç??æ?²ç?®å¯«å?¥é?³è¨? CD"
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:103
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
 msgid "Could not write CD"
 msgstr "��寫� CD"
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
 msgid "Brasero could not be started"
 msgstr "ç?¡æ³?å??å?? Brasero"
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs:78
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs:79
 msgid "Fullscreen video playback active"
 msgstr "使ç?¨å?¨è?¢å¹?å½±ç??æ?­æ?¾"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:88
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:89
 msgid "Could not find an encoder for ripping."
-msgstr "æ?¾ä¸?å?°ç?¨ä¾?æ??å??ç??編碼å?¨ã??"
+msgstr "æ?¾ä¸?å?°æ?·å??ç?¨ç??編碼å?¨ã??"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:104
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:108
 msgid "Could not create CD ripping driver."
-msgstr "ç?¡æ³?建ç«? CD æ??å??é©?å??ç¨?å¼?ã??"
+msgstr "ç?¡æ³?建ç«? CD æ?·å??é©?å??ç¨?å¼?ã??"
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs:71
+msgid "Could not create BPM detection driver."
+msgstr "ç?¡æ³?建ç«? BPM å?µæ¸¬é©?å??ç¨?å¼?ã??"
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+msgid "Enable _gapless playback"
+msgstr "å??ç?¨ç?¡ç¸«æ?­æ?¾(_G)"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:131
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:83
+msgid ""
+"Eliminate the small playback gap on track change.  Useful for concept albums "
+"and classical music"
+msgstr ""
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187
 msgid "Could not initialize GStreamer library"
 msgstr "ç?¡æ³?å??å§?å?? GStreamer å?½å¼?庫"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:259
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
 msgid "Unknown Error"
 msgstr "æ?ªç?¥ç??é?¯èª¤"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:507
-msgid "_Enable ReplayGain Correction"
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
+#, fuzzy
+#| msgid "_Enable ReplayGain Correction"
+msgid "_Enable ReplayGain correction"
 msgstr "å??ç?¨å??æ?¾å¢?ç??æ ¡æ­£(_E)"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:508
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
+#, fuzzy
+#| msgid ""
+#| "For tracks that have ReplayGain data, automatically scale (normalize) "
+#| "playback volume."
 msgid ""
 "For tracks that have ReplayGain data, automatically scale (normalize) "
-"playback volume."
-msgstr "å°?æ?¼å?«æ?? ReplayGain è³?æ??ç??é?³è»?ï¼?è?ªå??縮æ?¾ï¼?æ­£è¦?å??ï¼?æ?­æ?¾é?³é??ã??"
+"playback volume"
+msgstr "å°?æ?¼å?«æ?? ReplayGain è³?æ??ç??æ?²ç?®ï¼?è?ªå??縮æ?¾ï¼?æ­£è¦?å??ï¼?æ?­æ?¾é?³é??ã??"
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767
+msgid ""
+"Eliminate the small playback gap on track change.  Useful for concept albums "
+"and classical music."
+msgstr ""
 
 #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
 msgid "Could not create transcoder"
 msgstr "ç?¡æ³?建ç«?編碼è½?æ??å?¨"
 
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:87
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:116
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:139
+msgid "GStreamer# 0.10"
+msgstr "GStreamer# 0.10"
+
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:131
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:88
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:117
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:224
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:146
+#: ../src/Clients/Booter/Booter/Entry.cs:148
 msgid "Help Options"
 msgstr "����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:147
+#: ../src/Clients/Booter/Booter/Entry.cs:149
 msgid "Show this help"
 msgstr "顯示é??å??æ±?å?©æ??件"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:148
+#: ../src/Clients/Booter/Booter/Entry.cs:150
 msgid "Show options for controlling playback"
 msgstr "顯示ç?¨ä¾?æ?§å?¶æ?­æ?¾ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:149
+#: ../src/Clients/Booter/Booter/Entry.cs:151
 msgid "Show options for querying the playing track"
-msgstr "顯示ç?¨ä¾?æ?¥è©¢æ?­æ?¾é?³è»?ç??é?¸é ?"
+msgstr "顯示ç?¨ä¾?æ?¥è©¢æ?­æ?¾ä¸­æ?²ç?®ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:150
+#: ../src/Clients/Booter/Booter/Entry.cs:152
 msgid "Show options for querying the playing engine"
 msgstr "顯示ç?¨ä¾?æ?¥è©¢æ?­æ?¾å¼?æ??ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:153
 msgid "Show options for the user interface"
 msgstr "顯示此使ç?¨è??ä»?é?¢ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:152
+#: ../src/Clients/Booter/Booter/Entry.cs:154
 msgid "Show options for developers and debugging"
 msgstr "顯示給é??ç?¼è??è??é?¤é?¯ä¹?ç?¨ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:153
+#: ../src/Clients/Booter/Booter/Entry.cs:155
 msgid "Show all option groups"
 msgstr "顯示æ??æ??é?¸é ?ç¾£çµ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:154
+#: ../src/Clients/Booter/Booter/Entry.cs:156
 msgid "Show version information"
 msgstr "顯示ç??æ?¬è³?è¨?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:159
 msgid "Playback Control Options"
 msgstr "������"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:160
 msgid ""
 "Play the next track, optionally restarting if the 'restart' value is set"
-msgstr "æ?­æ?¾ä¸?ä¸?é¦?æ­?ï¼?å¦?æ??設å®?äº?ã??restartã??æ?¸å?¼å??æ??é??æ?°æ?­æ?¾"
+msgstr "æ?­æ?¾ä¸?ä¸?é¦?æ?²ç?®ï¼?å¦?æ??設å®?äº?ã??restartã??æ?¸å?¼å??æ??é??æ?°æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:161
 msgid ""
 "Play the previous track, optionally restarting if the 'restart value is set"
-msgstr "æ?­æ?¾å??ä¸?é¦?æ­?ï¼?å¦?æ??設å®?äº?ã??restartã??æ?¸å?¼å??æ??é??æ?°æ?­æ?¾"
+msgstr "æ?­æ?¾å??ä¸?é¦?æ?²ç?®ï¼?å¦?æ??設å®?äº?ã??restartã??æ?¸å?¼å??æ??é??æ?°æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:160
-msgid "Automatically start playing any tracks enqueued on the command line"
+#: ../src/Clients/Booter/Booter/Entry.cs:162
+msgid ""
+"If the current song has been played longer than 4 seconds then restart it, "
+"otherwise the same as --previous"
 msgstr ""
 
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:163
+msgid "Automatically start playing any tracks enqueued on the command line"
+msgstr "è?ªå??é??å§?æ?­æ?¾ä»»ä½?å?¨æ??令å??å?§ä½?å??ç??æ?²ç?®"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:164
 msgid "Start playback"
 msgstr "é??å§?æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:165
 msgid "Pause playback"
 msgstr "æ?«å??æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:166
+msgid "Toggle playback"
+msgstr "å??æ??æ?­æ?¾æ?§å?¶"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:167
 msgid "Completely stop playback"
 msgstr "çµ?æ??æ??å??æ­¢æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:169
 msgid ""
 "Enable or disable playback stopping after the currently playing track (value "
 "should be either 'true' or 'false')"
-msgstr "å??ç?¨æ??å??å?¨å?¨ç?®å??æ?­æ?¾æ­?æ?²çµ?æ??å¾?å??æ­¢æ?­æ?¾ï¼?æ?¸å?¼å?¯ä»¥æ?¯ã??trueã??æ??ã??falseã??ï¼?"
+msgstr "å??ç?¨æ??å??å?¨å?¨ç?®å??æ?­æ?¾æ?²ç?®çµ?æ??å¾?å??æ­¢æ?­æ?¾ï¼?æ?¸å?¼å?¯ä»¥æ?¯ã??trueã??æ??ã??falseã??ï¼?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:166
-msgid "Set the playback volume (0-100)"
-msgstr "設å®?æ?­æ?¾é?³é?? (0-100)"
+#: ../src/Clients/Booter/Booter/Entry.cs:170
+msgid "Set the playback volume (0-100), prefix with +/- for relative values"
+msgstr "設å®?æ?­æ?¾é?³é?? (0-100)ï¼?以å??飾å­? + æ?? - ä¾?表示ç?¸å°?å?¼"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:171
 #, fuzzy
 msgid "Seek to a specific point (seconds, float)"
-msgstr "å¾?ç?®å??ç??é ?ç?®æ??å°?ç?¹å®?ç??ä½?ç½®"
+msgstr "å¾?ç?®å??ç??é ?ç?®å°?æ?¾ç?¹å®?é»? (ç§?)"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:172
+#, fuzzy
+#| msgid "Jump to the currently playing item"
+msgid "Set the currently played track's rating (0 to 5)"
+msgstr "è·³å?°æ?­æ?¾ç?®å??ç??é ?ç?®"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:175
 msgid "Player Engine Query Options"
 msgstr "æ?­æ?¾å?¨å¼?æ??æ?¥è©¢é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:176
 msgid "Current player state"
 msgstr "ç?®å??ç??æ?­æ?¾å?¨ç??æ??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:177
 msgid "Last player state"
 msgstr "æ??æ?°æ?­æ?¾ç¨?å¼?ç??æ??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:178
 msgid "Query whether the player can be paused"
 msgstr "æ?¥è©¢æ?­æ?¾å?¨æ?¯å?¦è?½æ?«å??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:179
 msgid "Query whether the player can seek"
 msgstr "�詢��������"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:180
 msgid "Player volume"
 msgstr "æ?­æ?¾å?¨é?³é??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:181
 msgid "Player position in currently playing track"
-msgstr "ç?®å??æ?­æ?¾æ­?æ?²ä¸­æ?­æ?¾å?¨ç??ä½?ç½®"
+msgstr "ç?®å??æ?­æ?¾æ?²ç?®ä¸­æ?­æ?¾å?¨ç??ä½?ç½®"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:184
 #, fuzzy
 msgid "Playing Track Metadata Query Options"
 msgstr "æ?­æ?¾å?¨å¼?æ??æ?¥è©¢é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:180
+#: ../src/Clients/Booter/Booter/Entry.cs:185
 msgid "URI"
 msgstr "URI"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:181
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
+#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:161
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
 msgid "Artist Name"
 msgstr "æ¼?å?ºè??å??稱"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:182
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
+#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
 msgid "Album Title"
 msgstr "�輯��"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:183
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:139
-#, fuzzy
+#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
 msgid "Track Title"
-msgstr "����:"
+msgstr "����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:189
 msgid "Duration"
 msgstr "æ??çº?æ??é??"
 
 #. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:185
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:137
-#, fuzzy
+#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
 msgid "Track Number"
-msgstr "æ­?æ?²ç·¨è??:"
+msgstr "æ?²ç?®ç·¨è??"
 
 #. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:186
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:146
-#, fuzzy
+#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
 msgid "Track Count"
-msgstr "�� & ��"
+msgstr "����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:187
-#, fuzzy
+#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113
 msgid "Disc Number"
-msgstr "å??ç¢?ç·¨è??:"
+msgstr "å??ç¢?ç·¨è??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:188
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:107
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92
 msgid "Year"
 msgstr "年份"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:189
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:96
 msgid "Rating"
 msgstr "è©?ç­?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
+msgid "Score"
+msgstr "å??æ?¸"
+
+#. Translators: noun
+#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
+msgid "Bit Rate"
+msgstr "ä½?å??ç??"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:199
 msgid "User Interface Options"
 msgstr "使ç?¨è??ä»?é?¢é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:200
 msgid "Present the user interface on the active workspace"
 msgstr "å?¨ä½¿ç?¨ç??å·¥ä½?å??顯ç?¾ä½¿ç?¨è??ä»?é?¢"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:201
+msgid "Enter the full-screen mode"
+msgstr "�����模�"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:202
 msgid "Hide the user interface"
 msgstr "é?±è??使ç?¨è??ä»?é?¢"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:203
 msgid "Do not present the user interface, regardless of any other options"
 msgstr "ä¸?è¦?顯ç?¾ä½¿ç?¨è??ä»?é?¢ï¼?ä¸?顧任ä½?å?¶ä»?ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:204
+msgid "Present the import media dialog box"
+msgstr "顯示å?¯å?¥åª?é«?å°?話ç??"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:205
+msgid "Present the about dialog"
+msgstr "顯示é??æ?¼å°?話çª?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:206
+msgid "Present the open location dialog"
+msgstr "顯示é??å??ä½?ç½®å°?話çª?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:207
+msgid "Present the preferences dialog"
+msgstr "顯示å??好設å®?å°?話çª?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:210
 msgid "Debugging and Development Options"
 msgstr "é?¤é?¯è??é??ç?¼é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:211
 msgid "Enable general debugging features"
 msgstr "å??ç?¨ä¸?è?¬é?¤é?¯å??è?½"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:212
 msgid "Enable debugging output of SQL queries"
 msgstr "å??ç?¨ SQL æ?¥è©¢ç??é?¤é?¯ç?¨è¼¸å?º"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:213
 msgid "Enable debugging output of Mono.Addins"
 msgstr "å??ç?¨ Mono.Addins ç??é?¤é?¯ç?¨è¼¸å?º"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:214
 msgid "Specify an alternate database to use"
 msgstr "æ??å®?è¦?使ç?¨ç??æ?¿ä»£è³?æ??庫"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:215
+#, fuzzy
+#| msgid "Specify an alternate database to use"
+msgid "Specify an alternate key, default is /apps/banshee-1/"
+msgstr "æ??å®?è¦?使ç?¨ç??æ?¿ä»£è³?æ??庫"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:216
 msgid ""
 "Optimize instance for running uninstalled; most notably, this will create an "
 "alternate Mono.Addins database in the working directory"
-msgstr ""
+msgstr "æ?ªå®?è£?ç?¨ä¾?å?·è¡?ç??æ??ä½³å??實é«?ï¼?å¿?é ?注æ??ç??æ?¯ï¼?é??æ??å?¨å·¥ä½?ç?®é??å?§ç½®ç«?æ?¿ä»£æ?§ç?? Mono.Addins è³?æ??庫ã??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:218
 msgid "Disable DBus support completely"
 msgstr "å®?å?¨å??ç?¨ DBus æ?¯æ?´"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:220
 #, csharp-format
 msgid "Skip loading a custom gtkrc file ({0}) if it exists"
 msgstr "å¦?æ??æ??è?ªé?¸ç?? gtkrc æª?æ¡? ({0}) å­?å?¨æ??ä¸?è¦?è¼?å?¥å®?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:238
+#: ../src/Clients/Booter/Booter/Entry.cs:251
 #, csharp-format
 msgid "The following help arguments are invalid: {0}"
 msgstr "ä¸?å??æ±?å?©å¼?æ?¸æ?¯ç?¡æ??ç??ï¼?{0}"
@@ -525,12 +1169,16 @@ msgid "Play Album"
 msgstr "���輯"
 
 #: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:83
-msgid "Queue"
-msgstr "ä½?å??"
+#, fuzzy
+#| msgid "Queue"
+msgid "En_queue"
+msgstr "å? å?¥ä½?å??(Q)"
 
 #: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
-msgid "Play"
-msgstr "æ?­æ?¾"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
+msgid "_Play"
+msgstr "æ?­æ?¾(_P)"
 
 #: ../src/Clients/Muinshee/Muinshee/MuinsheeActions.cs:47
 msgid "Play _Song"
@@ -548,7 +1196,7 @@ msgstr "���輯(_A)"
 msgid "Add an album to the playlist"
 msgstr "���輯�����"
 
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:254
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
 #, csharp-format
 msgid "{0} remaining"
 msgstr "�� {0}"
@@ -557,379 +1205,687 @@ msgstr "�� {0}"
 msgid "Play Song"
 msgstr "����"
 
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:88
-msgid "_Search:"
-msgstr "æ??å°? (_S)ï¼?"
-
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
-#, fuzzy
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87
 msgid "Artist, Album, or Title"
-msgstr "�輯��"
+msgstr "表æ¼?è??ã??å°?輯ã??æ¨?é¡?"
 
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:92
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:187
+#. Alias for %album_artist%
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
+msgid "Album Artist"
+msgstr "å°?輯表æ¼?è??"
+
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:91
 msgid "Genre"
 msgstr "風格"
 
+#. Translators: noun
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
+msgid "Comment"
+msgstr "å??註"
+
 #. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:187
 #, csharp-format
-msgid "Filter Results"
-msgstr "é??濾çµ?æ??ç?º"
-
-#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:39
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:261
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs:86
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:99
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:162
+msgid "Search"
+msgstr "æ??å°?"
+
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
+#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:100
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
 msgid "Unknown Artist"
 msgstr "æ?ªç?¥ç??æ¼?å?ºè??"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:41
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:270
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs:91
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:100
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:161
+#: ../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:101
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:136
 msgid "Unknown Album"
 msgstr "æ?ªç?¥ç??å°?輯"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:87
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
-msgid "Artist"
-msgstr "æ¼?å?ºè??"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
+msgid "Unknown Title"
+msgstr "æ?ªç?¥ç??æ¨?é¡?"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:97
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:112
-msgid "Album"
-msgstr "�輯"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
+msgid "Various Artists"
+msgstr "å??é¡?表æ¼?è??"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:102
-msgid "Title"
-msgstr "��"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
+msgid "Stream location not found"
+msgstr "���串��置"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:112
-#, fuzzy
-msgid "Count"
-msgstr "å??註"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:321
+msgid "File not found"
+msgstr "�����"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:117
-#, fuzzy
-msgid "Number"
-msgstr "å??ç¢?ç·¨è??:"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344
+msgid "Codec for playing this media type not available"
+msgstr "ç?¨ä¾?æ?­æ?¾æ­¤åª?é«?é¡?å??ç??編解碼å?¨ä¸?å?¯ç?¨"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:122
-msgid "Count (unsorted)"
-msgstr "è¨?æ?¸ï¼?æ?ªæ??åº?ï¼?"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346
+msgid "File protected by Digital Rights Management (DRM)"
+msgstr "æª?æ¡?å??æ?¸ç¢¼æ¬?å?©ç®¡ç?? (Digital Rights Management, DRM) ä¿?è­·"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:127
-#, fuzzy
-msgid "Number (unsorted)"
-msgstr "è¨?æ?¸ï¼?æ?ªæ??åº?ï¼?"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+msgid "Unknown error"
+msgstr "���誤"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:215
-msgid "Various Artists"
-msgstr "å??é¡?表æ¼?è??"
+#. TODO turn this into a PrimarySource-owned delegate?
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417
+msgid "_Restart Podcast"
+msgstr "é??æ?°æ?­æ?¾ Podcast(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:279
-msgid "Unknown Title"
-msgstr "æ?ªç?¥ç??æ¨?é¡?"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418
+msgid "_Restart Audiobook"
+msgstr "é??æ?°æ?­æ?¾æ??è?²æ?¸(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:288
-msgid "Unknown Genre"
-msgstr "æ?ªç?¥ç??æ¨?æ?²å??é¡?"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419
+msgid "_Restart Video"
+msgstr "é??æ?°æ?­æ?¾å½±ç??(_R)"
 
-#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:490
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
-msgid "Podcast"
-msgstr "Podcast"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+msgid "_Restart Song"
+msgstr "é??æ?°æ?­æ?¾æ­?æ?²(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:491
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
-msgid "Video"
-msgstr "è¦?å??"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421
+msgid "_Restart Item"
+msgstr "é??æ?°æ?­æ?¾é ?ç?®(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:492
-msgid "Song"
-msgstr "æ­?æ?²"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437
+msgid "_Jump to Playing Podcast"
+msgstr "跳���中 Podcast(_J)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:493
-msgid "Item"
-msgstr "é ?ç?®"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438
+msgid "_Jump to Playing Audiobook"
+msgstr "è·³è?³æ?­æ?¾ä¸­æ??è?²æ?¸(_J)"
+
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439
+msgid "_Jump to Playing Video"
+msgstr "è·³å?°æ?­æ?¾å½±ç??(_J)"
+
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
+msgid "_Jump to Playing Song"
+msgstr "è·³å?°æ?­æ?¾ä¸­ç??æ?²ç?®(_J)"
 
-#: ../src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs:42
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441
+msgid "_Jump to Playing Item"
+msgstr "跳���中��(_J)"
+
+#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
+#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
 #, csharp-format
-msgid "Saving tags for {0}"
-msgstr "å?²å­? {0} ç??æ¨?籤"
+msgid "{0} ({1}:{2:00})"
+msgstr "{0} ({1}:{2:00})"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
 #, csharp-format
 msgid "All Albums ({0})"
 msgstr "æ??æ??å°?輯 ({0})"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:67
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
 #, csharp-format
 msgid "All Artists ({0})"
 msgstr "æ??æ??表æ¼?è?? ({0})"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:136
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:90
+msgid "Value"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+msgid "Shuffle by A_lbum"
+msgstr "æ ¹æ??å°?輯é?¨æ©?æ?­æ?¾(_L)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+msgid "by album"
+msgstr "æ ¹æ??å°?輯"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+msgid "Play all songs from an album, then randomly choose another album"
+msgstr "æ ¹æ??äº?æ?¸é?¸æ??å°?輯ç??æ?¹å¼?æ?­æ?¾æ??æ??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:49
+msgid "Shuffle by A_rtist"
+msgstr "æ ¹æ??表æ¼?è??é?¨æ©?æ?­æ?¾(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50
+msgid "by artist"
+msgstr "æ ¹æ??表æ¼?è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:51
+msgid "Play all songs by an artist, then randomly choose another artist"
+msgstr "æ ¹æ??äº?æ?¸é?¸æ??表æ¼?è??ç??æ?¹å¼?æ?­æ?¾æ??æ??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+msgid "Shuffle _Off"
+msgstr "å??æ­¢äº?æ?¸(_O)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+msgid "manually"
+msgstr "æ??å??"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+msgid "Do not shuffle playlist"
+msgstr "ä¸?è¦?äº?æ?¸æ?­æ?¾æ¸?å?®ä¸­ç??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+msgid "Shuffle by _Rating"
+msgstr "æ ¹æ??è©?ç­?é?¨æ©?æ?­æ?¾(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+msgid "by rating"
+msgstr "æ ¹æ??è©?ç­?"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+msgid "Play songs randomly, prefer higher rated songs"
+msgstr "é?¨æ©?æ?­æ?¾æ­?æ?²ï¼?å??好è©?ç­?è¼?é«?ç??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:42
+msgid "Shuffle by S_core"
+msgstr "æ ¹æ??å??æ?¸é?¨æ©?æ?­æ?¾(_C)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43
+msgid "by score"
+msgstr "æ ¹æ??å??æ?¸"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:44
+msgid "Play songs randomly, prefer higher scored songs"
+msgstr "é?¨æ©?æ?­æ?¾æ­?æ?²ï¼?å??好å??æ?¸è¼?é«?ç??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+msgid "Shuffle by _Song"
+msgstr "æ ¹æ??æ­?æ?²äº?æ?¸æ?­æ?¾(_S)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+msgid "by song"
+msgstr "æ ¹æ??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+msgid "Play songs randomly from the playlist"
+msgstr "æ ¹æ??æ?­æ?¾æ¸?å?®äº?æ?¸æ?­æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:132
 msgid "Scanning for media"
 msgstr "æ??æ??åª?é«?"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:184
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:933
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1375
 msgid "Scanning..."
 msgstr "æ??ç??中..."
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:200
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:198
 #, csharp-format
 msgid "Scanning ({0} files)..."
 msgstr "æ­£å?¨æ??æ?? ({0} å??æª?æ¡?)..."
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:232
 msgid "Importing Media"
 msgstr "正�����"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:241
-#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:115
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:239
+#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
 msgid "The import process is currently running. Would you like to stop it?"
 msgstr "å?¯å?¥ç¨?åº?ç?®å??æ­£å?¨å?·è¡?ã??ä½ æ?³è¦?å??æ­¢å??ï¼?"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:247
-#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:77
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:179
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
+#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:185
 #, csharp-format
 msgid "Importing {0} of {1}"
 msgstr "正��� {0} � {1}"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/MoveOnInfoSaveJob.cs:44
-#, csharp-format
-msgid "Renaming {0}"
-msgstr "é??æ?°å?½å?? {0}"
-
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
 #, csharp-format
 msgid "Rescanning {0} of {1}"
 msgstr "é??æ?°æ??æ?? {1} 中ç?? {0}"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:226
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
 msgid "Upgrading your Banshee Database"
 msgstr "å??ç´?ä½ ç?? Banshee è³?æ??庫"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:227
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
 msgid ""
 "Please wait while your old Banshee database is migrated to the new format."
 msgstr "å?¨ä½ ç??è?? Banshee è³?æ??庫è½?移å?°æ?°æ ¼å¼?æ??è«?ç¨?å??ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:932
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1372
 msgid "Refreshing Metadata"
 msgstr "é??æ?°æ?´ç??中繼è³?æ??"
 
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:252
+msgid "Classical"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:255
+msgid "Club"
+msgstr "俱��"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:258
+msgid "Dance"
+msgstr "è·³è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:261
+msgid "Full Bass"
+msgstr "ä½?é?³å¼·å??"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:264
+msgid "Full Bass and Treble"
+msgstr "ä½?é?³è??é«?é?³å¼·å??"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:267
+msgid "Full Treble"
+msgstr "é«?é?³å¼·å??"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:270
+msgid "Laptop Speakers and Headphones"
+msgstr "æ??æ??é?»è?¦ç??å??å?­è??é ­æ?´å¼?è?³æ©?"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:273
+msgid "Large Hall"
+msgstr "大廳"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:276
+msgid "Live"
+msgstr "�場"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:279
+msgid "Party"
+msgstr "派�"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:282
+msgid "Pop"
+msgstr "æµ?è¡?"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:285
+msgid "Reggae"
+msgstr "�鬼"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:288
+msgid "Rock"
+msgstr "æ??滾"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:291
+msgid "Ska"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:294
+msgid "Soft"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:297
+msgid "Soft Rock"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:300
+msgid "Techno"
+msgstr ""
+
 #: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Directory"
-msgstr "家ç?®é??"
+msgid "Home Folder"
+msgstr "家è³?æ??夾"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
 msgid "Remove From Library"
 msgstr "���庫移�"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:42
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:56
-msgid "Music Library"
-msgstr "é?³æ¨?è³?æ??庫"
+#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:65
+#, csharp-format
+msgid "{0} Folder"
+msgstr "{0}è³?æ??夾"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:67
+msgid "Track Artist"
+msgstr "æ?²ç?®è¡¨æ¼?è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83
+msgid "Album Artist Initial"
+msgstr "å°?輯表æ¼?è??é ­æ??å­?縮寫"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:199
+msgid "Conductor"
+msgstr "æ??æ?®"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:192
+msgid "Composer"
+msgstr "ä½?æ?²è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:103
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:360
+msgid "Album"
+msgstr "�輯"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:108
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:72
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:127
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:97
+msgid "Title"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:119
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:83
+msgid "Count"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:125
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:89
+msgid "Number"
+msgstr "ç·¨è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:131
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:95
+msgid "Count (unsorted)"
+msgstr "è¨?æ?¸ï¼?æ?ªæ??åº?ï¼?"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:137
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:101
+msgid "Number (unsorted)"
+msgstr "ç·¨è??ï¼?æ?ªæ??åº?ï¼?"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:107
+msgid "Disc Count"
+msgstr "å??ç¢?è¨?æ?¸"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:119
+msgid "Grouping"
+msgstr "羣�"
 
+#. Catalog.GetString ("Music Library")
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:80
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38
+msgid "Music"
+msgstr "��"
+
+#. Misc section
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
+msgid "Miscellaneous"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+msgid "_Sort an artist's albums by year, not title"
+msgstr "æ ¹æ??年代è??é??æ¨?é¡?æ??åº?æ??æ¼?å?ºè??ç??å°?輯(_S)"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:107
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:85
 msgid "Favorites"
 msgstr "å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:108
 msgid "Songs rated four and five stars"
 msgstr "è©?å?¹ 4 å?? 5 é¡?æ??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:112
 msgid "Recent Favorites"
 msgstr "æ??æ?°ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:113
 msgid "Songs listened to often in the past week"
 msgstr "é??å?»ä¸?é?±æ??常è?½ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:117
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
 msgid "Recently Added"
 msgstr "æ??è¿?å? å?¥ç??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:118
 msgid "Songs imported within the last week"
 msgstr "é??å?»ä¸?é?±å?¯å?¥ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:74
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:122
 msgid "Unheard"
 msgstr "æ²?æ??è?½é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:75
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:123
 msgid "Songs that have not been played or skipped"
 msgstr "å°?æ?ªæ?­æ?¾é??æ??被ç?¥é??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:81
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
 msgid "Neglected Favorites"
 msgstr "忽ç?¥ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82
-msgid "Favorites not played in over two weeks"
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
+#, fuzzy
+#| msgid "Favorites not played in over two weeks"
+msgid "Favorites not played in over two months"
 msgstr "æ??æ??æ­?æ?²è¶?é??å?©é?±æ²?æ??æ?­æ?¾é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:86
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
 msgid "Least Favorite"
 msgstr "æ??è¿?ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:87
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
 msgid "Songs rated one or two stars or that you have frequently skipped"
 msgstr "è©?å?¹ 1 æ?? 2 é¡?æ??æ??æ?¯ä½ å¸¸å¸¸è·³é??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
 msgid "700 MB of Favorites"
 msgstr "700MB ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
 msgid "A data CD worth of favorite songs"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:97
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:145
 msgid "80 Minutes of Favorites"
 msgstr "80 å??é??ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:98
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
 msgid "An audio CD worth of favorite songs"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:103
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
 msgid "Unrated"
 msgstr "æ?ªè©?å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
 msgid "Songs that haven't been rated"
 msgstr "å°?æ?ªçµ¦äº?è©?å?¹ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:54
+#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:56
 msgid "Importing Songs"
 msgstr "正�����"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:109
+#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:113
 #, csharp-format
 msgid "Importing From {0}"
 msgstr "正� {0} ��"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:42
-msgid "Video Library"
-msgstr "å½±ç??庫"
+#. Catalog.GetString ("Video Library")
+#: ../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:63
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:64
 msgid "Produced By"
 msgstr "製�人:"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:81
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:86
 msgid "Videos rated four and five stars"
 msgstr "è©?å?¹ 4 å?? 5 é¡?æ??ç??å½±ç??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:85
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
 msgid "Unwatched"
 msgstr "���"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:86
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:91
 msgid "Videos that haven't been played yet"
 msgstr "å°?æ?ªæ?­æ?¾é??ç??å½±ç??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:92
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:98
 msgid "Default player engine"
 msgstr "é ?設æ?­æ?¾å?¨å¼?æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:99
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:105
 msgid ""
 "No player engines were found. Please ensure Banshee has been cleanly "
 "installed."
 msgstr "æ?¾ä¸?å?°æ?­æ?¾å?¨å¼?æ??ã??è«?確å®? Banshee æ?¯ä¹¾æ·¨å®?è£?ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:279
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:347
 msgid "Problem with Player Engine"
 msgstr "æ?­æ?¾å?¨å¼?æ??æ??å??é¡?"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:132
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135
 #, csharp-format
 msgid "Converting {0} of {1}"
 msgstr "æ­£å?¨è½?æ?? {1} 中ç?? {0}"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:132
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135
 msgid "Initializing"
 msgstr "æ­£å?¨å??å§?å??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:133
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138
 msgid ""
 "Files are currently being converted to another format. Would you like to "
 "stop this?"
 msgstr "æª?æ¡?ç?®å??æ­£è¦?被è½?æ??æ??å?¶ä»?é?³è¨?æ ¼å¼?ã??ä½ æ?³è¦?å??æ­¢å??ï¼?"
 
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
+msgid "Saving Metadata to File"
+msgstr "æ­£å?¨å?²å­?中ä»?è³?æ??è?³æª?æ¡?"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
+msgid "Write _metadata to files"
+msgstr "寫å?¥ä¸­ç¹¼è³?æ??æª?æ¡?(_M)"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
+#, fuzzy
+#| msgid ""
+#| "Enable this option to save tags and other metadata inside supported audio "
+#| "files."
+msgid "Save tags and other metadata inside supported media files"
+msgstr "å??ç?¨é??å??é?¸é ?以å?²å­?æ¨?籤å??å?¶ä»?中繼è³?æ??å?°æ?¯æ?´ç??é?³æ??æª?æ¡?中ã??"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:174
+msgid "Write _ratings and play counts to files"
+msgstr "寫å?¥è©?ç­?è??æ?­æ?¾è¨?æ?¸è?³æª?æ¡?(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
+#, fuzzy
+#| msgid ""
+#| "Enable this option to save tags and other metadata inside supported audio "
+#| "files."
+msgid ""
+"Enable this option to save rating and playcount metadata inside supported "
+"audio files"
+msgstr "å??ç?¨é??å??é?¸é ?以å?²å­?æ¨?籤å??å?¶ä»?中繼è³?æ??å?°æ?¯æ?´ç??é?³æ??æª?æ¡?中ã??"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60
+msgid "_Update file and folder names"
+msgstr "æ?´æ?°æª?æ¡?è??è³?æ??夾å??稱(_U)"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
+#, fuzzy
+#| msgid ""
+#| "Enabling this option ensures that files and folders are renamed according "
+#| "to the metadata."
+msgid "Rename files and folders according to media metadata"
+msgstr "å??ç?¨é??å??é?¸é ?以確ä¿?æª?æ¡?è??è³?æ??夾å??稱é?½æ??æ ¹æ??中繼è³?æ??é??æ?°å?½å??ã??"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:175
+#, fuzzy
+#| msgid ""
+#| "Enable this option to save tags and other metadata inside supported audio "
+#| "files."
+msgid ""
+"Enable this option to save rating and play count metadata inside supported "
+"audio files whenever the rating is changed."
+msgstr "å??ç?¨é??å??é?¸é ?以å?²å­?æ¨?籤å??å?¶ä»?中繼è³?æ??å?°æ?¯æ?´ç??é?³æ??æª?æ¡?中ã??"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:176
+msgid "Import _ratings"
+msgstr "����(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:177
+msgid "Import play _counts"
+msgstr "������(_C)"
+
+#. disabled by default
+#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:302
+msgid "Improve Banshee by sending anonymous usage data"
+msgstr "è??ç?±å?³é??å?¿å??ç??使ç?¨è³?æ??ä¾?å??å?©æ?¹é?² Banshee"
+
 #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
 msgid "There is no available network connection"
 msgstr "æ²?æ??å?¯ç?¨ç??網絡é?£ç·?"
 
 #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:78
-msgid "Cannot connect to NetworkManager"
-msgstr "���� NetworkManager"
+msgid "Cannot connect to NetworkManager or Wicd"
+msgstr "ç?¡æ³?é?£æ?¥è?³ NetworkManager æ?? Wicd"
 
 #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:79
 msgid "An available, working network connection will be assumed"
 msgstr "å°?å??設已æ??ä¸?å??æ??æ??ã??å?¯é??ä½?ç??網絡é?£æ?¥ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:150
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:157
 msgid "_Disable features requiring Internet access"
 msgstr "å??ç?¨é??è¦?使ç?¨ç¶²çµ¡ç??å??è?½(_D)"
 
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:151
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:158
 msgid ""
 "Some features require a broadband Internet connection such as Last.fm or "
 "cover art fetching"
 msgstr "æ??äº?å??è?½é??è¦?äº?è?¯ç¶²é?£ç·?ï¼?å??æ?¯ Last.fm æ??å??å??å°?å¥?å??庫"
 
-#: ../src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
-#, csharp-format
-msgid "Unable to import track: {0}"
-msgstr "�������{0}"
-
-#: ../src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
-msgid "Importing from Amarok failed"
-msgstr "å¾? Amarok å?¯å?¥å¤±æ??"
-
-#: ../src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
-msgid "Amarok"
-msgstr "Amarok"
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:223
+msgid "The track's rating was set differently on the device and in Banshee"
+msgstr ""
 
 #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:302
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
 msgid "Playlist"
 msgstr "����"
 
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:131
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
 msgid "Remove From Playlist"
 msgstr "�����移�"
 
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:132
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
 msgid "Delete Playlist"
 msgstr "������"
 
+#. TODO generate name based on the track selection, or begin editing it
 #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
 #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:88
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:448
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:211
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:375
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:496
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213
 msgid "New Playlist"
 msgstr "æ?°ç??æ?­æ?¾æ¸?å?®"
 
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsfReferencePlaylistFormat.cs:43
+msgid "Windows Media ASX"
+msgstr "Windows Media ASX"
+
 #: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs:46
 msgid "Windows Media ASX (*.asx)"
 msgstr "Windows Media ASX (*.asx)"
@@ -938,550 +1894,614 @@ msgstr "Windows Media ASX (*.asx)"
 msgid "MPEG Version 3.0 Extended (*.m3u)"
 msgstr "MPEG 3.0 ç??æ?´å?? (*.m3u)"
 
-#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs:53
 msgid "Shoutcast Playlist version 2 (*.pls)"
 msgstr "Shoutcast æ?­æ?¾æ¸?å?®ç¬¬ 2 ç?? (*.pls)"
 
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/XspfPlaylistFormat.cs:44
+msgid "XML Shareable Playlist Format version 1 (*.xspf)"
+msgstr "XML å?¯å??享å¼?æ?­æ?¾æ¸?å?®æ ¼å¼?第 1 ç?? (*.xspf)"
+
+#. Pages (tabs)
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:50
 msgid "General"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:61
-msgid "Co_py files to media folders when importing"
-msgstr "ç?¶å?¯å?¥æ??è¤?製æª?æ¡?å?°åª?é«?è³?æ??夾(_P)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:64
-msgid "Write _metadata to files"
-msgstr "寫å?¥ä¸­ç¹¼è³?æ??æª?æ¡?(_M)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:65
-msgid ""
-"Enable this option to save tags and other metadata inside supported audio "
-"files."
-msgstr "å??ç?¨é??å??é?¸é ?以å?²å­?æ¨?籤å??å?¶ä»?中繼è³?æ??å?°æ?¯æ?´ç??é?³æ??æª?æ¡?中ã??"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:51
+msgid "Source Specific"
+msgstr "ä¾?æº?æ??å®?"
 
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:68
-msgid "_Update file and folder names"
-msgstr "æ?´æ?°æª?æ¡?è??è³?æ??夾å??稱(_U)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:69
-msgid ""
-"Enabling this option ensures that files and folders are renamed according to "
-"the metadata."
-msgstr "å??ç?¨é??å??é?¸é ?以確ä¿?æª?æ¡?è??è³?æ??夾å??稱é?½æ??æ ¹æ??中繼è³?æ??é??æ?°å?½å??ã??"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:73
-msgid "File System Organization"
-msgstr "����系統"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:76
-msgid "Folder hie_rarchy"
-msgstr "è³?æ??夾çµ?æ§?(_R)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:79
-msgid "File _name"
-msgstr "æª?æ¡?å??稱(_N)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:81
-msgid "Miscellaneous"
-msgstr "��"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:83
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:52
 msgid "Extensions"
 msgstr "æ?´å??å¥?件"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:59
-msgid "Random"
-msgstr "��"
-
-#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:65
-msgid "Name"
-msgstr "å??稱"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:69
-msgid "Highest Rating"
-msgstr "æ??é«?è©?å?¹"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:70
-msgid "Lowest Rating"
-msgstr "æ??ä½?è©?å?¹"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:72
-msgid "Most Often Played"
-msgstr "æ??常æ?­æ?¾ç??"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:73
-msgid "Least Often Played"
-msgstr "ä¸?常æ?­æ?¾ç??"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:75
-msgid "Most Recently Played"
-msgstr "æ??è¿?æ?­æ?¾ç??"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
-msgid "Least Recently Played"
-msgstr "æ??è¿?ä¸?常æ?­æ?¾ç??"
+#. General policies
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:55
+msgid "File Policies"
+msgstr "æª?æ¡?æ?¹é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:78
-msgid "Most Recently Added"
-msgstr "æ??è¿?å? å?¥ç??"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:79
-msgid "Least Recently Added"
-msgstr "æ??å¾?å? å?¥ç??"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+msgid "Co_py files to media folders when importing"
+msgstr "ç?¶å?¯å?¥æ??è¤?製æª?æ¡?å?°åª?é«?è³?æ??夾(_P)"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:83
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
 msgid "items"
 msgstr "é ?ç?®"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:85
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
 msgid "hours"
 msgstr "æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:86
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
 msgid "MB"
 msgstr "MB"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:87
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
 msgid "GB"
 msgstr "GB"
 
-#. Translators: These are unique search aliases for "artist".  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:74
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:361
+msgid "Artist"
+msgstr "æ¼?å?ºè??"
+
+#. 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:76
 msgid "artist"
 msgstr "表æ¼?è??å??稱"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
 msgid "by"
 msgstr "ç?±"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
 msgid "artists"
 msgstr "表æ¼?è??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
-msgid "Album Artist"
-msgstr "å°?輯表æ¼?è??"
-
-#. Translators: These are unique search aliases for "album artist".  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:104
+#. Translators: These are unique search aliases for "album artist". You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
 #, fuzzy
 msgid "albumartist"
 msgstr "å°?輯表æ¼?è??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
 msgid "compilationartist"
 msgstr ""
 
-#. Translators: These are unique search aliases for "album".  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:114
+#. Translators: These are unique search aliases for "album". You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
 msgid "album"
 msgstr "�輯"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:114
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
 msgid "on"
-msgstr "æ­?æ?²"
+msgstr "æ?¼"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:114
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
 msgid "from"
 msgstr "å¾?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:120
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:100
 msgid "Disc"
 msgstr "å??ç¢?"
 
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:122
+#. 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:102
 #, fuzzy
 msgid "disc"
 msgstr "å??ç¢?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:122
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
 msgid "cd"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:122
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
 msgid "discnum"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
-#, fuzzy
-msgid "Disc Count"
-msgstr "å??ç¢? & è¨?æ?¸"
-
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:130
+#. 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:110
 #, fuzzy
 msgid "discs"
 msgstr "å??ç¢?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:130
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:110
 msgid "cds"
-msgstr "��"
+msgstr ""
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:139
-#, fuzzy
+#. 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:119
 msgid "track"
-msgstr "æ­?æ?² #"
+msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
 msgid "trackno"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
 msgid "tracknum"
 msgstr ""
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:148
-#, fuzzy
+#. 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:128
 msgid "tracks"
-msgstr "æ­?æ?² #"
+msgstr "æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:148
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
 msgid "trackcount"
-msgstr "�� & ��"
+msgstr "����"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:134
 msgid "Beats per Minute"
-msgstr "ç¯?æ??"
+msgstr "æ¯?å??é??å¹¾æ??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:136
 msgid "bpm"
-msgstr ""
-
-#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
-#, fuzzy
-msgid "Bit Rate"
-msgstr "ä½?å??ç??"
+msgstr "bpm"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
-#, fuzzy
+#. 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:145
 msgid "bitrate"
 msgstr "ä½?å??ç??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
 msgid "kbs"
 msgstr "kbs"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
 msgid "kps"
 msgstr "kps"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#. Translators: noun
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:152
+msgid "Sample Rate"
+msgstr "å??樣頻ç??"
+
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
+msgid "samplerate"
+msgstr "å??樣頻ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
+msgid "Hz"
+msgstr "Hz"
+
+#. Translators: noun
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:161
+msgid "Bits Per Sample"
+msgstr "æ¯?樣æ?¬ä½?å??"
+
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+#, fuzzy
+msgid "bitspersample"
+msgstr "ä½?å??ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+msgid "bitdepth"
+msgstr "ä½?å??深度"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+#, fuzzy
+#| msgid "Station"
+msgid "quantization"
+msgstr "��"
+
+#. Translators: noun
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:169
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:363
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:666
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:89
+msgid "Name"
+msgstr "å??稱"
+
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
 msgid "title"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
 #, fuzzy
 msgid "titled"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
 msgid "name"
 msgstr "å??稱"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
 #, fuzzy
 msgid "named"
 msgstr "å??稱"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:181
-#, fuzzy
+#. 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:179
 msgid "year"
-msgstr "å¹´"
+msgstr "年代"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
 msgid "released"
-msgstr ""
+msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
 msgid "yr"
 msgstr ""
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:189
+#. 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:187
 msgid "genre"
 msgstr "風格"
 
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:194
-#, fuzzy
-msgid "Composer"
-msgstr "�彩"
-
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:196
 msgid "composer"
 msgstr ""
 
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:201
-msgid "Conductor"
-msgstr "æ??æ?®"
-
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:203
-#, fuzzy
 msgid "conductor"
 msgstr "æ??æ?®"
 
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:208
-msgid "Grouping"
-msgstr "羣�"
-
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:210
 #, fuzzy
 msgid "grouping"
 msgstr "羣�"
 
-#. Translators: noun
+#. 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:216
-msgid "Comment"
-msgstr "å??註"
-
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:218
 msgid "comment"
 msgstr "註解"
 
+#. Translators: noun
+#: ../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
+msgid "License"
+msgstr "æ??æ¬?æ¢?款"
+
+#. 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:224
+msgid "license"
+msgstr "æ??æ¬?æ¢?款"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
+msgid "licensed"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
+msgid "under"
+msgstr ""
+
 #. , typeof(NullQueryValue)},
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:225
-#, fuzzy
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
 msgid "rating"
 msgstr "è©?ç­?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:225
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
 msgid "stars"
 msgstr "æ??ç´?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:231
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:238
 msgid "Play Count"
 msgstr "��次�"
 
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:233
+#. 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:240
 #, fuzzy
 msgid "plays"
 msgstr "��次�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:233
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
 msgid "playcount"
 msgstr "���次"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:233
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
 msgid "listens"
 msgstr "è??è?½"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:239
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:246
 msgid "Skip Count"
 msgstr "ç?¥é??次æ?¸"
 
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:241
-#, fuzzy
+#. 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:248
 msgid "skips"
-msgstr "kps"
+msgstr "ç?¥é??次æ?¸"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:241
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:248
 #, fuzzy
 msgid "skipcount"
 msgstr "ç?¥é??次æ?¸"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:247
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:254
 msgid "File Size"
 msgstr "��大�"
 
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:249
+#. 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:256
 msgid "size"
 msgstr "大�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:249
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
 msgid "filesize"
 msgstr "��大�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:255
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:262
 msgid "File Location"
 msgstr "���置"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:257
+#. 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:264
 msgid "uri"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:257
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
 msgid "path"
 msgstr "路�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:257
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
 msgid "file"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:257
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
 msgid "location"
 msgstr "ä½?ç½®"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:263
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:270
 msgid "Time"
 msgstr "æ??é??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:265
+#. 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:272
 msgid "duration"
 msgstr "æ??çº?æ??é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:265
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
 msgid "length"
 msgstr "�度"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:265
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
 msgid "time"
 msgstr "time"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:271
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:278
 msgid "Mime Type"
 msgstr "Mime é¡?å??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:273
+#. 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:280
 msgid "type"
 msgstr "é¡?å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:273
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
 msgid "mimetype"
 msgstr "mimetype"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:273
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
 msgid "format"
 msgstr "格�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:273
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
 msgid "ext"
-msgstr "ä¸?ä¸?å??(_N)"
+msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:279
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:286
 msgid "Last Played"
 msgstr "ä¸?次æ?­æ?¾æ??é??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:281
-#, fuzzy
+#. 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:288
 msgid "lastplayed"
-msgstr "ä¸?次æ?­æ?¾æ??é??"
+msgstr "�次��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:281
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
 #, fuzzy
 msgid "played"
 msgstr "æ?­æ?¾"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:281
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
 msgid "playedon"
-msgstr "���次"
+msgstr "���"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:287
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:294
 msgid "Last Skipped"
 msgstr "ä¸?次ç?¥é??ç??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:289
-#, fuzzy
+#. 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:296
 msgid "lastskipped"
-msgstr "ä¸?次ç?¥é??ç??"
+msgstr "ä¸?次ç?¥é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:289
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
 msgid "skipped"
-msgstr "ä¸?次ç?¥é??ç??"
+msgstr "ç?¥é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:289
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
 msgid "skippedon"
-msgstr "ä¸?次ç?¥é??ç??"
+msgstr "ç?¥é??æ?¼"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:295
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:302
 msgid "Date Added"
 msgstr "å? å?¥æ?¥æ??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
+#. 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:304
 #, fuzzy
 msgid "added"
 msgstr "å? å?¥æ?¥æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
 #, fuzzy
 msgid "imported"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
 msgid "addedon"
-msgstr ""
+msgstr "é??å? å??件"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
 #, fuzzy
 msgid "dateadded"
 msgstr "å? å?¥æ?¥æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
 msgid "importedon"
-msgstr "已����"
+msgstr "���"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:308
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
 #: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
 msgid "Smart Playlist"
 msgstr "�������"
 
+#. 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:324
+msgid "score"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:330
+msgid "Playback Error"
+msgstr "æ?­æ?¾ç?¼ç??é?¯èª¤"
+
+#. Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:332
+msgid "playbackerror"
+msgstr "æ?­æ?¾æ?§å?¶ç?¼ç??é?¯èª¤"
+
 #. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:326
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:349
 msgid "BPM"
-msgstr ""
+msgstr "BPM"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:327
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:350
 msgid "Skips"
-msgstr "kps"
+msgstr "ç?¥é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:328
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:351
 msgid "Plays"
 msgstr "��次�"
 
-#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:254
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:141
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:143
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:145
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:376
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:356
+msgid "Random"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:366
+msgid "Highest Rating"
+msgstr "æ??é«?è©?å?¹"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:367
+msgid "Lowest Rating"
+msgstr "æ??ä½?è©?å?¹"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:369
+msgid "Highest Score"
+msgstr "æ??é«?å??æ?¸"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:370
+msgid "Lowest Score"
+msgstr "æ??ä½?å??æ?¸"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:372
+msgid "Most Often Played"
+msgstr "æ??常æ?­æ?¾ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:373
+msgid "Least Often Played"
+msgstr "ä¸?常æ?­æ?¾ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:375
+msgid "Most Recently Played"
+msgstr "æ??è¿?æ?­æ?¾ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:376
+msgid "Least Recently Played"
+msgstr "æ??è¿?ä¸?常æ?­æ?¾ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:378
+msgid "Most Recently Added"
+msgstr "æ??è¿?å? å?¥ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:379
+msgid "Least Recently Added"
+msgstr "æ??å¾?å? å?¥ç??"
+
+#. 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/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
+msgid "None"
+msgstr "ç?¡"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+msgid "none"
+msgstr "ç?¡"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+msgid "no"
+msgstr "ç?¡"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:49
+msgid "Resource Not Found"
+msgstr "�����"
+
+#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
+msgid "ResourceNotFound"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
+msgid "missing"
+msgstr "�失"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
+msgid "notfound"
+msgstr "���"
+
+#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:54
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:56
+msgid "CodecNotFound"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:56
+msgid "nocodec"
+msgstr "�編解碼�"
+
+#. 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 ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:61
+msgid "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:327
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:380
 msgid "Unknown"
 msgstr "��"
 
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:66
+msgid "unknown"
+msgstr "��"
+
 #: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
-#, fuzzy
 msgid "Unable to Migrate Smart Playlists"
-msgstr "���������"
+msgstr "ç?¡æ³?è½?移æ?ºæ?§å??æ?­æ?¾æ¸?å?®"
 
 #: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
 #, csharp-format
@@ -1489,16 +2509,16 @@ msgid "Please file a bug with this error: {0}"
 msgstr "è«?ç?ºé??å??é?¯èª¤å??å??å ±ï¼?{0}"
 
 #: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
-#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:51
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
 msgid "Edit Smart Playlist"
 msgstr "編輯�������"
 
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:229
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:233
 msgid "Delete Smart Playlist"
 msgstr "���������"
 
 #: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:147
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:154
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
 #, csharp-format
 msgid "All Genres ({0})"
 msgstr "æ??æ??æ¨?æ?²å??é¡? ({0})"
@@ -1538,45 +2558,87 @@ msgid_plural "{0} seconds"
 msgstr[0] "{0} �"
 msgstr[1] "{0} �"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:51
 msgid "Close Error Report"
 msgstr "é??é??é?¯èª¤å ±å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:82
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:6
+#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46
 msgid "Error"
 msgstr "�誤"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
+#: ../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
 msgid "Details"
 msgstr "詳細è³?æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:152
 msgid "Errors"
 msgstr "�誤"
 
+#: ../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:221
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:214
 msgid "Drive"
-msgstr ""
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:238
+msgid "File Organization"
+msgstr "����"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:659
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:239
+msgid "Folder hie_rarchy"
+msgstr "è³?æ??夾çµ?æ§?(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:240
+msgid "File _name"
+msgstr "æª?æ¡?å??稱(_N)"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689
 #, csharp-format
 msgid "Adding {0} of {1} to {2}"
 msgstr "å? å?¥ {1} 中ç?? {0} å?° {2}"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:676
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708
 #, csharp-format
 msgid "Deleting {0} of {1} From {2}"
 msgstr "å¾? {2} å?ªé?¤ {1} 中ç?? {0}"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:639
-#, csharp-format
-msgid "{0} item"
-msgid_plural "{0} items"
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:671
+msgid "Size Ascending"
+msgstr "大å°?é??å¢?æ??åº?"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:676
+msgid "Size Descending"
+msgstr "大å°?é??æ¸?æ??åº?"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:765
+#, fuzzy, csharp-format
+#| msgid "{0} item"
+#| msgid_plural "{0} items"
+msgid "{0:N0} item"
+msgid_plural "{0:N0} items"
 msgstr[0] "{0} å??é ?ç?®"
 msgstr[1] "{0} å??é ?ç?®"
 
+#: ../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:83
+msgid "Could not open stream or playlist"
+msgstr "ç?¡æ³?é??å??串æµ?æ??æ?­æ?¾æ¸?å?®"
+
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:92
+msgid "Problem parsing playlist"
+msgstr "解æ??æ?­æ?¾æ¸?å?®å??é¡?"
+
 #: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:61
 msgid "Could not launch URL"
 msgstr "ç?¡æ³?å??å?? URL"
@@ -1592,118 +2654,207 @@ msgstr ""
 "\n"
 "è«?檢æ?¥ä½ ç??ã??é¦?é?¸æ??ç?¨ç¨?å¼?ã??設å®?å?¼ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs:69
-msgid "Version:"
-msgstr "ç??æ?¬:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:49
+msgid "Show:"
+msgstr "顯示�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs:72
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinTile.cs:98
-msgid "Authors:"
-msgstr "ä½?è??:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+msgid "All"
+msgstr "��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs:75
-msgid "Copyright/License:"
-msgstr "ç??æ¬?/æ??æ¬?:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
+msgid "Enabled"
+msgstr "å·²å??ç?¨"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:53
+msgid "Not Enabled"
+msgstr "æ?ªå??ç?¨"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:56
+msgid "Search:"
+msgstr "æ??å°?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs:79
-msgid "Extension Dependencies:"
-msgstr "æ?´å??å¥?件ç?¸æ ¹æ??æ?§:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:76
+msgid "Disable album grid"
+msgstr ""
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:77
+msgid "Disable album grid and show the classic layout instead"
+msgstr ""
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinTile.cs:183
-msgid "Disable"
-msgstr "å??ç?¨"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:81
+#, fuzzy
+#| msgid "Cannot Convert File"
+msgid "Cannot Reorder While Sorted"
+msgstr "ä¸?è?½è½?æ??æª?æ¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinTile.cs:184
-msgid "Enable"
-msgstr "å??ç?¨"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:82
+msgid ""
+"To put the playlist in manual sort mode, click the currently sorted column "
+"header until the sort arrow goes away."
+msgstr ""
 
 #. 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:159
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:172
 #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
 #, csharp-format
 msgid "{0} of {1}"
 msgstr "{0} ä¹? {1}"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
+msgid "Playing"
+msgstr "正���"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
+msgid "Paused"
+msgstr "å·²æ?«å??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227
+msgid "Protected"
+msgstr "å??ä¿?è­·"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228
+#, fuzzy
+#| msgid "Extra processing"
+msgid "External Document"
+msgstr "ç?¹å?¥è??ç??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
+msgid "Choose New Cover Art..."
+msgstr "é?¸æ??æ?°ç??å°?é?¢è??è¡?..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98
+msgid "Delete This Cover Art"
+msgstr "å?ªé?¤æ­¤å°?輯è??è¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
 msgid "Track #"
-msgstr "æ­?æ?² #"
+msgstr "�� #"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:122
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:128
 msgid "Track & Count"
-msgstr "�� & ��"
+msgstr "æ?²ç?®è??è¨?æ?¸"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132
 msgid "Disc #"
 msgstr "å??ç¢? #"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:133
 msgid "Disc & Count"
 msgstr "å??ç¢? & è¨?æ?¸"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:130
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:136
 #, csharp-format
 msgid "{0} kbps"
 msgstr "{0} kbps"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139
+#, csharp-format
+msgid "{0} Hz"
+msgstr "{0} Hz"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:142
+#, csharp-format
+msgid "{0} bits"
+msgstr "{0} ä½?å??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
+msgid "Make the context pane larger or smaller"
+msgstr "è®?æ¢?ç?®çª?æ ¼æ?´å¤§æ??æ?´å°?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
+msgid "Hide context pane"
+msgstr "é?±è??æ¢?ç?®çª?æ ¼"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
+msgid "Waiting for playback to begin..."
+msgstr "æ­£å?¨ç­?å??æ?­æ?¾æ?§å?¶é??å§?..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+msgid "Loading..."
+msgstr "��中..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:53
 msgid "Equalizer"
 msgstr "ç­?å??å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
-msgid "Enabled"
-msgstr "å·²å??ç?¨"
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
+msgid "New Preset"
+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:159
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:203
 #, fuzzy, csharp-format
 msgid "{0} by {1}"
 msgstr "{0} ä¹? {1}"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:49
-msgid "Primary Development"
-msgstr "主è¦?é??ç?¼"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+msgid "_Bookmarks"
+msgstr "�籤(_B)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+msgid "_Add Bookmark"
+msgstr "���籤(_A)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:57
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#, fuzzy
+msgid "Bookmark the Position in the Current Track"
+msgstr "å?¨ç?®å??ç??æ?²ç?®ä½?ç½®æ¨?è¨?ç?ºæ?¸ç±¤"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
+msgid "_Remove Bookmark"
+msgstr "移��籤(_R)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:54
+msgid "Maintainers"
+msgstr "維護è??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:62
 msgid "Contributors"
 msgstr "è²¢ç?»è??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
 msgid "Extraordinary Multimedia Management and Playback"
 msgstr "å?ºç?¾ç??é?³æ¨?管ç??è??æ?­æ?¾"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+#, csharp-format
 msgid ""
-"Copyright © 2005â??2008 Novell, Inc.\n"
+"Copyright © 2005â??{0} Novell, Inc.\n"
+"Copyright © 2005â??{0} Others\n"
 "Copyright © 2005 Aaron Bockover"
 msgstr ""
-"ç??æ¬?æ??æ?? © 2005â??2008 Novell, Inc.\n"
+"ç??æ¬?æ??æ?? © 2005â??{0} Novell, Inc.\n"
+"ç??æ¬?æ??æ?? © 2005â??{0} å?¶ä»?人\n"
 "ç??æ¬?æ??æ?? © 2005 Aaron Bockover"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
 msgid "Banshee Website"
 msgstr "Banshee 網�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:45
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:50
 msgid "Important tasks are running"
 msgstr "é??è¦?ç??å·¥ä½?æ­£å?¨å?·è¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:47
+#: ../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 æ??è?ªå??ç¹¼çº?ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:54
-msgid "Quit anyway"
-msgstr "ç?¡è«?å¦?ä½?é?½é?¢é??"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
+msgid "Quit Anyway"
+msgstr "ç?¡è«?å¦?ä½?é?½é??å?º"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:55
-msgid "Continue running"
-msgstr "æ??çº?å?·è¡?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:61
+msgid "Continue Running"
+msgstr "繼���"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:69
 msgid "Make Banshee the default media player?"
@@ -1716,7 +2867,7 @@ msgid ""
 msgstr "ç?®å??æ??å?¶ä»?ç??ç¨?å¼?設å®?ç?ºé ?設ç??åª?é«?æ?­æ?¾ç¨?å¼?ã??ä½ æ?¯å?¦è¦?å°? Banshee 設ç?ºé ?設å?¼ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:412
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:435
 #, csharp-format
 msgid "Do not ask me this again"
 msgstr "ä¸?è¦?å??è©¢å??æ??é??å??å??é¡?"
@@ -1725,6 +2876,11 @@ msgstr "ä¸?è¦?å??è©¢å??æ??é??å??å??é¡?"
 msgid "Make Banshee the Default"
 msgstr "� Banshee 設��設"
 
+#. Translators: verb
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+msgid "I_mport"
+msgstr "��(_M)"
+
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39
 msgid "Select album cover image"
 msgstr "é?¸æ??å°?輯å°?å¥?å??ç??"
@@ -1741,14 +2897,22 @@ msgstr "JPEG å??ç??æª?æ¡?"
 msgid "PNG image files"
 msgstr "PNG å??ç??æª?æ¡?"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:45
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:103
+msgid "Open Location"
+msgstr "é??å??ä½?ç½®"
+
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:54
 msgid "Browse..."
 msgstr "ç??覽..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:98
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:9
-msgid "Open Location"
-msgstr "é??å??ä½?ç½®"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:64
+msgid "Enter the address of the file you would like to open:"
+msgstr "輸å?¥ä½ æ?³è¦?é??å??ç??æª?æ¡?ä½?å??ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/SeekDialog.cs:41
+msgid "Seek to Position"
+msgstr "å°?æ?¾æ??ä½?ç½®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:50
 msgid "_Media"
@@ -1763,8 +2927,8 @@ msgid "Import media from a variety of sources"
 msgstr "å¾?å??種ä¾?æº?å?¯å?¥åª?é«?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:57
-msgid "Import Playlist..."
-msgstr "������..."
+msgid "Import _Playlist..."
+msgstr "������(_P)..."
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:58
 msgid "Import a playlist"
@@ -1788,15 +2952,15 @@ msgstr "æ?­æ?¾é??å??ç??é? ç«¯ä½?ç½®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
 msgid "_Quit"
-msgstr "é?¢é?? (_Q)"
+msgstr "é??å?º(_Q)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
 msgid "Quit Banshee"
-msgstr "é?¢é?? Banshee"
+msgstr "é??å?º Banshee"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
 msgid "_Edit"
-msgstr "編輯 (_E)"
+msgstr "編輯(_E)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
 msgid "_Preferences"
@@ -1819,16 +2983,17 @@ msgid "_Tools"
 msgstr "工�(_T)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
 msgid "_Help"
-msgstr "說æ?? (_H)"
+msgstr "æ±?å?©(_H)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
 msgid "_Web Resources"
-msgstr "網���(_W)"
+msgstr "網���(_W)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:98
 msgid "Banshee _User Guide (Wiki)"
-msgstr "Banshee 使ç?¨è??æ??å??[Wiki](_U)"
+msgstr "Banshee 使ç?¨è??æ??å?? (Wiki)(_U)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
 msgid "Learn about how to use Banshee"
@@ -1836,7 +3001,7 @@ msgstr "å­¸ç¿?é??æ?¼å¦?ä½?使ç?¨ Banshee"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:104
 msgid "Advanced Collection Searching"
-msgstr ""
+msgstr "é?²é??æ?¶è??æ??å°?å??è?½"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:105
 msgid "Learn advanced ways to search your media collection"
@@ -1852,7 +3017,7 @@ msgstr "æ??訪 Banshee é¦?é ?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:116
 msgid "_Get Involved"
-msgstr "å??å? (_G)"
+msgstr "å??è??æ??å??(_G)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:117
 msgid "Become a contributor to Banshee"
@@ -1866,37 +3031,16 @@ msgstr "ç??æ?¬è³?è¨?(_V)"
 msgid "View detailed version and configuration information"
 msgstr "檢è¦?ç??æ?¬ç´°ç¯?è??é??ç½®è³?è¨?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:162
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
-msgid "Error opening stream"
-msgstr "é??å??串æµ?æ??ç?¼ç??é?¯èª¤"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:163
-msgid "Could not open stream or playlist"
-msgstr "ç?¡æ³?é??å??串æµ?æ??æ?­æ?¾æ¸?å?®"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
-msgid "Problem parsing playlist"
-msgstr "解æ??æ?­æ?¾æ¸?å?®å??é¡?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:178
+#. Prompt user for location of the playlist.
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:180
 msgid "Import Playlist"
 msgstr "������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:181
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
 msgid "Playlists"
 msgstr "����"
 
-#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:192
-msgid "Import"
-msgstr "��"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:191
-msgid "_Play"
-msgstr "æ?­æ?¾(_P)"
-
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:67
 msgid "Play or pause the current item"
 msgstr "æ?­æ?¾æ??æ?«å??ç?®å??ç??é ?ç?®"
@@ -1918,25 +3062,17 @@ msgid "Play the previous item"
 msgstr "æ?­æ?¾ä¸?ä¸?å??é ?ç?®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
-msgid "Seek _to..."
-msgstr "���(_T)..."
+msgid "Seek _To..."
+msgstr "å°?æ?¾(_T)..."
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:79
 msgid "Seek to a specific location in current item"
-msgstr "å¾?ç?®å??ç??é ?ç?®æ??å°?ç?¹å®?ç??ä½?ç½®"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
-msgid "_Jump to Playing Song"
-msgstr "è·³å?°æ?­æ?¾ä¸­ç??æ?²ç?®(_J)"
+msgstr "å?¨ç?®å??ç??é ?ç?®å?§å°?æ?¾ç?¹å®?ä½?ç½®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:83
 msgid "Jump to the currently playing item"
 msgstr "è·³å?°æ?­æ?¾ç?®å??ç??é ?ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
-msgid "_Restart Song"
-msgstr "é??æ?°æ?­æ?¾æ­?æ?²(_R)"
-
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:87
 msgid "Restart the current item"
 msgstr "é??æ?°æ?­æ?¾ç?®å??ç??é ?ç?®"
@@ -1953,272 +3089,266 @@ msgstr "å?¨ç?®å??ç??é ?ç?®æ?­å®?å¾?å??æ­¢æ?­æ?¾"
 msgid "_Playback"
 msgstr "æ?­æ?¾ (_P)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:164
-#, fuzzy, csharp-format
-msgid "_Restart {0}"
-msgstr "é??æ?°æ?­æ?¾æ­?æ?²(_R)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:165
-#, fuzzy, csharp-format
-msgid "_Jump to Playing {0}"
-msgstr "è·³å?°æ?­æ?¾ä¸­ç??æ?²ç?®(_J)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:190
 msgid "_Pause"
 msgstr "æ?«å??(_P)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:202
 msgid "Sto_p"
 msgstr "å??æ­¢(_P)"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:72
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:73
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:74
 msgid "Repeat"
 msgstr "é??è¤?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:78
 msgid "Repeat _Off"
 msgstr "å??æ­¢é??è¤?(_O)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:80
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:79
 msgid "Do not repeat playlist"
 msgstr "ä¸?è¦?é??è¤?æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:83
 msgid "Repeat _All"
 msgstr "é??è¤?å?¨é?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:85
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84
 msgid "Play all songs before repeating playlist"
 msgstr "å?¨é??è¤?æ?­æ?¾æ¸?å?®å??æ?­æ?¾æ??æ??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:89
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:88
 msgid "Repeat Singl_e"
 msgstr "é??è¤?å?®æ?²(_E)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:89
 msgid "Repeat the current playing song"
 msgstr "é??è¤?æ?­æ?¾ç?®å??ç??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:76
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:77
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
 msgid "Shuffle"
 msgstr "æ´?ç??模å¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:82
-msgid "Shuffle _Off"
-msgstr "å??æ­¢äº?æ?¸(_O)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:83
-msgid "Do not shuffle playlist"
-msgstr "ä¸?è¦?äº?æ?¸æ?­æ?¾æ¸?å?®ä¸­ç??æ­?æ?²"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:87
-msgid "Shuffle by _Song"
-msgstr "æ ¹æ??æ­?æ?²äº?æ?¸æ?­æ?¾(_S)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:88
-msgid "Play songs randomly from the playlist"
-msgstr "æ ¹æ??æ?­æ?¾æ¸?å?®äº?æ?¸æ?­æ­?æ?²"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:92
-msgid "Shuffle by A_rtist"
-msgstr "æ ¹æ??表æ¼?è??é?¨æ©?æ?­æ?¾(_R)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:93
-msgid "Play all songs by an artist, then randomly choose another artist"
-msgstr "æ ¹æ??äº?æ?¸é?¸æ??表æ¼?è??ç??æ?¹å¼?æ?­æ?¾æ??æ??æ­?æ?²"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:97
-msgid "Shuffle by A_lbum"
-msgstr "æ ¹æ??å°?輯é?¨æ©?æ?­æ?¾(_L)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:98
-msgid "Play all songs from an album, then randomly choose another album"
-msgstr "æ ¹æ??äº?æ?¸é?¸æ??å°?輯ç??æ?¹å¼?æ?­æ?¾æ??æ??æ­?æ?²"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:75
 msgid "_New Playlist"
 msgstr "������(_N)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:76
 msgid "Create a new empty playlist"
 msgstr "建ç«?æ?°ç??空ç?½æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:77
-msgid "New _Smart Playlist"
-msgstr "���������(_S)"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:79
+msgid "New _Smart Playlist..."
+msgstr "æ?°å¢?æ?ºæ?§å??æ?­æ?¾æ¸?å?®(_S)..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:80
 msgid "Create a new smart playlist"
 msgstr "建ç«?æ?°ç??æ?ºæ?§å¼?æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:88
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:90
 msgid "Import to Library"
 msgstr "�����庫"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:89
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:91
 msgid "Import source to library"
 msgstr "å°?ä¾?æº?å?¯å?¥è³?æ??庫"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:94
 msgid "Rename"
 msgstr "é??æ?°å?½å??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:97
 msgid "Export Playlist..."
 msgstr "������..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:98
 msgid "Export a playlist"
 msgstr "������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:101
 msgid "Unmap"
 msgstr "æ?ªå°?æ??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:104
 msgid "Source Properties"
 msgstr "��屬�"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:107
+#, fuzzy
+#| msgid "Sort Children"
+msgid "Sort Children by"
+msgstr "æ??åº?å­?é ?æ ¹æ??"
+
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:111
-msgid "Refresh"
-msgstr "é??æ?´æ¸?å?®"
+msgid "Switch Source"
+msgstr "å??æ??ä¾?æº?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:112
-msgid "Refresh this randomly sorted smart playlist"
-msgstr "é??æ?°æ?´ç??äº?æ?¸å?²å­?ç??æ?ºæ?§å??æ?­æ?¾æ¸?å?®"
+msgid "Switch to a source by typing its name"
+msgstr "å??æ??è?³æ??輸å?¥å??稱ç??ä¾?æº?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:117
-msgid "Sort Children"
-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:85
+msgid "Preferences"
+msgstr "å??好設å®?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:120
-msgid "Name Ascending"
-msgstr "å??稱é??å¢?æ??åº?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:116
+msgid "Edit preferences related to this source"
+msgstr "編輯è??æ­¤ä¾?æº?ç?¸é??ç??å??好設å®?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:124
-msgid "Name Descending"
-msgstr "å??稱é??æ¸?æ??åº?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:120
+msgid "New _Smart Playlist"
+msgstr "���������(_S)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:128
-msgid "Size Ascending"
-msgstr "大å°?é??å¢?æ??åº?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+msgid "Refresh"
+msgstr "é??æ?´æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:132
-msgid "Size Descending"
-msgstr "大å°?é??æ¸?æ??åº?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:130
+msgid "Refresh this randomly sorted smart playlist"
+msgstr "é??æ?°æ?´ç??äº?æ?¸å?²å­?ç??æ?ºæ?§å??æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:300
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:297
 msgid "Could not export playlist"
 msgstr "��������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:403
+#: ../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/TrackActions.cs:67
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:469
+msgid "Separate by Type"
+msgstr "æ ¹æ??é¡?å??å??é??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
 msgid "Select _All"
 msgstr "��(_A)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:68
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
 msgid "Select all tracks"
-msgstr "é?¸æ??å?¨é?¨ç??æ­?æ?²"
+msgstr "é?¸å??å?¨é?¨æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
 msgid "Select _None"
 msgstr "����(_N)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:72
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
 msgid "Unselect all tracks"
-msgstr "å??æ¶?é?¸å??å?¨é?¨æ­?æ?²"
+msgstr "å??æ¶?é?¸å??å?¨é?¨æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
 msgid "_Edit Track Information"
-msgstr "編輯����(_E)"
+msgstr "編輯����(_E)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:76
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
 msgid "Edit information on selected tracks"
-msgstr "編輯é?¸å??æ­?æ?²ç??è³?è¨?"
+msgstr "編輯æ??é?¸æ?²ç?®ç??è³?è¨?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:174
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:109
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:151
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:113
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:155
 msgid "Properties"
 msgstr "屬�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:80
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
 msgid "View information on selected tracks"
-msgstr "檢è¦?é?¸å??æ­?æ?²ç??è³?è¨?"
+msgstr "檢è¦?æ??é?¸æ?²ç?®ç??è³?è¨?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
 msgid "Add _to Playlist"
 msgstr "�������(_T)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:84
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
 msgid "Append selected items to playlist or create new playlist from selection"
 msgstr "å?¨æ?­æ?¾æ¸?å?®é??å? é?¸æ??ç??é ?ç?®æ??æ?¯å¾?é?¸æ??ç??é ?ç?®å»ºç«?æ?°ç??æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:89
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:92
 msgid "Create new playlist from selected tracks"
-msgstr "å¾?é?¸æ??ç??æ­?æ?²å»ºç«?æ?°ç??æ?­æ?¾æ¸?å?®"
+msgstr "å¾?æ??é?¸æ?²ç?®å»ºç«?æ?°ç??æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:97
 msgid "Remove selected track(s) from this source"
-msgstr "å¾?é??å??ä¾?æº?移é?¤é?¸å??ç??æ­?æ?²"
+msgstr "å¾?æ­¤ä¾?æº?移é?¤æ??é?¸æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:97
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
 msgid "Remove From _Library"
 msgstr "å¾?è³?æ??庫移é?¤(_L)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:98
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
 msgid "Remove selected track(s) from library"
-msgstr "å¾?è³?æ??庫移é?¤é?¸å??ç??æ­?æ?²"
+msgstr "å¾?è³?æ??庫移é?¤æ??é?¸æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+msgid "_Open Containing Folder"
+msgstr "é??å??å??å?«è³?æ??夾(_O)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
+msgid "Open the folder that contains the selected item"
+msgstr "é??å??å??å?«æ??é?¸é ?ç?®ç??è³?æ??夾"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
 msgid "_Delete From Drive"
 msgstr "��置��(_D)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
 msgid "Permanently delete selected item(s) from medium"
 msgstr "å¾?å?²å­?åª?ä»?中永ä¹?å?ªé?¤é?¸æ??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#. Translators: this is a verb (command), not a noun (things)
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
+#, csharp-format
 msgid "_Search"
 msgstr "å°?æ?¾(_S)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:116
 msgid "Search for items matching certain criteria"
 msgstr "æ??å°?符å??æ??å??æ¢?件ç??é ?ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
 msgid "By Matching _Album"
 msgstr "æ ¹æ??ç?¸ç¬¦ç??å°?輯(_A)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
 msgid "Search all songs of this album"
 msgstr "å°?æ?¾æ­¤å°?輯æ??æ??ç??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
 msgid "By Matching A_rtist"
 msgstr "æ ¹æ??ç?¸ç¬¦ç??表æ¼?è??(_R)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
 msgid "Search all songs of this artist"
 msgstr "å°?æ?¾æ­¤æ¼?å?ºè??æ??æ??ç??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:239
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:253
 #, csharp-format
-msgid "_Delete From {0}"
-msgstr "� {0} ��(_D)"
+msgid "_Delete From \"{0}\""
+msgstr "å¾?ã??{0}ã??å?ªé?¤(_D)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:456
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:445
+msgid "The folder could not be found."
+msgstr "ç?¡æ³?æ?¾å?°è³?æ??夾ã??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:446
+msgid "Please check that the track's location is accessible by the system."
+msgstr ""
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:512
 #, csharp-format
 msgid "Are you sure you want to permanently delete this item?"
 msgid_plural ""
@@ -2226,16 +3356,16 @@ msgid_plural ""
 msgstr[0] "你確å®?è¦?æ°¸ä¹?å?ªé?¤é??å??é ?ç?®ï¼?"
 msgstr[1] "你確å®?è¦?æ°¸ä¹?å?ªé?¤é?¸å??ç?? {0} å??é ?ç?®ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:460
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:516
 msgid "If you delete the selection, it will be permanently lost."
 msgstr "å¦?æ??ä½ å?ªé?¤é?¸æ??ï¼?ä½ å°?æ??æ°¸ä¹?失å?»è©²é ?ç?®ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:463
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:519
 #, csharp-format
 msgid "Remove selection from {0}?"
 msgstr "æ?¯å?¦å¾? {0} 移é?¤é?¸æ??å??å??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:466
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:522
 #, csharp-format
 msgid "Are you sure you want to remove the selected item from your {1}?"
 msgid_plural ""
@@ -2243,103 +3373,102 @@ msgid_plural ""
 msgstr[0] "你確å®?è¦?å¾? {1} 中移é?¤é?¸å??ç??é ?ç?®ï¼?"
 msgstr[1] "你確å®?è¦?å¾? {1} 中移é?¤é?¸å??ç?? {0} å??é ?ç?®ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:50
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
 #, fuzzy
-msgid "Compilation Album Artist:"
+msgid "Com_pilation Album Artist:"
 msgstr "å°?輯表æ¼?è??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57
 msgid ""
 "Check this if this track is part of an album with tracks by various artists"
 msgstr ""
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:55
+#: ../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 ""
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:45
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
 msgid "Basic Details"
 msgstr "å?ºæ?¬è©³ç´°è³?æ??"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:69
-msgid "Track Title:"
-msgstr "����:"
+msgid "Track _Title:"
+msgstr "����(_T)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:76
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:77
 msgid "Set all track artists to this value"
-msgstr "以此å?¼è¨­å®?æ??æ??æ­?æ?²è¡¨æ¼?è??"
+msgstr "以此å?¼è¨­å®?æ??æ??æ?²ç?®è¡¨æ¼?è??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:77
-msgid "Track Artist:"
-msgstr "æ­?æ?²è¡¨æ¼?è??:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:78
+msgid "Track _Artist:"
+msgstr "æ?²ç?®è¡¨æ¼?è??(_A)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:84
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:86
 #, fuzzy
 msgid "Set all compilation album artists to these values"
 msgstr "以此å?¼è¨­å®?æ??æ??å°?輯æ¨?é¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:98
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:106
 msgid "Set all album titles to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??å°?輯æ¨?é¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:99
-msgid "Album Title:"
-msgstr "�輯��:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:107
+msgid "Albu_m Title:"
+msgstr "�輯��(_M)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:113
 msgid "Set all genres to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??æ¨?æ?²å??é¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:106
-msgid "Genre:"
-msgstr "æ¨?æ?²å??é¡?:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:114
+msgid "_Genre:"
+msgstr "�風(_G)�"
 
-#. Right
 #. Translators: "of" is the word beteen a track/disc number and the total count.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:114
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:130
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:164
 msgid "of"
-msgstr ""
+msgstr "�總� "
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:115
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:141
 msgid "Automatically set track number and count"
-msgstr "è?ªå??設å®?æ­?æ?²ç·¨è??è??è¨?æ?¸"
+msgstr "è?ªå??設å®?æ?²ç?®ç·¨è??è??è¨?æ?¸"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:116
-msgid "Track Number:"
-msgstr "æ­?æ?²ç·¨è??:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:144
+msgid "Track _Number:"
+msgstr "æ?²ç?®ç·¨è??(_N)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:131
-msgid "Automatically set disc number and count"
-msgstr "è?ªå??設å®?å??ç¢?ç·¨è??è??è¨?æ?¸"
+#. Catalog.GetString ("Automatically set disc number and count"),
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166
+#, fuzzy
+msgid "Set all disc numbers and counts to these values"
+msgstr "以此å?¼è¨­å®?æ??æ??é?³è»?è¨?æ?¸"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:132
-msgid "Disc Number:"
-msgstr "å??ç¢?ç·¨è??:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167
+msgid "_Disc Number:"
+msgstr "å??ç¢?ç·¨è??(_D)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:151
+#: ../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:152
-msgid "Year:"
-msgstr "年份:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
+msgid "_Year:"
+msgstr "年代(_Y)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:159
+#: ../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:160
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
-#: ../src/Libraries/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:48
-msgid "Rating:"
-msgstr "è©?å?¹:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+msgid "_Rating:"
+msgstr "è©?ç­?(_R)ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:44
 msgid "Extra"
-msgstr ""
+msgstr "��"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:50
 #, fuzzy
@@ -2347,50 +3476,62 @@ msgid "Set all composers to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??è©?è«?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:51
-msgid "Composer:"
-msgstr ""
+msgid "C_omposer:"
+msgstr "ä½?æ?²è??(_O)ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:57
 msgid "Set all conductors to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??æ??æ?®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:58
-msgid "Conductor:"
-msgstr "æ??æ?®:"
+msgid "Con_ductor:"
+msgstr "æ??æ?®(_D)ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:69
 msgid "Set all groupings to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??ç¾£çµ?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:70
-msgid "Grouping:"
-msgstr "羣�:"
+#, fuzzy
+#| msgid "Grouping:"
+msgid "_Grouping:"
+msgstr "羣�(_G)�"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:80
 msgid "Set all beats per minute to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??ç¯?æ??"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:81
-msgid "Beats Per Minute:"
-msgstr "ç¯?æ??"
+msgid "Bea_ts Per Minute:"
+msgstr "æ¯?å??é??å¹¾æ??(_T)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:88
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:93
 msgid "Set all copyrights to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??ç??æ¬?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:89
-msgid "Copyright:"
-msgstr "ç??æ¬?ï¼?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:94
+msgid "Copyrig_ht:"
+msgstr "ç??æ¬?(_H)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:100
+#, fuzzy
+#| msgid "Set all genres to this value"
+msgid "Set all licenses to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??æ¨?æ?²å??é¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:101
+msgid "_License URI:"
+msgstr "æ??æ¬?æ¢?款網å??(_L)ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:110
 msgid "Set all comments to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??è©?è«?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:96
-msgid "Comment:"
-msgstr "註解�"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:111
+msgid "Co_mment:"
+msgstr "註解(_M)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
 msgid "Help"
 msgstr "æ±?å?©"
 
@@ -2398,136 +3539,193 @@ msgstr "æ±?å?©"
 msgid "Lyrics"
 msgstr "æ­?è©?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:66
-msgid "Value"
-msgstr "��"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
+msgid "Advance to the next track and edit its title"
+msgstr ""
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:42
+msgid "Sorting"
+msgstr "æ??åº?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:52
+#, fuzzy
+#| msgid "Set all track artists to this value"
+msgid "Set all sort track titles to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??æ?²ç?®è¡¨æ¼?è??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:53
+msgid "Sort Track Title:"
+msgstr "æ??åº?æ?²ç?®æ¨?é¡?ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:60
+#, fuzzy
+#| msgid "Set all track artists to this value"
+msgid "Set all sort track artists to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??æ?²ç?®è¡¨æ¼?è??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:61
+msgid "Sort Track Artist:"
+msgstr "æ??åº?æ?²ç?®è¡¨æ¼?è??ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:67
+#, fuzzy
+#| msgid "Set all album titles to this value"
+msgid "Set all sort album artists to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??å°?輯æ¨?é¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:68
+msgid "Sort Album Artist:"
+msgstr "æ??åº?å°?輯表æ¼?è??ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:74
+#, fuzzy
+#| msgid "Set all album titles to this value"
+msgid "Set all sort album titles to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??å°?輯æ¨?é¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:75
+msgid "Sort Album Title:"
+msgstr "æ??åº?å°?輯æ¨?é¡?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:97
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:159
 msgid "File Name:"
-msgstr "æª?æ¡?å??稱:"
+msgstr "æª?æ¡?å??稱ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:98
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:160
 msgid "Directory:"
-msgstr "ç?®é??:"
+msgstr "ç?®é??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:161
 msgid "Full Path:"
-msgstr "��路�:"
+msgstr "��路��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:167
 msgid "URI:"
 msgstr "URI:"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:176
 msgid "Duration:"
-msgstr "æ?­æ?¾æ??é??:"
+msgstr "�度�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:179
 msgid "Audio Bitrate:"
-msgstr "é?³æ??ä½?å??ç??:"
+msgstr "é?³è¨?ä½?å??ç??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:181
 msgid "Audio Sample Rate:"
-msgstr "è?²é?³å??樣ç??:"
+msgstr "é?³æ??å??樣頻ç??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:183
 msgid "Audio Channels:"
-msgstr "é?³æ??è?²é??:"
+msgstr "é?³è¨?è?²é??ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:185
+#, fuzzy
+#| msgid "Beats Per Minute:"
+msgid "Bits Per Sample:"
+msgstr "æ¯?樣æ?¬ä½?å??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:190
 msgid "Video Dimensions:"
-msgstr "å½±ç??尺寸:"
+msgstr "è¦?å??維度ï¼?"
 
 #. Translators: {0} is the description of the codec
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:131
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:197
 #, csharp-format
 msgid "{0} Codec:"
-msgstr "{0} �碼�:"
+msgstr "{0} 編解碼��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:202
+msgid "Container Formats:"
+msgstr "容�格��"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:207
 msgid "Imported On:"
 msgstr "已����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:209
 msgid "Last Played:"
-msgstr "ä¸?次æ?­æ?¾ç??:"
+msgstr "�次���"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:144
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:211
 msgid "Last Skipped:"
-msgstr "ä¸?次ç?¥é??:"
+msgstr "ä¸?次ç?¥é??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:213
 msgid "Play Count:"
-msgstr "��次�:"
+msgstr "��次��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:214
 msgid "Skip Count:"
-msgstr "ç?¥é??次æ?¸:"
+msgstr "ç?¥é??次æ?¸ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:215
+msgid "Score:"
+msgstr "å??æ?¸ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:221
 msgid "File Size:"
-msgstr "��大�:"
+msgstr "��大��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:154
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222
 msgid "bytes"
 msgstr "ä½?å??çµ?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
 msgid "Track Editor"
-msgstr "��編輯�"
+msgstr "��編輯�"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
 msgid "Track Properties"
-msgstr "��屬�"
+msgstr "��屬�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:141
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
 msgid "Show the previous track"
-msgstr "顯示å??ä¸?é¦?æ­?æ?²"
+msgstr "顯示å??ä¸?é¦?æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
 msgid "Show the next track"
-msgstr "顯示����"
+msgstr "顯示�����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:170
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
 msgid "Title:"
-msgstr "��:"
+msgstr "���"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:171
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
 msgid "Artist:"
-msgstr "表æ¼?è??:"
+msgstr "表æ¼?è??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:172
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
 msgid "Album:"
-msgstr "�輯:"
+msgstr "�輯�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:276
-msgid "Sync all field values"
-msgstr "å??æ­¥æ??æ??æ¬?ä½?æ?¸å?¼"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+msgid "Sync all field _values"
+msgstr "å??æ­¥æ??æ??æ¬?ä½?æ?¸å?¼(_V)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:281
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
 msgid ""
 "Apply the values of all common fields set for this track to all of the "
 "tracks selected in this editor"
-msgstr "å¥?ç?¨é??é¦?æ­?æ??æ??常è¦?æ¬?ä½?設å®?å?°é??å??編輯å?¨ä¸­æ??æ??é?¸å??ç??æ­?æ?²"
+msgstr "å¥?ç?¨æ?¬æ?²ç?®æ??æ??常è¦?æ¬?ä½?設å®?å?°é??å??編輯å?¨ä¸­æ??æ??é?¸å??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:389
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
 #, csharp-format
 msgid "<i>Editing {0} of {1} items</i>"
 msgstr "<i>編輯 {1} 中ç?? {0} å??é ?ç?®</i>"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:631
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
 #, csharp-format
 msgid "Save the changes made to the open track?"
 msgid_plural "Save the changes made to {0} of {1} open tracks?"
-msgstr[0] "æ?¯å?¦å°?æ??å??ç??æ?´æ?¹å?²å­?å?°é??å??ç??æ­?æ?²ï¼?"
-msgstr[1] "æ?¯å?¦å°?æ??å??ç??æ?´æ?¹å?²å­?å?°é??å??ç?? {1} é¦?æ­?æ?²ä¸­ç?? {0} é¦?ï¼?"
+msgstr[0] "æ?¯å?¦å°?æ??å??ç??æ?´æ?¹å?²å­?å?°é??å??ç??æ?²ç?®ï¼?"
+msgstr[1] "æ?¯å?¦å°?æ??å??ç??æ?´æ?¹å?²å­?å?°é??å??ç?? {1} é¦?æ?²ç?®ä¸­ç?? {0} é¦?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:648
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
 msgid "Close _without Saving"
 msgstr "é??é??ä½?ä¸?å?²å­?(_W)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:684
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
 #, csharp-format
 msgid "If you don't save, changes from the last {0} will be permanently lost."
 msgstr "å¦?æ??ç?¾å?¨ä¸?å?²å­?ï¼?å°?æ??失å?»æ??å¾? {0} æ??ä¿®æ?¹ç??é?¨ä»½ã??"
@@ -2544,35 +3742,61 @@ msgstr "ç­?å??å?¨(_E)"
 msgid "View the graphical equalizer"
 msgstr "檢è¦?å??å½¢å??ç­?å??å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:72
+msgid "_Context Pane"
+msgstr "���格(_C)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:73
+#, fuzzy
+#| msgid "Show the artist/album browser above the track list"
+msgid "Show the context pane beneath the track list"
+msgstr "�������顯示���格"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:80
 msgid "_Fullscreen"
 msgstr "���(_F)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:72
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:81
 msgid "Enter or leave fullscreen mode"
 msgstr "é?²å?¥æ??é?¢é??å?¨è?¢å¹?模å¼?"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:86
+msgid "Show Cover _Art"
+msgstr "顯示å°?é?¢è??è¡?(_A)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:87
+msgid "Toggle display of album cover art"
+msgstr "å??æ??å°?輯å°?é?¢å??ç??顯示"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs:92
+#, fuzzy
+#| msgid "Still Running"
+msgid "Active Task Running"
+msgid_plural "Active Tasks Running"
+msgstr[0] "����"
+msgstr[1] "����"
+
 #. 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:437
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:525
 #, csharp-format
 msgid "{0}from{1} {2} {0}published{1} {3}"
 msgstr "{0}ä¾?è?ª{1} {2} {0}å?ºç??æ?¼{1} {3}"
 
 #. simply: "Chicago Public Radio" or whatever the artist name is
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:450
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538
 msgid "Unknown Stream"
 msgstr "ä¸?æ??ç??串æµ?"
 
 #. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:453
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541
 #, csharp-format
 msgid "{0}on{1} {2}"
 msgstr "{0}æ?¼{1} {2}"
 
 #. Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:456
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:544
 #, csharp-format
 msgid "{0} {1}"
 msgstr "{0} {1}"
@@ -2580,112 +3804,189 @@ 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:492
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:580
 #, csharp-format
 msgid "{0}by{1} {2} {0}from{1} {3}"
 msgstr "{0}�{1} {2} {0}�輯�{1} {3}"
 
 #. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title;
 #. e.g. 'from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:496
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:584
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:521
 #, 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:500
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:588
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:525
 #, 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 "å??æ­¢æ??ä½?"
 
-#: ../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}"
 
-#: ../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 "é??å??æ??ä½?ä»?å?¨å?·è¡?ä½?業ã??ä½ æ?³è¦?å??æ­¢å??ï¼?"
 
-#: ../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 "ã??{0}ã??æ??ä½?ä»?å?¨å?·è¡?ä½?業ã??ä½ æ?³è¦?å??æ­¢å??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
 msgid "Continue"
 msgstr "繼�"
 
-#: ../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}"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
 msgid "Stopping..."
 msgstr "æ­£å?¨å??æ­¢..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:46
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:45
 msgid "Import Files to Library"
 msgstr "å°?æª?æ¡?å?¯å?¥è³?æ??庫"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:48
 msgid "Media Files"
 msgstr "����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:59
 msgid "Local Files"
 msgstr "����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:44
-msgid "Import Folder to Library"
-msgstr "å°?è³?æ??夾å?¯å?¥è³?æ??庫"
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:59
+msgid "Files"
+msgstr "��"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
+msgid "C_hoose Files"
+msgstr "é?¸æ??æª?æ¡?(_H)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
+msgid "_Files to import:"
+msgstr "è¦?å?¯å?¥ç??æª?æ¡?(_F)ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:82
+msgid "Select Files"
+msgstr "é?¸å??æª?æ¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:61
-msgid "Local Folder"
+#: ../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 "å?¯å?¥è³?æ??夾è?³è³?æ??庫"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:53
+msgid "Local Folders"
 msgstr "æ?¬å?°è³?æ??夾"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:67
-msgid "Videos from Photos Folder"
-msgstr "ç?¸ç??è³?æ??夾中ç??å½±ç??"
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:53
+msgid "Folders"
+msgstr "è³?æ??夾"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
+msgid "C_hoose Folders"
+msgstr "é?¸æ??è³?æ??夾(_H)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
+msgid "_Folders to import:"
+msgstr "è¦?å?¯å?¥ç??è³?æ??夾(_F)ï¼?"
+
+#: ../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 "ä½ ç??åª?é«?è³?æ??庫æ?¯ç©ºç??ã??ä½ ç?¾å?¨å?¯ä»¥å°?æ?°ç??é?³æ¨?å??å½±ç??å?¯å?¥è³?æ??庫ï¼?æ??æ??é»?å??é?¸æ??é??麼å??ã??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
+msgid "Import _from:"
+msgstr "�此��(_F)�"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:99
+msgid "Do not show this dialog again"
+msgstr "ä¸?è¦?å??顯示å°?話æ¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+msgid "_Import"
+msgstr "��(_I)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
+msgid "Videos From Photos Folder"
+msgstr "ç?¸ç??è³?æ??夾中ç??è¦?å??"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
 msgid "No available profiles"
 msgstr "æ²?æ??å?¯ç?¨ç??設å®?çµ?å??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:72
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:74
 msgid "Advanced"
 msgstr "é?²é??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:19
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
+#, csharp-format
+msgid "Configuring {0}"
+msgstr "正�設� {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:20
 msgid "Export Playlist"
 msgstr "������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:28
+#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:29
 msgid "Export"
 msgstr "��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:54
 msgid "Select Format: "
 msgstr "é?¸æ??æ ¼å¼?:"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:104
 msgid "Select library location"
 msgstr "é?¸æ??è³?æ??庫ä½?ç½®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:117
 msgid "Reset"
 msgstr "é??ç½®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:50
-msgid "Preferences"
-msgstr "å??好設å®?ï¼?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:120
+#, csharp-format
+msgid "Reset location to default ({0})"
+msgstr "é??設ä½?ç½®è?³é ?設å?¼ ({0})"
+
+#. FIXME this shouldn't be hard-coded to 'Source:', but this is the only
+#. user of this code atm...
+#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/NotebookPage.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:245
+msgid "Source:"
+msgstr "���"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:55
 msgid "Could not show preferences"
@@ -2695,87 +3996,51 @@ msgstr "ç?¡æ³?顯示å??好設å®?"
 msgid "The preferences service could not be found."
 msgstr "ç?¡æ³?æ?¾å?°å??好設å®?æ??å??ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:80
 msgid "New Smart Playlist"
 msgstr "������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:96
+msgid "Playlist _Name:"
+msgstr "æ?­æ?¾æ¸?å?®å??稱(_N)ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119
+msgid "Open in editor"
+msgstr "å?¨ç·¨è¼¯å?¨ä¸­é??å??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:120
+msgid "Create and save"
+msgstr "建�並��"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
 msgid "Browser on Left"
 msgstr "ç??覽å?¨å?¨å·¦æ?¹é?³é??æ?§å?¶"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:111
 msgid "Show the artist/album browser to the left of the track list"
-msgstr "å?¨æ­?æ?²æ¸?å?®ç??å·¦æ?¹é¡¯ç¤ºè¡¨æ¼?è??/å°?輯ç??覽å?¨"
+msgstr "å?¨æ?²ç?®æ¸?å?®ç??å·¦æ?¹é¡¯ç¤ºè¡¨æ¼?è??/å°?輯ç??覽å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:114
 msgid "Browser on Top"
 msgstr "ç??覽å?¨å?¨ä¸?æ?¹"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
 msgid "Show the artist/album browser above the track list"
-msgstr "å?¨æ­?æ?²æ¸?å?®ä¸?æ?¹é¡¯ç¤ºè¡¨æ¼?è??/å°?輯ç??覽å?¨"
+msgstr "å?¨æ?²ç?®æ¸?å?®ä¸?æ?¹é¡¯ç¤ºè¡¨æ¼?è??/å°?輯ç??覽å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
 msgid "Show Browser"
 msgstr "顯示ç??覽å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
 msgid "Show or hide the artist/album browser"
 msgstr "顯示æ??é?±è??表æ¼?è??/å°?輯ç??覽å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>詳細è³?æ??</b>"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:2
-msgid "<big><b>Import Media to Library</b></big>"
-msgstr "<big><b>å°?åª?é«?å?¯å?¥è³?æ??庫</b></big>"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:3
-msgid "Choose an import source:"
-msgstr "é?¸æ??å?¯å?¥ä¾?æº?ï¼?"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:4
-msgid "Do not show this dialog again"
-msgstr "ä¸?è¦?å??顯示å°?話æ¡?"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:5
-msgid "Enter the address of the file you would like to open:"
-msgstr "輸å?¥ä½ æ?³è¦?é??å??ç??æª?æ¡?ä½?å??ï¼?"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:7
-msgid "Import Media Source"
-msgstr "������"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:8
-msgid "Import Media to Library"
-msgstr "å°?åª?é«?å?¯å?¥è³?æ??庫"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:10
-msgid "Open in editor"
-msgstr "å?¨ç·¨è¼¯å?¨ä¸­é??å??"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:11
-msgid "Playlist _Name: "
-msgstr "æ?­æ?¾æ¸?å?®å??稱(_N):"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:12
-msgid "Predefined Smart Playlists"
-msgstr "é ?å??å®?義ç??æ?ºæ?§å¼?æ?­æ?¾æ¸?å?®"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:13
-msgid "Seek to Position"
-msgstr "æ??å°?ä½?ç½®"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:14
-msgid "Select for use"
-msgstr "é?¸æ??使ç?¨"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:15
-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.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:117
+#, fuzzy, csharp-format
+#| msgid "Loading {0}"
+msgid "Loading {0}..."
+msgstr "正��� {0}"
 
 #: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
 msgid ""
@@ -2785,41 +4050,55 @@ msgstr ""
 "æ??å?¥\n"
 "å??ç¢?"
 
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:140
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
+msgid "Seek"
+msgstr "å°?æ?¾"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:148
 msgid "Idle"
 msgstr "é??ç½®"
 
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:141
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:68
 msgid "Contacting..."
 msgstr "��中..."
 
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:159
 msgid "Buffering"
 msgstr "正�緩�"
 
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:549
+#: ../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:551
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
 msgid "Full Volume"
 msgstr "æ??大é?³é??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:123
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:131
 #, csharp-format
 msgid "Sync {0}"
 msgstr "å??æ­¥ {0}"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:165
+#. Note to translators: {0}, {1} and {2} will be replaced with numbers.
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:256
+#, csharp-format
+msgid "{0} to add, {1} to remove, {2} to update"
+msgstr "å? å?¥ {0} å??ï¼?移é?¤ {1} å??ï¼?æ?´æ?° {2} å??"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:175
 msgid "Device Properties"
 msgstr "�置屬�"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:189
-#, fuzzy
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:199
 msgid "Product"
-msgstr "Podcast"
+msgstr "ç?¢å??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:190
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
 msgid "Vendor"
 msgstr "å» å??"
 
@@ -2828,83 +4107,85 @@ msgstr "å» å??"
 msgid "Loading {0}"
 msgstr "正��� {0}"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:357
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:361
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:357
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:361
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:378
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:382
 #, 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:384
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:388
 msgid "File format conversion support is not available"
 msgstr "ç?¡æ³?使ç?¨æª?æ¡?æ ¼å¼?è½?æ??æ?¯æ?´"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:410
-#, fuzzy
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:414
 msgid "Error converting file"
-msgstr "寫å?¥å??ç¢?ç?¼ç??é?¯èª¤"
-
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:116
-msgid "Manually manage this device"
-msgstr "æ??å??管ç??é??å??è£?ç½®"
+msgstr "è½?æ??æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:117
-msgid ""
-"Manually managing your device means you can drag and drop items onto the "
-"device, and manually remove them."
-msgstr "æ??å??管ç??ä½ ç??è£?置表示你å?¯ä»¥æ??æ?¾é ?ç?®å?°æ­¤è£?ç½®ï¼?並ä¸?æ??å??移é?¤å®?å??ã??"
-
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:121
-msgid ""
-"Automatically sync the device when plugged in or when the libraries change"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:137
+#, fuzzy
+#| msgid ""
+#| "Automatically sync the device when plugged in or when the libraries change"
+msgid "Sync when first plugged in and when the libraries change"
 msgstr "ç?¶é?£æ?¥æ­¤è£?ç½®æ??é?³æ¨?館æ??æ?¹è®?æ??è?ªå??å??æ­¥"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:122
+#: ../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:125
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:141
 msgid "Sync Preferences"
 msgstr "å??æ­¥å??好設å®?"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:50
-msgid "Synchronize"
-msgstr "å??æ­¥"
-
-#. Translators: {0} is the name of the digital audio player
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:88
+#. singular form unused b/c we know it's > 1, but we still need GetPlural
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:364
 #, csharp-format
-msgid "Synchronize {0}"
-msgstr "å??æ­¥ {0}"
+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/DapInfoBar.cs:67
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:368
+msgid "Are you sure you want to continue?"
+msgstr "你確å®?è¦?ç¹¼çº?å??ï¼?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:376
+msgid "Remove tracks"
+msgstr "移���"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:52
+msgid "Sync"
+msgstr "å??æ­¥"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
 msgid "Audio"
 msgstr "��"
 
 #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:69
+msgid "Video"
+msgstr "è¦?å??"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:70
 msgid "Other"
 msgstr "��"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:70
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:71
 msgid "Free Space"
 msgstr "å?©é¤?空é??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:96
-msgid "None"
-msgstr "ç?¡"
-
 #. Translators: {0} is the name assigned to a Digital Audio Player by its owner
 #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:55
 #, csharp-format
@@ -2928,153 +4209,170 @@ msgstr "已使ç?¨ç??容é??"
 msgid "Advanced details"
 msgstr "é?²é??ç??詳細è³?æ??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs:53
+#. Translators: {0} is the name of a library, eg 'Music' or 'Podcasts'
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:65
 #, csharp-format
-msgid "Delete From {0}"
-msgstr "� {0} ��"
+msgid "{0}:"
+msgstr "{0}:"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38
-msgid "Music"
-msgstr "��"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:70
+msgid "Manage manually"
+msgstr "æ??å??管ç??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:93
-msgid "Podcasts"
-msgstr "Podcasts"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:71
+msgid "Sync entire library"
+msgstr "å??æ­¥æ?´å??è³?æ??庫"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:71
+#. Translators: {0} is the name of a playlist
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:124
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:154
 #, csharp-format
-msgid "Eject {0}"
-msgstr "é??å?º {0}"
+msgid "Sync from â??{0}â??"
+msgstr "å¾? {0} å??æ­¥"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:104
-#, csharp-format
-msgid "Ejecting {0}..."
-msgstr "é??å?º {0}..."
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs:53
+msgid "Import Purchased Music"
+msgstr "å?¯å?¥è³¼è²·ç??é?³æ¨?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:57
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:64
+msgid "Disconnect"
+msgstr "æ?·ç·?"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
 #, csharp-format
-msgid "Could not eject {0}: {1}"
-msgstr "ç?¡æ³?é??å?º {0}ï¼?{1}"
+msgid "Disconnecting {0}..."
+msgstr "æ­£å?¨è?? {0} 中æ?·é?£æ?¥..."
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
-msgid "Videos"
-msgstr "å½±ç??"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
+#, csharp-format
+msgid "Could not disconnect {0}: {1}"
+msgstr "ç?¡æ³?è?? {0} 中æ?·é?£æ?¥ï¼?{1}"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:91
 #: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:92
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:95
 msgid "Rebuilding Database"
 msgstr "æ­£å?¨é??建è³?æ??庫"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:93
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:96
 msgid "Scanning iPod..."
 msgstr "æ­£å?¨æ??ç?? iPod..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:128
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:131
 msgid "Processing Tracks..."
-msgstr "æ­£å?¨è??ç??é?³è»?..."
+msgstr "æ­£å?¨è??ç??æ?²ç?®..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:144
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:147
 msgid "Ordering Tracks..."
-msgstr "æ­£å?¨æ??åº?æ­?æ?²..."
+msgstr "æ­£å?¨æ??åº?æ?²ç?®..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:215
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:218
 msgid "Saving new database..."
 msgstr "æ­£å?¨å?²å­?æ?°ç??è³?æ??庫..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:227
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:230
 msgid "Error rebuilding iPod database"
 msgstr "é??建 iPod è³?æ??庫æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:98
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101
 msgid "Device"
 msgstr "�置"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:99
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
 msgid "Color"
 msgstr "�彩"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:100
-#, fuzzy
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
 msgid "Generation"
-msgstr "��"
+msgstr "�代"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
 msgid "Capacity"
 msgstr "容é??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:144
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:148
 msgid "Serial number"
 msgstr "åº?è??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
-#, fuzzy
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
 msgid "Produced on"
-msgstr "製�人:"
+msgstr "購買�"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107
 msgid "Firmware"
 msgstr "é??é«?"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:111
 msgid "Capabilities"
 msgstr "容é??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:109
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112
 msgid "Supports cover art"
 msgstr "æ?¯æ?´å°?é?¢æ??å??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:110
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
 msgid "Supports photos"
 msgstr "æ?¯æ?´ç??ç?¸ç??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:619
-#, fuzzy
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468
+msgid "Track duration is zero"
+msgstr "���度��"
+
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
 msgid "Out of space on device"
-msgstr "å??ç¢?空é??ä¸?足"
+msgstr "è£?置空é??ä¸?足"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:619
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
 msgid "Please manually remove some songs"
-msgstr ""
+msgstr "è«?æ??å??移é?¤æ??äº?æ­?æ?²"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:648
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:650
 msgid "Syncing iPod"
 msgstr "æ­£å?¨å??æ­¥ iPod"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:649
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:651
 msgid "Preparing to synchronize..."
 msgstr "æ­£å?¨æº?å??å??æ­¥å??..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:670
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:672
 msgid "Updating..."
 msgstr "正���..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:674
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:676
 msgid "Flushing to disk..."
-msgstr ""
+msgstr "正���寫���..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:59
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:61
 msgid "Unable to read your iPod"
 msgstr "ç?¡æ³?è®?å??ä½ ç?? iPod"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:75
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:77
+#, fuzzy
+#| msgid ""
+#| "You have used this iPod with a version of iTunes that saves a version of "
+#| "the song database for your iPod that is too new for Banshee to "
+#| "recognize.\n"
+#| "\n"
+#| "Banshee can rebuild your database, but some settings might be lost. Using "
+#| "Banshee and iTunes with the same iPod is not recommended."
 msgid ""
 "You have used this iPod with a version of iTunes that saves a version of the "
 "song database for your iPod that is too new for Banshee to recognize.\n"
 "\n"
-"Banshee can rebuild your database, but some settings might be lost. Using "
-"Banshee and iTunes with the same iPod is not recommended."
+"Banshee can rebuild your database, but you might lose your settings and all "
+"the content in the device (be sure to backup your data first). Using Banshee "
+"and iTunes with the same iPod is not recommended."
 msgstr ""
 "ä½ å?¨é??å?? iPod ä¸?使ç?¨é?? iTunes å¾?å?²å­?å?¨å?¶ä¸­ç??æ­?æ?²è³?æ??庫ç??æ?¬å¤ªæ?°ä»¥è?´ Banshee ç?¡æ³?辨è­?ã??\n"
 "\n"
 "Banshee å?¯ä»¥é??建你ç??è³?æ??庫ï¼?ä½?æ?¯æ??äº?設å®?å?¼å?¯è?½æ??é?ºå¤±ã??æ??å??ä¸?建議å?¨å??ä¸?å?° iPod ä¸?使ç?¨ Banshee å?? iTunesã??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:86
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:88
 msgid "Learn more about Banshee's iPod support"
 msgstr "å­¸ç¿?æ?´å¤?é??æ?¼ Banshee ç?? iPod æ?¯æ?´"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:94
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:96
 msgid ""
 "An iPod database could not be found on this device.\n"
 "\n"
@@ -3084,23 +4382,23 @@ msgstr ""
 "\n"
 "Banshee å?¯ä»¥ç?ºä½ å»ºç«?æ?°ç??è³?æ??庫ã??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:102
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:104
 msgid "What is the reason for this?"
 msgstr "é??æ?¯ç??麼å??å? ï¼?"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:115
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:117
 msgid "Your iPod is mounted read only. Banshee can not restore your iPod."
 msgstr "ä½ ç?? iPod 以å?¯è®?ç??æ??æ??è¼?ã??Banshee ä¸?è?½å?²å­?ä½ ç?? iPodã??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:123
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:125
 msgid "Rebuild iPod Database..."
 msgstr "é??建 iPod è³?æ??庫..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:131
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:133
 msgid "Confirm Rebuild iPod Database"
 msgstr "確å®?é??建 iPod è³?æ??庫"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:137
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:139
 msgid ""
 "Rebuilding your iPod database may take some time. Also note that any "
 "playlists you have on your iPod will be lost.\n"
@@ -3111,36 +4409,55 @@ msgstr ""
 "\n"
 "你確å®?è¦?é??建你ç?? iPod è³?æ??庫ï¼?"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:141
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:143
 msgid "Rebuild Database"
 msgstr "é??建è³?æ??庫"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:155
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:157
 msgid "Rebuilding iPod Database..."
 msgstr "æ­£å?¨é??建 iPod è³?æ??庫..."
 
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:101
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs:43
+msgid "Purchased Music"
+msgstr "購買ç??é?³æ¨?"
+
+#: ../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"
 msgstr[0] "é?³æ¨?è³?æ??夾"
 msgstr[1] "é?³æ¨?è³?æ??夾"
 
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:107
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:121
+#, csharp-format
+msgid "Video Folder"
+msgid_plural "Video Folders"
+msgstr[0] "è¦?å??è³?æ??夾"
+msgstr[1] "è¦?å??è³?æ??夾"
+
+#: ../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:110
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:130
 msgid "Supports Playlists"
 msgstr "������"
 
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs:189
+msgid "Ringtones"
+msgstr "é?´è?²"
+
 #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:78
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:117
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:121
 msgid "MTP Support Ignoring Device"
 msgstr "MTP æ?¯æ?´å¿½ç?¥ç??è£?ç½®"
 
 #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:79
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:118
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:122
 msgid ""
 "Banshee's MTP audio player support can only handle one device at a time."
 msgstr "Banshee ç?? MTP é?³æ¨?æ?­æ?¾ç¨?å¼?æ?¯æ?´ä¸?次å?ªè?½è??ç??ä¸?å??è£?ç½®ã??"
@@ -3164,197 +4481,354 @@ msgid ""
 "An MTP device was detected, but Banshee was unable to load support for it."
 msgstr "å?µæ¸¬å?° MTP è£?ç½®ï¼?ä½?æ?¯ Banshee ç?¡æ³?è¼?å?¥å°?å®?ç??æ?¯æ?´ã??"
 
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:145
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:149
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:146
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:151
 msgid "Battery level"
 msgstr "é?»æ± é?»é??"
 
 #. user_event.Progress = (double)current / total;
 #. Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the
 #. track currently being loaded, and {2} is the total # of tracks that will be loaded.
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:157
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:167
 #, csharp-format
 msgid "Loading {0} - {1} of {2}"
 msgstr "正��� {0} - {1} / {2}"
 
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:40
+msgid "Download Amazon MP3 Purchase"
+msgstr "�� Amazon MP3 購買��"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:42
+msgid "Amazon MP3 Files"
+msgstr "Amazon MP3 ��"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:63
+msgid "Amazon MP3 Purchase"
+msgstr "Amazon MP3 購買��"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:67
+msgid "Amazon MP3 Purchases"
+msgstr "Amazon MP3 購買��"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:176
+#, csharp-format
+msgid "{0} download at {1}/s"
+msgid_plural "{0} downloads at {1}/s"
+msgstr[0] "{0} é ?ä¸?è¼?ï¼?é??度 {1}/s"
+msgstr[1] "{0} é ?ä¸?è¼?ï¼?é??度 {1}/s"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:184
+#, csharp-format
+msgid "{0} download at {1}/s ({2} pending)"
+msgid_plural "{0} downloads at {1}/s ({2} pending)"
+msgstr[0] "{0} é ?ä¸?è¼?ï¼?é??度 {1}/s ({2} é ?æ?±ç½®ä¸­)"
+msgstr[1] "{0} é ?ä¸?è¼?ï¼?é??度 {1}/s ({2} é ?æ?±ç½®ä¸­)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/SignOutButton.cs:38
+msgid "Sign out of Amazon"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:38
+msgid "Amazon MP3 Store"
+msgstr "Amazon MP3 å??åº?"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:57
+#, fuzzy
+#| msgid "Count"
+msgid "Country"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:60
+msgid "Which Amazon MP3 storefront to use by default."
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:88
+msgid "Automatic (Geo IP detection)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90
+msgid "France (amazon.fr)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:91
+msgid "Germany, Switzerland, Austria (amazon.de)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:92
+msgid "Japan (amazon.co.jp)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:93
+msgid "United Kingdom (amazon.co.uk)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:94
+msgid "United States (amazon.com)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:47
+#, fuzzy, csharp-format
+#| msgid "Amazon MP3 Store"
+msgid "Search the Amazon MP3 Store"
+msgstr "Amazon MP3 å??åº?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:55
+msgid "Open Book"
+msgstr "é??å??æ?¸ç±?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:56
+msgid "Merge Discs..."
+msgstr "å??ä½µç¢?ç??..."
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65
+msgid "Resume"
+msgstr "復å??"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65
+msgid "Resume playback of this audiobook"
+msgstr "å??復此æ??è?²æ?¸ç??æ?­æ?¾"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:138
+#, csharp-format
+msgid "Merge the {0} selected discs into one book?"
+msgid_plural "Merge the {0} selected discs into one book?"
+msgstr[0] "è¦?å??ä½µæ??é?¸ç?? {0} å¼µå??ç¢?è?³ä¸?æ?¬æ?¸å?§å??ï¼?"
+msgstr[1] "è¦?å??ä½µæ??é?¸ç?? {0} å¼µå??ç¢?è?³ä¸?æ?¬æ?¸å?§å??ï¼?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:143
+msgid ""
+"This will ensure the disc numbers are all set properly, and then set the "
+"author and book title for all tracks on all these discs to the values below"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:152
+msgid "Author:"
+msgstr "ä½?è??ï¼?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:159
+msgid "Book Title:"
+msgstr "�����"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:57
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:91
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:87
+msgid "Author"
+msgstr "ä½?è??"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:62
+msgid "Author Initial"
+msgstr "ä½?è??é ­æ??å­?縮寫"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:67
+msgid "Book Title"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
+msgid "Audiobooks, etc"
+msgstr "æ??è?²æ?¸...ç­?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
+msgid "Resume Playback"
+msgstr "復å??æ?­æ?¾"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:120
+msgid "No Bookmark Set"
+msgstr "�設置�籤"
+
 #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:156
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:54
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
 msgid "Audio CD"
 msgstr "�� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:101
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:102
 #, csharp-format
 msgid "Track {0}"
-msgstr "�� {0}"
+msgstr "�� {0}"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:117
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:121
 msgid "Importing Audio CD"
 msgstr "正����� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:118
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:122
 msgid "Initializing Drive"
 msgstr "æ­£å?¨å??å§?å??è£?ç½®"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:120
+#: ../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> ä»?å?¨å?¯å?¥é?³æ¨?è³?æ??庫ã??ä½ æ?³è¦?å??æ­¢å??ï¼?"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:241
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:254
 msgid "Cannot Import CD"
 msgstr "���� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:160
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:233
+msgid "Audio CDs"
+msgstr "�� CD"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:235
 msgid "Audio CD Importing"
 msgstr "�� CD ��"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:162
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:238
 msgid "_Import format"
 msgstr "��格�(_I)"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:166
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:242
 msgid "_Automatically import audio CDs when inserted"
 msgstr "æ??å?¥å¾?è?ªå??å?¯å?¥é?³æ¨? CD(_A)"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:167
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:243
 msgid ""
 "When an audio CD is inserted, automatically begin importing it if metadata "
 "can be found and it is not already in the library."
 msgstr "ç?¶æ??å?¥é?³æ¨? CD å¾?ï¼?å¦?æ??å?¯ä»¥æ?¾å?°ä¸­ç¹¼è³?æ??ä¸?ä¸?å?¨é?³æ¨?館è£?æ??å°±è?ªå??é??å§?å?¯å?¥ã??"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:171
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:247
 msgid "_Eject when done importing"
 msgstr "å®?æ??å?¯å?¥å¾?é??å?º(_E)"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:172
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:248
 msgid "When an audio CD has been imported, automatically eject it."
 msgstr "ç?¶é?³æ¨? CD å?¯å?¥å¾?è?ªå??é??å?ºå®?ã??"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:175
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:251
 msgid "Use error correction when importing"
 msgstr "ç?¶å?¯å?¥æ??使ç?¨é?¯èª¤æ ¡æ­£"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:176
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:252
 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:244
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:425
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
 msgid "Import CD"
 msgstr "�� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:245
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:321
 msgid "Import this audio CD to the library"
 msgstr "å°?é??å¼µé?³æ¨? CD å?¯å?¥è³?æ??庫"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:251
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:327
 msgid "Duplicate CD"
 msgstr "�製 CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:252
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:328
 msgid "Duplicate this audio CD"
 msgstr "è¤?製é??å¼µé?³æ¨? CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:128
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
 msgid "Searching for CD metadata..."
-msgstr "æ­£å?¨æ??å°? CD metadata..."
+msgstr "æ­£å?¨æ??å°? CD 中ä»?è³?æ??..."
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:161
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
 msgid "Could not fetch metadata for CD."
-msgstr "ç?¡æ³?å??å¾? CD ç?? metadataã??"
+msgstr "ç?¡æ³?å??å¾? CD ç??中ä»?è³?æ??ã??"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:189
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
 msgid "Automatic import off since this album is already in the Music Library."
 msgstr "å¦?æ??é??å??å°?輯已ç¶?å?¨é?³æ¨?館中å??é??é??è?ªå??å?¯å?¥ã??"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:212
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
 msgid "Could not import CD"
 msgstr "���� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:229
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
 msgid "Could not duplicate audio CD"
 msgstr "���製�� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:349
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
 msgid "Ejecting audio CD..."
 msgstr "é??å?ºé?³æ¨? CD..."
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:367
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
 #, csharp-format
 msgid "Could not eject audio CD: {0}"
 msgstr "ç?¡æ³?é??å?ºé?³æ¨? CDï¼?{0}"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:400
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+msgid "Audio CD Preferences"
+msgstr "é?³è¨? CD å??好設å®?"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
 msgid "Eject Disc"
 msgstr "é??å?ºå??ç¢?"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:424
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
 #, csharp-format
 msgid "Import â??{0}â??"
 msgstr "å?¯å?¥ â??{0}â??"
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:84
-msgid "_Bookmarks"
-msgstr "�籤(_B)"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs:64
+msgid "Detecting BPM"
+msgstr "正��測 BPM"
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:87
-msgid "_Add Bookmark"
-msgstr "���籤(_A)"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
+msgid "D_etect"
+msgstr "�測(_E)"
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:88
-msgid "Bookmark the Position in the Current Track"
-msgstr "å?¨ç?®å??ç??é?³æ¨?ä½?ç½®æ¨?è¨?ç?ºæ?¸ç±¤"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
+msgid "T_ap"
+msgstr ""
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:100
-msgid "_Remove Bookmark"
-msgstr "移��籤(_R)"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+msgid "Have Banshee attempt to auto-detect the BPM of this song"
+msgstr ""
 
-#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
-#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:210
-#, csharp-format
-msgid "{0} ({1}:{2:00})"
-msgstr "{0} ({1}:{2:00})"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
+msgid "Play this song"
+msgstr "��此��"
+
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
+msgid "Tap this button to the beat to set the BPM for this song manually"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+msgid "_Automatically detect BPM for all songs"
+msgstr "ç?ºæ??æ??æ?²ç?®è?ªå??å?µæ¸¬ BPM(_A)"
+
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+msgid ""
+"Detect beats per minute (BPM) for all songs that don't already have a value "
+"set"
+msgstr ""
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:82
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
 msgid "Downloading Cover Art"
 msgstr "æ­£å?¨ä¸?è¼?å°?é?¢æ??å??"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:115
-msgid "Preparing..."
-msgstr "æ­£å?¨æº?å??..."
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:144
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:128
 #, csharp-format
 msgid "{0} - {1}"
 msgstr "{0} ä¹? {1}"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:106
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107
 msgid "_Cover Art"
 msgstr "å°?é?¢æ??å??(_C)"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:108
 msgid "Manage cover art"
 msgstr "管ç??å°?é?¢æ??å??"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:109
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110
 msgid "_Download Cover Art"
 msgstr "ä¸?è¼?å°?é?¢æ??å??(_D)"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:111
 msgid "Download cover art for all tracks"
-msgstr "ç?ºæ??æ??æ­?æ?²ä¸?è¼?å°?輯å°?é?¢æ??å??"
+msgstr "ç?ºæ??æ??æ?²ç?®ä¸?è¼?å°?輯å°?é?¢æ??å??"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:41
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:42
 msgid "Shared Music"
 msgstr "å??享ç??é?³æ¨?"
 
@@ -3367,9 +4841,8 @@ msgid "Unable to connect to music share"
 msgstr "ç?¡æ³?é?£ç·?è?³é?³æ¨?å??享ã??"
 
 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:88
-#, fuzzy
 msgid "Back"
-msgstr "����"
+msgstr "è¿?å??"
 
 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
 msgid ""
@@ -3421,12 +4894,11 @@ msgid "Authentication Required"
 msgstr "����"
 
 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs:104
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:57
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:54
 msgid "Username:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs:112
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:64
 msgid "Password:"
 msgstr "�碼�"
 
@@ -3435,51 +4907,117 @@ msgstr "�碼�"
 msgid "Login"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:59
-msgid "Music Share"
-msgstr "é?³æ¨?å??享"
-
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:63
-msgid "Disconnect"
-msgstr "æ?·ç·?"
-
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:105
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapResolverJob.cs:50
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:106
 #, csharp-format
 msgid "Connecting to {0}"
 msgstr "��� {0}"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:201
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+msgid "Add Remote DAAP Server"
+msgstr "å? å?¥é? ç«¯ DAAP 伺æ??å?¨"
+
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
+msgid "Add a new remote DAAP server"
+msgstr "å? å?¥æ?°ç??é? ç«¯ DAAP 伺æ??å?¨"
+
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:60
+msgid "Music Share"
+msgstr "é?³æ¨?å??享"
+
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:202
 #, csharp-format
 msgid "Logging in to {0}."
 msgstr "ç?»å?¥å?° {0}ã??"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:237
-#, fuzzy, csharp-format
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:238
+#, csharp-format
 msgid "Loading {0} track"
 msgid_plural "Loading {0} tracks"
-msgstr[0] "正��� {0}"
-msgstr[1] "正��� {0}"
+msgstr[0] "正��� {0} ���"
+msgstr[1] "正��� {0} ���"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:260
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:270
 msgid "Loading playlists"
 msgstr "������"
 
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:45
+msgid "Open remote DAAP server"
+msgstr "é??å??é? ç«¯ DAAP 伺æ??å?¨"
+
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:50
+msgid "Enter server IP address and port:"
+msgstr "輸å?¥ä¼ºæ??å?¨ IP ä½?å??è??é?£æ?¥å? ï¼?"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:46
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:133
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:67
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:91
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:46
+msgid "Downloads"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:50
+msgid "Downloading eMusic Track(s)"
+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 "æ­£å?¨å??å§?å??..."
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:52
+msgid "Cancel all eMusic downloads?"
+msgstr "æ?¯å?¦å??æ¶? eMusic ä¸?è¼?ï¼?"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:120
+#, fuzzy, csharp-format
+#| msgid "Transfering {0} file at {1} KB/s"
+#| msgid_plural "Transfering {0} of {2} files at {1} KB/s"
+msgid "Transferring {0} file at {1} KB/s"
+msgid_plural "Transferring {0} of {2} files at {1} KB/s"
+msgstr[0] "æ­£å?¨å?³è¼¸ {0} å??æª?æ¡?ï¼?é??ç?? {1} KB/s"
+msgstr[1] "æ­£å?¨å?³è¼¸ {2} å??æª?æ¡?ç??第 {0} å??ï¼?é??ç?? {1} KB/s"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:133
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:133
+msgid "Canceling Downloads"
+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 "����中止..."
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+msgid "Import eMusic Downloads to Library"
+msgstr "å°? eMusic ä¸?è¼?å?¯å?¥è?³è³?æ??庫"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+msgid "eMusic Files"
+msgstr "eMusic ��"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
+msgid "eMusic Tracks"
+msgstr "eMusic ��"
+
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:57
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:58
 msgid "File System Queue"
 msgstr "æª?æ¡?系統ä½?å??"
 
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:56
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:71
 msgid "Clear"
 msgstr "��"
 
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:73
 msgid "Remove all tracks from the file system queue"
-msgstr "å¾?æ­¤æª?æ¡?系統ä½?å??移é?¤æ??æ??æ­?æ?²"
+msgstr "å¾?æ­¤æª?æ¡?系統ä½?å??移é?¤æ??æ??æ?²ç?®"
 
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:78
 msgid "Clear on Quit"
 msgstr "é?¢é??æ??æ¸?é?¤"
 
@@ -3487,50 +5025,629 @@ msgstr "é?¢é??æ??æ¸?é?¤"
 msgid "Clear the file system queue when quitting"
 msgstr "é?¢é??æ??æ¸?é?¤æª?æ¡?系統ä½?å??"
 
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:46
+#, fuzzy
+#| msgid "Duplicate CD"
+msgid "Duplicate Albums"
+msgstr "�製 CD"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47
+msgid ""
+"Displayed are albums that should likely be merged.  For each row, click the "
+"desired title to make it bold, or uncheck it to take no action."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:73
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:76
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
+msgid " and "
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:75
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:78
+#, fuzzy
+#| msgid "Other"
+msgid ", the"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:77
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:80
+#, fuzzy
+#| msgid "Other"
+msgid "the "
+msgstr "��"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
+#, fuzzy
+#| msgid "Duplicate CD"
+msgid "Duplicate Artists"
+msgstr "�製 CD"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47
+msgid ""
+"Displayed are artists that should likely be merged.  For each row, click the "
+"desired name to make it bold, or uncheck it to take no action."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
+msgid "Fix Music Metadata..."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48
+#, fuzzy
+msgid "Metadata Fixer"
+msgstr "編輯�� Metadata"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:54
+msgid "Problem Type:"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:46
+#, fuzzy
+#| msgid "Duplicate CD"
+msgid "Duplicate Genres"
+msgstr "�製 CD"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47
+msgid ""
+"Displayed are genres that should likely be merged.  For each row, click the "
+"desired genre to make it bold, or uncheck it to take no action."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs:76
+msgid "Fix?"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48
+msgid "View Item Details"
+msgstr "檢���細�"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:57
+msgid "Open Webpage"
+msgstr "é??å??網é ?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:76
+msgid "Visit Archive.org"
+msgstr "�訪 Archive.org"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:78
+msgid "Close Item"
+msgstr "é??é??é ?ç?®"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:97
+msgid "Getting item details from the Internet Archive"
+msgstr "æ­£å?¨å¾?äº?è?¯ç¶²å?¸è??館å??å¾?é ?ç?®è©³ç´°è³?è¨?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148
+msgid "Timed out getting item details from the Internet Archive"
+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:301
+msgid "Try Again"
+msgstr "é??試"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:151
+msgid "Error getting item details from the Internet Archive"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:205
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
+msgid "Description"
+msgstr "æ??è¿°"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
+msgid "Creator:"
+msgstr "建ç«?è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:222
+msgid "Venue:"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:223
+msgid "Location:"
+msgstr "�置�"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
+msgid "Date:"
+msgstr "æ?¥æ??:"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:227
+msgid "Year:"
+msgstr "年份:"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:229
+msgid "Publisher:"
+msgstr "ç?¼å¸?è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
+msgid "Keywords:"
+msgstr "é??é?µå­?ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:231
+msgid "License URL:"
+msgstr "æ??æ¬?æ¢?款網å??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:232
+msgid "Language:"
+msgstr "���"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:236
+#, fuzzy
+#| msgid "_Download Cover Art"
+msgid "Downloads, overall:"
+msgstr "�������"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:237
+#, fuzzy
+#| msgid "Download paused"
+msgid "Downloads, past month:"
+msgstr "ä¸?è¼?æ?¸ï¼?ä¸?å??æ??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:238
+#, fuzzy
+#| msgid "Download paused"
+msgid "Downloads, past week:"
+msgstr "�������"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:242
+msgid "Added:"
+msgstr "���"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:243
+msgid "Added by:"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:244
+msgid "Collections:"
+msgstr "æ?¶è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:246
+msgid "Contributor:"
+msgstr "è²¢ç?»è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:247
+msgid "Recorded by:"
+msgstr "以此é??製ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:248
+msgid "Lineage:"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:249
+msgid "Transferred by:"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:266
+msgid "Reviews"
+msgstr "è©?è«?æ?¸"
+
+#. Translators: {0} is the number of reviewers, {1} is the average rating (not really relevant if there's only 1)
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:270
+#, csharp-format
+msgid "{0} reviewer"
+msgid_plural "{0} reviewers, avg {1}"
+msgstr[0] "{0} ä½?è©?è«?è??"
+msgstr[1] "{0} ä½?è©?è«?è??ï¼?å¹³å??è©?ç­?ç?º {1}"
+
+#. Translators: {0} is the unicode-stars-rating, {1} is the name of a person who reviewed this item, and {1} is a date/time string
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:289
+#, fuzzy, csharp-format
+#| msgid "{0}by{1} {2}"
+msgid "{0} by {1} on {2}"
+msgstr "{0}æ¼?å?º:{1} {2}"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:319
+msgid "Write your own review"
+msgstr "寫ä¸?ä½ è?ªå·±ç??è©?è«?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+msgid "Collection:"
+msgstr "æ?¶è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#, csharp-format
+msgid "Optional Query"
+msgstr "���詢"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+msgid "Sort by:"
+msgstr "æ??åº?æ ¹æ??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:119
+msgid "Preferred Media Types"
+msgstr "å??好ç??åª?é«?é¡?å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:122
+msgid "_Audio"
+msgstr "��(_A)"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:125
+msgid "_Video"
+msgstr "è¦?å??(_V)"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:128
+msgid "_Text"
+msgstr "æ??å­?(_T)"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:100
+#, csharp-format
+msgid "Search..."
+msgstr "æ??å°?..."
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:111
+msgid "_Go"
+msgstr "å??å¾?(_Go)"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:119
+msgid "Staff Picks"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:120
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:588
+msgid "Creative Commons"
+msgstr "�� CC"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:121
+msgid "History"
+msgstr "æ­·å?²"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:122
+msgid "Classic Cartoons"
+msgstr "æ­·å?²"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:123
+msgid "Speeches"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:124
+msgid "For Children"
+msgstr "給孩童"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:125
+msgid "Poetry"
+msgstr "è©©é??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:126
+msgid "Creator is United States"
+msgstr "建ç«?è??ç?ºç¾?å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:127
+msgid "Old Movies"
+msgstr "è??é?»å½±"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:128
+msgid "New From LibriVox"
+msgstr "LibriVox å?§æ?°ç??å?§å®¹"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:129
+msgid "Old Texts"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:130
+msgid "Charlie Chaplin"
+msgstr "Charlie Chaplin"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:131
+msgid "NASA"
+msgstr "NASA"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:132
+msgid "Library of Congress"
+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 ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
+msgid "Visit the Internet Archive online at archive.org"
+msgstr "網ä¸?é? è¨ªä½?æ?¼ archive.org ç??äº?è?¯ç¶²å?¸è??館"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+msgid "Audiobooks"
+msgstr "æ??è?²æ?¸"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
+msgid "Movies"
+msgstr "�影"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:309
+msgid "Lectures"
+msgstr "�說"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:310
+msgid "Concerts"
+msgstr "æ¼?å?±æ??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:311
+msgid "Books"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:58
+msgid "Search Results"
+msgstr "æ??å°?çµ?æ??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:139
+msgid "Searching the Internet Archive"
+msgstr "æ­£å?¨æ??å°?äº?è?¯ç¶²å?¸è??館"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:175
+msgid "No matches."
+msgstr "ç?¡ç¬¦å??çµ?æ??ã??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:180
+#, csharp-format
+msgid "Showing 1 match"
+msgid_plural "Showing 1 to {0:N0} of {1:N0} total matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:189
+msgid "Timed out searching the Internet Archive"
+msgstr "æ??å°?äº?è?¯ç¶²å?¸è??館é?¾æ??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:194
+msgid "Error searching the Internet Archive"
+msgstr "æ??å°?äº?è?¯ç¶²å?¸è??館æ??ç?¼ç??é?¯èª¤"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:88
+msgid "Fetch more results from the Internet Archive?"
+msgstr "è¦?å¾?äº?è?¯ç¶²å?¸è??館æ?·å??æ?´å¤?çµ?æ??å??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:94
+msgid "Fetch More"
+msgstr "æ?·å??æ?´å¤?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:128
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:61
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:98
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
+msgid "Creator"
+msgstr "建ç«?è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:129
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:75
+msgid "Publisher"
+msgstr "ç?¼ä½?è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:134
+msgid "Formats"
+msgstr "格�"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:136
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:65
+msgid "Added"
+msgstr "å? å?¥"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:62
+msgid "Collection"
+msgstr "æ?¶è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:63
+msgid "Contributor"
+msgstr "è²¢ç?»è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:64
+msgid "Created"
+msgstr "建�"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:68
+msgid "Format"
+msgstr "格�"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:69
+msgid "ID"
+msgstr "ID"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:70
+msgid "Language"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:73
+msgid "Media Type"
+msgstr "åª?é«?é¡?å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:74
+msgid "Review Count"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:71
+msgid "Moving Images"
+msgstr "æ­£å?¨ç§»å??å??ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:72
+msgid "Animation & Cartoons"
+msgstr "å??ç?«è??å?¡é??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:73
+msgid "Arts & Music"
+msgstr "è??è¡?è??é?³æ¨?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:74
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:99
+msgid "Computers & Technology"
+msgstr "é?»è?¦è??ç§?æ??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:75
+msgid "Cultural & Academic Films"
+msgstr "æ??å??è??å­¸è¡?å½±ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:76
+msgid "Ephemeral Films"
+msgstr "ç?­æ?«æ?§å½±ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:77
+msgid "Home Movies"
+msgstr "家庭�影"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:79
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:104
+msgid "News & Public Affairs"
+msgstr "æ?°è??è??å?¬ç?¾äº?å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:80
+msgid "Open Source Movies"
+msgstr "é??æº?é?»å½±"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:81
+msgid "Prelinger Archives"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:82
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:109
+msgid "Spirituality & Religion"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:83
+msgid "Sports Videos"
+msgstr "é??å??å½±ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:84
+msgid "Videogame Videos"
+msgstr "é?»ç?©å½±ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:85
+msgid "Vlogs"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:86
+msgid "Youth Media"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:88
+msgid "Texts"
+msgstr "æ??å­?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:89
+msgid "American Libraries"
+msgstr "ç¾?å??å??æ?¸é¤¨"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:90
+msgid "Canadian Libraries"
+msgstr "å? æ?¿å¤§å??æ?¸é¤¨"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:91
+msgid "Universal Library"
+msgstr "é??ç?¨è³?æ??庫"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:92
+msgid "Project Gutenberg"
+msgstr "�騰堡��"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:93
+msgid "Children's Library"
+msgstr "å­©ç«¥ç??è³?æ??庫"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:94
+msgid "Biodiversity Heritage Library"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:95
+msgid "Additional Collections"
+msgstr "é¡?å¤?ç??æ?¶è??é??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:98
+msgid "Audio Books & Poetry"
+msgstr "æ??è?²æ?¸è??è©©é??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:100
+msgid "Grateful Dead"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:101
+msgid "Live Music Archive"
+msgstr "å?³æ??é?³æ¨?å?¸è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:102
+msgid "Music & Arts"
+msgstr "é?³æ¨?è??è??è¡?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:103
+msgid "Netlabels"
+msgstr "網絡�籤"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:105
+msgid "Non-English Audio"
+msgstr "é??è?±æ??é?³è¨?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:106
+msgid "Open Source Audio"
+msgstr "é??å??ä¾?æº?é?³è¨?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:108
+msgid "Radio Programs"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:111
+msgid "Education"
+msgstr "æ??è?²"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:112
+msgid "Software"
+msgstr "�件"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:113
+msgid "CLASP"
+msgstr "CLASP"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:92
+msgid "Downloads This Week"
+msgstr "�����"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:93
+msgid "Newest"
+msgstr "æ??æ?°"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:94
+msgid "Oldest"
+msgstr "æ??è??"
+
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
 msgid "Not Set"
 msgstr "�設�"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:55
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:54
 msgid "Radio"
 msgstr "����話"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:66
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:65
 msgid "Add Station"
 msgstr "����"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:67
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:66
 msgid "Add a new Internet Radio station or playlist"
 msgstr "å? å?¥æ?°ç??網絡é?»å?°æ??æ?­æ?¾æ¸?å?®"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:80
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:64
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:81
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60
 msgid "Edit Station"
 msgstr "編輯��"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:132
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:133
 msgid "Station"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:133
-#, fuzzy
-msgid "Creator"
-msgstr "��"
-
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
-msgid "Description"
-msgstr "æ??è¿°"
-
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:234
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:235
 msgid "Please provide a valid station URI"
 msgstr "è«?æ??ä¾?æ??æ??ç??é?»å?° URI"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:247
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:248
 msgid "Please provide a station genre"
 msgstr "è«?æ??ä¾?é?»å?°æ¨?æ?²å??é¡?"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:255
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
 msgid "Please provide a station title"
 msgstr "è«?æ??ä¾?é?»å?°æ¨?é¡?"
 
@@ -3550,505 +5667,689 @@ msgstr "輸å?¥ä½ æ?³å? å?¥é?»å?°ç??æ¨?æ?²å??é¡?ã??æ¨?é¡?å?? URLã??æ??è¿°æ¬?ä½?
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
 msgid "Station Genre:"
-msgstr "é?»å?°æ¨?æ?²å??é¡?:"
+msgstr "���風�"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
 msgid "Station Name:"
-msgstr "é?»å?°å??稱:"
+msgstr "é?»å?°å??稱ï¼?"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
 msgid "Stream URL:"
-msgstr "串� URL:"
+msgstr "串� URL�"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
 msgid "Station Creator:"
-msgstr "é?»å?°å»ºç«?è??:"
+msgstr "é?»å?°å»ºç«?è??ï¼?"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:74
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:81
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
 msgid "Description:"
-msgstr "æ??è¿°:"
+msgstr "æ??è¿°ï¼?"
+
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
+msgid "Rating:"
+msgstr "è©?ç­?ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:125
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:122
 msgid "_Last.fm"
 msgstr "_Last.fm"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:123
 msgid "Configure the Audioscrobbler plugin"
-msgstr "é??ç½® Audioscrobbler å¤?æ??"
+msgstr "é??ç½® Audioscrobbler æ??件"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:129
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126
 msgid "Visit _User Profile Page"
 msgstr "æ??訪使ç?¨è??å??人設å®?é ?é?¢(_U)"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:130
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:127
+#: ../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:133
-msgid "_Configure..."
-msgstr "設�(_C)..."
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:134
-msgid "Configure the Last.fm Extension"
-msgstr "設å®? Last.fm æ?´å??å¥?件"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:139
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:132
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:91
 msgid "_Enable Song Reporting"
 msgstr "å??ç?¨æ­?æ?²å ±å??(_E)"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:133
 msgid "Enable song reporting"
 msgstr "å??ç?¨æ?²ç?®å ±å??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:66
-msgid "_Add Station"
-msgstr "����(_A)"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:67
-msgid "Add a new Last.fm radio station"
-msgstr "å? å?¥æ?°ç?? Last.fm é?»å?°"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:74
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
 msgid "Connect"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:79
-msgid "Sort Stations by"
-msgstr "é?»å?°æ??åº?æ ¹æ??"
-
-#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:85
-#, csharp-format
-msgid "Listen to {0} Station"
-msgstr "� {0} ��"
-
-#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:87
-#, csharp-format
-msgid "Listen to the Last.fm {0} station for this artist"
-msgstr "è?½é??ä½?表æ¼?è??ç?? Last.fm {0} é?»å?°"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:92
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:126
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:74
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:98
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:113
 msgid "View on Last.fm"
 msgstr "檢� Last.fm"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:93
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:75
 msgid "View this artist's Last.fm page"
 msgstr "檢è¦?é??ä½?表æ¼?è??ç?? Last.fm é ?é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:96
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:78
 msgid "View Artist on Wikipedia"
 msgstr "檢è¦?維å?ºç?¾ç§?ä¸?ç??表æ¼?è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:97
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:79
 msgid "Find this artist on Wikipedia"
 msgstr "å?¨ç¶­å?ºç?¾ç§?中å°?æ?¾é??ä½?表æ¼?è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:104
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:86
 msgid "View Artist's Videos"
 msgstr "檢è¦?表æ¼?è??ç??å½±ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:105
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:87
 msgid "Find videos by this artist"
 msgstr "å°?æ?¾é??ä½?表æ¼?è??ç??å½±ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:108
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:109
-#, fuzzy
-msgid "Fans of"
-msgstr "{0} ç??æ­?è¿·/影迷"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:113
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:114
-msgid "Similar to"
-msgstr "�似�"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:118
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:134
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:155
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:90
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:106
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:117
 msgid "Recommend to"
 msgstr "��給"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:119
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:91
 msgid "Recommend this artist to someone"
 msgstr "å??å?¥äººæ?¨è?¦é??ä½?表æ¼?è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:127
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:99
 msgid "View this album's Last.fm page"
 msgstr "檢è¦?é??å??å°?輯ç?? Last.fm é ?é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:135
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:107
 msgid "Recommend this album to someone"
 msgstr "å??å?¥äººæ?¨è?¦é??å??å°?輯"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:142
-msgid "Love Track"
-msgstr "å??æ??æ­?æ?²"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:143
-msgid "Mark current track as loved"
-msgstr "å°?ç?®å??æ­?æ?²æ¨?è¨?ç?ºå??æ??ç??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:147
-msgid "Ban Track"
-msgstr "����"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:148
-msgid "Mark current track as banned"
-msgstr "å°?ç?®å??æ­?æ?²æ¨?è¨?ç?ºç¦?æ­¢ç??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:114
 msgid "View this track's Last.fm page"
-msgstr "檢è¦?é??å??æ­?æ?²ç?? Last.fm é ?é?¢"
+msgstr "檢è¦?é??é¦?æ?²ç?®ç?? Last.fm é ?é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:118
 msgid "Recommend this track to someone"
-msgstr "å??å?¥äººæ?¨è?¦é??é¦?æ­?"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:166
-msgid "Station Name"
-msgstr "é?»å?°å??稱"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:171
-msgid "Total Play Count"
-msgstr "總���次�"
+msgstr "å??å?¥äººæ?¨è?¦æ­¤æ?²ç?®"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:176
-msgid "Station Type"
-msgstr "é?»å?°é¡?å??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:258
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:150
 #, csharp-format
 msgid "http://last.fm/music/{0}";
 msgstr "http://last.fm/music/{0}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:266
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:158
 #, csharp-format
 msgid "http://last.fm/music/{0}/{1}";
 msgstr "http://last.fm/music/{0}/{1}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:274
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:166
 #, csharp-format
 msgid "http://last.fm/music/{0}/_/{1}";
 msgstr "http://last.fm/music/{0}/_/{1}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:282
+#: ../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";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:290
+#. 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:182
+#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:48
 #, csharp-format
 msgid "http://en.wikipedia.org/wiki/{0}";
 msgstr "http://en.wikipedia.org/wiki/{0}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:324
-#, csharp-format
-msgid "Fans of {0}"
-msgstr "{0} ç??æ­?è¿·/影迷"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:78
+msgid "Account"
+msgstr "帳è??"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:270
+msgid "_Username"
+msgstr "使ç?¨è??å??稱(_U)"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:160
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:86
+msgid "Sign up for Last.fm"
+msgstr "註å?? Last.fm"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:254
+msgid ""
+"Open Last.fm in a browser, giving you the option to authorize Banshee to "
+"work with your account"
+msgstr ""
+
+#: ../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.Radio/LastfmActions.cs:345
+#: ../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:296
+msgid "Finish Logging In"
+msgstr "å®?æ??ç?»å?¥"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:310
 #, csharp-format
-msgid "Similar to {0}"
-msgstr "�似� {0}"
+msgid "You are logged in to Last.fm as the user <i>{0}</i>."
+msgstr ""
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:124
+#: ../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:123
 msgid "Recently Loved Tracks"
-msgstr "æ??è¿?å??æ??ç??æ­?æ?²"
+msgstr "æ??è¿?å??æ??ç??æ?²ç?®"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:125
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
 msgid "Recently Played Tracks"
-msgstr "æ??è¿?æ?­æ?¾ç??æ­?æ?²"
+msgstr "æ??è¿?æ?­æ?¾ç??æ?²ç?®"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:126
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
 msgid "My Top Artists"
 msgstr "æ??ç??æ??佳表æ¼?è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:206
-#, fuzzy, csharp-format
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:206
+#, csharp-format
 msgid "{0} plays"
-msgstr "{0} æ?¥"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:103
-msgid "Edit Last.fm Settings"
-msgstr "編輯 Last.fm 設��"
+msgstr "{0} 次��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:321
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs:243
 msgid "Account Settings"
 msgstr "帳è??設å®?å?¼"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:323
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs:247
 msgid "Join Last.fm"
 msgstr "å? å?¥ Last.fm"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:72
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/ContextPage.cs:44
+msgid "Last.fm Recommendations"
+msgstr "Last.fm ��"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:80
+#, csharp-format
+msgid "Top Albums by {0}"
+msgstr "ç?±é??å°?輯根æ?? {0}"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:81
+#, csharp-format
+msgid "Top Tracks by {0}"
+msgstr "æ??ä½³æ?²ç?® {0}"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:178
+msgid "Recommended Artists"
+msgstr "æ?¨è?¦ç??表æ¼?è??"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:206
+msgid "No similar artists found"
+msgstr "æ?¾ä¸?å?°é¡?ä¼¼ç??表æ¼?è??"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60
+#, csharp-format
+msgid "{0}% Similarity"
+msgstr "�似度 {0}%"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62
+msgid "Unknown Similarity"
+msgstr "æ?ªç?¥ç??ç?¸ä¼¼æ?§"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59
+msgid "_Add Station..."
+msgstr "����(_A)..."
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:60
+msgid "Add a new Last.fm radio station"
+msgstr "å? å?¥æ?°ç?? Last.fm é?»å?°"
+
+#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:73
+#, csharp-format
+msgid "Listen to {0} Station"
+msgstr "� {0} ��"
+
+#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:75
+#, csharp-format
+msgid "Listen to the Last.fm {0} station for this artist"
+msgstr "è?½é??ä½?表æ¼?è??ç?? Last.fm {0} é?»å?°"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:80
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:81
+#, fuzzy
+msgid "Fans of"
+msgstr "{0} ç??æ­?è¿·/影迷"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:85
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:86
+msgid "Similar to"
+msgstr "�似�"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:94
+msgid "Love Track"
+msgstr "å??æ??æ?²ç?®"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:95
+msgid "Mark current track as loved"
+msgstr "å°?ç?®å??æ?²ç?®æ¨?è¨?ç?ºå??æ??"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:99
+msgid "Ban Track"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:100
+msgid "Mark current track as banned"
+msgstr "å°?ç?®å??æ­?æ?²æ¨?è¨?ç?ºç¦?ç?¨"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
+#, csharp-format
+msgid "Fans of {0}"
+msgstr "{0} ç??æ­?è¿·/影迷"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
+#, csharp-format
+msgid "Similar to {0}"
+msgstr "�似� {0}"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
+msgid "_Add Station"
+msgstr "����(_A)"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingService.cs:93
+msgid "Sort Stations by"
+msgstr "é?»å?°æ??åº?æ ¹æ??"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingService.cs:136
+msgid "Total Play Count"
+msgstr "總���次�"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:68
 msgid "New Station"
 msgstr "���"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:57
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
+msgid "Station _Type:"
+msgstr "é?»å?°é¡?å??(_T):"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58
 msgid "Last.fm Station"
 msgstr "Last.fm ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:147
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:151
 msgid "Edit Last.fm Station"
 msgstr "編輯 Last.fm ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:148
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:152
 msgid "Delete Last.fm Station"
 msgstr "�� Last.fm ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:235
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239
 #, csharp-format
 msgid "Tuning Last.fm to {0}."
 msgstr "å°? Last.fm è½?å?° {0}ã??"
 
 #. Translators: {0} is an error message sentence from RadioConnection.cs.
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:245
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249
 #, csharp-format
 msgid "Failed to tune in station. {0}"
 msgstr "è½?å?°é?»å?°å¤±æ??ã??{0}"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:346
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:357
 #, csharp-format
 msgid "Getting new songs for {0}."
 msgstr "å??å¾? {0} ç??æ?°æ­?ã??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:353
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:364
 #, csharp-format
 msgid "No new songs available for {0}."
 msgstr "{0} æ²?æ??æ?°ç??æ­?æ?²ã??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:379
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:390
 #, csharp-format
 msgid "Failed to get new songs for {0}."
 msgstr "å??å¾? {0} ç??æ?°æ­?失æ??ã??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:440
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:451
 #, csharp-format
 msgid "{0} song played"
 msgid_plural "{0} songs played"
 msgstr[0] "已�� {0} ��"
 msgstr[1] "已�� {0} ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:564
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:84
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:583
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:84
 msgid "Recommended"
 msgstr "æ?¨è?¦ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:565
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:93
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:584
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:93
 msgid "Personal"
 msgstr "å??人"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:566
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:102
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:585
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:102
 msgid "Loved"
 msgstr "å??æ??ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:567
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:586
 msgid "Banshee Group"
 msgstr "Banshee 羣�"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:568
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:111
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:587
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:111
 msgid "Neighbors"
-msgstr ""
+msgstr "é?°å±?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:85
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:94
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:85
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:94
 #, fuzzy
 msgid "For User:"
 msgstr "æ ¹æ??使ç?¨è??:"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:103
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:103
 msgid "By User:"
-msgstr "æ ¹æ??使ç?¨è??:"
+msgstr "æ ¹æ??使ç?¨è??ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:112
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:112
 #, fuzzy
 msgid "Of User:"
 msgstr "æ ¹æ??使ç?¨è??:"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:120
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:120
 msgid "Group"
 msgstr "羣�"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:121
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:121
 msgid "Group Name:"
-msgstr "ç¾£çµ?å??稱:"
+msgstr "ç¾£çµ?å??稱ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:129
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:129
 msgid "Tag"
 msgstr "�籤"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:130
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:130
 msgid "Tag Name:"
-msgstr "æ¨?籤å??稱:"
+msgstr "æ¨?籤å??稱ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:138
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:138
 msgid "Fan"
 msgstr "æ­?è¿·"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:139
-#, fuzzy
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:139
 msgid "Fans of:"
-msgstr "{0} ç??æ­?è¿·/影迷"
+msgstr "誰ç??è¿·ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:147
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:147
 msgid "Similar"
-msgstr "é¡?ä¼¼ç??"
+msgstr "�似"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:148
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:148
 msgid "Similar to:"
-msgstr "�似�:"
+msgstr "�似��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:156
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:156
 msgid "lastfm:// URL"
-msgstr ""
+msgstr "lastfm:// URL"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:157
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:157
 msgid "lastfm://"
-msgstr ""
+msgstr "lastfm://"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationActions.cs:66
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationActions.cs:67
-msgid "Show Recommendations"
-msgstr "顯示��"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109
+msgid "Media"
+msgstr "��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:79
-#, csharp-format
-msgid "Top Albums by {0}"
-msgstr "ç?±é??å°?輯根æ?? {0}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:80
-#, csharp-format
-msgid "Top Tracks by {0}"
-msgstr "æ??ä½³æ­?æ?² {0}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:161
-msgid "Recommended Artists"
-msgstr "æ?¨è?¦ç??表æ¼?è??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:188
-msgid "No similar artists found"
-msgstr "æ?¾ä¸?å?°é¡?ä¼¼ç??表æ¼?è??"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119
+msgid "Library"
+msgstr "è³?æ??庫"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60
-#, csharp-format
-msgid "{0}% Similarity"
-msgstr "{0}% �似"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131
+msgid "Launch the Banshee Media Player"
+msgstr "å??å?? Banshee åª?é«?æ?­æ?¾ç¨?å¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62
-#, fuzzy
-msgid "Unknown Similarity"
-msgstr "æ?ªç?¥ç??æ¼?å?ºè??"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
+msgid "media"
+msgstr "��"
 
-#: ../src/Extensions/Banshee.Lastfm/Resources/lastfm.glade.h:1
-msgid "Station _Type:"
-msgstr "é?»å?°é¡?å??(_T):"
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
+msgid "Quick access panel for your media"
+msgstr "å¿«é??å­?å??ä½ åª?é«?ç??é?¢æ?¿"
 
 #: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeService.cs:25
 msgid "_Mini Mode"
 msgstr "迷你模�(_M)"
 
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:73
-msgid "Banshee Music Player"
-msgstr "Banshee �����"
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:100
+msgid "Full Mode"
+msgstr "��模�"
 
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:136
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:123
 msgid "Switch back to full mode"
 msgstr "å??æ??å??å®?æ?´æ¨¡å¼?"
 
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:137
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:124
 msgid "Change repeat playback mode"
 msgstr "æ?´æ?¹é??è¦?æ?­æ?¾æ¨¡å¼?"
 
-#: ../src/Extensions/Banshee.MiniMode/Resources/minimode.glade.h:1
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:64
-msgid "Banshee"
-msgstr "Banshee"
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:47
+msgid "Miro Guide"
+msgstr ""
 
-#: ../src/Extensions/Banshee.MiniMode/Resources/minimode.glade.h:2
-msgid "Current source:"
-msgstr "ç?®å??ç??ä¾?æº?:"
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:56
+#, fuzzy
+#| msgid "Search for songs"
+msgid "Search for Podcasts"
+msgstr "æ??å°?æ?²ç?®"
 
-#: ../src/Extensions/Banshee.MiniMode/Resources/minimode.glade.h:3
-msgid "Full Mode"
-msgstr "��模�"
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:57
+#, fuzzy
+#| msgid "Search for songs"
+msgid "Search for Video Podcasts"
+msgstr "æ??å°?æ?²ç?®"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:123
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:138
 msgid "_Show Notifications"
 msgstr "顯示é??ç?¥(_S)"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:124
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
 msgid "Show notifications when item changes"
 msgstr "ç?¶é ?ç?®æ?¹è®?æ??顯示é??ç?¥"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:299
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:343
 msgid "Still Running"
 msgstr "����"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:300
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:344
 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:404
-#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:48
-msgid "Now Playing"
-msgstr "����"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:409
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:479
 msgid "Skip this item"
 msgstr "ç?¥é??é??å??é ?ç?®"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:415
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
 msgid "Cannot show notification"
 msgstr "ä¸?è?½é¡¯ç¤ºé??ç?¥"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:49
+#. 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:517
+#, fuzzy, csharp-format
+#| msgid "{0}by{1} {2} {0}from{1} {3}"
+msgid ""
+"{0}by{1} {2}\n"
+"{0}from{1} {3}"
+msgstr "{0}�{1} {2} {0}�輯�{1} {3}"
+
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
+#, csharp-format
+msgid "Unable to import track: {0}"
+msgstr "�������{0}"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+msgid "Importing from Amarok failed"
+msgstr "å¾? Amarok å?¯å?¥å¤±æ??"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+msgid "Amarok"
+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:384
+msgid "iTunes Importer"
+msgstr "iTunes ����"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:90
+msgid "Import song ratings"
+msgstr "������"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:93
+msgid "Import play statistics (playcount, etc.)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:96
+msgid "Import playlists"
+msgstr "������"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#, 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:388
+#, csharp-format
+msgid "Locate \"{0}\""
+msgstr "å®?ä½?ã??{0}ã??"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+msgid "Locate iTunes Music Directory"
+msgstr "å®?ä½? iTunes é?³æ¨?ç?®é??"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#, 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 ""
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
+msgid "iTunes Media Player"
+msgstr "iTunes ������"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+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 ""
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+msgid "Unable to import song."
+msgstr "ç?¡æ³?å?¯å?¥æ­?æ?²ã??"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+msgid "Rhythmbox Music Player"
+msgstr "Rhythombox �����"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+msgid "Import _playlists"
+msgstr "������(_P)"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:59
+msgid "_Fill"
+msgstr "å¡«å?¥(_F)"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:71
+msgid "f_rom"
+msgstr "å¾?(_R)"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:50
 msgid "Add to Play Queue"
 msgstr "å? å?¥æ?­æ?¾ä½?å??"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:50
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
 msgid "Append selected songs to the play queue"
 msgstr "å°?é?¸å??ç??æ­?æ?²å? å?¥æ?­æ?¾ä½?å??"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
-msgid "Remove all tracks from the play queue"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+#, fuzzy
+#| msgid "Remove all tracks from the play queue"
+msgid "Refresh random tracks in the play queue"
 msgstr "å¾?æ?­æ?¾ä½?å??移é?¤æ??æ??ç??æ­?æ?²"
 
 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:64
+msgid "Add More"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:65
+msgid "Add more random tracks to the play queue"
+msgstr "å¾?æ?­æ?¾ä½?å??å? å?¥æ?´å¤?é?¨æ©?æ?²ç?®"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+msgid "Remove all tracks from the play queue"
+msgstr "å¾?æ?­æ?¾ä½?å??移é?¤æ??æ??ç??æ?²ç?®"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
 msgid "Clear the play queue when quitting"
 msgstr "é?¢é??æ??æ¸?é?¤æ?­æ?¾ä½?å??"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:63
-msgid "Play Queue"
-msgstr "æ?­æ?¾ä½?å??"
-
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:72
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:88
 msgid "Remove From Play Queue"
 msgstr "å¾?æ?­æ?¾ä½?å??移é?¤"
 
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:826
+msgid "Number of _played songs to show"
+msgstr "è¦?顯示ç??å·²æ?­æ?¾æ­?æ?²æ?¸ç?®(_P)"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:832
+msgid "Number of _upcoming songs to show"
+msgstr "è¦?顯示ç??å?³å?¥æ­?æ?²æ?¸ç?®(_U)"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
+msgid "Podcast"
+msgstr "Podcast"
+
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:69
 #, csharp-format
 msgid "All Podcasts ({0})"
 msgstr "æ??æ?? Podcast ({0})"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
 msgid "Published"
 msgstr "已��"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
 msgid "New"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
 msgid "Downloaded"
 msgstr "已��"
@@ -4076,6 +6377,10 @@ msgstr "æ?´æ?°æ?¼ {0}"
 msgid "Updated {0}"
 msgstr "已�� {0}"
 
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:62
+msgid "Downloading"
+msgstr "��中"
+
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:57
 msgid "New Items"
 msgstr "æ?°ç??é ?ç?®"
@@ -4084,119 +6389,104 @@ msgstr "æ?°ç??é ?ç?®"
 msgid "Old Items"
 msgstr "è??ç??é ?ç?®"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:46
-msgid "Downloads"
-msgstr "��"
-
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:50
 msgid "Downloading Podcast(s)"
 msgstr "正��� Podcast"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:51
-msgid "Initializing..."
-msgstr "æ­£å?¨å??å§?å??..."
-
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:52
 msgid "Cancel all podcast downloads?"
 msgstr "æ?¯å?¦å??æ¶?æ??æ??ç?? podcast ä¸?è¼?ï¼?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:120
-#, csharp-format
-msgid "Transfering {0} file at {1} KB/s"
-msgid_plural "Transfering {0} of {2} files at {1} KB/s"
-msgstr[0] "æ­£å?¨å?³è¼¸ {0} å??æª?æ¡?ï¼?é??ç?? {1} KB/s"
-msgstr[1] "æ­£å?¨å?³è¼¸ {2} å??æª?æ¡?ç??第 {0} å??ï¼?é??ç?? {1} KB/s"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:133
-msgid "Canceling Downloads"
-msgstr "æ­£å?¨å??æ¶?ä¸?è¼?"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:135
-msgid "Waiting for downloads to terminate..."
-msgstr "����中止..."
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:66
-msgid "Update Podcasts"
-msgstr "æ?´æ?° Podcast"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:71
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:95
+msgid "Check for New Episodes"
+msgstr "檢æ?¥æ?¯å?¦æ??æ?°ç??é??æ?¸"
 
 #. "<control><shift>U",
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:67
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
 msgid "Refresh All Podcasts"
 msgstr "é??æ?°æ?´ç??æ??æ??ç?? Podcast"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
-msgid "Subscribe to Podcast"
-msgstr "�� Podcast"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:77
+msgid "Subscribe to Podcast..."
+msgstr "�� Podcast..."
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
 msgid "Subscribe to a new podcast"
 msgstr "è¨?é?±æ?°ç?? Podcast"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
 msgid "Unsubscribe and Delete"
 msgstr "å??æ¶?è¨?é?±ä¸¦å?ªé?¤"
 
-#. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:91
-msgid "Check for New Episodes"
-msgstr "檢æ?¥æ?°ç??ç« ç¯?"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:97
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:101
 msgid "Download All Episodes"
-msgstr "ä¸?è¼?æ??æ??ç« ç¯?"
+msgstr "ä¸?è¼?æ¯?ä¸?é??"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:103
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:107
 msgid "Visit Podcast Homepage"
 msgstr "å??訪 Podcast é¦?é ?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:115
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:119
 msgid "Mark as New"
 msgstr "æ¨?è¨?ç?ºæ?°ç??"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:121
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:125
 msgid "Mark as Old"
 msgstr "æ¨?è¨?ç?ºè??ç??"
 
 #. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:127
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:131
 msgid "Download Podcast(s)"
 msgstr "�� Podcast"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:133
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:137
 msgid "Cancel Download"
 msgstr "å??æ¶?ä¸?è¼?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:139
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:143
 msgid "Remove Downloaded File(s)"
 msgstr "移é?¤ä¸?è¼?ç??æª?æ¡?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:145
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:149
 msgid "Visit Website"
 msgstr "å??訪網ç«?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:309
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:161
+msgid "Subscribe to Podcast"
+msgstr "�� Podcast"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325
 msgid "Invalid URL"
 msgstr "ç?¡æ??ç?? URL"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:310
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326
 msgid "Podcast URL is invalid."
 msgstr "Podcast URL æ?¯ç?¡æ??ç??ã??"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:78
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:109
+msgid "Episode Details"
+msgstr "æ?¬é??ç´°ç¯?"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:85
 msgid "Last updated:"
 msgstr "ä¸?次æ?´æ?°ç??:"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:82
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:89
+msgid "Podcast Name:"
+msgstr "Podcast å??稱ï¼?"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:99
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:146
 msgid "URL:"
-msgstr "網å??:"
+msgstr "URL:"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:86
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:103
 msgid "When feed is updated:"
 msgstr "ç?¶é¤µé??å·²æ?´æ?°æ??ï¼?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:119
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
 msgid "No description available"
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¿°"
@@ -4205,10 +6495,6 @@ msgstr "æ²?æ??å?¯ç?¨ç??æ??è¿°"
 msgid "Podcast:"
 msgstr "Podcast:"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
-msgid "Date:"
-msgstr "æ?¥æ??:"
-
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
 msgid "Subscribe"
@@ -4225,28 +6511,24 @@ msgstr "è«?輸å?¥ä½ æ?³è¦?è¨?é?±ç?? podcast URLã??"
 
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:112
 msgid "When new episodes are available:  "
-msgstr "ç?¶æ??æ?°ç??ç« ç¯?å?¯ç?¨æ??ï¼?"
+msgstr "ç?¶æ??æ?°ç??é??æ?¸å?¯ç?¨æ??ï¼?"
 
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
 msgid "Download all episodes"
-msgstr "ä¸?è¼?æ??æ??ç« ç¯?"
+msgstr "ä¸?è¼?æ¯?ä¸?é??"
 
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:42
 msgid "Download the most recent episode"
-msgstr "ä¸?è¼?æ??è¿?ç??ç« ç¯?"
+msgstr "ä¸?è¼?æ??è¿?ç??ä¸?é??"
 
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:43
 msgid "Let me decide which episodes to download"
-msgstr "è®?æ??決å®?è¦?ä¸?è¼?å?ªå??ç« ç¯?"
+msgstr "è®?æ??決å®?è¦?ä¸?è¼?å?ªå??ä¸?é??"
 
 #: ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio/RemoteSpeakersWidget.cs:51
 msgid "_Speaker:"
 msgstr "å??å?­(_S):"
 
-#: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40
-msgid "Sample"
-msgstr "樣å??"
-
 #: ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole/SqlActions.cs:59
 msgid "Show SQL Console"
 msgstr "顯示 SQL 主��"
@@ -4259,252 +6541,334 @@ msgstr "å??å?? SQL ç?£æ?§"
 msgid "Stop SQL Monitoring"
 msgstr "å??æ­¢ç?£æ?§ SQL"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:513
-#, csharp-format
-msgid "Hide <i>{0}</i>"
-msgstr "é?±è?? <i>{0}</i>"
+#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:136
+msgid "Uploaded by"
+msgstr "����"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
-msgid "Banshee Encountered a Fatal Error"
-msgstr "Banshee é??å?°ä¸?å??é??大ç??é?¯èª¤"
+#: ../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 æ?­æ?¾..."
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:89
-msgid "Error Details"
-msgstr "�誤細�"
+#: ../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 "�網��覽�中��..."
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:133
-msgid "An unhandled exception was thrown: "
-msgstr "ä¸?æ£?ä¸?å??æ?ªè??ç??ç??ç?°å¸¸ä¾?å¤?ï¼?"
+#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs:61
+msgid "No videos found"
+msgstr "æ?¾ä¸?å?°è¦?å??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
-msgid "Assembly Version Information"
-msgstr "çµ?件ç??æ?¬è³?è¨?"
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
+msgid "Last.fm Account Login"
+msgstr "Last.fm 帳è??ç?»å?¥"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64
-msgid "Assembly Name"
-msgstr "çµ?件å??稱"
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
+msgid "Please enter your Last.fm account credentials."
+msgstr "è«?輸å?¥ä½ ç?? Last.fm 帳è??è­?æ?¸ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62
-msgid "KB"
-msgstr "KB"
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
+msgid "Save and Log In"
+msgstr "��並��"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86
-msgid "Condition:"
-msgstr "�件:"
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:98
+msgid "Authorize for Last.fm"
+msgstr "ç?º Last.fm æ??æ¬?"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104
-msgid "_Match"
-msgstr "符å??(_M)"
+#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:447
+msgid ""
+"Last.fm username is invalid or Banshee is not authorized to access your "
+"account."
+msgstr "Last.fm 使ç?¨è??å??稱ç?¡æ??ï¼?æ??æ?¯ Banshee å°?æ?ªè¢«æ??æ¬?以å­?å??ä½ ç??帳è??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111
-msgid "all"
-msgstr "��"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
+msgid "This service does not exist."
+msgstr "æ­¤æ??å??ä¸?å­?å?¨ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112
-msgid "any"
-msgstr "任�"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+msgid "This station is only available to subscribers."
+msgstr "é??å??é?»å?°å?ªæ??ä¾?給è¨?é?±è??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117
-msgid "of the following:"
-msgstr ""
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
+msgid "This station is not available."
+msgstr "é??å??é?»å?°ç?¡æ³?使ç?¨ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58
-msgid "_Limit to"
-msgstr "é??å?¶ç?º(_L)"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+msgid "The request is missing a required parameter."
+msgstr "該è«?æ±?é?ºå¤±å¿?è¦?ç??å¼?æ?¸ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:82
-msgid "selected by"
-msgstr ""
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+msgid "The specified resource is invalid."
+msgstr "æ??å®?ç??è³?æº?ç?¡æ??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42
-msgid "ago"
-msgstr "å??"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+msgid "Server error, please try again later."
+msgstr "伺æ??å?¨é?¯èª¤ï¼?è«?ç¨?å¾?é??試ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59
-msgid "seconds"
-msgstr "��"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+msgid "Invalid authentication information, please re-authenticate."
+msgstr "ç?¡æ??ç??èª?è­?è³?è¨?ï¼?è«?é??æ?°èª?è­?ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62
-msgid "days"
-msgstr "天"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+msgid "The API key used by this application is invalid."
+msgstr "æ­¤æ??ç?¨ç¨?å¼?æ??使ç?¨ç?? API key ç?¡æ??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63
-msgid "weeks"
-msgstr "é?±"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+msgid ""
+"The streaming system is offline for maintenance, please try again later."
+msgstr "串統系統ç?®å??æ­£é?¢ç·?維謢中ï¼?è«?ç¨?å¾?å??試ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64
-msgid "months"
-msgstr "æ??"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+msgid "The method signature is invalid."
+msgstr "æ?¹æ³?簽署ç?¡æ??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65
-msgid "years"
-msgstr "å¹´"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
+msgid "There is not enough content to play this station."
+msgstr "é??è£?æ²?æ??足夠ç??å?§å®¹å?¯ä»¥æ?­æ?¾é??å??é?»å?°ã??"
 
-#. public static readonly Operator Equal              = new Operator ("equals", "= {0}", "==", "=", ":");
-#. public static readonly Operator NotEqual           = new Operator ("notEqual", "!= {0}", true, "!=", "!:");
-#. public static readonly Operator LessThanEqual      = new Operator ("lessThanEquals", "<= {0}", "<=");
-#. public static readonly Operator GreaterThanEqual   = new Operator ("greaterThanEquals", ">= {0}", ">=");
-#: ../src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs:47
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
+msgid "This group does not have enough members for radio."
+msgstr "é??å??ç¾£çµ?é??ä¸?å?°å»£æ?­æ??é??ç??æ??å?¡ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+msgid "This artist does not have enough fans for radio."
+msgstr "é??ä½?表æ¼?è??æ²?æ??足夠廣æ?­ç??æ­?è¿·ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
 #, fuzzy
-msgid "before"
-msgstr "é??æ?´æ¸?å?®"
+msgid "There are not enough neighbours for this station."
+msgstr "é??è£?æ²?æ??足夠ç??å?§å®¹å?¯ä»¥æ?­æ?¾é??å??é?»å?°ã??"
 
-#: ../src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs:48
-msgid "after"
-msgstr "ä¹?å¾?"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+msgid "There was an unknown error."
+msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:41
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:43
-msgid "is"
-msgstr "æ?¯"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
+msgid "Not connected to Last.fm."
+msgstr "å°?æ?ªé?£ç·?å?° Last.fmã??"
+
+#: ../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:317
+msgid "No network connection detected."
+msgstr "æ²?æ??å?µæ¸¬å?°ç¶²çµ¡é?£ç·?ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
+msgid "Last.fm username is invalid."
+msgstr "Last.fm 使ç?¨è??å??稱ç?¡æ??ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
+msgid "Connecting to Last.fm."
+msgstr "é?£ç·?è?³ Last.fmã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
+msgid "Connected to Last.fm."
+msgstr "å·²é?£ç·?è?³ Last.fmã??"
+
+#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:149
+#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:97
+#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:100
+msgid "Unknown Podcast"
+msgstr "ä¸?æ??ç?? Podcast"
+
+#~ msgid "Could not create 'filesink' plugin"
+#~ msgstr "ç?¡æ³?建ç«? 'filesink' æ??件"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:42
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:44
-msgid "is not"
-msgstr "��"
+#~ msgid "Unknown Genre"
+#~ msgstr "æ?ªç?¥ç??æ¨?æ?²å??é¡?"
+
+#~ msgid "Song"
+#~ msgstr "æ­?æ?²"
+
+#~ msgid "Item"
+#~ msgstr "é ?ç?®"
+
+#~ msgid "Saving tags for {0}"
+#~ msgstr "å?²å­? {0} ç??æ¨?籤"
+
+#~ msgid "Renaming {0}"
+#~ msgstr "é??æ?°å?½å?? {0}"
+
+#~ msgid "Home Directory"
+#~ msgstr "家ç?®é??"
+
+#~ msgid "Version:"
+#~ msgstr "ç??æ?¬:"
+
+#~ msgid "Copyright/License:"
+#~ msgstr "ç??æ¬?/æ??æ¬?:"
+
+#~ msgid "Extension Dependencies:"
+#~ msgstr "æ?´å??å¥?件ç?¸ä¾?æ?§:"
+
+#~ msgid "Disable"
+#~ msgstr "å??ç?¨"
+
+#~ msgid "Enable"
+#~ msgstr "å??ç?¨"
+
+#~ msgid "Primary Development"
+#~ msgstr "主è¦?é??ç?¼"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:43
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47
 #, fuzzy
-msgid "at most"
-msgstr "表æ¼?è??å??稱"
+#~ msgid "_Restart {0}"
+#~ msgstr "é??æ?°æ?­æ?¾æ­?æ?²(_R)"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:44
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46
 #, fuzzy
-msgid "at least"
-msgstr "�������"
+#~ msgid "_Jump to Playing {0}"
+#~ msgstr "è·³å?°æ?­æ?¾ä¸­ç??æ?²ç?®(_J)"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:45
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45
-msgid "less than"
-msgstr ""
+#~ msgid "Name Ascending"
+#~ msgstr "å??稱é??å¢?æ??åº?"
 
-#. The SQL operators in these Operators are reversed from normal on purpose
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:46
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44
-msgid "more than"
-msgstr ""
+#~ msgid "Name Descending"
+#~ msgstr "å??稱é??æ¸?æ??åº?"
 
-#: ../src/Libraries/Hyena/Hyena.Query/NullQueryValue.cs:41
-msgid "empty"
-msgstr "空ç??"
+#~ msgid "<b>Details</b>"
+#~ msgstr "<b>詳細è³?æ??</b>"
 
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:89
-#, csharp-format
-msgid "{0} ago"
-msgstr "{0}å??"
+#~ msgid "Choose an import source:"
+#~ msgstr "é?¸æ??å?¯å?¥ä¾?æº?ï¼?"
 
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:41
-msgid "contains"
-msgstr "å??å?«"
+#~ msgid "Import Media Source"
+#~ msgstr "������"
 
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:42
-#, fuzzy
-msgid "doesn't contain"
-msgstr "å??å?«"
+#~ msgid "Import Media to Library"
+#~ msgstr "å°?åª?é«?å?¯å?¥è³?æ??庫"
 
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:45
-msgid "starts with"
-msgstr "以此é??å§?"
+#~ msgid "Predefined Smart Playlists"
+#~ msgstr "é ?å??å®?義ç??æ?ºæ?§å¼?æ?­æ?¾æ¸?å?®"
 
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:46
-msgid "ends with"
-msgstr "以此��"
+#~ msgid "Manually manage this device"
+#~ msgstr "æ??å??管ç??é??å??è£?ç½®"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
-msgid "Log in to Last.fm"
-msgstr "�� Last.fm"
+#~ msgid ""
+#~ "Manually managing your device means you can drag and drop items onto the "
+#~ "device, and manually remove them."
+#~ msgstr "æ??å??管ç??æ?¨ç??è£?置表示æ?¨å?¯ä»¥æ??æ?¾é ?ç?®å?°æ­¤è£?ç½®ï¼?並ä¸?æ??å??移é?¤å®?å??ã??"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
-msgid "Last.fm Account Login"
-msgstr "Last.fm 帳è??ç?»å?¥"
+#~ msgid "Synchronize"
+#~ msgstr "å??æ­¥"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
-msgid "Please enter your Last.fm account credentials."
-msgstr "è«?輸å?¥ä½ ç?? Last.fm 帳è??è­?æ?¸ã??"
+#~ msgid "Synchronize {0}"
+#~ msgstr "å??æ­¥ {0}"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
-msgid "Save and Log In"
-msgstr "��並��"
+#~ msgid "Delete From {0}"
+#~ msgstr "� {0} ��"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:113
-msgid "Sign up for Last.fm"
-msgstr "註å?? Last.fm"
+#~ msgid "Eject {0}"
+#~ msgstr "é??å?º {0}"
 
-#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:439
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:458
-msgid "Last.fm username or password is invalid."
-msgstr "Last.fm 使ç?¨è??å??稱æ??å¯?碼ç?¡æ??ã??"
+#~ msgid "Preparing..."
+#~ msgstr "æ­£å?¨æº?å??..."
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:301
-msgid "Failed to Login to Last.fm"
-msgstr "ç?»å?¥ Last.fm 失æ??"
+#~ msgid "_Configure..."
+#~ msgstr "設�(_C)..."
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
-msgid "Either your username or password is invalid."
-msgstr "ä½ ç??使ç?¨è??å??稱æ??å¯?碼æ?¯ç?¡æ??ã??"
+#~ msgid "Configure the Last.fm Extension"
+#~ msgstr "設å®? Last.fm æ?´å??å¥?件"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:440
-msgid "There is not enough content to play this station."
-msgstr "é??è£?æ²?æ??足夠ç??å?§å®¹å?¯ä»¥æ?­æ?¾é??å??é?»å?°ã??"
+#~ msgid "Station Name"
+#~ msgstr "é?»å?°å??稱"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:441
-msgid "This group does not have enough members for radio."
-msgstr "é??å??ç¾£çµ?é??ä¸?å?°å»£æ?­æ??é??ç??æ??å?¡ã??"
+#~ msgid "Station Type"
+#~ msgstr "é?»å?°é¡?å??"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:442
-msgid "This artist does not have enough fans for radio."
-msgstr "é??ä½?表æ¼?è??æ²?æ??足夠廣æ?­ç??æ­?è¿·ã??"
+#~ msgid "Edit Last.fm Settings"
+#~ msgstr "編輯 Last.fm 設��"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:443
-msgid "This station is not available."
-msgstr "é??å??é?»å?°ç?¡æ³?使ç?¨ã??"
+#~ msgid "Current source:"
+#~ msgstr "ç?®å??ç??ä¾?æº?:"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:444
-msgid "This station is only available to subscribers."
-msgstr "é??å??é?»å?°å?ªæ??ä¾?給è¨?é?±è??ã??"
+#~ msgid "Update Podcasts"
+#~ msgstr "æ?´æ?° Podcast"
+
+#~ msgid "Hide <i>{0}</i>"
+#~ msgstr "é?±è?? <i>{0}</i>"
+
+#~ msgid "Banshee Encountered a Fatal Error"
+#~ msgstr "Banshee é??å?°ä¸?å??é??大ç??é?¯èª¤"
+
+#~ msgid "An unhandled exception was thrown: "
+#~ msgstr "ä¸?æ£?ä¸?å??æ?ªè??ç??ç??ç?°å¸¸ä¾?å¤?ï¼?"
+
+#~ msgid "Assembly Version Information"
+#~ msgstr "çµ?件ç??æ?¬è³?è¨?"
+
+#~ msgid "Assembly Name"
+#~ msgstr "çµ?件å??稱"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "_Match"
+#~ msgstr "符å??(_M)"
+
+#~ msgid "any"
+#~ msgstr "任�"
+
+#~ msgid "_Limit to"
+#~ msgstr "é??å?¶ç?º(_L)"
+
+#~ msgid "ago"
+#~ msgstr "å??"
+
+#~ msgid "seconds"
+#~ msgstr "��"
+
+#~ msgid "days"
+#~ msgstr "天"
+
+#~ msgid "months"
+#~ msgstr "æ??"
+
+#~ msgid "years"
+#~ msgstr "å¹´"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:445
 #, fuzzy
-msgid "There are not enough neighbours for this station."
-msgstr "é??è£?æ²?æ??足夠ç??å?§å®¹å?¯ä»¥æ?­æ?¾é??å??é?»å?°ã??"
+#~ msgid "before"
+#~ msgstr "é??æ?´æ¸?å?®"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:446
-msgid ""
-"The streaming system is offline for maintenance, please try again later."
-msgstr "串統系統ç?®å??æ­£é?¢ç·?維謢中ï¼?è«?ç¨?å¾?å??試ã??"
+#~ msgid "after"
+#~ msgstr "ä¹?å¾?"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:447
-msgid "There was an unknown error."
-msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
+#~ msgid "is"
+#~ msgstr "æ?¯"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:455
-msgid "Not connected to Last.fm."
-msgstr "å°?æ?ªé?£ç·?å?° Last.fmã??"
+#~ msgid "is not"
+#~ msgstr "��"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:456
-msgid "Account details are needed before you can connect to Last.fm"
-msgstr "å?¨ä½ å?¯ä»¥é?£ç·?å?° Last.fm ä¹?å??é??è¦?帳è??ç??詳細è³?è¨?"
+#, fuzzy
+#~ msgid "at most"
+#~ msgstr "表æ¼?è??å??稱"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:457
-msgid "No network connection detected."
-msgstr "æ²?æ??å?µæ¸¬å?°ç¶²çµ¡é?£ç·?ã??"
+#, fuzzy
+#~ msgid "at least"
+#~ msgstr "�������"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:459
-msgid "Connecting to Last.fm."
-msgstr "é?£ç·?è?³ Last.fmã??"
+#~ msgid "empty"
+#~ msgstr "空ç??"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:460
-msgid "Connected to Last.fm."
-msgstr "å·²é?£ç·?è?³ Last.fmã??"
+#~ msgid "{0} ago"
+#~ msgstr "{0}å??"
 
-#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:149
-msgid "Unknown Podcast"
-msgstr "ä¸?æ??ç?? Podcast"
+#, fuzzy
+#~ msgid "doesn't contain"
+#~ msgstr "å??å?«"
+
+#~ msgid "starts with"
+#~ msgstr "以此é??å§?"
 
-#~ msgid "Download paused"
-#~ msgstr "ä¸?è¼?å·²æ?«å??"
+#~ msgid "ends with"
+#~ msgstr "以此��"
+
+#~ msgid "Failed to Login to Last.fm"
+#~ msgstr "ç?»å?¥ Last.fm 失æ??"
+
+#~ msgid "Either your username or password is invalid."
+#~ msgstr "æ?¨ç??使ç?¨è??å??稱æ??å¯?碼æ?¯ç?¡æ??ã??"
 
 #~ msgid "Download failed"
 #~ msgstr "ä¸?è¼?失æ??"
@@ -4518,27 +6882,12 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "All Columns"
 #~ msgstr "æ??æ??æ¬?ä½?"
 
-#~ msgid "Cannot Convert File"
-#~ msgstr "ä¸?è?½è½?æ??æª?æ¡?"
-
-#~ msgid "_Restart Video"
-#~ msgstr "é??æ?°æ?­æ?¾å½±ç??(_R)"
-
-#~ msgid "_Jump to Playing Video"
-#~ msgstr "è·³å?°æ?­æ?¾å½±ç??(_J)"
-
-#~ msgid "Downloading"
-#~ msgstr "��中"
-
 #~ msgid "Waiting to download"
 #~ msgstr "����"
 
 #~ msgid "Heard"
 #~ msgstr "å·²è?½é??"
 
-#~ msgid "<b>Loading...</b>"
-#~ msgstr "<b>��中...</b>"
-
 #~ msgid "Disk Usage:"
 #~ msgstr "ç£?ç¢?使ç?¨æ??å½¢ï¼?"
 
@@ -4701,9 +7050,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "<b>CD Importing</b>"
 #~ msgstr "<b>CD ��中</b>"
 
-#~ msgid "<b>Digital Audio Player</b>"
-#~ msgstr "<b>�������</b>"
-
 #, fuzzy
 #~ msgid "<b>Duration:</b>"
 #~ msgstr "<b>CD ��中</b>"
@@ -4746,22 +7092,9 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "<b>_Title:</b>"
 #~ msgstr "<b>é?³æ¨?è³?æ??夾</b>"
 
-#~ msgid "Conversion Format:"
-#~ msgstr "è½?æ??æ ¼å¼?ï¼?"
-
-#~ msgid "Create a new preset"
-#~ msgstr "建ç«?æ?°ç??é ?設"
-
-#~ msgid "Delete the active preset"
-#~ msgstr "å?ªé?¤ç?®å??ç??é ?設"
-
 #~ msgid "Eject disc after writing"
 #~ msgstr "寫å?¥å®?æ??å¾?é??å?ºå??ç¢?"
 
-#, fuzzy
-#~ msgid "Metadata"
-#~ msgstr "編輯�� Metadata"
-
 #~ msgid "Write disc to:"
 #~ msgstr "å°?å??ç¢?寫å?¥ï¼?"
 
@@ -4775,10 +7108,10 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "ç?¡æ³?å??å§?å?? cdparanoia"
 
 #~ msgid "Could not create mbtrm plugin"
-#~ msgstr "ç?¡æ³?建ç«? mbtrm å¤?æ??"
+#~ msgstr "ç?¡æ³?建ç«? mbtrm æ??件"
 
 #~ msgid "Could not create GNOME VFS output plugin"
-#~ msgstr "ç?¡æ³?建ç«? GNOME VFS 輸å?ºå¤?æ??"
+#~ msgstr "ç?¡æ³?建ç«? GNOME VFS 輸å?ºæ??件"
 
 #~ msgid "Encoding element does not support tagging!"
 #~ msgstr "編碼å??件ä¸?æ?¯æ?´æ¨?籤å??è?½ï¼?"
@@ -4790,7 +7123,7 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "ç?¡æ³?é??å§?æª?æ¡?編碼"
 
 #~ msgid "Could not create 'gnomevfssink' plugin"
-#~ msgstr "ç?¡æ³?建ç«?å¤?æ??ã??gnomevfssinkã??"
+#~ msgstr "ç?¡æ³?建ç«?æ??件ã??gnomevfssinkã??"
 
 #~ msgid "Could not create new HAL context"
 #~ msgstr "ç?¡æ³?建ç«?æ?°ç?? HAL å?§å®¹"
@@ -4826,10 +7159,10 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "å??å??é?¸å??æ¸?å?®ä¸­ç??æ??æ??æ?²ç?®"
 
 #~ msgid "Plugins..."
-#~ msgstr "å¤?æ??..."
+#~ msgstr "æ??件..."
 
 #~ msgid "Configure Banshee plugins"
-#~ msgstr "é??ç½® Banshee å¤?æ??"
+#~ msgstr "é??ç½® Banshee æ??件"
 
 #~ msgid "Select which columns to display in the song list"
 #~ msgstr "é?¸æ??顯示æ?²ç?®æ¸?å?®ç??æ¬?ä½?"
@@ -4840,18 +7173,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "View a detailed log of events"
 #~ msgstr "檢è¦?äº?件ç´?é??ç´°ç¯?"
 
-#~ msgid "Source"
-#~ msgstr "��"
-
-#~ msgid "Debug"
-#~ msgstr "��"
-
-#~ msgid "Toggle display of album cover art"
-#~ msgstr "å??æ??å°?輯å°?é?¢å??ç??顯示"
-
-#~ msgid "Search for songs"
-#~ msgstr "æ??å°?æ?²ç?®"
-
 #~ msgid "By matching genre"
 #~ msgstr "符å??風格"
 
@@ -4883,9 +7204,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "HAL is not initialized"
 #~ msgstr "HAL å°?æ?ªå??å§?å??"
 
-#~ msgid "Audio CD Core Initialized"
-#~ msgstr "é?³è¨? CD æ ¸å¿?å??å§?å??"
-
 #~ msgid "Cannot Eject CD"
 #~ msgstr "ç?¡æ³?é??å?º CD"
 
@@ -4994,9 +7312,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Low"
 #~ msgstr "ä½?"
 
-#~ msgid "{0}x"
-#~ msgstr "{0}x"
-
 #, fuzzy
 #~ msgid "Could not run nautilus-cd-burner"
 #~ msgstr "ç?¡æ³?建ç«?編碼è½?æ??å?¨"
@@ -5025,9 +7340,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Message"
 #~ msgstr "��"
 
-#~ msgid "Show:"
-#~ msgstr "顯示�"
-
 #~ msgid "Only Error Messages"
 #~ msgstr "å??顯示é?¯èª¤è¨?æ?¯"
 
@@ -5043,10 +7355,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Entry Details:"
 #~ msgstr "��細��"
 
-#, fuzzy
-#~ msgid "Set all track counts to this value"
-#~ msgstr "以此å?¼è¨­å®?æ??æ??é?³è»?è¨?æ?¸"
-
 #~ msgid "HAL context could not be created"
 #~ msgstr "��建� HAL �容"
 
@@ -5094,16 +7402,13 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "正�����"
 
 #~ msgid "Banshee Plugins"
-#~ msgstr "Banshee å¤?æ??"
+#~ msgstr "Banshee æ??件"
 
 #~ msgid "Plugin Name"
-#~ msgstr "å¤?æ??å??稱"
-
-#~ msgid "Overview"
-#~ msgstr "�覽"
+#~ msgstr "æ??件å??稱"
 
 #~ msgid "This plugin could not be initialized."
-#~ msgstr "å¤?æ??ç?¡æ³?å??å§?å??ã??"
+#~ msgstr "æ??件ç?¡æ³?å??å§?å??ã??"
 
 #~ msgid "Reading table of contents from CD..."
 #~ msgstr "æ­£å?¨å¾? CD è®?å??ç?®é??..."
@@ -5127,9 +7432,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "You are currently importing from {0}. Would you like to stop it?"
 #~ msgstr "æ?¨ç?®å??æ­£å?¨å¾? {0} é?²è¡?å?¯å?¥ã??æ?¨æ?³è¦?å??æ­¢å??ï¼?"
 
-#~ msgid "Copying from {0}"
-#~ msgstr "正�� {0} ���製"
-
 #, fuzzy
 #~ msgid "Import Errors"
 #~ msgstr "����"
@@ -5156,9 +7458,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Copying Songs"
 #~ msgstr "正��製��"
 
-#~ msgid "Audio Device"
-#~ msgstr "���置"
-
 #~ msgid ": Found"
 #~ msgstr "���"
 
@@ -5177,9 +7476,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Removing Songs"
 #~ msgstr "正�移���"
 
-#~ msgid "Device Error"
-#~ msgstr "è£?ç½®ç?¼ç??é?¯èª¤"
-
 #~ msgid "Could not set the owner of the device."
 #~ msgstr "ç?¡æ³?設å®?è£?ç½®ç??æ??æ??è??"
 
@@ -5211,10 +7507,10 @@ msgstr "ä¸?æ??ç?? Podcast"
 
 #~ msgid ""
 #~ "Allow engine to submit song data to last.fm in the Audioscrobbler plugin"
-#~ msgstr "å??許å¼?æ??以 Audioscrobbler å¤?æ??é??å?ºæ?²ç?®è³?æ??å?° last.fm"
+#~ msgstr "å??許å¼?æ??以 Audioscrobbler æ??件é??å?ºæ?²ç?®è³?æ??å?° last.fm"
 
 #~ msgid "Enable the Audioscrobbler plugin"
-#~ msgstr "å??ç?¨é?³è¨? scrobbler å¤?æ??"
+#~ msgstr "å??ç?¨é?³è¨? scrobbler æ??件"
 
 #~ msgid "Your last.fm password"
 #~ msgstr "æ?¨ç?? last.fm å¯?碼"
@@ -5239,10 +7535,7 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "å??ç?¨ DAAP 伺æ??å?¨æ?¯æ?´"
 
 #~ msgid "Enable the DAAP Music Sharing plugin"
-#~ msgstr "å??ç?¨ DAAP é?³æ¨?å??享å¤?æ??"
-
-#~ msgid "Name of DAAP server share"
-#~ msgstr "DAAP 伺æ??å?¨å??享å??稱"
+#~ msgstr "å??ç?¨ DAAP é?³æ¨?å??享æ??件"
 
 #~ msgid "Cannot login to DAAP share"
 #~ msgstr "ç?¡æ³?ç?»å?¥ DAAP å??享"
@@ -5276,27 +7569,21 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ "ç??ï¼?è¦?寫 metadata"
 
 #~ msgid "Enable the MetadataSearch plugin"
-#~ msgstr "å??ç?¨ Metadata æ??å°?å¤?æ??"
+#~ msgstr "å??ç?¨ Metadata æ??å°?æ??件"
 
 #~ msgid "Method of fetching cover art and supplementary metadata"
 #~ msgstr "å°?é?¢å??ç??è??é??å?  metadata ç??å??ç?¨æ?¹æ³?"
 
-#~ msgid "Multimedia Keyboard Shortcuts"
-#~ msgstr "���快��"
-
 #~ msgid ""
 #~ "Configuration of multimedia keyboard shortcuts is done through the Gnome "
 #~ "Keyboard Shortcuts configuration applet."
 #~ msgstr "ç¶?ç?± Gnome å¿«æ?·é?µé??ç½® appletï¼?å¤?åª?é«?å¿«æ?·é?µå·²ç¶?é??ç½®å®?æ??ã??"
 
 #~ msgid "Enable the MultimediaKeys plugin"
-#~ msgstr "å??ç?¨å¤?åª?é«?æ??é?µå¤?æ??"
-
-#~ msgid "Notification Area Icon"
-#~ msgstr "ç¨?å¼?ç??æ??é??ç?¥å??å??示"
+#~ msgstr "å??ç?¨å¤?åª?é«?æ??é?µæ??件"
 
 #~ msgid "Enable the Notification Area Icon plugin"
-#~ msgstr "å??ç?¨ç¨?å¼?ç??æ??é??ç?¥å??å??示å¤?æ??"
+#~ msgstr "å??ç?¨ç¨?å¼?ç??æ??é??ç?¥å??å??示æ??件"
 
 #~ msgid "Searching: {0}"
 #~ msgstr "æ­£å?¨æ??å°?ï¼?{0}"
@@ -5313,9 +7600,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Play/pause current song"
 #~ msgstr "æ?­æ?¾ï¼?æ?«å??ç?¶å??ç??æ?²ç?®"
 
-#~ msgid "Play next song"
-#~ msgstr "�������"
-
 #~ msgid "Device disk usage"
 #~ msgstr "è£?ç½®ç£?ç¢?使ç?¨æ??å½¢"
 
@@ -5325,9 +7609,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Adjust volume"
 #~ msgstr "調æ?´é?³é??"
 
-#~ msgid "Toggle shuffle playback mode"
-#~ msgstr "å??æ??æ´?ç??æ?­æ?¾æ¨¡å¼?"
-
 #~ msgid "Edit and view metadata of selected songs"
 #~ msgstr "編輯並檢è¦?é?¸æ??æ?²ç?®ç?? metadata"
 
@@ -5341,9 +7622,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ "  <big>â?¢</big> 該æ?²ç?®å??å?°ä¿?è­· (DRM)\n"
 #~ "  <big>�</big> 該��� DAP ��被����\n"
 
-#~ msgid "Playback Error"
-#~ msgstr "æ?­æ?¾ç?¼ç??é?¯èª¤"
-
 #~ msgid ""
 #~ "You have made changes to your {0}. Please choose a method for updating "
 #~ "the contents of your {0}.\n"
@@ -5365,18 +7643,12 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ "<b>è­¦å??ï¼?</b>æ?¨ç??å??ä½?å°?æ??æ?¹è®?æ??æ¸?é?¤ç?¾å­?ç?? iPod å?§å®¹ä¸¦æ??å?¯è?½é? æ??è?? iTunes "
 #~ "��容�"
 
-#~ msgid "Synchronize Library"
-#~ msgstr "å??æ­¥è³?æ??庫"
-
 #~ msgid "Save Manual Changes"
 #~ msgstr "å?²å­?æ??å??è®?æ?´"
 
 #~ msgid "Invalid column width"
 #~ msgstr "ç?¡æ??ç??æ¬?寬"
 
-#~ msgid "Choose Columns"
-#~ msgstr "é?¸æ??æ¬?ä½?"
-
 #~ msgid "Visible Playlist Columns"
 #~ msgstr "è¦?顯示ç??æ?­æ?¾æ¸?å?®æ¬?ä½?"
 
@@ -5421,6 +7693,3 @@ msgstr "ä¸?æ??ç?? Podcast"
 
 #~ msgid "File: {0}"
 #~ msgstr "���{0}"
-
-#~ msgid "{0} KHz"
-#~ msgstr "{0} KHz"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1998b6a..3944c26 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,21 +5,517 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Banshee 1.3.3\n"
+"Project-Id-Version: Banshee 1.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-27 20:26+0800\n"
-"PO-Revision-Date: 2006-08-17 17:10+0800\n"
-"Last-Translator: Hsin-lin Cheng <lancetw gmail com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n linux org tw>\n"
+"POT-Creation-Date: 2010-08-04 14:43+0800\n"
+"PO-Revision-Date: 2010-07-22 14:27+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"Language-Team: chinese-l10n <chinese-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: ../data/audio-profiles/base.xml.in.h:1
+#. ../src/Backends/Banshee.Gio/Banshee.Gio.addin.xml
+#: ../data/addin-xml-strings.cs:8
+msgid "GIO IO backend"
+msgstr "GIO IO �端��"
+
+#. ../src/Backends/Banshee.Gnome/Banshee.Gnome.addin.xml
+#: ../data/addin-xml-strings.cs:11
+msgid ""
+"Backend providers for the GNOME platform. Includes GConf support and general "
+"GNOME integration."
+msgstr ""
+
+#. ../src/Backends/Banshee.GStreamer/Banshee.GStreamer.addin.xml
+#. ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.addin.xml
+#: ../data/addin-xml-strings.cs:14 ../data/addin-xml-strings.cs:17
+msgid ""
+"GStreamer multimedia services including playback, CD ripping, and "
+"transcoding."
+msgstr "GStreamer å¤?åª?é«?æ??å??ï¼?å??å?®æ?­æ?¾æ?§å?¶ã??CD æ?·å??ã??è½?碼ç­?ã??"
+
+#. ../src/Backends/Banshee.Hal/Banshee.Hal.addin.xml
+#: ../data/addin-xml-strings.cs:20
+msgid "Provides hardware support through HAL."
+msgstr "é??é?? HAL æ??ä¾?硬é«?æ?¯æ?´ã??"
+
+#. ../src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.addin.xml
+#: ../data/addin-xml-strings.cs:23
+msgid ""
+"Provides an X11 backend for video support, which enables proper fullscreen "
+"support."
+msgstr "ç?ºè¦?è¨?æ?¯æ?´æ??ä¾? X11 å¾?端ç¨?å¼?ï¼?å?¯ä»¥å??ç?¨å??é?©ç??å?¨è?¢å¹?æ?¯æ?´ã??"
+
+#. ../src/Backends/Banshee.Osx/Banshee.Osx.addin.xml
+#: ../data/addin-xml-strings.cs:26
+msgid ""
+"Backend providers for the OSX platform. Includes general OSX integration."
+msgstr "OSX å¹³å?°ç??æ??ä¾?ç??å¾?端ç¨?å¼?ã??å??å?«é??ç?¨ç?? OSX æ?´å??ã??"
+
+#. ../src/Backends/Banshee.Unix/Banshee.Unix.addin.xml
+#: ../data/addin-xml-strings.cs:29
+msgid "Provides POSIX/UNIX support, including IO."
+msgstr "æ??ä¾? POSIX/UNIX æ?¯æ?´ï¼?å??æ?¬ IOã??"
+
+#. ../src/Core/Banshee.Core/Banshee.Core.addin.xml
+#: ../data/addin-xml-strings.cs:32
+msgid "Provides low level non-GUI utilities."
+msgstr "æ??ä¾?ä½?層ç´?ç??é?? GUI å?¬ç?¨ç¨?å¼?ã??"
+
+#. ../src/Core/Banshee.Services/Banshee.Services.addin.xml
+#: ../data/addin-xml-strings.cs:35
+msgid "Provides non-GUI utilities and services."
+msgstr "æ??ä¾?é?? GUI å?¬ç?¨ç¨?å¼?è??æ??å??ã??"
+
+#. ../src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml
+#: ../data/addin-xml-strings.cs:38
+msgid "Provides GUI utilities and services."
+msgstr "æ??ä¾? GUI å?¬ç?¨ç¨?å¼?è??æ??å??ã??"
+
+#. ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml
+#: ../data/addin-xml-strings.cs:41
+msgid "iPod Support"
+msgstr "iPod ��"
+
+#: ../data/addin-xml-strings.cs:42
+msgid "Support for most iPod devices."
+msgstr "æ?¯æ?´å¤§å¤?æ?¸ iPod è£?ç½®ã??"
+
+#: ../data/addin-xml-strings.cs:43 ../data/addin-xml-strings.cs:48
+#: ../data/addin-xml-strings.cs:53 ../data/addin-xml-strings.cs:58
+msgid "Device Support"
+msgstr "�置��"
+
+#. ../src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml
+#: ../data/addin-xml-strings.cs:46
+msgid "Karma Support"
+msgstr "Karma ��"
+
+#: ../data/addin-xml-strings.cs:47
+msgid "Support for Rio Karma devices."
+msgstr "æ?¯æ?´ Rio Karma è£?ç½®ã??"
+
+#. ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
+#: ../data/addin-xml-strings.cs:51
+msgid "Mass Storage Media Player Support"
+msgstr "大容é??å?²å­?åª?é«?æ?­æ?¾å?¨æ?¯æ?´"
+
+#: ../data/addin-xml-strings.cs:52
+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:56
+msgid "MTP Media Player Support"
+msgstr "MTP �������"
+
+#: ../data/addin-xml-strings.cs:57
+msgid "Support for MTP devices, including many Creative Zen devices."
+msgstr "æ?¯æ?´ MTP è£?ç½®ï¼?å??å?«è¨±å¤? Creative Zen è£?ç½®ã??"
+
+#. ../src/Dap/Banshee.Dap/Banshee.Dap.addin.xml
+#: ../data/addin-xml-strings.cs:61
+msgid "Digital Media Player Support"
+msgstr "���������"
+
+#: ../data/addin-xml-strings.cs:62
+msgid "Provides general support for many kinds of media player devices."
+msgstr "æ??ä¾?å¤?種é¡?å??ç??åª?é«?æ?­æ?¾å?¨è£?ç½®ç??é??ç?¨æ?¯æ?´ã??"
+
+#. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml
+#: ../data/addin-xml-strings.cs:65
+msgid "Amazon MP3 Store Source"
+msgstr "Amazon MP3 å??åº?ä¾?æº?"
+
+#: ../data/addin-xml-strings.cs:66
+msgid "Browse, search, and purchase music from the Amazon MP3 store"
+msgstr "å¾? Amazon MP3 å??åº?ç??覽ã??æ??å°?ã??購買é?³æ¨?"
+
+#: ../data/addin-xml-strings.cs:67 ../data/addin-xml-strings.cs:72
+#: ../data/addin-xml-strings.cs:107 ../data/addin-xml-strings.cs:122
+#: ../data/addin-xml-strings.cs:132 ../data/addin-xml-strings.cs:137
+#: ../data/addin-xml-strings.cs:156
+msgid "Online Sources"
+msgstr "����"
+
+#. ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.addin.xml
+#: ../data/addin-xml-strings.cs:70
+msgid "Amazon MP3 Import"
+msgstr "Amazon MP3 ��"
+
+#: ../data/addin-xml-strings.cs:71
+msgid "Download and import music purchased from Amazon.com"
+msgstr "ä¸?è¼?並å?¯å?¥å¾? Amazon.com 購買ç??é?³æ¨?"
+
+#. ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml
+#: ../data/addin-xml-strings.cs:75
+msgid "Audiobooks Library"
+msgstr "æ??è?²æ?¸è³?æ??庫"
+
+#: ../data/addin-xml-strings.cs:76
+msgid "Organize audiobooks, lectures, etc."
+msgstr "æ?´ç??æ??è?²æ?¸ã??æ¼?è¬?ç­?ã??"
+
+#: ../data/addin-xml-strings.cs:77 ../data/addin-xml-strings.cs:82
+#: ../data/addin-xml-strings.cs:112 ../data/addin-xml-strings.cs:127
+#: ../data/addin-xml-strings.cs:180 ../data/addin-xml-strings.cs:185
+msgid "Core"
+msgstr "核�"
+
+#. ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml
+#: ../data/addin-xml-strings.cs:80
+msgid "Audio CD Support"
+msgstr "�� CD ��"
+
+#: ../data/addin-xml-strings.cs:81
+msgid "Listen to and rip Audio CDs."
+msgstr "è??è?½ä¸¦æ?·å??é?³è¨? CDã??"
+
+#. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
+#: ../data/addin-xml-strings.cs:85
+msgid "Boo Scripting"
+msgstr "Boo æ??令稿"
+
+#: ../data/addin-xml-strings.cs:86
+msgid "Customize and extend Banshee with Boo-language scripts."
+msgstr "é??é?? Boo èª?è¨?æ??令稿ä¾?è?ªè¨?並æ?´å±? Banshee ç??å??è?½ã??"
+
+#: ../data/addin-xml-strings.cs:87 ../data/addin-xml-strings.cs:92
+#: ../data/addin-xml-strings.cs:97 ../data/addin-xml-strings.cs:102
+#: ../data/addin-xml-strings.cs:117 ../data/addin-xml-strings.cs:142
+#: ../data/addin-xml-strings.cs:151 ../data/addin-xml-strings.cs:161
+#: ../data/addin-xml-strings.cs:166 ../data/addin-xml-strings.cs:175
+#: ../data/addin-xml-strings.cs:204
+msgid "Utilities"
+msgstr "����"
+
+#. ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml
+#: ../data/addin-xml-strings.cs:90
+msgid "BPM Detection"
+msgstr "BMP �測"
+
+#: ../data/addin-xml-strings.cs:91
+msgid "Detect the beats per minute (BPM) of your music."
+msgstr "å?µæ¸¬æ?¨ç??é?³æ¨?æ¯?å??é??æ??å¹¾æ?? (beats per minute, BPM)ã??"
+
+#. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
+#: ../data/addin-xml-strings.cs:95
+msgid "Cover Art Fetching"
+msgstr "å°?é?¢è??è¡?æ?·å??"
+
+#: ../data/addin-xml-strings.cs:96
+msgid "Fetch cover art for all items in your library."
+msgstr "ç?ºæ?¨è³?æ??庫å?§ç??æ??æ??é ?ç?®æ?·å??å°?é?¢è??è¡?ã??"
+
+#. ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml
+#: ../data/addin-xml-strings.cs:100
+msgid "DAAP Sharing"
+msgstr "DAAP å??享"
+
+#: ../data/addin-xml-strings.cs:101
+msgid "Browse and listen to music shared over your local network."
+msgstr "ç??覽並è??è?½é??é??æ?¨æ?¬å?°ç¶²è·¯æ??å??享ç??é?³æ¨?ã??"
+
+#. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
+#: ../data/addin-xml-strings.cs:105
+msgid "eMusic Import"
+msgstr "eMusic ��"
+
+#: ../data/addin-xml-strings.cs:106
+msgid "Download and import music purchased from eMusic"
+msgstr "ä¸?è¼?並å?¯å?¥å¾? eMusic 購買ç??é?³æ¨?"
+
+#. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
+#: ../data/addin-xml-strings.cs:110
+msgid "File System Preview Queue"
+msgstr "æª?æ¡?系統é ?覽ä½?å??"
+
+#: ../data/addin-xml-strings.cs:111
+msgid "Preview files without importing to your library."
+msgstr "é ?覽æª?æ¡?è??ä¸?ç?¨å?¯å?¥è?³æ?¨ç??è³?æ??庫å?§ã??"
+
+#. ../src/Extensions/Banshee.Fixup/Banshee.Fixup.addin.xml
+#: ../data/addin-xml-strings.cs:115
+#, fuzzy
+msgid "Metadata Fixup"
+msgstr "編輯�� Metadata"
+
+#: ../data/addin-xml-strings.cs:116
+msgid "Fix broken and missing metadata using bulk operations"
+msgstr ""
+
+#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
+#: ../data/addin-xml-strings.cs:120
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:58
+msgid "Internet Archive"
+msgstr "網é??網路å?¸è??館"
+
+#: ../data/addin-xml-strings.cs:121
+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:125
+msgid "Internet Radio"
+msgstr "網路��"
+
+#: ../data/addin-xml-strings.cs:126
+msgid "Listen to and organize Internet Radio stations."
+msgstr "è??è?½ä¸¦çµ?ç¹?網é??網路é?»å?°ã??"
+
+#. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
+#: ../data/addin-xml-strings.cs:130
 #, fuzzy
+#| msgid "Last.fm Station"
+msgid "Last.fm Scrobbling"
+msgstr "Last.fm ��"
+
+#: ../data/addin-xml-strings.cs:131
+msgid "Last.fm scrobbling and context pane recommendations."
+msgstr ""
+
+#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
+#: ../data/addin-xml-strings.cs:135
+msgid "Last.fm Radio"
+msgstr "Last.fm ��"
+
+#: ../data/addin-xml-strings.cs:136
+msgid "Last.fm streaming radio for paid subscribers."
+msgstr "給ä»?è²»è¨?é?±è??æ?¶è?½ç?? Last.fm 串æµ?ç?¡ç·?é?»å?°ã??"
+
+#. ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
+#: ../data/addin-xml-strings.cs:140
+msgid "Library Watcher"
+msgstr "è³?æ??庫ç?£è¦?å?¨"
+
+#: ../data/addin-xml-strings.cs:141
+msgid "Automatically update music and video libraries"
+msgstr "è?ªå??æ?´æ?°é?³æ¨?è??å½±ç??è³?æ??庫"
+
+#. ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
+#: ../data/addin-xml-strings.cs:145
+msgid "MeeGo Support"
+msgstr "MeeGo ��"
+
+#: ../data/addin-xml-strings.cs:146
+msgid "Provides MeeGo integration, including a custom media panel."
+msgstr "æ??ä¾? MeeGo æ?´å??ï¼?å??å?®è?ªè¨?ç??åª?é«?é?¢æ?¿ã??"
+
+#. ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
+#: ../data/addin-xml-strings.cs:149
+msgid "Mini Mode"
+msgstr "迷你模�"
+
+#: ../data/addin-xml-strings.cs:150
+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:154
+msgid "Miro Guide Podcast Directory"
+msgstr ""
+
+#: ../data/addin-xml-strings.cs:155
+msgid "Browse and subscribe to thousands of audio and video podcasts."
+msgstr ""
+
+#. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
+#: ../data/addin-xml-strings.cs:159
+msgid "Multimedia Keys"
+msgstr "å¤?åª?é«?æ??é?µ"
+
+#: ../data/addin-xml-strings.cs:160
+msgid "Control playback via the multimedia keys on your keyboard."
+msgstr "é??é??æ?¨é?µç?¤ä¸?ç??å¤?åª?é«?æ??é?µä¾?æ?§å?¶æ?­æ?¾å??è?½ã??"
+
+#. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
+#: ../data/addin-xml-strings.cs:164
+msgid "Notification Area Icon"
+msgstr "ç¨?å¼?ç??æ??é??ç?¥å??å??示"
+
+#: ../data/addin-xml-strings.cs:165
+msgid "Display an icon in the notification area for controlling Banshee."
+msgstr "å?¨é??ç?¥å??å??å?§é¡¯ç¤ºç?¨ä¾?æ?§å?¶ Banshee ç??å??示ã??"
+
+#. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
+#: ../data/addin-xml-strings.cs:169
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164
+#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50
+msgid "Now Playing"
+msgstr "����"
+
+#: ../data/addin-xml-strings.cs:170
+msgid ""
+"Provides a source that displays embedded video and provides fullscreen video "
+"playback and controls."
+msgstr "æ??ä¾?顯示å?§åµ?è¦?è¨?ç??ä¾?æº?ï¼?以å??å?¨è?¢å¹?ç??è¦?è¨?æ?­æ?¾æ?§å?¶ã??"
+
+#. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
+#: ../data/addin-xml-strings.cs:173
+msgid "Importers for Amarok, Rhythmbox and iTunes"
+msgstr "æ?¯æ?´ Amarokã??Rhythmboxã??iTunes ç??å?¯å?¥ç¨?å¼?"
+
+#: ../data/addin-xml-strings.cs:174
+msgid "Import your library from Amarok, Rhythmbox or iTunes."
+msgstr "å¾? Amarokã??Rhythomboxã??iTunes å?¯å?¥æ?¨ç??è³?æ??庫ã??"
+
+#. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml
+#: ../data/addin-xml-strings.cs:178
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:58
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:79
+msgid "Play Queue"
+msgstr "æ?­æ?¾ä½?å??"
+
+#: ../data/addin-xml-strings.cs:179
+msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
+msgstr ""
+
+#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
+#: ../data/addin-xml-strings.cs:183
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:99
+msgid "Podcasts"
+msgstr "Podcasts"
+
+#: ../data/addin-xml-strings.cs:184
+msgid "Subscribe to podcasts and stream or download episodes."
+msgstr ""
+
+#. ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml
+#: ../data/addin-xml-strings.cs:188
+msgid "Remote Audio"
+msgstr "�端��"
+
+#: ../data/addin-xml-strings.cs:189
+msgid "Provides support for remote speakers like the Airport Express"
+msgstr "æ??ä¾?é? ç«¯å??å?­æ?¯æ?´ï¼?ä¾?å¦? Airport Express"
+
+#. ../src/Extensions/Banshee.Sample/Banshee.Sample.addin.xml
+#: ../data/addin-xml-strings.cs:192
+#: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40
+msgid "Sample"
+msgstr "樣å??"
+
+#: ../data/addin-xml-strings.cs:193
+msgid "A sample source useful to developers."
+msgstr "å°?é??æ³?è??ä¾?說å¾?æ??ç?¨ç??樣æ?¬ä¾?æº?ã??"
+
+#: ../data/addin-xml-strings.cs:194
+msgid "Sources"
+msgstr "��"
+
+#. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
+#: ../data/addin-xml-strings.cs:197
+msgid "SQL Debug Console"
+msgstr "SQL ��主��"
+
+#: ../data/addin-xml-strings.cs:198
+msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries."
+msgstr "æ??ä¾?ä¸?å¥? UIï¼?ç?¨ä¾?ç?£æ?§ Banshee ç?? SQL 使ç?¨ç¨?度ï¼?以å??æ?¥è©¢ã??"
+
+#: ../data/addin-xml-strings.cs:199
+msgid "Debug"
+msgstr "��"
+
+#. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
+#: ../data/addin-xml-strings.cs:202
+msgid "Torrent Downloader"
+msgstr "Torrent ����"
+
+#: ../data/addin-xml-strings.cs:203
+msgid "Support downloading BitTorrent files from podcasts."
+msgstr "æ?¯æ?´å¾? podcast ä¸?è¼? BitTorrent æª?æ¡?ã??"
+
+#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
+#: ../data/addin-xml-strings.cs:207
+#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44
+msgid "Wikipedia"
+msgstr "Wikipedia"
+
+#: ../data/addin-xml-strings.cs:208
+#, fuzzy
+msgid "View artist information from Wikipedia in the context pane."
+msgstr "å?¨æ¢?ç?®çª?æ ¼å?§æª¢è¦? Wikipedia æ??ä¾?ç??æ¼?å?ºè??è³?è¨?ã??"
+
+#: ../data/addin-xml-strings.cs:209 ../data/addin-xml-strings.cs:214
+msgid "Context Pane"
+msgstr "���格"
+
+#. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml
+#: ../data/addin-xml-strings.cs:212
+#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
+msgid "YouTube"
+msgstr "YouTube"
+
+#: ../data/addin-xml-strings.cs:213
+#, fuzzy
+msgid "Show related YouTube videos in the context pane"
+msgstr "å?¨æ¢?ç?®çª?æ ¼å?§é¡¯ç¤ºç?¸é??ç?? YouTube å½±ç??ã??"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:1
+msgid "3GPP"
+msgstr "3GPP"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:2
+msgid "AAC (Novell Encoder)"
+msgstr "AAC (Novell 編碼�)"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:3
+#: ../data/audio-profiles/mp3-lame.xml.in.h:4
+#: ../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 "ä½?å??ç??"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:4
+#, fuzzy
+#| msgid "Continue"
+msgid "Container"
+msgstr "容�"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:5
+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 "Long Term Prediction"
+msgstr ""
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:7
+msgid "Low Complexity"
+msgstr ""
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:8
+msgid "MPEG-4 ISO"
+msgstr "MPEG-4 ISO"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:9
+msgid "MPEG-4 QuickTime"
+msgstr "MPEG-4 QuickTime"
+
+#: ../data/audio-profiles/aac-novell.xml.in.h:10
+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 "é?³æ??è?²é??:"
+msgstr "è?²é??"
 
 #: ../data/audio-profiles/flac.xml.in.h:1
 msgid "Free Lossless Audio Codec"
@@ -52,36 +548,53 @@ msgstr "å¹³å??ä½?å??ç??"
 msgid "Best"
 msgstr "æ??ä½³"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:4
-#: ../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 "ä½?å??ç??"
-
 #: ../data/audio-profiles/mp3-lame.xml.in.h:5
 msgid "Constant Bitrate"
 msgstr "å?ºå®?ä½?å??ç??"
 
 #: ../data/audio-profiles/mp3-lame.xml.in.h:6
+msgid "Extreme"
+msgstr "�極"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:7
+msgid "Insane"
+msgstr ""
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:8
+msgid "LAME Preset"
+msgstr "LAME é ?å??設置"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
 msgid "MP3 (LAME Encoder)"
 msgstr "MP3 (LAME 編碼�)"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:7
+#: ../data/audio-profiles/mp3-lame.xml.in.h:10
+msgid "Medium"
+msgstr ""
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:11
+msgid "Preset"
+msgstr "é ?å??設置"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:12
+msgid "Standard"
+msgstr "��"
+
+#: ../data/audio-profiles/mp3-lame.xml.in.h:13
 msgid "VBR Mode"
 msgstr "VBR 模�"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:8
+#: ../data/audio-profiles/mp3-lame.xml.in.h:14
 msgid "VBR Quality"
 msgstr "VBR å??質"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
+#: ../data/audio-profiles/mp3-lame.xml.in.h:15
 msgid "Variable Bitrate"
 msgstr "å?¯è®?ä½?å??ç??"
 
-#: ../data/audio-profiles/mp3-lame.xml.in.h:10
+#: ../data/audio-profiles/mp3-lame.xml.in.h:16
 #: ../data/audio-profiles/vorbis.xml.in.h:5
-#: ../data/audio-profiles/wavpack.xml.in.h:11
+#: ../data/audio-profiles/wavpack.xml.in.h:15
 #: ../data/audio-profiles/wma.xml.in.h:7
 msgid "Worst"
 msgstr "æ??å·®"
@@ -119,26 +632,42 @@ msgid "Default"
 msgstr "�設�"
 
 #: ../data/audio-profiles/wavpack.xml.in.h:5
+msgid "Default Compression"
+msgstr "�設�縮�度"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:6
 msgid "Extra processing"
 msgstr "ç?¹å?¥è??ç??"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:6
+#: ../data/audio-profiles/wavpack.xml.in.h:7
+msgid "Fast Compression"
+msgstr "å¿«é??å£?縮"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:8
+msgid "High Compression"
+msgstr "��縮"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:9
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:7
+#: ../data/audio-profiles/wavpack.xml.in.h:10
 msgid "Lossy mode"
 msgstr "破���縮模�"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:8
+#: ../data/audio-profiles/wavpack.xml.in.h:11
 msgid "Mode"
 msgstr "模�"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:9
+#: ../data/audio-profiles/wavpack.xml.in.h:12
 msgid "Store MD5 sum in the file"
 msgstr "���中�� MD5 sum"
 
-#: ../data/audio-profiles/wavpack.xml.in.h:10
+#: ../data/audio-profiles/wavpack.xml.in.h:13
+msgid "Very High Compression"
+msgstr "é??常é«?å£?縮"
+
+#: ../data/audio-profiles/wavpack.xml.in.h:14
 msgid "Wavpack"
 msgstr ""
 
@@ -172,360 +701,479 @@ msgstr "使ç?¨å?¯è®?ä½?å??ç??"
 msgid "Windows Media Audio"
 msgstr "Windows Media Audio"
 
-#: ../data/banshee-1.desktop.in.in.h:1
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:72
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:76
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:162
+#: ../data/desktop-files/common.desktop.in.h:1
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:95
+#: ../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/banshee-1.desktop.in.in.h:2
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:182
+#: ../data/desktop-files/common.desktop.in.h:2
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:192
 msgid "Media Player"
 msgstr "������"
 
-#: ../data/banshee-1.desktop.in.in.h:3
+#: ../data/desktop-files/common.desktop.in.h:3
 msgid "Play and organize your media collection"
 msgstr "æ?­æ?¾ä¸¦ç®¡ç??æ?¨ç??åª?é«?æ?¶è??"
 
-#: ../libbanshee/banshee-ripper.c:201
+#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
 msgid "Could not create pipeline"
 msgstr "��建�管�"
 
-#: ../libbanshee/banshee-ripper.c:207
+#: ../libbanshee/banshee-bpmdetector.c:208
+msgid "Could not create filesrc element"
+msgstr "ç?¡æ³?建ç«? filesrc å??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:214
+msgid "Could not create decodebin plugin"
+msgstr "ç?¡æ³?建ç«? decodebin æ??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:220
+msgid "Could not create audioconvert plugin"
+msgstr "ç?¡æ³?建ç«? audioconvert æ??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:226
+msgid "Could not create bpmdetect plugin"
+msgstr "ç?¡æ³?建ç«? bpmdetect æ??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:232
+msgid "Could not create fakesink plugin"
+msgstr "ç?¡æ³?建ç«? fakesink æ??件"
+
+#: ../libbanshee/banshee-bpmdetector.c:241
+#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+msgid "Could not link pipeline elements"
+msgstr "ç?¡æ³?é?£çµ?管ç·?å??件"
+
+#: ../libbanshee/banshee-ripper.c:276
 msgid "Could not initialize element from cdda URI"
 msgstr "ç?¡æ³?å??å§?å?? cdda URI å??件"
 
-#: ../libbanshee/banshee-ripper.c:221
+#: ../libbanshee/banshee-ripper.c:290
 msgid "Could not create encoder pipeline"
 msgstr "��建�編碼�管�"
 
-#: ../libbanshee/banshee-ripper.c:227
+#: ../libbanshee/banshee-ripper.c:296
 msgid "Could not create queue plugin"
-msgstr "ç?¡æ³?建ç«?ä½?å??å¤?æ??"
+msgstr "ç?¡æ³?建ç«?ä½?å??æ??件"
 
-#: ../libbanshee/banshee-ripper.c:235
+#: ../libbanshee/banshee-ripper.c:304
 msgid "Could not create filesink plugin"
-msgstr "ç?¡æ³?建ç«? filesink å¤?æ??ç¨?å¼?"
-
-#: ../libbanshee/banshee-ripper.c:242
-msgid "Could not link pipeline elements"
-msgstr "ç?¡æ³?é?£çµ?管ç·?å??件"
+msgstr "ç?¡æ³?建ç«? filesink æ??件"
 
-#: ../libbanshee/banshee-transcoder.c:241
-msgid "Could not create 'filesrc' plugin"
-msgstr "ç?¡æ³?建ç«? 'filesrc' å¤?æ??ç¨?å¼?"
+#: ../libbanshee/banshee-transcoder.c:240
+msgid "Could not create source element"
+msgstr "ç?¡æ³?建ç«?ä¾?æº?å??件"
 
-#: ../libbanshee/banshee-transcoder.c:247
+#: ../libbanshee/banshee-transcoder.c:246
 msgid "Could not create 'decodebin' plugin"
-msgstr "ç?¡æ³?建ç«?å¤?æ??ã??decodebinã??"
+msgstr "ç?¡æ³?建ç«?ã??decodebinã??æ??件"
 
-#: ../libbanshee/banshee-transcoder.c:253
-msgid "Could not create 'filesink' plugin"
-msgstr "ç?¡æ³?建ç«? 'filesink' å¤?æ??ç¨?å¼?"
+#: ../libbanshee/banshee-transcoder.c:252
+msgid "Could not create sink element"
+msgstr "ç?¡æ³?建ç«? sink å??件"
 
-#: ../libbanshee/banshee-transcoder.c:259
+#: ../libbanshee/banshee-transcoder.c:258
 msgid "Could not create 'sinkben' plugin"
-msgstr "ç?¡æ³?建ç«?å¤?æ??ã??sinkbenã??"
+msgstr "ç?¡æ³?建ç«?ã??sinkbenã??æ??件"
 
-#: ../libbanshee/banshee-transcoder.c:265
+#: ../libbanshee/banshee-transcoder.c:264
 msgid "Could not create 'audioconvert' plugin"
-msgstr "ç?¡æ³?建ç«?å¤?æ??ã??audioconvertã??"
+msgstr "ç?¡æ³?建ç«?ã??audioconvertã??æ??件"
 
-#: ../libbanshee/banshee-transcoder.c:271
+#: ../libbanshee/banshee-transcoder.c:270
 msgid "Could not create encoding pipeline"
 msgstr "��建�編碼管�"
 
-#: ../libbanshee/banshee-transcoder.c:277
+#: ../libbanshee/banshee-transcoder.c:276
 msgid "Could not get sink pad from encoder"
 msgstr "ç?¡æ³?å¾?解碼å?¨å??å¾? sink pad"
 
-#: ../libbanshee/banshee-transcoder.c:345
+#: ../libbanshee/banshee-transcoder.c:341
 msgid "Could not construct pipeline"
 msgstr "ç?¡æ³?æ§?æ??管ç·?"
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:64
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65
 msgid "Write CD..."
 msgstr "寫� CD..."
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:66
 msgid "Write selected tracks to an audio CD"
-msgstr "å°?é?¸æ??ç??æ­?æ?²å¯«å?¥é?³æ¨? CD"
+msgstr "å°?æ??é?¸ç??æ?²ç?®å¯«å?¥é?³è¨? CD"
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:103
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
 msgid "Could not write CD"
 msgstr "��寫� CD"
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
 msgid "Brasero could not be started"
 msgstr "ç?¡æ³?å??å?? Brasero"
 
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs:78
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs:79
 msgid "Fullscreen video playback active"
 msgstr "使ç?¨å?¨è?¢å¹?å½±ç??æ?­æ?¾"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:88
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:89
 msgid "Could not find an encoder for ripping."
-msgstr "æ?¾ä¸?å?°ç?¨ä¾?æ??å??ç??編碼å?¨ã??"
+msgstr "æ?¾ä¸?å?°æ?·å??ç?¨ç??編碼å?¨ã??"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:104
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:108
 msgid "Could not create CD ripping driver."
-msgstr "ç?¡æ³?建ç«? CD æ??å??é©?å??ç¨?å¼?ã??"
+msgstr "ç?¡æ³?建ç«? CD æ?·å??é©?å??ç¨?å¼?ã??"
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs:71
+msgid "Could not create BPM detection driver."
+msgstr "ç?¡æ³?建ç«? BPM å?µæ¸¬é©?å??ç¨?å¼?ã??"
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+msgid "Enable _gapless playback"
+msgstr "å??ç?¨ç?¡ç¸«æ?­æ?¾(_G)"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:131
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:83
+msgid ""
+"Eliminate the small playback gap on track change.  Useful for concept albums "
+"and classical music"
+msgstr ""
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187
 msgid "Could not initialize GStreamer library"
 msgstr "ç?¡æ³?å??å§?å?? GStreamer å?½å¼?庫"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:259
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
 msgid "Unknown Error"
 msgstr "æ?ªç?¥ç??é?¯èª¤"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:507
-msgid "_Enable ReplayGain Correction"
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
+#, fuzzy
+#| msgid "_Enable ReplayGain Correction"
+msgid "_Enable ReplayGain correction"
 msgstr "å??ç?¨å??æ?¾å¢?ç??æ ¡æ­£(_E)"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:508
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
+#, fuzzy
+#| msgid ""
+#| "For tracks that have ReplayGain data, automatically scale (normalize) "
+#| "playback volume."
 msgid ""
 "For tracks that have ReplayGain data, automatically scale (normalize) "
-"playback volume."
-msgstr "å°?æ?¼å?«æ?? ReplayGain è³?æ??ç??é?³è»?ï¼?è?ªå??縮æ?¾ï¼?æ­£è¦?å??ï¼?æ?­æ?¾é?³é??ã??"
+"playback volume"
+msgstr "å°?æ?¼å?«æ?? ReplayGain è³?æ??ç??æ?²ç?®ï¼?è?ªå??縮æ?¾ï¼?æ­£è¦?å??ï¼?æ?­æ?¾é?³é??ã??"
+
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767
+msgid ""
+"Eliminate the small playback gap on track change.  Useful for concept albums "
+"and classical music."
+msgstr ""
 
 #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
 msgid "Could not create transcoder"
 msgstr "ç?¡æ³?建ç«?編碼è½?æ??å?¨"
 
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:87
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:116
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:139
+msgid "GStreamer# 0.10"
+msgstr "GStreamer# 0.10"
+
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:131
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:88
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:117
+#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:224
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:146
+#: ../src/Clients/Booter/Booter/Entry.cs:148
 msgid "Help Options"
 msgstr "����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:147
+#: ../src/Clients/Booter/Booter/Entry.cs:149
 msgid "Show this help"
 msgstr "顯示é??å??æ±?å?©æ??件"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:148
+#: ../src/Clients/Booter/Booter/Entry.cs:150
 msgid "Show options for controlling playback"
 msgstr "顯示ç?¨ä¾?æ?§å?¶æ?­æ?¾ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:149
+#: ../src/Clients/Booter/Booter/Entry.cs:151
 msgid "Show options for querying the playing track"
-msgstr "顯示ç?¨ä¾?æ?¥è©¢æ?­æ?¾é?³è»?ç??é?¸é ?"
+msgstr "顯示ç?¨ä¾?æ?¥è©¢æ?­æ?¾ä¸­æ?²ç?®ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:150
+#: ../src/Clients/Booter/Booter/Entry.cs:152
 msgid "Show options for querying the playing engine"
 msgstr "顯示ç?¨ä¾?æ?¥è©¢æ?­æ?¾å¼?æ??ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:153
 msgid "Show options for the user interface"
 msgstr "顯示此使ç?¨è??ä»?é?¢ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:152
+#: ../src/Clients/Booter/Booter/Entry.cs:154
 msgid "Show options for developers and debugging"
 msgstr "顯示給é??ç?¼è??è??é?¤é?¯ä¹?ç?¨ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:153
+#: ../src/Clients/Booter/Booter/Entry.cs:155
 msgid "Show all option groups"
 msgstr "顯示æ??æ??é?¸é ?群çµ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:154
+#: ../src/Clients/Booter/Booter/Entry.cs:156
 msgid "Show version information"
 msgstr "顯示ç??æ?¬è³?è¨?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:157
+#: ../src/Clients/Booter/Booter/Entry.cs:159
 msgid "Playback Control Options"
 msgstr "������"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:158
+#: ../src/Clients/Booter/Booter/Entry.cs:160
 msgid ""
 "Play the next track, optionally restarting if the 'restart' value is set"
-msgstr "æ?­æ?¾ä¸?ä¸?é¦?æ­?ï¼?å¦?æ??設å®?äº?ã??restartã??æ?¸å?¼å??æ??é??æ?°æ?­æ?¾"
+msgstr "æ?­æ?¾ä¸?ä¸?é¦?æ?²ç?®ï¼?å¦?æ??設å®?äº?ã??restartã??æ?¸å?¼å??æ??é??æ?°æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:161
 msgid ""
 "Play the previous track, optionally restarting if the 'restart value is set"
-msgstr "æ?­æ?¾å??ä¸?é¦?æ­?ï¼?å¦?æ??設å®?äº?ã??restartã??æ?¸å?¼å??æ??é??æ?°æ?­æ?¾"
+msgstr "æ?­æ?¾å??ä¸?é¦?æ?²ç?®ï¼?å¦?æ??設å®?äº?ã??restartã??æ?¸å?¼å??æ??é??æ?°æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:160
-msgid "Automatically start playing any tracks enqueued on the command line"
+#: ../src/Clients/Booter/Booter/Entry.cs:162
+msgid ""
+"If the current song has been played longer than 4 seconds then restart it, "
+"otherwise the same as --previous"
 msgstr ""
 
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:163
+msgid "Automatically start playing any tracks enqueued on the command line"
+msgstr "è?ªå??é??å§?æ?­æ?¾ä»»ä½?å?¨æ??令å??å?§ä½?å??ç??æ?²ç?®"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:164
 msgid "Start playback"
 msgstr "é??å§?æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:165
 msgid "Pause playback"
 msgstr "æ?«å??æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:166
+msgid "Toggle playback"
+msgstr "å??æ??æ?­æ?¾æ?§å?¶"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:167
 msgid "Completely stop playback"
 msgstr "çµ?æ??æ??å??æ­¢æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:169
 msgid ""
 "Enable or disable playback stopping after the currently playing track (value "
 "should be either 'true' or 'false')"
 msgstr ""
-"å??ç?¨æ??å??å?¨å?¨ç?®å??æ?­æ?¾æ­?æ?²çµ?æ??å¾?å??æ­¢æ?­æ?¾ï¼?æ?¸å?¼å?¯ä»¥æ?¯ã??trueã??æ??ã??falseã??ï¼?"
+"å??ç?¨æ??å??å?¨å?¨ç?®å??æ?­æ?¾æ?²ç?®çµ?æ??å¾?å??æ­¢æ?­æ?¾ï¼?æ?¸å?¼å?¯ä»¥æ?¯ã??trueã??æ??ã??falseã??ï¼?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:166
-msgid "Set the playback volume (0-100)"
-msgstr "設å®?æ?­æ?¾é?³é?? (0-100)"
+#: ../src/Clients/Booter/Booter/Entry.cs:170
+msgid "Set the playback volume (0-100), prefix with +/- for relative values"
+msgstr "設å®?æ?­æ?¾é?³é?? (0-100)ï¼?以å??飾å­? + æ?? - ä¾?表示ç?¸å°?å?¼"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:171
 #, fuzzy
 msgid "Seek to a specific point (seconds, float)"
-msgstr "å¾?ç?®å??ç??é ?ç?®æ??å°?ç?¹å®?ç??ä½?ç½®"
+msgstr "å¾?ç?®å??ç??é ?ç?®å°?æ?¾ç?¹å®?é»? (ç§?)"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:172
+#, fuzzy
+#| msgid "Jump to the currently playing item"
+msgid "Set the currently played track's rating (0 to 5)"
+msgstr "è·³å?°æ?­æ?¾ç?®å??ç??é ?ç?®"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:175
 msgid "Player Engine Query Options"
 msgstr "æ?­æ?¾å?¨å¼?æ??æ?¥è©¢é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:176
 msgid "Current player state"
 msgstr "ç?®å??ç??æ?­æ?¾å?¨ç??æ??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:177
 msgid "Last player state"
 msgstr "æ??æ?°æ?­æ?¾ç¨?å¼?ç??æ??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:178
 msgid "Query whether the player can be paused"
 msgstr "æ?¥è©¢æ?­æ?¾å?¨æ?¯å?¦è?½æ?«å??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:179
 msgid "Query whether the player can seek"
 msgstr "�詢��������"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:180
 msgid "Player volume"
 msgstr "æ?­æ?¾å?¨é?³é??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:181
 msgid "Player position in currently playing track"
-msgstr "ç?®å??æ?­æ?¾æ­?æ?²ä¸­æ?­æ?¾å?¨ç??ä½?ç½®"
+msgstr "ç?®å??æ?­æ?¾æ?²ç?®ä¸­æ?­æ?¾å?¨ç??ä½?ç½®"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:184
 #, fuzzy
 msgid "Playing Track Metadata Query Options"
 msgstr "æ?­æ?¾å?¨å¼?æ??æ?¥è©¢é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:180
+#: ../src/Clients/Booter/Booter/Entry.cs:185
 msgid "URI"
 msgstr "URI"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:181
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
+#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:161
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
 msgid "Artist Name"
 msgstr "æ¼?å?ºè??å??稱"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:182
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
+#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
 msgid "Album Title"
 msgstr "�輯��"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:183
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:139
-#, fuzzy
+#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
 msgid "Track Title"
-msgstr "����:"
+msgstr "����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:189
 msgid "Duration"
 msgstr "æ??çº?æ??é??"
 
 #. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:185
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:137
-#, fuzzy
+#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
 msgid "Track Number"
-msgstr "æ­?æ?²ç·¨è??:"
+msgstr "æ?²ç?®ç·¨è??"
 
 #. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:186
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:146
-#, fuzzy
+#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
 msgid "Track Count"
-msgstr "�� & ��"
+msgstr "����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:187
-#, fuzzy
+#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113
 msgid "Disc Number"
-msgstr "å??ç¢?ç·¨è??:"
+msgstr "å??ç¢?ç·¨è??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:188
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:107
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92
 msgid "Year"
 msgstr "年份"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:189
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:223
+#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:96
 msgid "Rating"
 msgstr "è©?ç­?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
+msgid "Score"
+msgstr "å??æ?¸"
+
+#. Translators: noun
+#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
+msgid "Bit Rate"
+msgstr "ä½?å??ç??"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:199
 msgid "User Interface Options"
 msgstr "使ç?¨è??ä»?é?¢é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:200
 msgid "Present the user interface on the active workspace"
 msgstr "å?¨ä½¿ç?¨ç??å·¥ä½?å??顯ç?¾ä½¿ç?¨è??ä»?é?¢"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:201
+msgid "Enter the full-screen mode"
+msgstr "�����模�"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:202
 msgid "Hide the user interface"
 msgstr "é?±è??使ç?¨è??ä»?é?¢"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:203
 msgid "Do not present the user interface, regardless of any other options"
 msgstr "ä¸?è¦?顯ç?¾ä½¿ç?¨è??ä»?é?¢ï¼?ä¸?顧任ä½?å?¶ä»?ç??é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:204
+msgid "Present the import media dialog box"
+msgstr "顯示å?¯å?¥åª?é«?å°?話ç??"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:205
+msgid "Present the about dialog"
+msgstr "顯示é??æ?¼å°?話çª?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:206
+msgid "Present the open location dialog"
+msgstr "顯示é??å??ä½?ç½®å°?話çª?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:207
+msgid "Present the preferences dialog"
+msgstr "顯示å??好設å®?å°?話çª?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:210
 msgid "Debugging and Development Options"
 msgstr "é?¤é?¯è??é??ç?¼é?¸é ?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:211
 msgid "Enable general debugging features"
 msgstr "å??ç?¨ä¸?è?¬é?¤é?¯å??è?½"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:212
 msgid "Enable debugging output of SQL queries"
 msgstr "å??ç?¨ SQL æ?¥è©¢ç??é?¤é?¯ç?¨è¼¸å?º"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:213
 msgid "Enable debugging output of Mono.Addins"
 msgstr "å??ç?¨ Mono.Addins ç??é?¤é?¯ç?¨è¼¸å?º"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:214
 msgid "Specify an alternate database to use"
 msgstr "æ??å®?è¦?使ç?¨ç??æ?¿ä»£è³?æ??庫"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:215
+#, fuzzy
+#| msgid "Specify an alternate database to use"
+msgid "Specify an alternate key, default is /apps/banshee-1/"
+msgstr "æ??å®?è¦?使ç?¨ç??æ?¿ä»£è³?æ??庫"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:216
 msgid ""
 "Optimize instance for running uninstalled; most notably, this will create an "
 "alternate Mono.Addins database in the working directory"
 msgstr ""
+"æ?ªå®?è£?ç?¨ä¾?å?·è¡?ç??æ??ä½³å??實é«?ï¼?å¿?é ?注æ??ç??æ?¯ï¼?é??æ??å?¨å·¥ä½?ç?®é??å?§å»ºç«?æ?¿ä»£æ?§ç?? Mono."
+"Addins è³?æ??庫ã??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:218
 msgid "Disable DBus support completely"
 msgstr "å®?å?¨å??ç?¨ DBus æ?¯æ?´"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:220
 #, csharp-format
 msgid "Skip loading a custom gtkrc file ({0}) if it exists"
 msgstr "å¦?æ??æ??è?ªè¨?ç?? gtkrc æª?æ¡? ({0}) å­?å?¨æ??ä¸?è¦?è¼?å?¥å®?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:238
+#: ../src/Clients/Booter/Booter/Entry.cs:251
 #, csharp-format
 msgid "The following help arguments are invalid: {0}"
 msgstr "ä¸?å??æ±?å?©å¼?æ?¸æ?¯ç?¡æ??ç??ï¼?{0}"
@@ -535,12 +1183,16 @@ msgid "Play Album"
 msgstr "���輯"
 
 #: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:83
-msgid "Queue"
-msgstr "ä½?å??"
+#, fuzzy
+#| msgid "Queue"
+msgid "En_queue"
+msgstr "å? å?¥ä½?å??(Q)"
 
 #: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
-msgid "Play"
-msgstr "æ?­æ?¾"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
+msgid "_Play"
+msgstr "æ?­æ?¾(_P)"
 
 #: ../src/Clients/Muinshee/Muinshee/MuinsheeActions.cs:47
 msgid "Play _Song"
@@ -558,7 +1210,7 @@ msgstr "���輯(_A)"
 msgid "Add an album to the playlist"
 msgstr "���輯�����"
 
-#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:254
+#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:267
 #, csharp-format
 msgid "{0} remaining"
 msgstr "�� {0}"
@@ -567,379 +1219,687 @@ msgstr "�� {0}"
 msgid "Play Song"
 msgstr "����"
 
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:88
-msgid "_Search:"
-msgstr "æ??å°? (_S)ï¼?"
-
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
-#, fuzzy
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87
 msgid "Artist, Album, or Title"
-msgstr "�輯��"
+msgstr "表æ¼?è??ã??å°?輯ã??æ¨?é¡?"
 
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:92
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:187
+#. Alias for %album_artist%
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
+msgid "Album Artist"
+msgstr "å°?輯表æ¼?è??"
+
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:91
 msgid "Genre"
 msgstr "風格"
 
+#. Translators: noun
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:166
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
+msgid "Comment"
+msgstr "å??註"
+
 #. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:187
 #, csharp-format
-msgid "Filter Results"
-msgstr "é??濾çµ?æ??ç?º"
-
-#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:39
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:261
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs:86
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:99
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:162
+msgid "Search"
+msgstr "æ??å°?"
+
+#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
+#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:100
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
 msgid "Unknown Artist"
 msgstr "æ?ªç?¥ç??æ¼?å?ºè??"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:41
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:270
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs:91
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:100
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:161
+#: ../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:101
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:136
 msgid "Unknown Album"
 msgstr "æ?ªç?¥ç??å°?輯"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:87
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
-msgid "Artist"
-msgstr "æ¼?å?ºè??"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
+msgid "Unknown Title"
+msgstr "æ?ªç?¥ç??æ¨?é¡?"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:97
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:112
-msgid "Album"
-msgstr "�輯"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
+msgid "Various Artists"
+msgstr "å??é¡?表æ¼?è??"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:102
-msgid "Title"
-msgstr "��"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
+msgid "Stream location not found"
+msgstr "���串��置"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:112
-#, fuzzy
-msgid "Count"
-msgstr "å??註"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:321
+msgid "File not found"
+msgstr "�����"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:117
-#, fuzzy
-msgid "Number"
-msgstr "å??ç¢?ç·¨è??:"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344
+msgid "Codec for playing this media type not available"
+msgstr "ç?¨ä¾?æ?­æ?¾æ­¤åª?é«?é¡?å??ç??編解碼å?¨ä¸?å?¯ç?¨"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:122
-msgid "Count (unsorted)"
-msgstr "è¨?æ?¸ï¼?æ?ªæ??åº?ï¼?"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346
+msgid "File protected by Digital Rights Management (DRM)"
+msgstr "æª?æ¡?å??æ?¸ä½?æ¬?å?©ç®¡ç?? (Digital Rights Management, DRM) ä¿?è­·"
 
-#: ../src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs:127
-#, fuzzy
-msgid "Number (unsorted)"
-msgstr "è¨?æ?¸ï¼?æ?ªæ??åº?ï¼?"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+msgid "Unknown error"
+msgstr "���誤"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:215
-msgid "Various Artists"
-msgstr "å??é¡?表æ¼?è??"
+#. TODO turn this into a PrimarySource-owned delegate?
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417
+msgid "_Restart Podcast"
+msgstr "é??æ?°æ?­æ?¾ Podcast(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:279
-msgid "Unknown Title"
-msgstr "æ?ªç?¥ç??æ¨?é¡?"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418
+msgid "_Restart Audiobook"
+msgstr "é??æ?°æ?­æ?¾æ??è?²æ?¸(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:288
-msgid "Unknown Genre"
-msgstr "æ?ªç?¥ç??æ¨?æ?²å??é¡?"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419
+msgid "_Restart Video"
+msgstr "é??æ?°æ?­æ?¾å½±ç??(_R)"
 
-#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:490
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
-msgid "Podcast"
-msgstr "Podcast"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+msgid "_Restart Song"
+msgstr "é??æ?°æ?­æ?¾æ­?æ?²(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:491
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
-msgid "Video"
-msgstr "��"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421
+msgid "_Restart Item"
+msgstr "é??æ?°æ?­æ?¾é ?ç?®(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:492
-msgid "Song"
-msgstr "æ­?æ?²"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437
+msgid "_Jump to Playing Podcast"
+msgstr "跳���中 Podcast(_J)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:493
-msgid "Item"
-msgstr "é ?ç?®"
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438
+msgid "_Jump to Playing Audiobook"
+msgstr "è·³è?³æ?­æ?¾ä¸­æ??è?²æ?¸(_J)"
+
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439
+msgid "_Jump to Playing Video"
+msgstr "è·³å?°æ?­æ?¾å½±ç??(_J)"
 
-#: ../src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs:42
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
+msgid "_Jump to Playing Song"
+msgstr "è·³å?°æ?­æ?¾ä¸­ç??æ?²ç?®(_J)"
+
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441
+msgid "_Jump to Playing Item"
+msgstr "跳���中��(_J)"
+
+#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
+#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
 #, csharp-format
-msgid "Saving tags for {0}"
-msgstr "å?²å­? {0} ç??æ¨?籤"
+msgid "{0} ({1}:{2:00})"
+msgstr "{0} ({1}:{2:00})"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:68
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
 #, csharp-format
 msgid "All Albums ({0})"
 msgstr "æ??æ??å°?輯 ({0})"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:67
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
 #, csharp-format
 msgid "All Artists ({0})"
 msgstr "æ??æ??表æ¼?è?? ({0})"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:136
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:90
+msgid "Value"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+msgid "Shuffle by A_lbum"
+msgstr "��輯����(_L)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+msgid "by album"
+msgstr "��輯"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+msgid "Play all songs from an album, then randomly choose another album"
+msgstr "ä¾?äº?æ?¸é?¸æ??å°?輯ç??æ?¹å¼?æ?­æ?¾æ??æ??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:49
+msgid "Shuffle by A_rtist"
+msgstr "ä¾?表æ¼?è??é?¨æ©?æ?­æ?¾(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50
+msgid "by artist"
+msgstr "ä¾?表æ¼?è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:51
+msgid "Play all songs by an artist, then randomly choose another artist"
+msgstr "ä¾?äº?æ?¸é?¸æ??表æ¼?è??ç??æ?¹å¼?æ?­æ?¾æ??æ??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+msgid "Shuffle _Off"
+msgstr "å??æ­¢äº?æ?¸(_O)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+msgid "manually"
+msgstr "æ??å??"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+msgid "Do not shuffle playlist"
+msgstr "ä¸?è¦?äº?æ?¸æ?­æ?¾æ¸?å?®ä¸­ç??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+msgid "Shuffle by _Rating"
+msgstr "�������(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+msgid "by rating"
+msgstr "ä¾?è©?ç­?"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+msgid "Play songs randomly, prefer higher rated songs"
+msgstr "é?¨æ©?æ?­æ?¾æ­?æ?²ï¼?å??好è©?ç­?è¼?é«?ç??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:42
+msgid "Shuffle by S_core"
+msgstr "ä¾?å??æ?¸é?¨æ©?æ?­æ?¾(_C)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43
+msgid "by score"
+msgstr "ä¾?å??æ?¸"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:44
+msgid "Play songs randomly, prefer higher scored songs"
+msgstr "é?¨æ©?æ?­æ?¾æ­?æ?²ï¼?å??好å??æ?¸è¼?é«?ç??æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+msgid "Shuffle by _Song"
+msgstr "�������(_S)"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+msgid "by song"
+msgstr "ä¾?æ­?æ?²"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+msgid "Play songs randomly from the playlist"
+msgstr "����������"
+
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:132
 msgid "Scanning for media"
 msgstr "æ??æ??åª?é«?"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:184
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:933
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1375
 msgid "Scanning..."
 msgstr "æ??ç??中..."
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:200
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:198
 #, csharp-format
 msgid "Scanning ({0} files)..."
 msgstr "æ­£å?¨æ??æ?? ({0} å??æª?æ¡?)..."
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:232
 msgid "Importing Media"
 msgstr "正�����"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:241
-#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:115
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:239
+#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
 msgid "The import process is currently running. Would you like to stop it?"
 msgstr "å?¯å?¥ç¨?åº?ç?®å??æ­£å?¨å?·è¡?ã??æ?¨æ?³è¦?å??æ­¢å??ï¼?"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:247
-#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:77
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:179
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
+#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:185
 #, csharp-format
 msgid "Importing {0} of {1}"
 msgstr "正��� {0} � {1}"
 
-#: ../src/Core/Banshee.Services/Banshee.Collection/MoveOnInfoSaveJob.cs:44
-#, csharp-format
-msgid "Renaming {0}"
-msgstr "é??æ?°å?½å?? {0}"
-
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
 #, csharp-format
 msgid "Rescanning {0} of {1}"
 msgstr "é??æ?°æ??æ?? {1} 中ç?? {0}"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:226
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
 msgid "Upgrading your Banshee Database"
 msgstr "å??ç´?æ?¨ç?? Banshee è³?æ??庫"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:227
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
 msgid ""
 "Please wait while your old Banshee database is migrated to the new format."
 msgstr "å?¨æ?¨ç??è?? Banshee è³?æ??庫è½?移å?°æ?°æ ¼å¼?æ??è«?ç¨?å??ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:932
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1372
 msgid "Refreshing Metadata"
 msgstr "é??æ?°æ?´ç??中繼è³?æ??"
 
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:252
+msgid "Classical"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:255
+msgid "Club"
+msgstr "俱��"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:258
+msgid "Dance"
+msgstr "è·³è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:261
+msgid "Full Bass"
+msgstr "ä½?é?³å¼·å??"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:264
+msgid "Full Bass and Treble"
+msgstr "ä½?é?³è??é«?é?³å¼·å??"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:267
+msgid "Full Treble"
+msgstr "é«?é?³å¼·å??"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:270
+msgid "Laptop Speakers and Headphones"
+msgstr "è??ä¸?å??é?»è?¦ç??å??å?­è??é ­æ?´å¼?è?³æ©?"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:273
+msgid "Large Hall"
+msgstr "大廳"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:276
+msgid "Live"
+msgstr "�場"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:279
+msgid "Party"
+msgstr "派�"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:282
+msgid "Pop"
+msgstr "æµ?è¡?"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:285
+msgid "Reggae"
+msgstr "�鬼"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:288
+msgid "Rock"
+msgstr "æ??滾"
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:291
+msgid "Ska"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:294
+msgid "Soft"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:297
+msgid "Soft Rock"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:300
+msgid "Techno"
+msgstr ""
+
 #: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Directory"
-msgstr "家ç?®é??"
+msgid "Home Folder"
+msgstr "家è³?æ??夾"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
 msgid "Remove From Library"
 msgstr "���庫移�"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:42
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:56
-msgid "Music Library"
-msgstr "é?³æ¨?è³?æ??庫"
+#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:65
+#, csharp-format
+msgid "{0} Folder"
+msgstr "{0}è³?æ??夾"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:67
+msgid "Track Artist"
+msgstr "æ?²ç?®è¡¨æ¼?è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83
+msgid "Album Artist Initial"
+msgstr "å°?輯表æ¼?è??é ­æ??å­?縮寫"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:88
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:199
+msgid "Conductor"
+msgstr "æ??æ?®"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:192
+msgid "Composer"
+msgstr "ä½?æ?²è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:103
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:360
+msgid "Album"
+msgstr "�輯"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:108
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:72
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:127
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:97
+msgid "Title"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:119
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:83
+msgid "Count"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:125
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:89
+msgid "Number"
+msgstr "ç·¨è??"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:131
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:95
+msgid "Count (unsorted)"
+msgstr "è¨?æ?¸ï¼?æ?ªæ??åº?ï¼?"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:137
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:101
+msgid "Number (unsorted)"
+msgstr "ç·¨è??ï¼?æ?ªæ??åº?ï¼?"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:107
+msgid "Disc Count"
+msgstr "å??ç¢?è¨?æ?¸"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:119
+msgid "Grouping"
+msgstr "群�"
 
+#. Catalog.GetString ("Music Library")
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:80
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38
+msgid "Music"
+msgstr "��"
+
+#. Misc section
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
+msgid "Miscellaneous"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+msgid "_Sort an artist's albums by year, not title"
+msgstr "ä¾?年代è??é??æ¨?é¡?æ??åº?æ??æ¼?å?ºè??ç??å°?輯(_S)"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:107
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:85
 msgid "Favorites"
 msgstr "å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:108
 msgid "Songs rated four and five stars"
 msgstr "è©?å?¹ 4 å?? 5 é¡?æ??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:112
 msgid "Recent Favorites"
 msgstr "æ??æ?°ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:113
 msgid "Songs listened to often in the past week"
 msgstr "é??å?»ä¸?é?±æ??常è?½ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:117
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
 msgid "Recently Added"
 msgstr "æ??è¿?å? å?¥ç??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:118
 msgid "Songs imported within the last week"
 msgstr "é??å?»ä¸?é?±å?¯å?¥ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:74
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:122
 msgid "Unheard"
 msgstr "æ²?æ??è?½é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:75
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:123
 msgid "Songs that have not been played or skipped"
 msgstr "å°?æ?ªæ?­æ?¾é??æ??被ç?¥é??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:81
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
 msgid "Neglected Favorites"
 msgstr "忽ç?¥ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82
-msgid "Favorites not played in over two weeks"
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
+#, fuzzy
+#| msgid "Favorites not played in over two weeks"
+msgid "Favorites not played in over two months"
 msgstr "æ??æ??æ­?æ?²è¶?é??å?©é?±æ²?æ??æ?­æ?¾é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:86
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
 msgid "Least Favorite"
 msgstr "æ??è¿?ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:87
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
 msgid "Songs rated one or two stars or that you have frequently skipped"
 msgstr "è©?å?¹ 1 æ?? 2 é¡?æ??æ??æ?¯æ?¨å¸¸å¸¸è·³é??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
 msgid "700 MB of Favorites"
 msgstr "700MB ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
 msgid "A data CD worth of favorite songs"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:97
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:145
 msgid "80 Minutes of Favorites"
 msgstr "80 å??é??ç??æ??æ??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:98
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
 msgid "An audio CD worth of favorite songs"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:103
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
 msgid "Unrated"
 msgstr "æ?ªè©?å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
 msgid "Songs that haven't been rated"
 msgstr "å°?æ?ªçµ¦äº?è©?å?¹ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:54
+#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:56
 msgid "Importing Songs"
 msgstr "正�����"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:109
+#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:113
 #, csharp-format
 msgid "Importing From {0}"
 msgstr "正� {0} ��"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:42
-msgid "Video Library"
-msgstr "å½±ç??庫"
+#. Catalog.GetString ("Video Library")
+#: ../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:63
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:64
 msgid "Produced By"
 msgstr "製�人:"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:81
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:86
 msgid "Videos rated four and five stars"
 msgstr "è©?å?¹ 4 å?? 5 é¡?æ??ç??å½±ç??"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:85
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
 msgid "Unwatched"
 msgstr "���"
 
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:86
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:91
 msgid "Videos that haven't been played yet"
 msgstr "å°?æ?ªæ?­æ?¾é??ç??å½±ç??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:92
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:98
 msgid "Default player engine"
 msgstr "é ?設æ?­æ?¾å?¨å¼?æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:99
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:105
 msgid ""
 "No player engines were found. Please ensure Banshee has been cleanly "
 "installed."
 msgstr "æ?¾ä¸?å?°æ?­æ?¾å?¨å¼?æ??ã??è«?確å®? Banshee æ?¯ä¹¾æ·¨å®?è£?ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:279
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:347
 msgid "Problem with Player Engine"
 msgstr "æ?­æ?¾å?¨å¼?æ??æ??å??é¡?"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:132
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135
 #, csharp-format
 msgid "Converting {0} of {1}"
 msgstr "æ­£å?¨è½?æ?? {1} 中ç?? {0}"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:132
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135
 msgid "Initializing"
 msgstr "æ­£å?¨å??å§?å??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:133
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138
 msgid ""
 "Files are currently being converted to another format. Would you like to "
 "stop this?"
 msgstr "æª?æ¡?ç?®å??æ­£è¦?被è½?æ??æ??å?¶ä»?é?³è¨?æ ¼å¼?ã??æ?¨æ?³è¦?å??æ­¢å??ï¼?"
 
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
+msgid "Saving Metadata to File"
+msgstr "æ­£å?¨å?²å­?中ä»?è³?æ??è?³æª?æ¡?"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
+msgid "Write _metadata to files"
+msgstr "寫å?¥ä¸­ç¹¼è³?æ??æª?æ¡?(_M)"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
+#, fuzzy
+#| msgid ""
+#| "Enable this option to save tags and other metadata inside supported audio "
+#| "files."
+msgid "Save tags and other metadata inside supported media files"
+msgstr "å??ç?¨é??å??é?¸é ?以å?²å­?æ¨?籤å??å?¶ä»?中繼è³?æ??å?°æ?¯æ?´ç??é?³æ??æª?æ¡?中ã??"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:174
+msgid "Write _ratings and play counts to files"
+msgstr "寫å?¥è©?ç­?è??æ?­æ?¾è¨?æ?¸è?³æª?æ¡?(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
+#, fuzzy
+#| msgid ""
+#| "Enable this option to save tags and other metadata inside supported audio "
+#| "files."
+msgid ""
+"Enable this option to save rating and playcount metadata inside supported "
+"audio files"
+msgstr "å??ç?¨é??å??é?¸é ?以å?²å­?æ¨?籤å??å?¶ä»?中繼è³?æ??å?°æ?¯æ?´ç??é?³æ??æª?æ¡?中ã??"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60
+msgid "_Update file and folder names"
+msgstr "æ?´æ?°æª?æ¡?è??è³?æ??夾å??稱(_U)"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
+#, fuzzy
+#| msgid ""
+#| "Enabling this option ensures that files and folders are renamed according "
+#| "to the metadata."
+msgid "Rename files and folders according to media metadata"
+msgstr "å??ç?¨é??å??é?¸é ?以確ä¿?æª?æ¡?è??è³?æ??夾å??稱é?½æ??æ ¹æ??中繼è³?æ??é??æ?°å?½å??ã??"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:175
+#, fuzzy
+#| msgid ""
+#| "Enable this option to save tags and other metadata inside supported audio "
+#| "files."
+msgid ""
+"Enable this option to save rating and play count metadata inside supported "
+"audio files whenever the rating is changed."
+msgstr "å??ç?¨é??å??é?¸é ?以å?²å­?æ¨?籤å??å?¶ä»?中繼è³?æ??å?°æ?¯æ?´ç??é?³æ??æª?æ¡?中ã??"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:176
+msgid "Import _ratings"
+msgstr "����(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:177
+msgid "Import play _counts"
+msgstr "������(_C)"
+
+#. disabled by default
+#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:302
+msgid "Improve Banshee by sending anonymous usage data"
+msgstr "è??ç?±å?³é??å?¿å??ç??使ç?¨è³?æ??ä¾?å??å?©æ?¹é?² Banshee"
+
 #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
 msgid "There is no available network connection"
 msgstr "æ²?æ??å?¯ç?¨ç??網路é?£ç·?"
 
 #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:78
-msgid "Cannot connect to NetworkManager"
-msgstr "���� NetworkManager"
+msgid "Cannot connect to NetworkManager or Wicd"
+msgstr "ç?¡æ³?é?£æ?¥è?³ NetworkManager æ?? Wicd"
 
 #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:79
 msgid "An available, working network connection will be assumed"
 msgstr "å°?å??設已æ??ä¸?å??æ??æ??ã??å?¯é??ä½?ç??網路é?£æ?¥ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:150
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:157
 msgid "_Disable features requiring Internet access"
 msgstr "å??ç?¨é??è¦?使ç?¨ç¶²è·¯ç??å??è?½(_D)"
 
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:151
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:158
 msgid ""
 "Some features require a broadband Internet connection such as Last.fm or "
 "cover art fetching"
 msgstr "æ??äº?å??è?½é??è¦?網é??網路é?£ç·?ï¼?å??æ?¯ Last.fm æ??å??å??å°?å¥?å??庫"
 
-#: ../src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
-#, csharp-format
-msgid "Unable to import track: {0}"
-msgstr "�������{0}"
-
-#: ../src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
-msgid "Importing from Amarok failed"
-msgstr "å¾? Amarok å?¯å?¥å¤±æ??"
-
-#: ../src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
-msgid "Amarok"
-msgstr "Amarok"
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:223
+msgid "The track's rating was set differently on the device and in Banshee"
+msgstr ""
 
 #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:302
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
 msgid "Playlist"
 msgstr "����"
 
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:131
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
 msgid "Remove From Playlist"
 msgstr "�����移�"
 
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:132
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
 msgid "Delete Playlist"
 msgstr "������"
 
+#. TODO generate name based on the track selection, or begin editing it
 #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
 #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:88
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:448
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:211
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:375
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:496
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213
 msgid "New Playlist"
 msgstr "æ?°ç??æ?­æ?¾æ¸?å?®"
 
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsfReferencePlaylistFormat.cs:43
+msgid "Windows Media ASX"
+msgstr "Windows Media ASX"
+
 #: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs:46
 msgid "Windows Media ASX (*.asx)"
 msgstr "Windows Media ASX (*.asx)"
@@ -948,550 +1908,614 @@ msgstr "Windows Media ASX (*.asx)"
 msgid "MPEG Version 3.0 Extended (*.m3u)"
 msgstr "MPEG 3.0 ç??æ?´å?? (*.m3u)"
 
-#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs:53
 msgid "Shoutcast Playlist version 2 (*.pls)"
 msgstr "Shoutcast æ?­æ?¾æ¸?å?®ç¬¬ 2 ç?? (*.pls)"
 
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/XspfPlaylistFormat.cs:44
+msgid "XML Shareable Playlist Format version 1 (*.xspf)"
+msgstr "XML å?¯å??享å¼?æ?­æ?¾æ¸?å?®æ ¼å¼?第 1 ç?? (*.xspf)"
+
+#. Pages (tabs)
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:50
 msgid "General"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:61
-msgid "Co_py files to media folders when importing"
-msgstr "ç?¶å?¯å?¥æ??è¤?製æª?æ¡?å?°åª?é«?è³?æ??夾(_P)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:64
-msgid "Write _metadata to files"
-msgstr "寫å?¥ä¸­ç¹¼è³?æ??æª?æ¡?(_M)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:65
-msgid ""
-"Enable this option to save tags and other metadata inside supported audio "
-"files."
-msgstr "å??ç?¨é??å??é?¸é ?以å?²å­?æ¨?籤å??å?¶ä»?中繼è³?æ??å?°æ?¯æ?´ç??é?³æ??æª?æ¡?中ã??"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:68
-msgid "_Update file and folder names"
-msgstr "æ?´æ?°æª?æ¡?è??è³?æ??夾å??稱(_U)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:69
-msgid ""
-"Enabling this option ensures that files and folders are renamed according to "
-"the metadata."
-msgstr "å??ç?¨é??å??é?¸é ?以確ä¿?æª?æ¡?è??è³?æ??夾å??稱é?½æ??æ ¹æ??中繼è³?æ??é??æ?°å?½å??ã??"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:73
-msgid "File System Organization"
-msgstr "����系統"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:76
-msgid "Folder hie_rarchy"
-msgstr "è³?æ??夾çµ?æ§?(_R)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:79
-msgid "File _name"
-msgstr "æª?æ¡?å??稱(_N)"
-
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:81
-msgid "Miscellaneous"
-msgstr "��"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:51
+msgid "Source Specific"
+msgstr "ä¾?æº?æ??å®?"
 
-#: ../src/Core/Banshee.Services/Banshee.Preferences/Page.cs:83
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:52
 msgid "Extensions"
 msgstr "æ?´å??å¥?件"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:59
-msgid "Random"
-msgstr "��"
-
-#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:65
-msgid "Name"
-msgstr "å??稱"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:69
-msgid "Highest Rating"
-msgstr "æ??é«?è©?å?¹"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:70
-msgid "Lowest Rating"
-msgstr "æ??ä½?è©?å?¹"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:72
-msgid "Most Often Played"
-msgstr "æ??常æ?­æ?¾ç??"
+#. General policies
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:55
+msgid "File Policies"
+msgstr "æª?æ¡?æ?¹é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:73
-msgid "Least Often Played"
-msgstr "ä¸?常æ?­æ?¾ç??"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:75
-msgid "Most Recently Played"
-msgstr "æ??è¿?æ?­æ?¾ç??"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
-msgid "Least Recently Played"
-msgstr "æ??è¿?ä¸?常æ?­æ?¾ç??"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:78
-msgid "Most Recently Added"
-msgstr "æ??è¿?å? å?¥ç??"
-
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:79
-msgid "Least Recently Added"
-msgstr "æ??å¾?å? å?¥ç??"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+msgid "Co_py files to media folders when importing"
+msgstr "ç?¶å?¯å?¥æ??è¤?製æª?æ¡?å?°åª?é«?è³?æ??夾(_P)"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:83
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
 msgid "items"
 msgstr "é ?ç?®"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:85
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
 msgid "hours"
 msgstr "æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:86
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
 msgid "MB"
 msgstr "MB"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:87
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
 msgid "GB"
 msgstr "GB"
 
-#. Translators: These are unique search aliases for "artist".  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:74
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:361
+msgid "Artist"
+msgstr "æ¼?å?ºè??"
+
+#. 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:76
 msgid "artist"
 msgstr "表æ¼?è??å??稱"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
 msgid "by"
 msgstr "ç?±"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
 msgid "artists"
 msgstr "表æ¼?è??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
-msgid "Album Artist"
-msgstr "å°?輯表æ¼?è??"
-
-#. Translators: These are unique search aliases for "album artist".  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:104
+#. Translators: These are unique search aliases for "album artist". You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
 #, fuzzy
 msgid "albumartist"
 msgstr "å°?輯表æ¼?è??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:104
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
 msgid "compilationartist"
 msgstr ""
 
-#. Translators: These are unique search aliases for "album".  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:114
+#. Translators: These are unique search aliases for "album". You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
 msgid "album"
 msgstr "�輯"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:114
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
 msgid "on"
-msgstr "æ­?æ?²"
+msgstr "æ?¼"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:114
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
 msgid "from"
 msgstr "å¾?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:120
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:100
 msgid "Disc"
 msgstr "å??ç¢?"
 
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:122
+#. 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:102
 #, fuzzy
 msgid "disc"
 msgstr "å??ç¢?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:122
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
 msgid "cd"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:122
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
 msgid "discnum"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
-#, fuzzy
-msgid "Disc Count"
-msgstr "å??ç¢? & è¨?æ?¸"
-
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:130
+#. 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:110
 #, fuzzy
 msgid "discs"
 msgstr "å??ç¢?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:130
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:110
 msgid "cds"
-msgstr "��"
+msgstr ""
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:139
-#, fuzzy
+#. 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:119
 msgid "track"
-msgstr "æ­?æ?² #"
+msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
 msgid "trackno"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
 msgid "tracknum"
 msgstr ""
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:148
-#, fuzzy
+#. 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:128
 msgid "tracks"
-msgstr "æ­?æ?² #"
+msgstr "æ­?æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:148
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
 msgid "trackcount"
-msgstr "�� & ��"
+msgstr "����"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:134
 msgid "Beats per Minute"
-msgstr "ç¯?æ??"
+msgstr "æ¯?å??é??å¹¾æ??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:136
 msgid "bpm"
-msgstr ""
-
-#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
-#, fuzzy
-msgid "Bit Rate"
-msgstr "ä½?å??ç??"
+msgstr "bpm"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
-#, fuzzy
+#. 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:145
 msgid "bitrate"
 msgstr "ä½?å??ç??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
 msgid "kbs"
 msgstr "kbs"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
 msgid "kps"
 msgstr "kps"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#. Translators: noun
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:152
+msgid "Sample Rate"
+msgstr "å??樣頻ç??"
+
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
+msgid "samplerate"
+msgstr "å??樣頻ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
+msgid "Hz"
+msgstr "Hz"
+
+#. Translators: noun
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:161
+msgid "Bits Per Sample"
+msgstr "æ¯?樣æ?¬ä½?å??"
+
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+#, fuzzy
+msgid "bitspersample"
+msgstr "ä½?å??ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+msgid "bitdepth"
+msgstr "ä½?å??深度"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+#, fuzzy
+#| msgid "Station"
+msgid "quantization"
+msgstr "��"
+
+#. Translators: noun
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:169
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:363
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:666
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:89
+msgid "Name"
+msgstr "å??稱"
+
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
 msgid "title"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
 #, fuzzy
 msgid "titled"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
 msgid "name"
 msgstr "å??稱"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
 #, fuzzy
 msgid "named"
 msgstr "å??稱"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:181
-#, fuzzy
+#. 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:179
 msgid "year"
-msgstr "å¹´"
+msgstr "年代"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
 msgid "released"
-msgstr ""
+msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:181
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
 msgid "yr"
 msgstr ""
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:189
+#. 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:187
 msgid "genre"
 msgstr "風格"
 
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:194
-#, fuzzy
-msgid "Composer"
-msgstr "�彩"
-
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:196
 msgid "composer"
 msgstr ""
 
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:201
-msgid "Conductor"
-msgstr "æ??æ?®"
-
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:203
-#, fuzzy
 msgid "conductor"
 msgstr "æ??æ?®"
 
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:208
-msgid "Grouping"
-msgstr "群�"
-
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:210
 #, fuzzy
 msgid "grouping"
 msgstr "群�"
 
-#. Translators: noun
+#. 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:216
-msgid "Comment"
-msgstr "å??註"
-
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:218
 msgid "comment"
 msgstr "註解"
 
+#. Translators: noun
+#: ../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
+msgid "License"
+msgstr "æ??æ¬?æ¢?款"
+
+#. 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:224
+msgid "license"
+msgstr "æ??æ¬?æ¢?款"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
+msgid "licensed"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
+msgid "under"
+msgstr ""
+
 #. , typeof(NullQueryValue)},
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:225
-#, fuzzy
+#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
 msgid "rating"
 msgstr "è©?ç­?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:225
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
 msgid "stars"
 msgstr "æ??ç´?"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:231
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:238
 msgid "Play Count"
 msgstr "��次�"
 
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:233
+#. 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:240
 #, fuzzy
 msgid "plays"
 msgstr "��次�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:233
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
 msgid "playcount"
 msgstr "���次"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:233
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
 msgid "listens"
 msgstr "è??è?½"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:239
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:246
 msgid "Skip Count"
 msgstr "ç?¥é??次æ?¸"
 
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:241
-#, fuzzy
+#. 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:248
 msgid "skips"
-msgstr "kps"
+msgstr "ç?¥é??次æ?¸"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:241
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:248
 #, fuzzy
 msgid "skipcount"
 msgstr "ç?¥é??次æ?¸"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:247
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:254
 msgid "File Size"
 msgstr "��大�"
 
-#. Translators: These are unique search fields (and nouns).  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:249
+#. 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:256
 msgid "size"
 msgstr "大�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:249
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
 msgid "filesize"
 msgstr "��大�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:255
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:262
 msgid "File Location"
 msgstr "���置"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:257
+#. 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:264
 msgid "uri"
 msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:257
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
 msgid "path"
 msgstr "路�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:257
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
 msgid "file"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:257
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
 msgid "location"
 msgstr "ä½?ç½®"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:263
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:270
 msgid "Time"
 msgstr "æ??é??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:265
+#. 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:272
 msgid "duration"
 msgstr "æ??çº?æ??é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:265
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
 msgid "length"
 msgstr "�度"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:265
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
 msgid "time"
 msgstr "time"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:271
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:278
 msgid "Mime Type"
 msgstr "Mime é¡?å??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:273
+#. 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:280
 msgid "type"
 msgstr "é¡?å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:273
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
 msgid "mimetype"
 msgstr "mimetype"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:273
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
 msgid "format"
 msgstr "格�"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:273
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
 msgid "ext"
-msgstr "ä¸?ä¸?å??(_N)"
+msgstr ""
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:279
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:286
 msgid "Last Played"
 msgstr "ä¸?次æ?­æ?¾æ??é??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:281
-#, fuzzy
+#. 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:288
 msgid "lastplayed"
-msgstr "ä¸?次æ?­æ?¾æ??é??"
+msgstr "�次��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:281
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
 #, fuzzy
 msgid "played"
 msgstr "æ?­æ?¾"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:281
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
 msgid "playedon"
-msgstr "���次"
+msgstr "���"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:287
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:294
 msgid "Last Skipped"
 msgstr "ä¸?次ç?¥é??ç??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:289
-#, fuzzy
+#. 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:296
 msgid "lastskipped"
-msgstr "ä¸?次ç?¥é??ç??"
+msgstr "ä¸?次ç?¥é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:289
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
 msgid "skipped"
-msgstr "ä¸?次ç?¥é??ç??"
+msgstr "ç?¥é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:289
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
 msgid "skippedon"
-msgstr "ä¸?次ç?¥é??ç??"
+msgstr "ç?¥é??æ?¼"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:295
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:302
 msgid "Date Added"
 msgstr "å? å?¥æ?¥æ??"
 
-#. Translators: These are unique search fields.  Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
+#. 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:304
 #, fuzzy
 msgid "added"
 msgstr "å? å?¥æ?¥æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
 #, fuzzy
 msgid "imported"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
 msgid "addedon"
-msgstr ""
+msgstr "é??å? å??件"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
 #, fuzzy
 msgid "dateadded"
 msgstr "å? å?¥æ?¥æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:297
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
 msgid "importedon"
-msgstr "已����"
+msgstr "���"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:308
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
 #: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
 msgid "Smart Playlist"
 msgstr "�������"
 
+#. 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:324
+msgid "score"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:330
+msgid "Playback Error"
+msgstr "æ?­æ?¾ç?¼ç??é?¯èª¤"
+
+#. Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:332
+msgid "playbackerror"
+msgstr "æ?­æ?¾æ?§å?¶ç?¼ç??é?¯èª¤"
+
 #. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:326
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:349
 msgid "BPM"
-msgstr ""
+msgstr "BPM"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:327
-#, fuzzy
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:350
 msgid "Skips"
-msgstr "kps"
+msgstr "ç?¥é??"
 
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:328
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:351
 msgid "Plays"
 msgstr "��次�"
 
-#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:254
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:141
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:143
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:145
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:376
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:356
+msgid "Random"
+msgstr "��"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:366
+msgid "Highest Rating"
+msgstr "æ??é«?è©?å?¹"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:367
+msgid "Lowest Rating"
+msgstr "æ??ä½?è©?å?¹"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:369
+msgid "Highest Score"
+msgstr "æ??é«?å??æ?¸"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:370
+msgid "Lowest Score"
+msgstr "æ??ä½?å??æ?¸"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:372
+msgid "Most Often Played"
+msgstr "æ??常æ?­æ?¾ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:373
+msgid "Least Often Played"
+msgstr "ä¸?常æ?­æ?¾ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:375
+msgid "Most Recently Played"
+msgstr "æ??è¿?æ?­æ?¾ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:376
+msgid "Least Recently Played"
+msgstr "æ??è¿?ä¸?常æ?­æ?¾ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:378
+msgid "Most Recently Added"
+msgstr "æ??è¿?å? å?¥ç??"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:379
+msgid "Least Recently Added"
+msgstr "æ??å¾?å? å?¥ç??"
+
+#. 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/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
+msgid "None"
+msgstr "ç?¡"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+msgid "none"
+msgstr "ç?¡"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+msgid "no"
+msgstr "ç?¡"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:49
+msgid "Resource Not Found"
+msgstr "�����"
+
+#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
+msgid "ResourceNotFound"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
+msgid "missing"
+msgstr "�失"
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
+msgid "notfound"
+msgstr "���"
+
+#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:54
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:56
+msgid "CodecNotFound"
+msgstr ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:56
+msgid "nocodec"
+msgstr "�編解碼�"
+
+#. 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 ""
+
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:61
+msgid "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:327
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:380
 msgid "Unknown"
 msgstr "��"
 
+#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:66
+msgid "unknown"
+msgstr "��"
+
 #: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
-#, fuzzy
 msgid "Unable to Migrate Smart Playlists"
-msgstr "���������"
+msgstr "ç?¡æ³?è½?移æ?ºæ?§å??æ?­æ?¾æ¸?å?®"
 
 #: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
 #, csharp-format
@@ -1499,16 +2523,16 @@ msgid "Please file a bug with this error: {0}"
 msgstr "è«?ç?ºé??å??é?¯èª¤å??å??å ±ï¼?{0}"
 
 #: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
-#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:51
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
 msgid "Edit Smart Playlist"
 msgstr "編輯�������"
 
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:229
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:233
 msgid "Delete Smart Playlist"
 msgstr "���������"
 
 #: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:147
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:154
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
 #, csharp-format
 msgid "All Genres ({0})"
 msgstr "æ??æ??æ¨?æ?²å??é¡? ({0})"
@@ -1548,45 +2572,87 @@ msgid_plural "{0} seconds"
 msgstr[0] "{0} �"
 msgstr[1] "{0} �"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:51
 msgid "Close Error Report"
 msgstr "é??é??é?¯èª¤å ±å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:82
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:6
+#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46
 msgid "Error"
 msgstr "�誤"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
+#: ../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
 msgid "Details"
 msgstr "詳細è³?æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:152
 msgid "Errors"
 msgstr "�誤"
 
+#: ../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:221
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:214
 msgid "Drive"
-msgstr ""
+msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:659
+#: ../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 "è³?æ??夾çµ?æ§?(_R)"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:240
+msgid "File _name"
+msgstr "æª?æ¡?å??稱(_N)"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689
 #, csharp-format
 msgid "Adding {0} of {1} to {2}"
 msgstr "å? å?¥ {1} 中ç?? {0} å?° {2}"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:676
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708
 #, csharp-format
 msgid "Deleting {0} of {1} From {2}"
 msgstr "å¾? {2} å?ªé?¤ {1} 中ç?? {0}"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:639
-#, csharp-format
-msgid "{0} item"
-msgid_plural "{0} items"
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:671
+msgid "Size Ascending"
+msgstr "大å°?é??å¢?æ??åº?"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:676
+msgid "Size Descending"
+msgstr "大å°?é??æ¸?æ??åº?"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:765
+#, fuzzy, csharp-format
+#| msgid "{0} item"
+#| msgid_plural "{0} items"
+msgid "{0:N0} item"
+msgid_plural "{0:N0} items"
 msgstr[0] "{0} å??é ?ç?®"
 msgstr[1] "{0} å??é ?ç?®"
 
+#: ../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:83
+msgid "Could not open stream or playlist"
+msgstr "ç?¡æ³?é??å??串æµ?æ??æ?­æ?¾æ¸?å?®"
+
+#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:92
+msgid "Problem parsing playlist"
+msgstr "解æ??æ?­æ?¾æ¸?å?®å??é¡?"
+
 #: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:61
 msgid "Could not launch URL"
 msgstr "ç?¡æ³?å??å?? URL"
@@ -1602,106 +2668,195 @@ msgstr ""
 "\n"
 "è«?檢æ?¥æ?¨ç??ã??é¦?é?¸æ??ç?¨ç¨?å¼?ã??設å®?å?¼ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs:69
-msgid "Version:"
-msgstr "ç??æ?¬:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:49
+msgid "Show:"
+msgstr "顯示�"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+msgid "All"
+msgstr "��"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:82
+msgid "Enabled"
+msgstr "å·²å??ç?¨"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:53
+msgid "Not Enabled"
+msgstr "æ?ªå??ç?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs:72
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinTile.cs:98
-msgid "Authors:"
-msgstr "ä½?è??:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:56
+msgid "Search:"
+msgstr "æ??å°?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs:75
-msgid "Copyright/License:"
-msgstr "ç??æ¬?/æ??æ¬?:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:76
+msgid "Disable album grid"
+msgstr ""
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs:79
-msgid "Extension Dependencies:"
-msgstr "æ?´å??å¥?件ç?¸ä¾?æ?§:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:77
+msgid "Disable album grid and show the classic layout instead"
+msgstr ""
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinTile.cs:183
-msgid "Disable"
-msgstr "å??ç?¨"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:81
+#, fuzzy
+#| msgid "Cannot Convert File"
+msgid "Cannot Reorder While Sorted"
+msgstr "ä¸?è?½è½?æ??æª?æ¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinTile.cs:184
-msgid "Enable"
-msgstr "å??ç?¨"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:82
+msgid ""
+"To put the playlist in manual sort mode, click the currently sorted column "
+"header until the sort arrow goes away."
+msgstr ""
 
 #. 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:159
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:172
 #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
 #, csharp-format
 msgid "{0} of {1}"
 msgstr "{0} ä¹? {1}"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
+msgid "Playing"
+msgstr "正���"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
+msgid "Paused"
+msgstr "å·²æ?«å??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227
+msgid "Protected"
+msgstr "å??ä¿?è­·"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228
+#, fuzzy
+#| msgid "Extra processing"
+msgid "External Document"
+msgstr "ç?¹å?¥è??ç??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
+msgid "Choose New Cover Art..."
+msgstr "é?¸æ??æ?°ç??å°?é?¢è??è¡?..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98
+msgid "Delete This Cover Art"
+msgstr "å?ªé?¤æ­¤å°?輯è??è¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
 msgid "Track #"
-msgstr "æ­?æ?² #"
+msgstr "�� #"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:122
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:128
 msgid "Track & Count"
-msgstr "�� & ��"
+msgstr "æ?²ç?®è??è¨?æ?¸"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132
 msgid "Disc #"
 msgstr "å??ç¢? #"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:133
 msgid "Disc & Count"
 msgstr "å??ç¢? & è¨?æ?¸"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:130
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:136
 #, csharp-format
 msgid "{0} kbps"
 msgstr "{0} kbps"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139
+#, csharp-format
+msgid "{0} Hz"
+msgstr "{0} Hz"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:142
+#, csharp-format
+msgid "{0} bits"
+msgstr "{0} ä½?å??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
+msgid "Make the context pane larger or smaller"
+msgstr "è®?æ¢?ç?®çª?æ ¼æ?´å¤§æ??æ?´å°?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
+msgid "Hide context pane"
+msgstr "é?±è??æ¢?ç?®çª?æ ¼"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
+msgid "Waiting for playback to begin..."
+msgstr "æ­£å?¨ç­?å??æ?­æ?¾æ?§å?¶é??å§?..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+msgid "Loading..."
+msgstr "��中..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:53
 msgid "Equalizer"
 msgstr "ç­?å??å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:81
-msgid "Enabled"
-msgstr "å·²å??ç?¨"
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:144
+msgid "New Preset"
+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:159
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:203
 #, fuzzy, csharp-format
 msgid "{0} by {1}"
 msgstr "{0} ä¹? {1}"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:49
-msgid "Primary Development"
-msgstr "主è¦?é??ç?¼"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+msgid "_Bookmarks"
+msgstr "�籤(_B)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+msgid "_Add Bookmark"
+msgstr "���籤(_A)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#, fuzzy
+msgid "Bookmark the Position in the Current Track"
+msgstr "å?¨ç?®å??ç??æ?²ç?®ä½?ç½®æ¨?è¨?ç?ºæ?¸ç±¤"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
+msgid "_Remove Bookmark"
+msgstr "移��籤(_R)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:54
+msgid "Maintainers"
+msgstr "維護è??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:57
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:62
 msgid "Contributors"
 msgstr "è²¢ç?»è??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:96
 msgid "Extraordinary Multimedia Management and Playback"
 msgstr "å?ºç?¾ç??é?³æ¨?管ç??è??æ?­æ?¾"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+#, csharp-format
 msgid ""
-"Copyright © 2005â??2008 Novell, Inc.\n"
+"Copyright © 2005â??{0} Novell, Inc.\n"
+"Copyright © 2005â??{0} Others\n"
 "Copyright © 2005 Aaron Bockover"
 msgstr ""
-"ç??æ¬?æ??æ?? © 2005â??2008 Novell, Inc.\n"
+"ç??æ¬?æ??æ?? © 2005â??{0} Novell, Inc.\n"
+"ç??æ¬?æ??æ?? © 2005â??{0} å?¶ä»?人\n"
 "ç??æ¬?æ??æ?? © 2005 Aaron Bockover"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:104
 msgid "Banshee Website"
 msgstr "Banshee 網�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:45
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:50
 msgid "Important tasks are running"
 msgstr "é??è¦?ç??å·¥ä½?æ­£å?¨å?·è¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:47
+#: ../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."
@@ -1709,13 +2864,13 @@ msgstr ""
 "ç?¾å?¨é??é?? Banshee å°?æ??å??æ¶?ä»»ä½?æ­£å?¨å?·è¡?ç??å·¥ä½?ã??å®?å??ä¸?æ??å?¨ä¸?次å?·è¡? Banshee æ??è?ª"
 "å??ç¹¼çº?ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:54
-msgid "Quit anyway"
-msgstr "ç?¡è«?å¦?ä½?é?½é?¢é??"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
+msgid "Quit Anyway"
+msgstr "ç?¡è«?å¦?ä½?é?½é??å?º"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:55
-msgid "Continue running"
-msgstr "æ??çº?å?·è¡?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:61
+msgid "Continue Running"
+msgstr "繼���"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:69
 msgid "Make Banshee the default media player?"
@@ -1729,7 +2884,7 @@ msgstr ""
 "ç?®å??æ??å?¶ä»?ç??ç¨?å¼?設å®?ç?ºé ?設ç??åª?é«?æ?­æ?¾ç¨?å¼?ã??æ?¨æ?¯å?¦è¦?å°? Banshee 設ç?ºé ?設å?¼ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:412
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:435
 #, csharp-format
 msgid "Do not ask me this again"
 msgstr "ä¸?è¦?å??è©¢å??æ??é??å??å??é¡?"
@@ -1738,6 +2893,11 @@ msgstr "ä¸?è¦?å??è©¢å??æ??é??å??å??é¡?"
 msgid "Make Banshee the Default"
 msgstr "� Banshee 設��設"
 
+#. Translators: verb
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+msgid "I_mport"
+msgstr "��(_M)"
+
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39
 msgid "Select album cover image"
 msgstr "é?¸æ??å°?輯å°?å¥?å??ç??"
@@ -1754,14 +2914,22 @@ msgstr "JPEG å??ç??æª?æ¡?"
 msgid "PNG image files"
 msgstr "PNG å??ç??æª?æ¡?"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:45
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:103
+msgid "Open Location"
+msgstr "é??å??ä½?ç½®"
+
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:54
 msgid "Browse..."
 msgstr "ç??覽..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:98
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:9
-msgid "Open Location"
-msgstr "é??å??ä½?ç½®"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:64
+msgid "Enter the address of the file you would like to open:"
+msgstr "輸å?¥æ?¨æ?³è¦?é??å??ç??æª?æ¡?ä½?å??ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/SeekDialog.cs:41
+msgid "Seek to Position"
+msgstr "å°?æ?¾æ??ä½?ç½®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:50
 msgid "_Media"
@@ -1776,8 +2944,8 @@ msgid "Import media from a variety of sources"
 msgstr "å¾?å??種ä¾?æº?å?¯å?¥åª?é«?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:57
-msgid "Import Playlist..."
-msgstr "������..."
+msgid "Import _Playlist..."
+msgstr "������(_P)..."
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:58
 msgid "Import a playlist"
@@ -1801,15 +2969,15 @@ msgstr "æ?­æ?¾é??å??ç??é? ç«¯ä½?ç½®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:71
 msgid "_Quit"
-msgstr "é?¢é?? (_Q)"
+msgstr "é??å?º(_Q)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:72
 msgid "Quit Banshee"
-msgstr "é?¢é?? Banshee"
+msgstr "é??å?º Banshee"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:76
 msgid "_Edit"
-msgstr "編輯 (_E)"
+msgstr "編輯(_E)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:79
 msgid "_Preferences"
@@ -1832,16 +3000,17 @@ msgid "_Tools"
 msgstr "工�(_T)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
 msgid "_Help"
-msgstr "說æ?? (_H)"
+msgstr "æ±?å?©(_H)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
 msgid "_Web Resources"
-msgstr "網���(_W)"
+msgstr "網���(_W)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:98
 msgid "Banshee _User Guide (Wiki)"
-msgstr "Banshee 使ç?¨è??æ??å??[Wiki](_U)"
+msgstr "Banshee 使ç?¨è??æ??å?? (Wiki)(_U)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
 msgid "Learn about how to use Banshee"
@@ -1849,7 +3018,7 @@ msgstr "å­¸ç¿?é??æ?¼å¦?ä½?使ç?¨ Banshee"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:104
 msgid "Advanced Collection Searching"
-msgstr ""
+msgstr "é?²é??æ?¶è??æ??å°?å??è?½"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:105
 msgid "Learn advanced ways to search your media collection"
@@ -1865,7 +3034,7 @@ msgstr "æ??訪 Banshee é¦?é ?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:116
 msgid "_Get Involved"
-msgstr "å??å? (_G)"
+msgstr "å??è??æ??å??(_G)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:117
 msgid "Become a contributor to Banshee"
@@ -1879,37 +3048,16 @@ msgstr "ç??æ?¬è³?è¨?(_V)"
 msgid "View detailed version and configuration information"
 msgstr "檢è¦?ç??æ?¬ç´°ç¯?è??é??ç½®è³?è¨?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:162
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
-msgid "Error opening stream"
-msgstr "é??å??串æµ?æ??ç?¼ç??é?¯èª¤"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:163
-msgid "Could not open stream or playlist"
-msgstr "ç?¡æ³?é??å??串æµ?æ??æ?­æ?¾æ¸?å?®"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
-msgid "Problem parsing playlist"
-msgstr "解æ??æ?­æ?¾æ¸?å?®å??é¡?"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:178
+#. Prompt user for location of the playlist.
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:180
 msgid "Import Playlist"
 msgstr "������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:181
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
 msgid "Playlists"
 msgstr "����"
 
-#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:192
-msgid "Import"
-msgstr "��"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:191
-msgid "_Play"
-msgstr "æ?­æ?¾(_P)"
-
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:67
 msgid "Play or pause the current item"
 msgstr "æ?­æ?¾æ??æ?«å??ç?®å??ç??é ?ç?®"
@@ -1931,25 +3079,17 @@ msgid "Play the previous item"
 msgstr "æ?­æ?¾ä¸?ä¸?å??é ?ç?®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
-msgid "Seek _to..."
-msgstr "���(_T)..."
+msgid "Seek _To..."
+msgstr "å°?æ?¾(_T)..."
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:79
 msgid "Seek to a specific location in current item"
-msgstr "å¾?ç?®å??ç??é ?ç?®æ??å°?ç?¹å®?ç??ä½?ç½®"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
-msgid "_Jump to Playing Song"
-msgstr "è·³å?°æ?­æ?¾ä¸­ç??æ?²ç?®(_J)"
+msgstr "å?¨ç?®å??ç??é ?ç?®å?§å°?æ?¾ç?¹å®?ä½?ç½®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:83
 msgid "Jump to the currently playing item"
 msgstr "è·³å?°æ?­æ?¾ç?®å??ç??é ?ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
-msgid "_Restart Song"
-msgstr "é??æ?°æ?­æ?¾æ­?æ?²(_R)"
-
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:87
 msgid "Restart the current item"
 msgstr "é??æ?°æ?­æ?¾ç?®å??ç??é ?ç?®"
@@ -1966,272 +3106,266 @@ msgstr "å?¨ç?®å??ç??é ?ç?®æ?­å®?å¾?å??æ­¢æ?­æ?¾"
 msgid "_Playback"
 msgstr "æ?­æ?¾ (_P)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:164
-#, fuzzy, csharp-format
-msgid "_Restart {0}"
-msgstr "é??æ?°æ?­æ?¾æ­?æ?²(_R)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:165
-#, fuzzy, csharp-format
-msgid "_Jump to Playing {0}"
-msgstr "è·³å?°æ?­æ?¾ä¸­ç??æ?²ç?®(_J)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:190
 msgid "_Pause"
 msgstr "æ?«å??(_P)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:197
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:202
 msgid "Sto_p"
 msgstr "å??æ­¢(_P)"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:72
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:73
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:74
 msgid "Repeat"
 msgstr "é??è¤?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:78
 msgid "Repeat _Off"
 msgstr "å??æ­¢é??è¤?(_O)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:80
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:79
 msgid "Do not repeat playlist"
 msgstr "ä¸?è¦?é??è¤?æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:83
 msgid "Repeat _All"
 msgstr "é??è¤?å?¨é?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:85
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84
 msgid "Play all songs before repeating playlist"
 msgstr "å?¨é??è¤?æ?­æ?¾æ¸?å?®å??æ?­æ?¾æ??æ??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:89
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:88
 msgid "Repeat Singl_e"
 msgstr "é??è¤?å?®æ?²(_E)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:89
 msgid "Repeat the current playing song"
 msgstr "é??è¤?æ?­æ?¾ç?®å??ç??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:76
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:77
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
 msgid "Shuffle"
 msgstr "æ´?ç??模å¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:82
-msgid "Shuffle _Off"
-msgstr "å??æ­¢äº?æ?¸(_O)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:83
-msgid "Do not shuffle playlist"
-msgstr "ä¸?è¦?äº?æ?¸æ?­æ?¾æ¸?å?®ä¸­ç??æ­?æ?²"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:87
-msgid "Shuffle by _Song"
-msgstr "�������(_S)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:88
-msgid "Play songs randomly from the playlist"
-msgstr "����������"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:92
-msgid "Shuffle by A_rtist"
-msgstr "ä¾?表æ¼?è??é?¨æ©?æ?­æ?¾(_R)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:93
-msgid "Play all songs by an artist, then randomly choose another artist"
-msgstr "ä¾?äº?æ?¸é?¸æ??表æ¼?è??ç??æ?¹å¼?æ?­æ?¾æ??æ??æ­?æ?²"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:97
-msgid "Shuffle by A_lbum"
-msgstr "��輯����(_L)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:98
-msgid "Play all songs from an album, then randomly choose another album"
-msgstr "ä¾?äº?æ?¸é?¸æ??å°?輯ç??æ?¹å¼?æ?­æ?¾æ??æ??æ­?æ?²"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:75
 msgid "_New Playlist"
 msgstr "������(_N)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:76
 msgid "Create a new empty playlist"
 msgstr "建ç«?æ?°ç??空ç?½æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:77
-msgid "New _Smart Playlist"
-msgstr "���������(_S)"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:79
+msgid "New _Smart Playlist..."
+msgstr "æ?°å¢?æ?ºæ?§å??æ?­æ?¾æ¸?å?®(_S)..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:80
 msgid "Create a new smart playlist"
 msgstr "建ç«?æ?°ç??æ?ºæ?§å¼?æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:88
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:90
 msgid "Import to Library"
 msgstr "�����庫"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:89
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:91
 msgid "Import source to library"
 msgstr "å°?ä¾?æº?å?¯å?¥è³?æ??庫"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:94
 msgid "Rename"
 msgstr "é??æ?°å?½å??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:97
 msgid "Export Playlist..."
 msgstr "������..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:98
 msgid "Export a playlist"
 msgstr "������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:101
 msgid "Unmap"
 msgstr "æ?ªå°?æ??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:104
 msgid "Source Properties"
 msgstr "��屬�"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:107
+#, fuzzy
+#| msgid "Sort Children"
+msgid "Sort Children by"
+msgstr "æ??åº?å­?é ?ä¾?"
+
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:111
-msgid "Refresh"
-msgstr "é??æ?´æ¸?å?®"
+msgid "Switch Source"
+msgstr "å??æ??ä¾?æº?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:112
-msgid "Refresh this randomly sorted smart playlist"
-msgstr "é??æ?°æ?´ç??äº?æ?¸å?²å­?ç??æ?ºæ?§å??æ?­æ?¾æ¸?å?®"
+msgid "Switch to a source by typing its name"
+msgstr "å??æ??è?³æ??輸å?¥å??稱ç??ä¾?æº?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:117
-msgid "Sort Children"
-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:85
+msgid "Preferences"
+msgstr "å??好設å®?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:120
-msgid "Name Ascending"
-msgstr "å??稱é??å¢?æ??åº?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:116
+msgid "Edit preferences related to this source"
+msgstr "編輯è??æ­¤ä¾?æº?ç?¸é??ç??å??好設å®?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:124
-msgid "Name Descending"
-msgstr "å??稱é??æ¸?æ??åº?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:120
+msgid "New _Smart Playlist"
+msgstr "���������(_S)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:128
-msgid "Size Ascending"
-msgstr "大å°?é??å¢?æ??åº?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+msgid "Refresh"
+msgstr "é??æ?´æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:132
-msgid "Size Descending"
-msgstr "大å°?é??æ¸?æ??åº?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:130
+msgid "Refresh this randomly sorted smart playlist"
+msgstr "é??æ?°æ?´ç??äº?æ?¸å?²å­?ç??æ?ºæ?§å??æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:300
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:297
 msgid "Could not export playlist"
 msgstr "��������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:403
+#: ../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/TrackActions.cs:67
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:469
+msgid "Separate by Type"
+msgstr "ä¾?é¡?å??å??é??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
 msgid "Select _All"
 msgstr "��(_A)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:68
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
 msgid "Select all tracks"
-msgstr "é?¸æ??å?¨é?¨ç??æ­?æ?²"
+msgstr "é?¸å??å?¨é?¨æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
 msgid "Select _None"
 msgstr "����(_N)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:72
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
 msgid "Unselect all tracks"
-msgstr "å??æ¶?é?¸å??å?¨é?¨æ­?æ?²"
+msgstr "å??æ¶?é?¸å??å?¨é?¨æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
 msgid "_Edit Track Information"
-msgstr "編輯����(_E)"
+msgstr "編輯����(_E)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:76
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
 msgid "Edit information on selected tracks"
-msgstr "編輯é?¸å??æ­?æ?²ç??è³?è¨?"
+msgstr "編輯æ??é?¸æ?²ç?®ç??è³?è¨?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:174
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:109
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:151
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:113
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:155
 msgid "Properties"
 msgstr "屬�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:80
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
 msgid "View information on selected tracks"
-msgstr "檢è¦?é?¸å??æ­?æ?²ç??è³?è¨?"
+msgstr "檢è¦?æ??é?¸æ?²ç?®ç??è³?è¨?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
 msgid "Add _to Playlist"
 msgstr "�������(_T)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:84
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
 msgid "Append selected items to playlist or create new playlist from selection"
 msgstr "å?¨æ?­æ?¾æ¸?å?®é??å? é?¸æ??ç??é ?ç?®æ??æ?¯å¾?é?¸æ??ç??é ?ç?®å»ºç«?æ?°ç??æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:89
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:92
 msgid "Create new playlist from selected tracks"
-msgstr "å¾?é?¸æ??ç??æ­?æ?²å»ºç«?æ?°ç??æ?­æ?¾æ¸?å?®"
+msgstr "å¾?æ??é?¸æ?²ç?®å»ºç«?æ?°ç??æ?­æ?¾æ¸?å?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:94
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:97
 msgid "Remove selected track(s) from this source"
-msgstr "å¾?é??å??ä¾?æº?移é?¤é?¸å??ç??æ­?æ?²"
+msgstr "å¾?æ­¤ä¾?æº?移é?¤æ??é?¸æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:97
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
 msgid "Remove From _Library"
 msgstr "å¾?è³?æ??庫移é?¤(_L)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:98
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
 msgid "Remove selected track(s) from library"
-msgstr "å¾?è³?æ??庫移é?¤é?¸å??ç??æ­?æ?²"
+msgstr "å¾?è³?æ??庫移é?¤æ??é?¸æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+msgid "_Open Containing Folder"
+msgstr "é??å??å??å?«è³?æ??夾(_O)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
+msgid "Open the folder that contains the selected item"
+msgstr "é??å??å??å?«æ??é?¸é ?ç?®ç??è³?æ??夾"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
 msgid "_Delete From Drive"
 msgstr "��置��(_D)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:102
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
 msgid "Permanently delete selected item(s) from medium"
 msgstr "å¾?å?²å­?åª?ä»?中永ä¹?å?ªé?¤é?¸æ??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#. Translators: this is a verb (command), not a noun (things)
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
+#, csharp-format
 msgid "_Search"
 msgstr "å°?æ?¾(_S)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:116
 msgid "Search for items matching certain criteria"
 msgstr "æ??å°?符å??æ??å??æ¢?件ç??é ?ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
 msgid "By Matching _Album"
 msgstr "ä¾?ç?¸ç¬¦ç??å°?輯(_A)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
 msgid "Search all songs of this album"
 msgstr "å°?æ?¾æ­¤å°?輯æ??æ??ç??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
 msgid "By Matching A_rtist"
 msgstr "ä¾?ç?¸ç¬¦ç??表æ¼?è??(_R)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
 msgid "Search all songs of this artist"
 msgstr "å°?æ?¾æ­¤æ¼?å?ºè??æ??æ??ç??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:239
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:253
 #, csharp-format
-msgid "_Delete From {0}"
-msgstr "� {0} ��(_D)"
+msgid "_Delete From \"{0}\""
+msgstr "å¾?ã??{0}ã??å?ªé?¤(_D)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:445
+msgid "The folder could not be found."
+msgstr "ç?¡æ³?æ?¾å?°è³?æ??夾ã??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:446
+msgid "Please check that the track's location is accessible by the system."
+msgstr ""
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:456
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:512
 #, csharp-format
 msgid "Are you sure you want to permanently delete this item?"
 msgid_plural ""
@@ -2239,16 +3373,16 @@ msgid_plural ""
 msgstr[0] "æ?¨ç¢ºå®?è¦?æ°¸ä¹?å?ªé?¤é??å??é ?ç?®ï¼?"
 msgstr[1] "æ?¨ç¢ºå®?è¦?æ°¸ä¹?å?ªé?¤é?¸å??ç?? {0} å??é ?ç?®ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:460
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:516
 msgid "If you delete the selection, it will be permanently lost."
 msgstr "å¦?æ??æ?¨å?ªé?¤é?¸æ??ï¼?æ?¨å°?æ??æ°¸ä¹?失å?»è©²é ?ç?®ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:463
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:519
 #, csharp-format
 msgid "Remove selection from {0}?"
 msgstr "æ?¯å?¦å¾? {0} 移é?¤é?¸æ??å??å??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:466
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:522
 #, csharp-format
 msgid "Are you sure you want to remove the selected item from your {1}?"
 msgid_plural ""
@@ -2256,103 +3390,102 @@ msgid_plural ""
 msgstr[0] "æ?¨ç¢ºå®?è¦?å¾? {1} 中移é?¤é?¸å??ç??é ?ç?®ï¼?"
 msgstr[1] "æ?¨ç¢ºå®?è¦?å¾? {1} 中移é?¤é?¸å??ç?? {0} å??é ?ç?®ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:50
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
 #, fuzzy
-msgid "Compilation Album Artist:"
+msgid "Com_pilation Album Artist:"
 msgstr "å°?輯表æ¼?è??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57
 msgid ""
 "Check this if this track is part of an album with tracks by various artists"
 msgstr ""
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:55
+#: ../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 ""
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:45
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
 msgid "Basic Details"
 msgstr "å?ºæ?¬è©³ç´°è³?æ??"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:69
-msgid "Track Title:"
-msgstr "����:"
+msgid "Track _Title:"
+msgstr "����(_T)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:76
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:77
 msgid "Set all track artists to this value"
-msgstr "以此å?¼è¨­å®?æ??æ??æ­?æ?²è¡¨æ¼?è??"
+msgstr "以此å?¼è¨­å®?æ??æ??æ?²ç?®è¡¨æ¼?è??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:77
-msgid "Track Artist:"
-msgstr "æ­?æ?²è¡¨æ¼?è??:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:78
+msgid "Track _Artist:"
+msgstr "æ?²ç?®è¡¨æ¼?è??(_A)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:84
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:86
 #, fuzzy
 msgid "Set all compilation album artists to these values"
 msgstr "以此å?¼è¨­å®?æ??æ??å°?輯æ¨?é¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:98
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:106
 msgid "Set all album titles to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??å°?輯æ¨?é¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:99
-msgid "Album Title:"
-msgstr "�輯��:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:107
+msgid "Albu_m Title:"
+msgstr "�輯��(_M)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:113
 msgid "Set all genres to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??æ¨?æ?²å??é¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:106
-msgid "Genre:"
-msgstr "æ¨?æ?²å??é¡?:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:114
+msgid "_Genre:"
+msgstr "�風(_G)�"
 
-#. Right
 #. Translators: "of" is the word beteen a track/disc number and the total count.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:114
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:130
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:164
 msgid "of"
-msgstr ""
+msgstr "�總� "
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:115
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:141
 msgid "Automatically set track number and count"
-msgstr "è?ªå??設å®?æ­?æ?²ç·¨è??è??è¨?æ?¸"
+msgstr "è?ªå??設å®?æ?²ç?®ç·¨è??è??è¨?æ?¸"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:116
-msgid "Track Number:"
-msgstr "æ­?æ?²ç·¨è??:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:144
+msgid "Track _Number:"
+msgstr "æ?²ç?®ç·¨è??(_N)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:131
-msgid "Automatically set disc number and count"
-msgstr "è?ªå??設å®?å??ç¢?ç·¨è??è??è¨?æ?¸"
+#. Catalog.GetString ("Automatically set disc number and count"),
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166
+#, fuzzy
+msgid "Set all disc numbers and counts to these values"
+msgstr "以此å?¼è¨­å®?æ??æ??é?³è»?è¨?æ?¸"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:132
-msgid "Disc Number:"
-msgstr "å??ç¢?ç·¨è??:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167
+msgid "_Disc Number:"
+msgstr "å??ç¢?ç·¨è??(_D)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:151
+#: ../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:152
-msgid "Year:"
-msgstr "年份:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
+msgid "_Year:"
+msgstr "年代(_Y)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:159
+#: ../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:160
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
-#: ../src/Libraries/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:48
-msgid "Rating:"
-msgstr "è©?å?¹:"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+msgid "_Rating:"
+msgstr "è©?ç­?(_R)ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:44
 msgid "Extra"
-msgstr ""
+msgstr "��"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:50
 #, fuzzy
@@ -2360,50 +3493,62 @@ msgid "Set all composers to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??è©?è«?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:51
-msgid "Composer:"
-msgstr ""
+msgid "C_omposer:"
+msgstr "ä½?æ?²è??(_O)ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:57
 msgid "Set all conductors to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??æ??æ?®"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:58
-msgid "Conductor:"
-msgstr "æ??æ?®:"
+msgid "Con_ductor:"
+msgstr "æ??æ?®(_D)ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:69
 msgid "Set all groupings to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??群çµ?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:70
-msgid "Grouping:"
-msgstr "群�:"
+#, fuzzy
+#| msgid "Grouping:"
+msgid "_Grouping:"
+msgstr "群�(_G)�"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:80
 msgid "Set all beats per minute to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??ç¯?æ??"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:81
-msgid "Beats Per Minute:"
-msgstr "ç¯?æ??"
+msgid "Bea_ts Per Minute:"
+msgstr "æ¯?å??é??å¹¾æ??(_T)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:88
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:93
 msgid "Set all copyrights to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??ç??æ¬?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:89
-msgid "Copyright:"
-msgstr "ç??æ¬?ï¼?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:94
+msgid "Copyrig_ht:"
+msgstr "ç??æ¬?(_H)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:100
+#, fuzzy
+#| msgid "Set all genres to this value"
+msgid "Set all licenses to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??æ¨?æ?²å??é¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:101
+msgid "_License URI:"
+msgstr "æ??æ¬?æ¢?款網å??(_L)ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:110
 msgid "Set all comments to this value"
 msgstr "以此å?¼è¨­å®?æ??æ??è©?è«?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:96
-msgid "Comment:"
-msgstr "註解�"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:111
+msgid "Co_mment:"
+msgstr "註解(_M)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/HelpPage.cs:69
 msgid "Help"
 msgstr "æ±?å?©"
 
@@ -2411,136 +3556,193 @@ msgstr "æ±?å?©"
 msgid "Lyrics"
 msgstr "æ­?è©?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:66
-msgid "Value"
-msgstr "��"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
+msgid "Advance to the next track and edit its title"
+msgstr ""
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:42
+msgid "Sorting"
+msgstr "æ??åº?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:52
+#, fuzzy
+#| msgid "Set all track artists to this value"
+msgid "Set all sort track titles to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??æ?²ç?®è¡¨æ¼?è??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:53
+msgid "Sort Track Title:"
+msgstr "æ??åº?æ?²ç?®æ¨?é¡?ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:60
+#, fuzzy
+#| msgid "Set all track artists to this value"
+msgid "Set all sort track artists to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??æ?²ç?®è¡¨æ¼?è??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:61
+msgid "Sort Track Artist:"
+msgstr "æ??åº?æ?²ç?®è¡¨æ¼?è??ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:67
+#, fuzzy
+#| msgid "Set all album titles to this value"
+msgid "Set all sort album artists to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??å°?輯æ¨?é¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:68
+msgid "Sort Album Artist:"
+msgstr "æ??åº?å°?輯表æ¼?è??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:97
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:74
+#, fuzzy
+#| msgid "Set all album titles to this value"
+msgid "Set all sort album titles to this value"
+msgstr "以此å?¼è¨­å®?æ??æ??å°?輯æ¨?é¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:75
+msgid "Sort Album Title:"
+msgstr "æ??åº?å°?輯æ¨?é¡?ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:159
 msgid "File Name:"
-msgstr "æª?æ¡?å??稱:"
+msgstr "æª?æ¡?å??稱ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:98
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:160
 msgid "Directory:"
-msgstr "ç?®é??:"
+msgstr "ç?®é??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:161
 msgid "Full Path:"
-msgstr "��路�:"
+msgstr "��路��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:167
 msgid "URI:"
 msgstr "URI:"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:176
 msgid "Duration:"
-msgstr "æ?­æ?¾æ??é??:"
+msgstr "�度�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:179
 msgid "Audio Bitrate:"
-msgstr "é?³æ??ä½?å??ç??:"
+msgstr "é?³è¨?ä½?å??ç??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:181
 msgid "Audio Sample Rate:"
-msgstr "è?²é?³å??樣ç??:"
+msgstr "é?³æ??å??樣頻ç??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:183
 msgid "Audio Channels:"
-msgstr "é?³æ??è?²é??:"
+msgstr "é?³è¨?è?²é??ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:185
+#, fuzzy
+#| msgid "Beats Per Minute:"
+msgid "Bits Per Sample:"
+msgstr "æ¯?樣æ?¬ä½?å??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:190
 msgid "Video Dimensions:"
-msgstr "å½±ç??尺寸:"
+msgstr "��維度�"
 
 #. Translators: {0} is the description of the codec
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:131
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:197
 #, csharp-format
 msgid "{0} Codec:"
-msgstr "{0} �碼�:"
+msgstr "{0} 編解碼��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:140
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:202
+msgid "Container Formats:"
+msgstr "容�格��"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:207
 msgid "Imported On:"
 msgstr "已����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:142
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:209
 msgid "Last Played:"
-msgstr "ä¸?次æ?­æ?¾ç??:"
+msgstr "�次���"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:144
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:211
 msgid "Last Skipped:"
-msgstr "ä¸?次ç?¥é??:"
+msgstr "ä¸?次ç?¥é??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:213
 msgid "Play Count:"
-msgstr "��次�:"
+msgstr "��次��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:214
 msgid "Skip Count:"
-msgstr "ç?¥é??次æ?¸:"
+msgstr "ç?¥é??次æ?¸ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:215
+msgid "Score:"
+msgstr "å??æ?¸ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:221
 msgid "File Size:"
-msgstr "��大�:"
+msgstr "��大��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:154
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222
 msgid "bytes"
 msgstr "ä½?å??çµ?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
 msgid "Track Editor"
-msgstr "��編輯�"
+msgstr "��編輯�"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
 msgid "Track Properties"
-msgstr "��屬�"
+msgstr "��屬�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:141
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
 msgid "Show the previous track"
-msgstr "顯示å??ä¸?é¦?æ­?æ?²"
+msgstr "顯示å??ä¸?é¦?æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
 msgid "Show the next track"
-msgstr "顯示����"
+msgstr "顯示�����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:170
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
 msgid "Title:"
-msgstr "��:"
+msgstr "���"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:171
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
 msgid "Artist:"
-msgstr "表æ¼?è??:"
+msgstr "表æ¼?è??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:172
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
 msgid "Album:"
-msgstr "�輯:"
+msgstr "�輯�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:276
-msgid "Sync all field values"
-msgstr "å??æ­¥æ??æ??æ¬?ä½?æ?¸å?¼"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+msgid "Sync all field _values"
+msgstr "å??æ­¥æ??æ??æ¬?ä½?æ?¸å?¼(_V)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:281
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
 msgid ""
 "Apply the values of all common fields set for this track to all of the "
 "tracks selected in this editor"
-msgstr "å¥?ç?¨é??é¦?æ­?æ??æ??常è¦?æ¬?ä½?設å®?å?°é??å??編輯å?¨ä¸­æ??æ??é?¸å??ç??æ­?æ?²"
+msgstr "å¥?ç?¨æ?¬æ?²ç?®æ??æ??常è¦?æ¬?ä½?設å®?å?°é??å??編輯å?¨ä¸­æ??æ??é?¸å??ç??æ­?æ?²"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:389
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
 #, csharp-format
 msgid "<i>Editing {0} of {1} items</i>"
 msgstr "<i>編輯 {1} 中ç?? {0} å??é ?ç?®</i>"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:631
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
 #, csharp-format
 msgid "Save the changes made to the open track?"
 msgid_plural "Save the changes made to {0} of {1} open tracks?"
-msgstr[0] "æ?¯å?¦å°?æ??å??ç??è®?æ?´å?²å­?å?°é??å??ç??æ­?æ?²ï¼?"
-msgstr[1] "æ?¯å?¦å°?æ??å??ç??è®?æ?´å?²å­?å?°é??å??ç?? {1} é¦?æ­?æ?²ä¸­ç?? {0} é¦?ï¼?"
+msgstr[0] "æ?¯å?¦å°?æ??å??ç??è®?æ?´å?²å­?å?°é??å??ç??æ?²ç?®ï¼?"
+msgstr[1] "æ?¯å?¦å°?æ??å??ç??è®?æ?´å?²å­?å?°é??å??ç?? {1} é¦?æ?²ç?®ä¸­ç?? {0} é¦?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:648
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
 msgid "Close _without Saving"
 msgstr "é??é??ä½?ä¸?å?²å­?(_W)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:684
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
 #, csharp-format
 msgid "If you don't save, changes from the last {0} will be permanently lost."
 msgstr "å¦?æ??ç?¾å?¨ä¸?å?²å­?ï¼?å°?æ??失å?»æ??å¾? {0} æ??ä¿®æ?¹ç??é?¨ä»½ã??"
@@ -2557,35 +3759,61 @@ msgstr "ç­?å??å?¨(_E)"
 msgid "View the graphical equalizer"
 msgstr "檢è¦?å??å½¢å??ç­?å??å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:72
+msgid "_Context Pane"
+msgstr "���格(_C)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:73
+#, fuzzy
+#| msgid "Show the artist/album browser above the track list"
+msgid "Show the context pane beneath the track list"
+msgstr "�������顯示���格"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:80
 msgid "_Fullscreen"
 msgstr "���(_F)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:72
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:81
 msgid "Enter or leave fullscreen mode"
 msgstr "é?²å?¥æ??é?¢é??å?¨è?¢å¹?模å¼?"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:86
+msgid "Show Cover _Art"
+msgstr "顯示å°?é?¢è??è¡?(_A)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:87
+msgid "Toggle display of album cover art"
+msgstr "å??æ??å°?輯å°?é?¢å??ç??顯示"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs:92
+#, fuzzy
+#| msgid "Still Running"
+msgid "Active Task Running"
+msgid_plural "Active Tasks Running"
+msgstr[0] "����"
+msgstr[1] "����"
+
 #. 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:437
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:525
 #, csharp-format
 msgid "{0}from{1} {2} {0}published{1} {3}"
 msgstr "{0}ä¾?è?ª{1} {2} {0}å?ºç??æ?¼{1} {3}"
 
 #. simply: "Chicago Public Radio" or whatever the artist name is
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:450
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538
 msgid "Unknown Stream"
 msgstr "ä¸?æ??ç??串æµ?"
 
 #. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:453
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541
 #, csharp-format
 msgid "{0}on{1} {2}"
 msgstr "{0}æ?¼{1} {2}"
 
 #. Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:456
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:544
 #, csharp-format
 msgid "{0} {1}"
 msgstr "{0} {1}"
@@ -2593,112 +3821,191 @@ 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:492
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:580
 #, csharp-format
 msgid "{0}by{1} {2} {0}from{1} {3}"
 msgstr "{0}�{1} {2} {0}�輯�{1} {3}"
 
 #. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title;
 #. e.g. 'from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:496
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:584
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:521
 #, 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:500
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:588
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:525
 #, 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 "å??æ­¢æ??ä½?"
 
-#: ../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}"
 
-#: ../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 "é??å??æ??ä½?ä»?å?¨å?·è¡?ä½?業ã??æ?¨æ?³è¦?å??æ­¢å??ï¼?"
 
-#: ../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 "ã??{0}ã??æ??ä½?ä»?å?¨å?·è¡?ä½?業ã??æ?¨æ?³è¦?å??æ­¢å??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:146
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
 msgid "Continue"
 msgstr "繼�"
 
-#: ../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}"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:182
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
 msgid "Stopping..."
 msgstr "æ­£å?¨å??æ­¢..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:46
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:45
 msgid "Import Files to Library"
 msgstr "å°?æª?æ¡?å?¯å?¥è³?æ??庫"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:48
 msgid "Media Files"
 msgstr "����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:66
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:59
 msgid "Local Files"
 msgstr "����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:44
-msgid "Import Folder to Library"
-msgstr "å°?è³?æ??夾å?¯å?¥è³?æ??庫"
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:59
+msgid "Files"
+msgstr "��"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
+msgid "C_hoose Files"
+msgstr "é?¸æ??æª?æ¡?(_H)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
+msgid "_Files to import:"
+msgstr "è¦?å?¯å?¥ç??æª?æ¡?(_F)ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:61
-msgid "Local Folder"
+#: ../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 "å?¯å?¥è³?æ??夾è?³è³?æ??庫"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:53
+msgid "Local Folders"
 msgstr "æ?¬å?°è³?æ??夾"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:67
-msgid "Videos from Photos Folder"
-msgstr "ç?¸ç??è³?æ??夾中ç??å½±ç??"
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:53
+msgid "Folders"
+msgstr "è³?æ??夾"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
+msgid "C_hoose Folders"
+msgstr "é?¸æ??è³?æ??夾(_H)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
+msgid "_Folders to import:"
+msgstr "è¦?å?¯å?¥ç??è³?æ??夾(_F)ï¼?"
+
+#: ../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 ""
+"æ?¨ç??åª?é«?è³?æ??庫æ?¯ç©ºç??ã??æ?¨ç?¾å?¨å?¯ä»¥å°?æ?°ç??é?³æ¨?å??å½±ç??å?¯å?¥è³?æ??庫ï¼?æ??æ??é»?å??é?¸æ??é??麼"
+"å??ã??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
+msgid "Import _from:"
+msgstr "�此��(_F)�"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:99
+msgid "Do not show this dialog again"
+msgstr "ä¸?è¦?å??顯示å°?話æ¡?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+msgid "_Import"
+msgstr "��(_I)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
+msgid "Videos From Photos Folder"
+msgstr "ç?¸ç??è³?æ??夾中ç??è¦?è¨?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
 msgid "No available profiles"
 msgstr "æ²?æ??å?¯ç?¨ç??設å®?çµ?å??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:72
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:74
 msgid "Advanced"
 msgstr "é?²é??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:19
+#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
+#, csharp-format
+msgid "Configuring {0}"
+msgstr "正�設� {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:20
 msgid "Export Playlist"
 msgstr "������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:28
+#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:29
 msgid "Export"
 msgstr "��"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:53
+#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:54
 msgid "Select Format: "
 msgstr "é?¸æ??æ ¼å¼?:"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:104
 msgid "Select library location"
 msgstr "é?¸æ??è³?æ??庫ä½?ç½®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:117
 msgid "Reset"
 msgstr "é??ç½®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:50
-msgid "Preferences"
-msgstr "å??好設å®?ï¼?"
+#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:120
+#, csharp-format
+msgid "Reset location to default ({0})"
+msgstr "é??設ä½?ç½®è?³é ?設å?¼ ({0})"
+
+#. FIXME this shouldn't be hard-coded to 'Source:', but this is the only
+#. user of this code atm...
+#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/NotebookPage.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:245
+msgid "Source:"
+msgstr "���"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:55
 msgid "Could not show preferences"
@@ -2708,89 +4015,51 @@ msgstr "ç?¡æ³?顯示å??好設å®?"
 msgid "The preferences service could not be found."
 msgstr "ç?¡æ³?æ?¾å?°å??好設å®?æ??å??ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:80
 msgid "New Smart Playlist"
 msgstr "������"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:96
+msgid "Playlist _Name:"
+msgstr "æ?­æ?¾æ¸?å?®å??稱(_N)ï¼?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119
+msgid "Open in editor"
+msgstr "å?¨ç·¨è¼¯å?¨ä¸­é??å??"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:120
+msgid "Create and save"
+msgstr "建�並��"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
 msgid "Browser on Left"
 msgstr "ç??覽å?¨å?¨å·¦æ?¹é?³é??æ?§å?¶"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:111
 msgid "Show the artist/album browser to the left of the track list"
-msgstr "å?¨æ­?æ?²æ¸?å?®ç??å·¦æ?¹é¡¯ç¤ºè¡¨æ¼?è??/å°?輯ç??覽å?¨"
+msgstr "å?¨æ?²ç?®æ¸?å?®ç??å·¦æ?¹é¡¯ç¤ºè¡¨æ¼?è??/å°?輯ç??覽å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:114
 msgid "Browser on Top"
 msgstr "ç??覽å?¨å?¨ä¸?æ?¹"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:115
 msgid "Show the artist/album browser above the track list"
-msgstr "å?¨æ­?æ?²æ¸?å?®ä¸?æ?¹é¡¯ç¤ºè¡¨æ¼?è??/å°?輯ç??覽å?¨"
+msgstr "å?¨æ?²ç?®æ¸?å?®ä¸?æ?¹é¡¯ç¤ºè¡¨æ¼?è??/å°?輯ç??覽å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
 msgid "Show Browser"
 msgstr "顯示ç??覽å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:121
 msgid "Show or hide the artist/album browser"
 msgstr "顯示æ??é?±è??表æ¼?è??/å°?輯ç??覽å?¨"
 
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>詳細è³?æ??</b>"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:2
-msgid "<big><b>Import Media to Library</b></big>"
-msgstr "<big><b>å°?åª?é«?å?¯å?¥è³?æ??庫</b></big>"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:3
-msgid "Choose an import source:"
-msgstr "é?¸æ??å?¯å?¥ä¾?æº?ï¼?"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:4
-msgid "Do not show this dialog again"
-msgstr "ä¸?è¦?å??顯示å°?話æ¡?"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:5
-msgid "Enter the address of the file you would like to open:"
-msgstr "輸å?¥æ?¨æ?³è¦?é??å??ç??æª?æ¡?ä½?å??ï¼?"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:7
-msgid "Import Media Source"
-msgstr "������"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:8
-msgid "Import Media to Library"
-msgstr "å°?åª?é«?å?¯å?¥è³?æ??庫"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:10
-msgid "Open in editor"
-msgstr "å?¨ç·¨è¼¯å?¨ä¸­é??å??"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:11
-msgid "Playlist _Name: "
-msgstr "æ?­æ?¾æ¸?å?®å??稱(_N):"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:12
-msgid "Predefined Smart Playlists"
-msgstr "é ?å??å®?義ç??æ?ºæ?§å¼?æ?­æ?¾æ¸?å?®"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:13
-msgid "Seek to Position"
-msgstr "æ??å°?ä½?ç½®"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:14
-msgid "Select for use"
-msgstr "é?¸æ??使ç?¨"
-
-#: ../src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade.h:15
-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.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:117
+#, fuzzy, csharp-format
+#| msgid "Loading {0}"
+msgid "Loading {0}..."
+msgstr "正��� {0}"
 
 #: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
 msgid ""
@@ -2800,41 +4069,55 @@ msgstr ""
 "æ??å?¥\n"
 "å??ç¢?"
 
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:140
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
+msgid "Seek"
+msgstr "å°?æ?¾"
+
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:148
 msgid "Idle"
 msgstr "é??ç½®"
 
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:141
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:68
 msgid "Contacting..."
 msgstr "��中..."
 
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:159
 msgid "Buffering"
 msgstr "正�緩�"
 
-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:549
+#: ../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:551
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
 msgid "Full Volume"
 msgstr "æ??大é?³é??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:123
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:131
 #, csharp-format
 msgid "Sync {0}"
 msgstr "å??æ­¥ {0}"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:165
+#. Note to translators: {0}, {1} and {2} will be replaced with numbers.
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:256
+#, csharp-format
+msgid "{0} to add, {1} to remove, {2} to update"
+msgstr "å? å?¥ {0} å??ï¼?移é?¤ {1} å??ï¼?æ?´æ?° {2} å??"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:175
 msgid "Device Properties"
 msgstr "�置屬�"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:189
-#, fuzzy
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:199
 msgid "Product"
-msgstr "Podcast"
+msgstr "ç?¢å??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:190
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
 msgid "Vendor"
 msgstr "å» å??"
 
@@ -2843,83 +4126,85 @@ msgstr "å» å??"
 msgid "Loading {0}"
 msgstr "正��� {0}"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:357
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:361
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:357
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:361
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:378
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:382
 #, 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:384
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:388
 msgid "File format conversion support is not available"
 msgstr "ç?¡æ³?使ç?¨æª?æ¡?æ ¼å¼?è½?æ??æ?¯æ?´"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:410
-#, fuzzy
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:414
 msgid "Error converting file"
-msgstr "寫å?¥å??ç¢?ç?¼ç??é?¯èª¤"
+msgstr "è½?æ??æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:116
-msgid "Manually manage this device"
-msgstr "æ??å??管ç??é??å??è£?ç½®"
-
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:117
-msgid ""
-"Manually managing your device means you can drag and drop items onto the "
-"device, and manually remove them."
-msgstr "æ??å??管ç??æ?¨ç??è£?置表示æ?¨å?¯ä»¥æ??æ?¾é ?ç?®å?°æ­¤è£?ç½®ï¼?並ä¸?æ??å??移é?¤å®?å??ã??"
-
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:121
-msgid ""
-"Automatically sync the device when plugged in or when the libraries change"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:137
+#, fuzzy
+#| msgid ""
+#| "Automatically sync the device when plugged in or when the libraries change"
+msgid "Sync when first plugged in and when the libraries change"
 msgstr "ç?¶é?£æ?¥æ­¤è£?ç½®æ??é?³æ¨?館æ??æ?¹è®?æ??è?ªå??å??æ­¥"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:122
+#: ../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:125
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:141
 msgid "Sync Preferences"
 msgstr "å??æ­¥å??好設å®?"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:50
-msgid "Synchronize"
-msgstr "å??æ­¥"
-
-#. Translators: {0} is the name of the digital audio player
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:88
+#. singular form unused b/c we know it's > 1, but we still need GetPlural
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:364
 #, csharp-format
-msgid "Synchronize {0}"
-msgstr "å??æ­¥ {0}"
+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/DapSync.cs:368
+msgid "Are you sure you want to continue?"
+msgstr "æ?¨ç¢ºå®?è¦?ç¹¼çº?å??ï¼?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:376
+msgid "Remove tracks"
+msgstr "移���"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:52
+msgid "Sync"
+msgstr "å??æ­¥"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:67
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97
 msgid "Audio"
 msgstr "��"
 
 #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:69
+msgid "Video"
+msgstr "��"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:70
 msgid "Other"
 msgstr "��"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:70
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:71
 msgid "Free Space"
 msgstr "å?©é¤?空é??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:96
-msgid "None"
-msgstr "ç?¡"
-
 #. Translators: {0} is the name assigned to a Digital Audio Player by its owner
 #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:55
 #, csharp-format
@@ -2943,143 +4228,160 @@ msgstr "已使ç?¨ç??容é??"
 msgid "Advanced details"
 msgstr "é?²é??ç??詳細è³?æ??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs:53
+#. Translators: {0} is the name of a library, eg 'Music' or 'Podcasts'
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:65
 #, csharp-format
-msgid "Delete From {0}"
-msgstr "� {0} ��"
+msgid "{0}:"
+msgstr "{0}:"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38
-msgid "Music"
-msgstr "��"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:70
+msgid "Manage manually"
+msgstr "æ??å??管ç??"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:93
-msgid "Podcasts"
-msgstr "Podcasts"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:71
+msgid "Sync entire library"
+msgstr "å??æ­¥æ?´å??è³?æ??庫"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:71
+#. Translators: {0} is the name of a playlist
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:124
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:154
 #, csharp-format
-msgid "Eject {0}"
-msgstr "é??å?º {0}"
+msgid "Sync from â??{0}â??"
+msgstr "å¾? {0} å??æ­¥"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:104
-#, csharp-format
-msgid "Ejecting {0}..."
-msgstr "é??å?º {0}..."
+#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs:53
+msgid "Import Purchased Music"
+msgstr "å?¯å?¥è³¼è²·ç??é?³æ¨?"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:57
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:64
+msgid "Disconnect"
+msgstr "æ?·ç·?"
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
 #, csharp-format
-msgid "Could not eject {0}: {1}"
-msgstr "ç?¡æ³?é??å?º {0}ï¼?{1}"
+msgid "Disconnecting {0}..."
+msgstr "æ­£å?¨è?? {0} 中æ?·é?£æ?¥..."
 
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
-msgid "Videos"
-msgstr "å½±ç??"
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
+#, csharp-format
+msgid "Could not disconnect {0}: {1}"
+msgstr "ç?¡æ³?è?? {0} 中æ?·é?£æ?¥ï¼?{1}"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:91
 #: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:92
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:95
 msgid "Rebuilding Database"
 msgstr "æ­£å?¨é??建è³?æ??庫"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:93
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:96
 msgid "Scanning iPod..."
 msgstr "æ­£å?¨æ??ç?? iPod..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:128
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:131
 msgid "Processing Tracks..."
-msgstr "æ­£å?¨è??ç??é?³è»?..."
+msgstr "æ­£å?¨è??ç??æ?²ç?®..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:144
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:147
 msgid "Ordering Tracks..."
-msgstr "æ­£å?¨æ??åº?æ­?æ?²..."
+msgstr "æ­£å?¨æ??åº?æ?²ç?®..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:215
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:218
 msgid "Saving new database..."
 msgstr "æ­£å?¨å?²å­?æ?°ç??è³?æ??庫..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:227
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:230
 msgid "Error rebuilding iPod database"
 msgstr "é??建 iPod è³?æ??庫æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:98
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101
 msgid "Device"
 msgstr "�置"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:99
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
 msgid "Color"
 msgstr "�彩"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:100
-#, fuzzy
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
 msgid "Generation"
-msgstr "��"
+msgstr "�代"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
 msgid "Capacity"
 msgstr "容é??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:144
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:148
 msgid "Serial number"
 msgstr "åº?è??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
-#, fuzzy
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
 msgid "Produced on"
-msgstr "製�人:"
+msgstr "購買�"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107
 msgid "Firmware"
 msgstr "é??é«?"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:111
 msgid "Capabilities"
 msgstr "容é??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:109
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112
 msgid "Supports cover art"
 msgstr "æ?¯æ?´å°?é?¢æ??å??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:110
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
 msgid "Supports photos"
 msgstr "æ?¯æ?´ç??ç?¸ç??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:619
-#, fuzzy
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468
+msgid "Track duration is zero"
+msgstr "���度��"
+
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
 msgid "Out of space on device"
-msgstr "å??ç¢?空é??ä¸?足"
+msgstr "è£?置空é??ä¸?足"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:619
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
 msgid "Please manually remove some songs"
-msgstr ""
+msgstr "è«?æ??å??移é?¤æ??äº?æ­?æ?²"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:648
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:650
 msgid "Syncing iPod"
 msgstr "æ­£å?¨å??æ­¥ iPod"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:649
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:651
 msgid "Preparing to synchronize..."
 msgstr "æ­£å?¨æº?å??å??æ­¥å??..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:670
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:672
 msgid "Updating..."
 msgstr "正���..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:674
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:676
 msgid "Flushing to disk..."
-msgstr ""
+msgstr "正���寫���..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:59
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:61
 msgid "Unable to read your iPod"
 msgstr "ç?¡æ³?è®?å??æ?¨ç?? iPod"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:75
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:77
+#, fuzzy
+#| msgid ""
+#| "You have used this iPod with a version of iTunes that saves a version of "
+#| "the song database for your iPod that is too new for Banshee to "
+#| "recognize.\n"
+#| "\n"
+#| "Banshee can rebuild your database, but some settings might be lost. Using "
+#| "Banshee and iTunes with the same iPod is not recommended."
 msgid ""
 "You have used this iPod with a version of iTunes that saves a version of the "
 "song database for your iPod that is too new for Banshee to recognize.\n"
 "\n"
-"Banshee can rebuild your database, but some settings might be lost. Using "
-"Banshee and iTunes with the same iPod is not recommended."
+"Banshee can rebuild your database, but you might lose your settings and all "
+"the content in the device (be sure to backup your data first). Using Banshee "
+"and iTunes with the same iPod is not recommended."
 msgstr ""
 "æ?¨å?¨é??å?? iPod ä¸?使ç?¨é?? iTunes å¾?å?²å­?å?¨å?¶ä¸­ç??æ­?æ?²è³?æ??庫ç??æ?¬å¤ªæ?°ä»¥è?´ Banshee ç?¡"
 "æ³?辨è­?ã??\n"
@@ -3087,11 +4389,11 @@ msgstr ""
 "Banshee å?¯ä»¥é??建æ?¨ç??è³?æ??庫ï¼?ä½?æ?¯æ??äº?設å®?å?¼å?¯è?½æ??é?ºå¤±ã??æ??å??ä¸?建議å?¨å??ä¸?å?° "
 "iPod ä¸?使ç?¨ Banshee å?? iTunesã??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:86
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:88
 msgid "Learn more about Banshee's iPod support"
 msgstr "å­¸ç¿?æ?´å¤?é??æ?¼ Banshee ç?? iPod æ?¯æ?´"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:94
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:96
 msgid ""
 "An iPod database could not be found on this device.\n"
 "\n"
@@ -3101,23 +4403,23 @@ msgstr ""
 "\n"
 "Banshee å?¯ä»¥ç?ºæ?¨å»ºç«?æ?°ç??è³?æ??庫ã??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:102
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:104
 msgid "What is the reason for this?"
 msgstr "é??æ?¯ç??麼å??å? ï¼?"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:115
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:117
 msgid "Your iPod is mounted read only. Banshee can not restore your iPod."
 msgstr "æ?¨ç?? iPod 以å?¯è®?ç??æ??æ??è¼?ã??Banshee ä¸?è?½å?²å­?æ?¨ç?? iPodã??"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:123
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:125
 msgid "Rebuild iPod Database..."
 msgstr "é??建 iPod è³?æ??庫..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:131
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:133
 msgid "Confirm Rebuild iPod Database"
 msgstr "確å®?é??建 iPod è³?æ??庫"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:137
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:139
 msgid ""
 "Rebuilding your iPod database may take some time. Also note that any "
 "playlists you have on your iPod will be lost.\n"
@@ -3129,36 +4431,55 @@ msgstr ""
 "\n"
 "æ?¨ç¢ºå®?è¦?é??建æ?¨ç?? iPod è³?æ??庫ï¼?"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:141
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:143
 msgid "Rebuild Database"
 msgstr "é??建è³?æ??庫"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:155
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:157
 msgid "Rebuilding iPod Database..."
 msgstr "æ­£å?¨é??建 iPod è³?æ??庫..."
 
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:101
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs:43
+msgid "Purchased Music"
+msgstr "購買ç??é?³æ¨?"
+
+#: ../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"
 msgstr[0] "é?³æ¨?è³?æ??夾"
 msgstr[1] "é?³æ¨?è³?æ??夾"
 
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:107
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:121
+#, csharp-format
+msgid "Video Folder"
+msgid_plural "Video Folders"
+msgstr[0] "è¦?è¨?è³?æ??夾"
+msgstr[1] "è¦?è¨?è³?æ??夾"
+
+#: ../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:110
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:130
 msgid "Supports Playlists"
 msgstr "������"
 
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs:189
+msgid "Ringtones"
+msgstr "é?´è?²"
+
 #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:78
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:117
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:121
 msgid "MTP Support Ignoring Device"
 msgstr "MTP æ?¯æ?´å¿½ç?¥ç??è£?ç½®"
 
 #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:79
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:118
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:122
 msgid ""
 "Banshee's MTP audio player support can only handle one device at a time."
 msgstr "Banshee ç?? MTP é?³æ¨?æ?­æ?¾ç¨?å¼?æ?¯æ?´ä¸?次å?ªè?½è??ç??ä¸?å??è£?ç½®ã??"
@@ -3184,198 +4505,355 @@ msgid ""
 "An MTP device was detected, but Banshee was unable to load support for it."
 msgstr "å?µæ¸¬å?° MTP è£?ç½®ï¼?ä½?æ?¯ Banshee ç?¡æ³?è¼?å?¥å°?å®?ç??æ?¯æ?´ã??"
 
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:145
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:149
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:146
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:151
 msgid "Battery level"
 msgstr "é?»æ± é?»é??"
 
 #. user_event.Progress = (double)current / total;
 #. Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the
 #. track currently being loaded, and {2} is the total # of tracks that will be loaded.
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:157
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:167
 #, csharp-format
 msgid "Loading {0} - {1} of {2}"
 msgstr "正��� {0} - {1} / {2}"
 
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:40
+msgid "Download Amazon MP3 Purchase"
+msgstr "�� Amazon MP3 購買��"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:42
+msgid "Amazon MP3 Files"
+msgstr "Amazon MP3 ��"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:63
+msgid "Amazon MP3 Purchase"
+msgstr "Amazon MP3 購買��"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:67
+msgid "Amazon MP3 Purchases"
+msgstr "Amazon MP3 購買��"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:176
+#, csharp-format
+msgid "{0} download at {1}/s"
+msgid_plural "{0} downloads at {1}/s"
+msgstr[0] "{0} é ?ä¸?è¼?ï¼?é??度 {1}/s"
+msgstr[1] "{0} é ?ä¸?è¼?ï¼?é??度 {1}/s"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:184
+#, csharp-format
+msgid "{0} download at {1}/s ({2} pending)"
+msgid_plural "{0} downloads at {1}/s ({2} pending)"
+msgstr[0] "{0} é ?ä¸?è¼?ï¼?é??度 {1}/s ({2} é ?æ?±ç½®ä¸­)"
+msgstr[1] "{0} é ?ä¸?è¼?ï¼?é??度 {1}/s ({2} é ?æ?±ç½®ä¸­)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/SignOutButton.cs:38
+msgid "Sign out of Amazon"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:38
+msgid "Amazon MP3 Store"
+msgstr "Amazon MP3 å??åº?"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:57
+#, fuzzy
+#| msgid "Count"
+msgid "Country"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:60
+msgid "Which Amazon MP3 storefront to use by default."
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:88
+msgid "Automatic (Geo IP detection)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90
+msgid "France (amazon.fr)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:91
+msgid "Germany, Switzerland, Austria (amazon.de)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:92
+msgid "Japan (amazon.co.jp)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:93
+msgid "United Kingdom (amazon.co.uk)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:94
+msgid "United States (amazon.com)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:47
+#, fuzzy, csharp-format
+#| msgid "Amazon MP3 Store"
+msgid "Search the Amazon MP3 Store"
+msgstr "Amazon MP3 å??åº?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:55
+msgid "Open Book"
+msgstr "é??å??æ?¸ç±?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:56
+msgid "Merge Discs..."
+msgstr "å??ä½µç¢?ç??..."
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65
+msgid "Resume"
+msgstr "復å??"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65
+msgid "Resume playback of this audiobook"
+msgstr "å??復此æ??è?²æ?¸ç??æ?­æ?¾"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:138
+#, csharp-format
+msgid "Merge the {0} selected discs into one book?"
+msgid_plural "Merge the {0} selected discs into one book?"
+msgstr[0] "è¦?å??ä½µæ??é?¸ç?? {0} å¼µå??ç¢?è?³ä¸?æ?¬æ?¸å?§å??ï¼?"
+msgstr[1] "è¦?å??ä½µæ??é?¸ç?? {0} å¼µå??ç¢?è?³ä¸?æ?¬æ?¸å?§å??ï¼?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:143
+msgid ""
+"This will ensure the disc numbers are all set properly, and then set the "
+"author and book title for all tracks on all these discs to the values below"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:152
+msgid "Author:"
+msgstr "ä½?è??ï¼?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:159
+msgid "Book Title:"
+msgstr "�����"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:57
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:91
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:87
+msgid "Author"
+msgstr "ä½?è??"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:62
+msgid "Author Initial"
+msgstr "ä½?è??é ­æ??å­?縮寫"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:67
+msgid "Book Title"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
+msgid "Audiobooks, etc"
+msgstr "æ??è?²æ?¸...ç­?"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
+msgid "Resume Playback"
+msgstr "復å??æ?­æ?¾"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:120
+msgid "No Bookmark Set"
+msgstr "�設置�籤"
+
 #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:156
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:54
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
 msgid "Audio CD"
 msgstr "�� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:101
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:102
 #, csharp-format
 msgid "Track {0}"
-msgstr "�� {0}"
+msgstr "�� {0}"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:117
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:121
 msgid "Importing Audio CD"
 msgstr "正����� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:118
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:122
 msgid "Initializing Drive"
 msgstr "æ­£å?¨å??å§?å??è£?ç½®"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:120
+#: ../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> ä»?å?¨å?¯å?¥é?³æ¨?è³?æ??庫ã??æ?¨æ?³è¦?å??æ­¢å??ï¼?"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:241
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:254
 msgid "Cannot Import CD"
 msgstr "���� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:160
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:233
+msgid "Audio CDs"
+msgstr "�� CD"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:235
 msgid "Audio CD Importing"
 msgstr "�� CD ��"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:162
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:238
 msgid "_Import format"
 msgstr "��格�(_I)"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:166
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:242
 msgid "_Automatically import audio CDs when inserted"
 msgstr "æ??å?¥å¾?è?ªå??å?¯å?¥é?³æ¨? CD(_A)"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:167
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:243
 msgid ""
 "When an audio CD is inserted, automatically begin importing it if metadata "
 "can be found and it is not already in the library."
 msgstr "ç?¶æ??å?¥é?³æ¨? CD å¾?ï¼?å¦?æ??å?¯ä»¥æ?¾å?°ä¸­ç¹¼è³?æ??ä¸?ä¸?å?¨é?³æ¨?館裡æ??å°±è?ªå??é??å§?å?¯å?¥ã??"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:171
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:247
 msgid "_Eject when done importing"
 msgstr "å®?æ??å?¯å?¥å¾?é??å?º(_E)"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:172
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:248
 msgid "When an audio CD has been imported, automatically eject it."
 msgstr "ç?¶é?³æ¨? CD å?¯å?¥å¾?è?ªå??é??å?ºå®?ã??"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:175
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:251
 msgid "Use error correction when importing"
 msgstr "ç?¶å?¯å?¥æ??使ç?¨é?¯èª¤æ ¡æ­£"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:176
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:252
 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:244
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:425
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
 msgid "Import CD"
 msgstr "�� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:245
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:321
 msgid "Import this audio CD to the library"
 msgstr "å°?é??å¼µé?³æ¨? CD å?¯å?¥è³?æ??庫"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:251
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:327
 msgid "Duplicate CD"
 msgstr "�製 CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:252
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:328
 msgid "Duplicate this audio CD"
 msgstr "è¤?製é??å¼µé?³æ¨? CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:128
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
 msgid "Searching for CD metadata..."
-msgstr "æ­£å?¨æ??å°? CD metadata..."
+msgstr "æ­£å?¨æ??å°? CD 中ä»?è³?æ??..."
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:161
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
 msgid "Could not fetch metadata for CD."
-msgstr "ç?¡æ³?å??å¾? CD ç?? metadataã??"
+msgstr "ç?¡æ³?å??å¾? CD ç??中ä»?è³?æ??ã??"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:189
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
 msgid "Automatic import off since this album is already in the Music Library."
 msgstr "å¦?æ??é??å??å°?輯已ç¶?å?¨é?³æ¨?館中å??é??é??è?ªå??å?¯å?¥ã??"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:212
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
 msgid "Could not import CD"
 msgstr "���� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:229
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
 msgid "Could not duplicate audio CD"
 msgstr "���製�� CD"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:349
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
 msgid "Ejecting audio CD..."
 msgstr "é??å?ºé?³æ¨? CD..."
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:367
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
 #, csharp-format
 msgid "Could not eject audio CD: {0}"
 msgstr "ç?¡æ³?é??å?ºé?³æ¨? CDï¼?{0}"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:400
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+msgid "Audio CD Preferences"
+msgstr "é?³è¨? CD å??好設å®?"
+
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
 msgid "Eject Disc"
 msgstr "é??å?ºå??ç¢?"
 
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:424
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
 #, csharp-format
 msgid "Import â??{0}â??"
 msgstr "å?¯å?¥ â??{0}â??"
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:84
-msgid "_Bookmarks"
-msgstr "�籤(_B)"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs:64
+msgid "Detecting BPM"
+msgstr "正��測 BPM"
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:87
-msgid "_Add Bookmark"
-msgstr "���籤(_A)"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
+msgid "D_etect"
+msgstr "�測(_E)"
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:88
-msgid "Bookmark the Position in the Current Track"
-msgstr "å?¨ç?®å??ç??é?³æ¨?ä½?ç½®æ¨?è¨?ç?ºæ?¸ç±¤"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
+msgid "T_ap"
+msgstr ""
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:100
-msgid "_Remove Bookmark"
-msgstr "移��籤(_R)"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+msgid "Have Banshee attempt to auto-detect the BPM of this song"
+msgstr ""
 
-#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
-#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:210
-#, csharp-format
-msgid "{0} ({1}:{2:00})"
-msgstr "{0} ({1}:{2:00})"
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
+msgid "Play this song"
+msgstr "��此��"
+
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
+msgid "Tap this button to the beat to set the BPM for this song manually"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+msgid "_Automatically detect BPM for all songs"
+msgstr "ç?ºæ??æ??æ?²ç?®è?ªå??å?µæ¸¬ BPM(_A)"
+
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+msgid ""
+"Detect beats per minute (BPM) for all songs that don't already have a value "
+"set"
+msgstr ""
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:82
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
 msgid "Downloading Cover Art"
 msgstr "æ­£å?¨ä¸?è¼?å°?é?¢æ??å??"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:115
-msgid "Preparing..."
-msgstr "æ­£å?¨æº?å??..."
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:144
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:128
 #, csharp-format
 msgid "{0} - {1}"
 msgstr "{0} ä¹? {1}"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:106
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107
 msgid "_Cover Art"
 msgstr "å°?é?¢æ??å??(_C)"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:108
 msgid "Manage cover art"
 msgstr "管ç??å°?é?¢æ??å??"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:109
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110
 msgid "_Download Cover Art"
 msgstr "ä¸?è¼?å°?é?¢æ??å??(_D)"
 
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110
+#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:111
 msgid "Download cover art for all tracks"
-msgstr "ç?ºæ??æ??æ­?æ?²ä¸?è¼?å°?輯å°?é?¢æ??å??"
+msgstr "ç?ºæ??æ??æ?²ç?®ä¸?è¼?å°?輯å°?é?¢æ??å??"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:41
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:42
 msgid "Shared Music"
 msgstr "å??享ç??é?³æ¨?"
 
@@ -3388,9 +4866,8 @@ msgid "Unable to connect to music share"
 msgstr "ç?¡æ³?é?£ç·?è?³é?³æ¨?å??享ã??"
 
 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:88
-#, fuzzy
 msgid "Back"
-msgstr "����"
+msgstr "è¿?å??"
 
 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
 msgid ""
@@ -3443,12 +4920,11 @@ msgid "Authentication Required"
 msgstr "����"
 
 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs:104
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:57
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:54
 msgid "Username:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs:112
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:64
 msgid "Password:"
 msgstr "�碼�"
 
@@ -3457,51 +4933,117 @@ msgstr "�碼�"
 msgid "Login"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:59
-msgid "Music Share"
-msgstr "é?³æ¨?å??享"
-
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:63
-msgid "Disconnect"
-msgstr "æ?·ç·?"
-
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:105
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapResolverJob.cs:50
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:106
 #, csharp-format
 msgid "Connecting to {0}"
 msgstr "��� {0}"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:201
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+msgid "Add Remote DAAP Server"
+msgstr "å? å?¥é? ç«¯ DAAP 伺æ??å?¨"
+
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
+msgid "Add a new remote DAAP server"
+msgstr "å? å?¥æ?°ç??é? ç«¯ DAAP 伺æ??å?¨"
+
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:60
+msgid "Music Share"
+msgstr "é?³æ¨?å??享"
+
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:202
 #, csharp-format
 msgid "Logging in to {0}."
 msgstr "ç?»å?¥å?° {0}ã??"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:237
-#, fuzzy, csharp-format
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:238
+#, csharp-format
 msgid "Loading {0} track"
 msgid_plural "Loading {0} tracks"
-msgstr[0] "正��� {0}"
-msgstr[1] "正��� {0}"
+msgstr[0] "正��� {0} ���"
+msgstr[1] "正��� {0} ���"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:260
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:270
 msgid "Loading playlists"
 msgstr "������"
 
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:45
+msgid "Open remote DAAP server"
+msgstr "é??å??é? ç«¯ DAAP 伺æ??å?¨"
+
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:50
+msgid "Enter server IP address and port:"
+msgstr "輸å?¥ä¼ºæ??å?¨ IP ä½?å??è??é?£æ?¥å? ï¼?"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:46
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:133
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:67
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:91
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:46
+msgid "Downloads"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:50
+msgid "Downloading eMusic Track(s)"
+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 "æ­£å?¨å??å§?å??..."
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:52
+msgid "Cancel all eMusic downloads?"
+msgstr "æ?¯å?¦å??æ¶? eMusic ä¸?è¼?ï¼?"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:120
+#, fuzzy, csharp-format
+#| msgid "Transfering {0} file at {1} KB/s"
+#| msgid_plural "Transfering {0} of {2} files at {1} KB/s"
+msgid "Transferring {0} file at {1} KB/s"
+msgid_plural "Transferring {0} of {2} files at {1} KB/s"
+msgstr[0] "æ­£å?¨å?³è¼¸ {0} å??æª?æ¡?ï¼?é??ç?? {1} KB/s"
+msgstr[1] "æ­£å?¨å?³è¼¸ {2} å??æª?æ¡?ç??第 {0} å??ï¼?é??ç?? {1} KB/s"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:133
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:133
+msgid "Canceling Downloads"
+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 "����中止..."
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+msgid "Import eMusic Downloads to Library"
+msgstr "å°? eMusic ä¸?è¼?å?¯å?¥è?³è³?æ??庫"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+msgid "eMusic Files"
+msgstr "eMusic ��"
+
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
+msgid "eMusic Tracks"
+msgstr "eMusic ��"
+
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:57
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:58
 msgid "File System Queue"
 msgstr "æª?æ¡?系統ä½?å??"
 
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:56
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:71
 msgid "Clear"
 msgstr "��"
 
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:73
 msgid "Remove all tracks from the file system queue"
-msgstr "å¾?æ­¤æª?æ¡?系統ä½?å??移é?¤æ??æ??æ­?æ?²"
+msgstr "å¾?æ­¤æª?æ¡?系統ä½?å??移é?¤æ??æ??æ?²ç?®"
 
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:78
 msgid "Clear on Quit"
 msgstr "é?¢é??æ??æ¸?é?¤"
 
@@ -3509,50 +5051,629 @@ msgstr "é?¢é??æ??æ¸?é?¤"
 msgid "Clear the file system queue when quitting"
 msgstr "é?¢é??æ??æ¸?é?¤æª?æ¡?系統ä½?å??"
 
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:46
+#, fuzzy
+#| msgid "Duplicate CD"
+msgid "Duplicate Albums"
+msgstr "�製 CD"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47
+msgid ""
+"Displayed are albums that should likely be merged.  For each row, click the "
+"desired title to make it bold, or uncheck it to take no action."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:73
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:76
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
+msgid " and "
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:75
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:78
+#, fuzzy
+#| msgid "Other"
+msgid ", the"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:77
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:80
+#, fuzzy
+#| msgid "Other"
+msgid "the "
+msgstr "��"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
+#, fuzzy
+#| msgid "Duplicate CD"
+msgid "Duplicate Artists"
+msgstr "�製 CD"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47
+msgid ""
+"Displayed are artists that should likely be merged.  For each row, click the "
+"desired name to make it bold, or uncheck it to take no action."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
+msgid "Fix Music Metadata..."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48
+#, fuzzy
+msgid "Metadata Fixer"
+msgstr "編輯�� Metadata"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:54
+msgid "Problem Type:"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:46
+#, fuzzy
+#| msgid "Duplicate CD"
+msgid "Duplicate Genres"
+msgstr "�製 CD"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47
+msgid ""
+"Displayed are genres that should likely be merged.  For each row, click the "
+"desired genre to make it bold, or uncheck it to take no action."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs:76
+msgid "Fix?"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48
+msgid "View Item Details"
+msgstr "檢���細�"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:57
+msgid "Open Webpage"
+msgstr "é??å??網é ?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:76
+msgid "Visit Archive.org"
+msgstr "�訪 Archive.org"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:78
+msgid "Close Item"
+msgstr "é??é??é ?ç?®"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:97
+msgid "Getting item details from the Internet Archive"
+msgstr "æ­£å?¨å¾?網é??網路å?¸è??館å??å¾?é ?ç?®è©³ç´°è³?è¨?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148
+msgid "Timed out getting item details from the Internet Archive"
+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:301
+msgid "Try Again"
+msgstr "é??試"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:151
+msgid "Error getting item details from the Internet Archive"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:205
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
+msgid "Description"
+msgstr "æ??è¿°"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:221
+msgid "Creator:"
+msgstr "建ç«?è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:222
+msgid "Venue:"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:223
+msgid "Location:"
+msgstr "�置�"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
+msgid "Date:"
+msgstr "æ?¥æ??:"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:227
+msgid "Year:"
+msgstr "年份:"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:229
+msgid "Publisher:"
+msgstr "ç?¼å¸?è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
+msgid "Keywords:"
+msgstr "é??é?µå­?ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:231
+msgid "License URL:"
+msgstr "æ??æ¬?æ¢?款網å??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:232
+msgid "Language:"
+msgstr "���"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:236
+#, fuzzy
+#| msgid "_Download Cover Art"
+msgid "Downloads, overall:"
+msgstr "�������"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:237
+#, fuzzy
+#| msgid "Download paused"
+msgid "Downloads, past month:"
+msgstr "ä¸?è¼?æ?¸ï¼?ä¸?å??æ??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:238
+#, fuzzy
+#| msgid "Download paused"
+msgid "Downloads, past week:"
+msgstr "�������"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:242
+msgid "Added:"
+msgstr "���"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:243
+msgid "Added by:"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:244
+msgid "Collections:"
+msgstr "æ?¶è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:246
+msgid "Contributor:"
+msgstr "è²¢ç?»è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:247
+msgid "Recorded by:"
+msgstr "以此é??製ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:248
+msgid "Lineage:"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:249
+msgid "Transferred by:"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:266
+msgid "Reviews"
+msgstr "è©?è«?æ?¸"
+
+#. Translators: {0} is the number of reviewers, {1} is the average rating (not really relevant if there's only 1)
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:270
+#, csharp-format
+msgid "{0} reviewer"
+msgid_plural "{0} reviewers, avg {1}"
+msgstr[0] "{0} ä½?è©?è«?è??"
+msgstr[1] "{0} ä½?è©?è«?è??ï¼?å¹³å??è©?ç­?ç?º {1}"
+
+#. Translators: {0} is the unicode-stars-rating, {1} is the name of a person who reviewed this item, and {1} is a date/time string
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:289
+#, fuzzy, csharp-format
+#| msgid "{0}by{1} {2}"
+msgid "{0} by {1} on {2}"
+msgstr "{0}æ¼?å?º:{1} {2}"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:319
+msgid "Write your own review"
+msgstr "寫ä¸?æ?¨è?ªå·±ç??è©?è«?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+msgid "Collection:"
+msgstr "æ?¶è??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#, csharp-format
+msgid "Optional Query"
+msgstr "���詢"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+msgid "Sort by:"
+msgstr "æ??åº?ä¾?ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:119
+msgid "Preferred Media Types"
+msgstr "å??好ç??åª?é«?é¡?å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:122
+msgid "_Audio"
+msgstr "��(_A)"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:125
+msgid "_Video"
+msgstr "��(_V)"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:128
+msgid "_Text"
+msgstr "æ??å­?(_T)"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:100
+#, csharp-format
+msgid "Search..."
+msgstr "æ??å°?..."
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:111
+msgid "_Go"
+msgstr "å??å¾?(_Go)"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:119
+msgid "Staff Picks"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:120
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:588
+msgid "Creative Commons"
+msgstr "�� CC"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:121
+msgid "History"
+msgstr "æ­·å?²"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:122
+msgid "Classic Cartoons"
+msgstr "æ­·å?²"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:123
+msgid "Speeches"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:124
+msgid "For Children"
+msgstr "給孩童"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:125
+msgid "Poetry"
+msgstr "è©©é??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:126
+msgid "Creator is United States"
+msgstr "建ç«?è??ç?ºç¾?å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:127
+msgid "Old Movies"
+msgstr "è??é?»å½±"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:128
+msgid "New From LibriVox"
+msgstr "LibriVox å?§æ?°ç??å?§å®¹"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:129
+msgid "Old Texts"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:130
+msgid "Charlie Chaplin"
+msgstr "Charlie Chaplin"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:131
+msgid "NASA"
+msgstr "NASA"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:132
+msgid "Library of Congress"
+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 ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
+msgid "Visit the Internet Archive online at archive.org"
+msgstr "ç·?ä¸?é? è¨ªä½?æ?¼ archive.org ç??網é??網路å?¸è??館"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+msgid "Audiobooks"
+msgstr "æ??è?²æ?¸"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
+msgid "Movies"
+msgstr "�影"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:309
+msgid "Lectures"
+msgstr "�說"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:310
+msgid "Concerts"
+msgstr "æ¼?å?±æ??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:311
+msgid "Books"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:58
+msgid "Search Results"
+msgstr "æ??å°?çµ?æ??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:139
+msgid "Searching the Internet Archive"
+msgstr "æ­£å?¨æ??å°?網é??網路å?¸è??館"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:175
+msgid "No matches."
+msgstr "ç?¡ç¬¦å??çµ?æ??ã??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:180
+#, csharp-format
+msgid "Showing 1 match"
+msgid_plural "Showing 1 to {0:N0} of {1:N0} total matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:189
+msgid "Timed out searching the Internet Archive"
+msgstr "æ??å°?網é??網路å?¸è??館é?¾æ??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:194
+msgid "Error searching the Internet Archive"
+msgstr "æ??å°?網é??網路å?¸è??館æ??ç?¼ç??é?¯èª¤"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:88
+msgid "Fetch more results from the Internet Archive?"
+msgstr "è¦?å¾?網é??網路å?¸è??館æ?·å??æ?´å¤?çµ?æ??å??ï¼?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:94
+msgid "Fetch More"
+msgstr "æ?·å??æ?´å¤?"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:128
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:61
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:98
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
+msgid "Creator"
+msgstr "建ç«?è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:129
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:75
+msgid "Publisher"
+msgstr "ç?¼ä½?è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:134
+msgid "Formats"
+msgstr "格�"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:136
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:65
+msgid "Added"
+msgstr "å? å?¥"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:62
+msgid "Collection"
+msgstr "æ?¶è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:63
+msgid "Contributor"
+msgstr "è²¢ç?»è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:64
+msgid "Created"
+msgstr "建�"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:68
+msgid "Format"
+msgstr "格�"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:69
+msgid "ID"
+msgstr "ID"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:70
+msgid "Language"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:73
+msgid "Media Type"
+msgstr "åª?é«?é¡?å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:74
+msgid "Review Count"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:71
+msgid "Moving Images"
+msgstr "æ­£å?¨ç§»å??å½±å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:72
+msgid "Animation & Cartoons"
+msgstr "å??ç?«è??å?¡é??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:73
+msgid "Arts & Music"
+msgstr "è??è¡?è??é?³æ¨?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:74
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:99
+msgid "Computers & Technology"
+msgstr "é?»è?¦è??ç§?æ??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:75
+msgid "Cultural & Academic Films"
+msgstr "æ??å??è??å­¸è¡?å½±ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:76
+msgid "Ephemeral Films"
+msgstr "ç?­æ?«æ?§å½±ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:77
+msgid "Home Movies"
+msgstr "家庭�影"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:79
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:104
+msgid "News & Public Affairs"
+msgstr "æ?°è??è??å?¬ç?¾äº?å??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:80
+msgid "Open Source Movies"
+msgstr "é??æº?é?»å½±"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:81
+msgid "Prelinger Archives"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:82
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:109
+msgid "Spirituality & Religion"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:83
+msgid "Sports Videos"
+msgstr "é??å??å½±ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:84
+msgid "Videogame Videos"
+msgstr "é?»ç?©å½±ç??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:85
+msgid "Vlogs"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:86
+msgid "Youth Media"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:88
+msgid "Texts"
+msgstr "æ??å­?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:89
+msgid "American Libraries"
+msgstr "ç¾?å??å??æ?¸é¤¨"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:90
+msgid "Canadian Libraries"
+msgstr "å? æ?¿å¤§å??æ?¸é¤¨"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:91
+msgid "Universal Library"
+msgstr "é??ç?¨è³?æ??庫"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:92
+msgid "Project Gutenberg"
+msgstr "�騰堡��"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:93
+msgid "Children's Library"
+msgstr "å­©ç«¥ç??è³?æ??庫"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:94
+msgid "Biodiversity Heritage Library"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:95
+msgid "Additional Collections"
+msgstr "é¡?å¤?ç??æ?¶è??é??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:98
+msgid "Audio Books & Poetry"
+msgstr "æ??è?²æ?¸è??è©©é??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:100
+msgid "Grateful Dead"
+msgstr ""
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:101
+msgid "Live Music Archive"
+msgstr "å?³æ??é?³æ¨?å?¸è??"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:102
+msgid "Music & Arts"
+msgstr "é?³æ¨?è??è??è¡?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:103
+msgid "Netlabels"
+msgstr "網路�籤"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:105
+msgid "Non-English Audio"
+msgstr "é??è?±æ??é?³è¨?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:106
+msgid "Open Source Audio"
+msgstr "é??å??ä¾?æº?é?³è¨?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:108
+msgid "Radio Programs"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:111
+msgid "Education"
+msgstr "æ??è?²"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:112
+msgid "Software"
+msgstr "è»?é«?"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:113
+msgid "CLASP"
+msgstr "CLASP"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:92
+msgid "Downloads This Week"
+msgstr "�����"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:93
+msgid "Newest"
+msgstr "æ??æ?°"
+
+#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:94
+msgid "Oldest"
+msgstr "æ??è??"
+
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
 msgid "Not Set"
 msgstr "�設�"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:55
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:54
 msgid "Radio"
 msgstr "����話"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:66
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:65
 msgid "Add Station"
 msgstr "����"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:67
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:66
 msgid "Add a new Internet Radio station or playlist"
 msgstr "å? å?¥æ?°ç??網路é?»å?°æ??æ?­æ?¾æ¸?å?®"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:80
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:64
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:81
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60
 msgid "Edit Station"
 msgstr "編輯��"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:132
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:133
 msgid "Station"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:133
-#, fuzzy
-msgid "Creator"
-msgstr "��"
-
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
-msgid "Description"
-msgstr "æ??è¿°"
-
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:234
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:235
 msgid "Please provide a valid station URI"
 msgstr "è«?æ??ä¾?æ??æ??ç??é?»å?° URI"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:247
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:248
 msgid "Please provide a station genre"
 msgstr "è«?æ??ä¾?é?»å?°æ¨?æ?²å??é¡?"
 
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:255
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
 msgid "Please provide a station title"
 msgstr "è«?æ??ä¾?é?»å?°æ¨?é¡?"
 
@@ -3572,505 +5693,689 @@ msgstr "輸å?¥æ?¨æ?³å? å?¥é?»å?°ç??æ¨?æ?²å??é¡?ã??æ¨?é¡?å?? URLã??æ??è¿°æ¬?ä½?
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
 msgid "Station Genre:"
-msgstr "é?»å?°æ¨?æ?²å??é¡?:"
+msgstr "���風�"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:120
 msgid "Station Name:"
-msgstr "é?»å?°å??稱:"
+msgstr "é?»å?°å??稱ï¼?"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:121
 msgid "Stream URL:"
-msgstr "串� URL:"
+msgstr "串� URL�"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:122
 msgid "Station Creator:"
-msgstr "é?»å?°å»ºç«?è??:"
+msgstr "é?»å?°å»ºç«?è??ï¼?"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:123
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:74
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:81
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:89
 msgid "Description:"
-msgstr "æ??è¿°:"
+msgstr "æ??è¿°ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:125
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
+msgid "Rating:"
+msgstr "è©?ç­?ï¼?"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:122
 msgid "_Last.fm"
 msgstr "_Last.fm"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:123
 msgid "Configure the Audioscrobbler plugin"
-msgstr "é??ç½® Audioscrobbler å¤?æ??"
+msgstr "é??ç½® Audioscrobbler æ??件"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:129
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126
 msgid "Visit _User Profile Page"
 msgstr "æ??訪使ç?¨è??å??人設å®?é ?é?¢(_U)"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:130
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:127
+#: ../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:133
-msgid "_Configure..."
-msgstr "設�(_C)..."
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:134
-msgid "Configure the Last.fm Extension"
-msgstr "設å®? Last.fm æ?´å??å¥?件"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:139
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:132
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:91
 msgid "_Enable Song Reporting"
 msgstr "å??ç?¨æ­?æ?²å ±å??(_E)"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:140
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:133
 msgid "Enable song reporting"
 msgstr "å??ç?¨æ?²ç?®å ±å??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:66
-msgid "_Add Station"
-msgstr "����(_A)"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:67
-msgid "Add a new Last.fm radio station"
-msgstr "å? å?¥æ?°ç?? Last.fm é?»å?°"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:74
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
 msgid "Connect"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:79
-msgid "Sort Stations by"
-msgstr "é?»å?°æ??åº?ä¾?"
-
-#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:85
-#, csharp-format
-msgid "Listen to {0} Station"
-msgstr "� {0} ��"
-
-#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:87
-#, csharp-format
-msgid "Listen to the Last.fm {0} station for this artist"
-msgstr "è?½é??ä½?表æ¼?è??ç?? Last.fm {0} é?»å?°"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:92
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:126
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:151
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:74
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:98
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:113
 msgid "View on Last.fm"
 msgstr "檢� Last.fm"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:93
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:75
 msgid "View this artist's Last.fm page"
 msgstr "檢è¦?é??ä½?表æ¼?è??ç?? Last.fm é ?é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:96
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:78
 msgid "View Artist on Wikipedia"
 msgstr "檢è¦?維å?ºç?¾ç§?ä¸?ç??表æ¼?è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:97
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:79
 msgid "Find this artist on Wikipedia"
 msgstr "å?¨ç¶­å?ºç?¾ç§?中å°?æ?¾é??ä½?表æ¼?è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:104
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:86
 msgid "View Artist's Videos"
 msgstr "檢è¦?表æ¼?è??ç??å½±ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:105
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:87
 msgid "Find videos by this artist"
 msgstr "å°?æ?¾é??ä½?表æ¼?è??ç??å½±ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:108
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:109
-#, fuzzy
-msgid "Fans of"
-msgstr "{0} ç??æ­?è¿·/影迷"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:113
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:114
-msgid "Similar to"
-msgstr "�似�"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:118
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:134
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:155
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:90
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:106
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:117
 msgid "Recommend to"
 msgstr "��給"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:119
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:91
 msgid "Recommend this artist to someone"
 msgstr "å??å?¥äººæ?¨è?¦é??ä½?表æ¼?è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:127
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:99
 msgid "View this album's Last.fm page"
 msgstr "檢è¦?é??å??å°?輯ç?? Last.fm é ?é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:135
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:107
 msgid "Recommend this album to someone"
 msgstr "å??å?¥äººæ?¨è?¦é??å??å°?輯"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:142
-msgid "Love Track"
-msgstr "å??æ??æ­?æ?²"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:143
-msgid "Mark current track as loved"
-msgstr "å°?ç?®å??æ­?æ?²æ¨?è¨?ç?ºå??æ??ç??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:147
-msgid "Ban Track"
-msgstr "����"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:148
-msgid "Mark current track as banned"
-msgstr "å°?ç?®å??æ­?æ?²æ¨?è¨?ç?ºç¦?æ­¢ç??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:114
 msgid "View this track's Last.fm page"
-msgstr "檢è¦?é??å??æ­?æ?²ç?? Last.fm é ?é?¢"
+msgstr "檢è¦?é??é¦?æ?²ç?®ç?? Last.fm é ?é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:118
 msgid "Recommend this track to someone"
-msgstr "å??å?¥äººæ?¨è?¦é??é¦?æ­?"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:166
-msgid "Station Name"
-msgstr "é?»å?°å??稱"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:171
-msgid "Total Play Count"
-msgstr "總���次�"
+msgstr "å??å?¥äººæ?¨è?¦æ­¤æ?²ç?®"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:176
-msgid "Station Type"
-msgstr "é?»å?°é¡?å??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:258
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:150
 #, csharp-format
 msgid "http://last.fm/music/{0}";
 msgstr "http://last.fm/music/{0}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:266
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:158
 #, csharp-format
 msgid "http://last.fm/music/{0}/{1}";
 msgstr "http://last.fm/music/{0}/{1}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:274
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:166
 #, csharp-format
 msgid "http://last.fm/music/{0}/_/{1}";
 msgstr "http://last.fm/music/{0}/_/{1}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:282
+#: ../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";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:290
+#. 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:182
+#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:48
 #, csharp-format
 msgid "http://en.wikipedia.org/wiki/{0}";
 msgstr "http://en.wikipedia.org/wiki/{0}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:324
-#, csharp-format
-msgid "Fans of {0}"
-msgstr "{0} ç??æ­?è¿·/影迷"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:78
+msgid "Account"
+msgstr "帳è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:345
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:270
+msgid "_Username"
+msgstr "使ç?¨è??å??稱(_U)"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:160
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:86
+msgid "Sign up for Last.fm"
+msgstr "註å?? Last.fm"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:254
+msgid ""
+"Open Last.fm in a browser, giving you the option to authorize Banshee to "
+"work with your account"
+msgstr ""
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:265
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
+msgid "Log in to Last.fm"
+msgstr "�� Last.fm"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:286
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321
+msgid "You need to allow Banshee to access your Last.fm account."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:296
+msgid "Finish Logging In"
+msgstr "å®?æ??ç?»å?¥"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:310
 #, csharp-format
-msgid "Similar to {0}"
-msgstr "�似� {0}"
+msgid "You are logged in to Last.fm as the user <i>{0}</i>."
+msgstr ""
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:313
+msgid "Log out of Last.fm"
+msgstr "�� Last.fm"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:124
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
 msgid "Recently Loved Tracks"
-msgstr "æ??è¿?å??æ??ç??æ­?æ?²"
+msgstr "æ??è¿?å??æ??ç??æ?²ç?®"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:125
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
 msgid "Recently Played Tracks"
-msgstr "æ??è¿?æ?­æ?¾ç??æ­?æ?²"
+msgstr "æ??è¿?æ?­æ?¾ç??æ?²ç?®"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:126
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
 msgid "My Top Artists"
 msgstr "æ??ç??æ??佳表æ¼?è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:206
-#, fuzzy, csharp-format
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:206
+#, csharp-format
 msgid "{0} plays"
-msgstr "{0} æ?¥"
+msgstr "{0} 次��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:103
-msgid "Edit Last.fm Settings"
-msgstr "編輯 Last.fm 設��"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:321
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs:243
 msgid "Account Settings"
 msgstr "帳è??設å®?å?¼"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:323
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs:247
 msgid "Join Last.fm"
 msgstr "å? å?¥ Last.fm"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:72
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/ContextPage.cs:44
+msgid "Last.fm Recommendations"
+msgstr "Last.fm ��"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:80
+#, csharp-format
+msgid "Top Albums by {0}"
+msgstr "ç?±é??å°?輯ä¾? {0}"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:81
+#, csharp-format
+msgid "Top Tracks by {0}"
+msgstr "æ??ä½³æ?²ç?® {0}"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:178
+msgid "Recommended Artists"
+msgstr "æ?¨è?¦ç??表æ¼?è??"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:206
+msgid "No similar artists found"
+msgstr "æ?¾ä¸?å?°é¡?ä¼¼ç??表æ¼?è??"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60
+#, csharp-format
+msgid "{0}% Similarity"
+msgstr "�似度 {0}%"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62
+msgid "Unknown Similarity"
+msgstr "æ?ªç?¥ç??ç?¸ä¼¼æ?§"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59
+msgid "_Add Station..."
+msgstr "����(_A)..."
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:60
+msgid "Add a new Last.fm radio station"
+msgstr "å? å?¥æ?°ç?? Last.fm é?»å?°"
+
+#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:73
+#, csharp-format
+msgid "Listen to {0} Station"
+msgstr "� {0} ��"
+
+#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:75
+#, csharp-format
+msgid "Listen to the Last.fm {0} station for this artist"
+msgstr "è?½é??ä½?表æ¼?è??ç?? Last.fm {0} é?»å?°"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:80
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:81
+#, fuzzy
+msgid "Fans of"
+msgstr "{0} ç??æ­?è¿·/影迷"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:85
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:86
+msgid "Similar to"
+msgstr "�似�"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:94
+msgid "Love Track"
+msgstr "å??æ??æ?²ç?®"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:95
+msgid "Mark current track as loved"
+msgstr "å°?ç?®å??æ?²ç?®æ¨?è¨?ç?ºå??æ??"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:99
+msgid "Ban Track"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:100
+msgid "Mark current track as banned"
+msgstr "å°?ç?®å??æ­?æ?²æ¨?è¨?ç?ºç¦?ç?¨"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
+#, csharp-format
+msgid "Fans of {0}"
+msgstr "{0} ç??æ­?è¿·/影迷"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
+#, csharp-format
+msgid "Similar to {0}"
+msgstr "�似� {0}"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
+msgid "_Add Station"
+msgstr "����(_A)"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingService.cs:93
+msgid "Sort Stations by"
+msgstr "é?»å?°æ??åº?ä¾?"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingService.cs:136
+msgid "Total Play Count"
+msgstr "總���次�"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:68
 msgid "New Station"
 msgstr "���"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:57
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
+msgid "Station _Type:"
+msgstr "é?»å?°é¡?å??(_T):"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58
 msgid "Last.fm Station"
 msgstr "Last.fm ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:147
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:151
 msgid "Edit Last.fm Station"
 msgstr "編輯 Last.fm ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:148
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:152
 msgid "Delete Last.fm Station"
 msgstr "�� Last.fm ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:235
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239
 #, csharp-format
 msgid "Tuning Last.fm to {0}."
 msgstr "å°? Last.fm è½?å?° {0}ã??"
 
 #. Translators: {0} is an error message sentence from RadioConnection.cs.
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:245
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249
 #, csharp-format
 msgid "Failed to tune in station. {0}"
 msgstr "è½?å?°é?»å?°å¤±æ??ã??{0}"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:346
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:357
 #, csharp-format
 msgid "Getting new songs for {0}."
 msgstr "å??å¾? {0} ç??æ?°æ­?ã??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:353
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:364
 #, csharp-format
 msgid "No new songs available for {0}."
 msgstr "{0} æ²?æ??æ?°ç??æ­?æ?²ã??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:379
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:390
 #, csharp-format
 msgid "Failed to get new songs for {0}."
 msgstr "å??å¾? {0} ç??æ?°æ­?失æ??ã??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:440
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:451
 #, csharp-format
 msgid "{0} song played"
 msgid_plural "{0} songs played"
 msgstr[0] "已�� {0} ��"
 msgstr[1] "已�� {0} ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:564
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:84
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:583
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:84
 msgid "Recommended"
 msgstr "æ?¨è?¦ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:565
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:93
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:584
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:93
 msgid "Personal"
 msgstr "å??人"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:566
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:102
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:585
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:102
 msgid "Loved"
 msgstr "å??æ??ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:567
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:586
 msgid "Banshee Group"
 msgstr "Banshee 群�"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:568
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:111
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:587
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:111
 msgid "Neighbors"
-msgstr ""
+msgstr "é?°å±?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:85
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:94
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:85
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:94
 #, fuzzy
 msgid "For User:"
 msgstr "ä¾?使ç?¨è??:"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:103
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:103
 msgid "By User:"
-msgstr "ä¾?使ç?¨è??:"
+msgstr "ä¾?使ç?¨è??ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:112
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:112
 #, fuzzy
 msgid "Of User:"
 msgstr "ä¾?使ç?¨è??:"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:120
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:120
 msgid "Group"
 msgstr "群�"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:121
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:121
 msgid "Group Name:"
-msgstr "群çµ?å??稱:"
+msgstr "群çµ?å??稱ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:129
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:129
 msgid "Tag"
 msgstr "�籤"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:130
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:130
 msgid "Tag Name:"
-msgstr "æ¨?籤å??稱:"
+msgstr "æ¨?籤å??稱ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:138
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:138
 msgid "Fan"
 msgstr "æ­?è¿·"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:139
-#, fuzzy
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:139
 msgid "Fans of:"
-msgstr "{0} ç??æ­?è¿·/影迷"
+msgstr "誰ç??è¿·ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:147
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:147
 msgid "Similar"
-msgstr "é¡?ä¼¼ç??"
+msgstr "�似"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:148
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:148
 msgid "Similar to:"
-msgstr "�似�:"
+msgstr "�似��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:156
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:156
 msgid "lastfm:// URL"
-msgstr ""
+msgstr "lastfm:// URL"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:157
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:157
 msgid "lastfm://"
-msgstr ""
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationActions.cs:66
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationActions.cs:67
-msgid "Show Recommendations"
-msgstr "顯示��"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:79
-#, csharp-format
-msgid "Top Albums by {0}"
-msgstr "ç?±é??å°?輯ä¾? {0}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:80
-#, csharp-format
-msgid "Top Tracks by {0}"
-msgstr "æ??ä½³æ­?æ?² {0}"
+msgstr "lastfm://"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:161
-msgid "Recommended Artists"
-msgstr "æ?¨è?¦ç??表æ¼?è??"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109
+msgid "Media"
+msgstr "��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:188
-msgid "No similar artists found"
-msgstr "æ?¾ä¸?å?°é¡?ä¼¼ç??表æ¼?è??"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119
+msgid "Library"
+msgstr "è³?æ??庫"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60
-#, csharp-format
-msgid "{0}% Similarity"
-msgstr "{0}% �似"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131
+msgid "Launch the Banshee Media Player"
+msgstr "å??å?? Banshee åª?é«?æ?­æ?¾ç¨?å¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62
-#, fuzzy
-msgid "Unknown Similarity"
-msgstr "æ?ªç?¥ç??æ¼?å?ºè??"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
+msgid "media"
+msgstr "��"
 
-#: ../src/Extensions/Banshee.Lastfm/Resources/lastfm.glade.h:1
-msgid "Station _Type:"
-msgstr "é?»å?°é¡?å??(_T):"
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
+msgid "Quick access panel for your media"
+msgstr "å¿«é??å­?å??æ?¨åª?é«?ç??é?¢æ?¿"
 
 #: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeService.cs:25
 msgid "_Mini Mode"
 msgstr "迷你模�(_M)"
 
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:73
-msgid "Banshee Music Player"
-msgstr "Banshee �����"
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:100
+msgid "Full Mode"
+msgstr "��模�"
 
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:136
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:123
 msgid "Switch back to full mode"
 msgstr "å??æ??å??å®?æ?´æ¨¡å¼?"
 
-#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:137
+#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:124
 msgid "Change repeat playback mode"
 msgstr "è®?æ?´é??è¦?æ?­æ?¾æ¨¡å¼?"
 
-#: ../src/Extensions/Banshee.MiniMode/Resources/minimode.glade.h:1
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:64
-msgid "Banshee"
-msgstr "Banshee"
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:47
+msgid "Miro Guide"
+msgstr ""
 
-#: ../src/Extensions/Banshee.MiniMode/Resources/minimode.glade.h:2
-msgid "Current source:"
-msgstr "ç?®å??ç??ä¾?æº?:"
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:56
+#, fuzzy
+#| msgid "Search for songs"
+msgid "Search for Podcasts"
+msgstr "æ??å°?æ?²ç?®"
 
-#: ../src/Extensions/Banshee.MiniMode/Resources/minimode.glade.h:3
-msgid "Full Mode"
-msgstr "��模�"
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:57
+#, fuzzy
+#| msgid "Search for songs"
+msgid "Search for Video Podcasts"
+msgstr "æ??å°?æ?²ç?®"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:123
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:138
 msgid "_Show Notifications"
 msgstr "顯示é??ç?¥(_S)"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:124
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
 msgid "Show notifications when item changes"
 msgstr "ç?¶é ?ç?®æ?¹è®?æ??顯示é??ç?¥"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:299
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:343
 msgid "Still Running"
 msgstr "����"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:300
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:344
 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:404
-#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:48
-msgid "Now Playing"
-msgstr "����"
-
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:409
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:479
 msgid "Skip this item"
 msgstr "ç?¥é??é??å??é ?ç?®"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:415
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
 msgid "Cannot show notification"
 msgstr "ä¸?è?½é¡¯ç¤ºé??ç?¥"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:49
+#. 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:517
+#, fuzzy, csharp-format
+#| msgid "{0}by{1} {2} {0}from{1} {3}"
+msgid ""
+"{0}by{1} {2}\n"
+"{0}from{1} {3}"
+msgstr "{0}�{1} {2} {0}�輯�{1} {3}"
+
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
+msgid "Banshee"
+msgstr "Banshee"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
+#, csharp-format
+msgid "Unable to import track: {0}"
+msgstr "�������{0}"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+msgid "Importing from Amarok failed"
+msgstr "å¾? Amarok å?¯å?¥å¤±æ??"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+msgid "Amarok"
+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:384
+msgid "iTunes Importer"
+msgstr "iTunes ����"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:90
+msgid "Import song ratings"
+msgstr "������"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:93
+msgid "Import play statistics (playcount, etc.)"
+msgstr ""
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:96
+msgid "Import playlists"
+msgstr "������"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#, 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:388
+#, csharp-format
+msgid "Locate \"{0}\""
+msgstr "å®?ä½?ã??{0}ã??"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+msgid "Locate iTunes Music Directory"
+msgstr "å®?ä½? iTunes é?³æ¨?ç?®é??"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#, 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 ""
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
+msgid "iTunes Media Player"
+msgstr "iTunes ������"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+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 ""
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+msgid "Unable to import song."
+msgstr "ç?¡æ³?å?¯å?¥æ­?æ?²ã??"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+msgid "Rhythmbox Music Player"
+msgstr "Rhythombox �����"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+msgid "Import _playlists"
+msgstr "������(_P)"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:59
+msgid "_Fill"
+msgstr "å¡«å?¥(_F)"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:71
+msgid "f_rom"
+msgstr "å¾?(_R)"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:50
 msgid "Add to Play Queue"
 msgstr "å? å?¥æ?­æ?¾ä½?å??"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:50
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
 msgid "Append selected songs to the play queue"
 msgstr "å°?é?¸å??ç??æ­?æ?²å? å?¥æ?­æ?¾ä½?å??"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
-msgid "Remove all tracks from the play queue"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+#, fuzzy
+#| msgid "Remove all tracks from the play queue"
+msgid "Refresh random tracks in the play queue"
 msgstr "å¾?æ?­æ?¾ä½?å??移é?¤æ??æ??ç??æ­?æ?²"
 
 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:64
+msgid "Add More"
+msgstr "����"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:65
+msgid "Add more random tracks to the play queue"
+msgstr "å¾?æ?­æ?¾ä½?å??å? å?¥æ?´å¤?é?¨æ©?æ?²ç?®"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+msgid "Remove all tracks from the play queue"
+msgstr "å¾?æ?­æ?¾ä½?å??移é?¤æ??æ??ç??æ?²ç?®"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
 msgid "Clear the play queue when quitting"
 msgstr "é?¢é??æ??æ¸?é?¤æ?­æ?¾ä½?å??"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:63
-msgid "Play Queue"
-msgstr "æ?­æ?¾ä½?å??"
-
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:72
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:88
 msgid "Remove From Play Queue"
 msgstr "å¾?æ?­æ?¾ä½?å??移é?¤"
 
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:826
+msgid "Number of _played songs to show"
+msgstr "è¦?顯示ç??å·²æ?­æ?¾æ­?æ?²æ?¸ç?®(_P)"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:832
+msgid "Number of _upcoming songs to show"
+msgstr "è¦?顯示ç??å?³å?¥æ­?æ?²æ?¸ç?®(_U)"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
+msgid "Podcast"
+msgstr "Podcast"
+
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:69
 #, csharp-format
 msgid "All Podcasts ({0})"
 msgstr "æ??æ?? Podcast ({0})"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
 msgid "Published"
 msgstr "已��"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
 msgid "New"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
 msgid "Downloaded"
 msgstr "已��"
@@ -4098,6 +6403,10 @@ msgstr "æ?´æ?°æ?¼ {0}"
 msgid "Updated {0}"
 msgstr "已�� {0}"
 
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:62
+msgid "Downloading"
+msgstr "��中"
+
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:57
 msgid "New Items"
 msgstr "æ?°ç??é ?ç?®"
@@ -4106,119 +6415,104 @@ msgstr "æ?°ç??é ?ç?®"
 msgid "Old Items"
 msgstr "è??ç??é ?ç?®"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:46
-msgid "Downloads"
-msgstr "��"
-
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:50
 msgid "Downloading Podcast(s)"
 msgstr "正��� Podcast"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:51
-msgid "Initializing..."
-msgstr "æ­£å?¨å??å§?å??..."
-
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:52
 msgid "Cancel all podcast downloads?"
 msgstr "æ?¯å?¦å??æ¶?æ??æ??ç?? podcast ä¸?è¼?ï¼?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:120
-#, csharp-format
-msgid "Transfering {0} file at {1} KB/s"
-msgid_plural "Transfering {0} of {2} files at {1} KB/s"
-msgstr[0] "æ­£å?¨å?³è¼¸ {0} å??æª?æ¡?ï¼?é??ç?? {1} KB/s"
-msgstr[1] "æ­£å?¨å?³è¼¸ {2} å??æª?æ¡?ç??第 {0} å??ï¼?é??ç?? {1} KB/s"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:133
-msgid "Canceling Downloads"
-msgstr "æ­£å?¨å??æ¶?ä¸?è¼?"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:135
-msgid "Waiting for downloads to terminate..."
-msgstr "����中止..."
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:66
-msgid "Update Podcasts"
-msgstr "æ?´æ?° Podcast"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:71
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:95
+msgid "Check for New Episodes"
+msgstr "檢æ?¥æ?¯å?¦æ??æ?°ç??é??æ?¸"
 
 #. "<control><shift>U",
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:67
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
 msgid "Refresh All Podcasts"
 msgstr "é??æ?°æ?´ç??æ??æ??ç?? Podcast"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
-msgid "Subscribe to Podcast"
-msgstr "�� Podcast"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:77
+msgid "Subscribe to Podcast..."
+msgstr "�� Podcast..."
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
 msgid "Subscribe to a new podcast"
 msgstr "è¨?é?±æ?°ç?? Podcast"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:84
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
 msgid "Unsubscribe and Delete"
 msgstr "å??æ¶?è¨?é?±ä¸¦å?ªé?¤"
 
-#. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:91
-msgid "Check for New Episodes"
-msgstr "檢æ?¥æ?°ç??ç« ç¯?"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:97
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:101
 msgid "Download All Episodes"
-msgstr "ä¸?è¼?æ??æ??ç« ç¯?"
+msgstr "ä¸?è¼?æ¯?ä¸?é??"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:103
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:107
 msgid "Visit Podcast Homepage"
 msgstr "å??訪 Podcast é¦?é ?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:115
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:119
 msgid "Mark as New"
 msgstr "æ¨?è¨?ç?ºæ?°ç??"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:121
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:125
 msgid "Mark as Old"
 msgstr "æ¨?è¨?ç?ºè??ç??"
 
 #. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:127
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:131
 msgid "Download Podcast(s)"
 msgstr "�� Podcast"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:133
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:137
 msgid "Cancel Download"
 msgstr "å??æ¶?ä¸?è¼?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:139
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:143
 msgid "Remove Downloaded File(s)"
 msgstr "移é?¤ä¸?è¼?ç??æª?æ¡?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:145
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:149
 msgid "Visit Website"
 msgstr "å??訪網ç«?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:309
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:161
+msgid "Subscribe to Podcast"
+msgstr "�� Podcast"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325
 msgid "Invalid URL"
 msgstr "ç?¡æ??ç?? URL"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:310
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326
 msgid "Podcast URL is invalid."
 msgstr "Podcast URL æ?¯ç?¡æ??ç??ã??"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:78
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:109
+msgid "Episode Details"
+msgstr "æ?¬é??ç´°ç¯?"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:85
 msgid "Last updated:"
 msgstr "ä¸?次æ?´æ?°ç??:"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:82
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:89
+msgid "Podcast Name:"
+msgstr "Podcast å??稱ï¼?"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:99
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:146
 msgid "URL:"
-msgstr "網å??:"
+msgstr "URL:"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:86
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:103
 msgid "When feed is updated:"
 msgstr "ç?¶é¤µé??å·²æ?´æ?°æ??ï¼?"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:119
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
 msgid "No description available"
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¿°"
@@ -4227,10 +6521,6 @@ msgstr "æ²?æ??å?¯ç?¨ç??æ??è¿°"
 msgid "Podcast:"
 msgstr "Podcast:"
 
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
-msgid "Date:"
-msgstr "æ?¥æ??:"
-
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
 msgid "Subscribe"
@@ -4247,28 +6537,24 @@ msgstr "è«?輸å?¥æ?¨æ?³è¦?è¨?é?±ç?? podcast URLã??"
 
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:112
 msgid "When new episodes are available:  "
-msgstr "ç?¶æ??æ?°ç??ç« ç¯?å?¯ç?¨æ??ï¼?"
+msgstr "ç?¶æ??æ?°ç??é??æ?¸å?¯ç?¨æ??ï¼?"
 
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
 msgid "Download all episodes"
-msgstr "ä¸?è¼?æ??æ??ç« ç¯?"
+msgstr "ä¸?è¼?æ¯?ä¸?é??"
 
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:42
 msgid "Download the most recent episode"
-msgstr "ä¸?è¼?æ??è¿?ç??ç« ç¯?"
+msgstr "ä¸?è¼?æ??è¿?ç??ä¸?é??"
 
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:43
 msgid "Let me decide which episodes to download"
-msgstr "è®?æ??決å®?è¦?ä¸?è¼?å?ªå??ç« ç¯?"
+msgstr "è®?æ??決å®?è¦?ä¸?è¼?å?ªå??ä¸?é??"
 
 #: ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio/RemoteSpeakersWidget.cs:51
 msgid "_Speaker:"
 msgstr "å??å?­(_S):"
 
-#: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40
-msgid "Sample"
-msgstr "樣å??"
-
 #: ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole/SqlActions.cs:59
 msgid "Show SQL Console"
 msgstr "顯示 SQL 主��"
@@ -4281,252 +6567,334 @@ msgstr "å??å?? SQL ç?£æ?§"
 msgid "Stop SQL Monitoring"
 msgstr "å??æ­¢ç?£æ?§ SQL"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:513
-#, csharp-format
-msgid "Hide <i>{0}</i>"
-msgstr "é?±è?? <i>{0}</i>"
+#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:136
+msgid "Uploaded by"
+msgstr "����"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
-msgid "Banshee Encountered a Fatal Error"
-msgstr "Banshee é??å?°ä¸?å??é??大ç??é?¯èª¤"
+#: ../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 æ?­æ?¾..."
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:89
-msgid "Error Details"
-msgstr "�誤細�"
+#: ../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 "�網��覽�中��..."
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:133
-msgid "An unhandled exception was thrown: "
-msgstr "ä¸?æ£?ä¸?å??æ?ªè??ç??ç??ç?°å¸¸ä¾?å¤?ï¼?"
+#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs:61
+msgid "No videos found"
+msgstr "�����"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
-msgid "Assembly Version Information"
-msgstr "çµ?件ç??æ?¬è³?è¨?"
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
+msgid "Last.fm Account Login"
+msgstr "Last.fm 帳è??ç?»å?¥"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64
-msgid "Assembly Name"
-msgstr "çµ?件å??稱"
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
+msgid "Please enter your Last.fm account credentials."
+msgstr "è«?輸å?¥æ?¨ç?? Last.fm 帳è??æ??è­?ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62
-msgid "KB"
-msgstr "KB"
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
+msgid "Save and Log In"
+msgstr "��並��"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86
-msgid "Condition:"
-msgstr "�件:"
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:98
+msgid "Authorize for Last.fm"
+msgstr "ç?º Last.fm æ??æ¬?"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104
-msgid "_Match"
-msgstr "符å??(_M)"
+#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:447
+msgid ""
+"Last.fm username is invalid or Banshee is not authorized to access your "
+"account."
+msgstr "Last.fm 使ç?¨è??å??稱ç?¡æ??ï¼?æ??æ?¯ Banshee å°?æ?ªè¢«æ??æ¬?以å­?å??æ?¨ç??帳è??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111
-msgid "all"
-msgstr "��"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
+msgid "This service does not exist."
+msgstr "æ­¤æ??å??ä¸?å­?å?¨ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112
-msgid "any"
-msgstr "任�"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+msgid "This station is only available to subscribers."
+msgstr "é??å??é?»å?°å?ªæ??ä¾?給è¨?é?±è??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117
-msgid "of the following:"
-msgstr ""
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
+msgid "This station is not available."
+msgstr "é??å??é?»å?°ç?¡æ³?使ç?¨ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58
-msgid "_Limit to"
-msgstr "é??å?¶ç?º(_L)"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+msgid "The request is missing a required parameter."
+msgstr "該è«?æ±?é?ºå¤±å¿?è¦?ç??å¼?æ?¸ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:82
-msgid "selected by"
-msgstr ""
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+msgid "The specified resource is invalid."
+msgstr "æ??å®?ç??è³?æº?ç?¡æ??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42
-msgid "ago"
-msgstr "å??"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+msgid "Server error, please try again later."
+msgstr "伺æ??å?¨é?¯èª¤ï¼?è«?ç¨?å¾?é??試ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59
-msgid "seconds"
-msgstr "��"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+msgid "Invalid authentication information, please re-authenticate."
+msgstr "ç?¡æ??ç??èª?è­?è³?è¨?ï¼?è«?é??æ?°èª?è­?ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62
-msgid "days"
-msgstr "天"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+msgid "The API key used by this application is invalid."
+msgstr "æ­¤æ??ç?¨ç¨?å¼?æ??使ç?¨ç?? API key ç?¡æ??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63
-msgid "weeks"
-msgstr "é?±"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+msgid ""
+"The streaming system is offline for maintenance, please try again later."
+msgstr "串統系統ç?®å??æ­£é?¢ç·?維謢中ï¼?è«?ç¨?å¾?å??試ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64
-msgid "months"
-msgstr "æ??"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+msgid "The method signature is invalid."
+msgstr "æ?¹æ³?簽署ç?¡æ??ã??"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65
-msgid "years"
-msgstr "å¹´"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
+msgid "There is not enough content to play this station."
+msgstr "é??裡æ²?æ??足夠ç??å?§å®¹å?¯ä»¥æ?­æ?¾é??å??é?»å?°ã??"
 
-#. public static readonly Operator Equal              = new Operator ("equals", "= {0}", "==", "=", ":");
-#. public static readonly Operator NotEqual           = new Operator ("notEqual", "!= {0}", true, "!=", "!:");
-#. public static readonly Operator LessThanEqual      = new Operator ("lessThanEquals", "<= {0}", "<=");
-#. public static readonly Operator GreaterThanEqual   = new Operator ("greaterThanEquals", ">= {0}", ">=");
-#: ../src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs:47
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
+msgid "This group does not have enough members for radio."
+msgstr "é??å??群çµ?é??ä¸?å?°å»£æ?­æ??é??ç??æ??å?¡ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+msgid "This artist does not have enough fans for radio."
+msgstr "é??ä½?表æ¼?è??æ²?æ??足夠廣æ?­ç??æ­?è¿·ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
 #, fuzzy
-msgid "before"
-msgstr "é??æ?´æ¸?å?®"
+msgid "There are not enough neighbours for this station."
+msgstr "é??裡æ²?æ??足夠ç??å?§å®¹å?¯ä»¥æ?­æ?¾é??å??é?»å?°ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+msgid "There was an unknown error."
+msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs:48
-msgid "after"
-msgstr "ä¹?å¾?"
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
+msgid "Not connected to Last.fm."
+msgstr "å°?æ?ªé?£ç·?å?° Last.fmã??"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:41
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:43
-msgid "is"
-msgstr "æ?¯"
+#: ../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:317
+msgid "No network connection detected."
+msgstr "æ²?æ??å?µæ¸¬å?°ç¶²è·¯é?£ç·?ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
+msgid "Last.fm username is invalid."
+msgstr "Last.fm 使ç?¨è??å??稱ç?¡æ??ã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
+msgid "Connecting to Last.fm."
+msgstr "é?£ç·?è?³ Last.fmã??"
+
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
+msgid "Connected to Last.fm."
+msgstr "å·²é?£ç·?è?³ Last.fmã??"
+
+#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:149
+#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:97
+#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:100
+msgid "Unknown Podcast"
+msgstr "ä¸?æ??ç?? Podcast"
+
+#~ msgid "Could not create 'filesink' plugin"
+#~ msgstr "ç?¡æ³?建ç«? 'filesink' æ??件"
+
+#~ msgid "Unknown Genre"
+#~ msgstr "æ?ªç?¥ç??æ¨?æ?²å??é¡?"
+
+#~ msgid "Song"
+#~ msgstr "æ­?æ?²"
+
+#~ msgid "Item"
+#~ msgstr "é ?ç?®"
+
+#~ msgid "Saving tags for {0}"
+#~ msgstr "å?²å­? {0} ç??æ¨?籤"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:42
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:44
-msgid "is not"
-msgstr "��"
+#~ msgid "Renaming {0}"
+#~ msgstr "é??æ?°å?½å?? {0}"
+
+#~ msgid "Home Directory"
+#~ msgstr "家ç?®é??"
+
+#~ msgid "Version:"
+#~ msgstr "ç??æ?¬:"
+
+#~ msgid "Copyright/License:"
+#~ msgstr "ç??æ¬?/æ??æ¬?:"
+
+#~ msgid "Extension Dependencies:"
+#~ msgstr "æ?´å??å¥?件ç?¸ä¾?æ?§:"
+
+#~ msgid "Disable"
+#~ msgstr "å??ç?¨"
+
+#~ msgid "Enable"
+#~ msgstr "å??ç?¨"
+
+#~ msgid "Primary Development"
+#~ msgstr "主è¦?é??ç?¼"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:43
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47
 #, fuzzy
-msgid "at most"
-msgstr "表æ¼?è??å??稱"
+#~ msgid "_Restart {0}"
+#~ msgstr "é??æ?°æ?­æ?¾æ­?æ?²(_R)"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:44
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46
 #, fuzzy
-msgid "at least"
-msgstr "�������"
+#~ msgid "_Jump to Playing {0}"
+#~ msgstr "è·³å?°æ?­æ?¾ä¸­ç??æ?²ç?®(_J)"
 
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:45
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45
-msgid "less than"
-msgstr ""
+#~ msgid "Name Ascending"
+#~ msgstr "å??稱é??å¢?æ??åº?"
 
-#. The SQL operators in these Operators are reversed from normal on purpose
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:46
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44
-msgid "more than"
-msgstr ""
+#~ msgid "Name Descending"
+#~ msgstr "å??稱é??æ¸?æ??åº?"
 
-#: ../src/Libraries/Hyena/Hyena.Query/NullQueryValue.cs:41
-msgid "empty"
-msgstr "空ç??"
+#~ msgid "<b>Details</b>"
+#~ msgstr "<b>詳細è³?æ??</b>"
 
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:89
-#, csharp-format
-msgid "{0} ago"
-msgstr "{0}å??"
+#~ msgid "Choose an import source:"
+#~ msgstr "é?¸æ??å?¯å?¥ä¾?æº?ï¼?"
 
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:41
-msgid "contains"
-msgstr "å??å?«"
+#~ msgid "Import Media Source"
+#~ msgstr "������"
 
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:42
-#, fuzzy
-msgid "doesn't contain"
-msgstr "å??å?«"
+#~ msgid "Import Media to Library"
+#~ msgstr "å°?åª?é«?å?¯å?¥è³?æ??庫"
 
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:45
-msgid "starts with"
-msgstr "以此é??å§?"
+#~ msgid "Predefined Smart Playlists"
+#~ msgstr "é ?å??å®?義ç??æ?ºæ?§å¼?æ?­æ?¾æ¸?å?®"
 
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:46
-msgid "ends with"
-msgstr "以此��"
+#~ msgid "Manually manage this device"
+#~ msgstr "æ??å??管ç??é??å??è£?ç½®"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
-msgid "Log in to Last.fm"
-msgstr "�� Last.fm"
+#~ msgid ""
+#~ "Manually managing your device means you can drag and drop items onto the "
+#~ "device, and manually remove them."
+#~ msgstr "æ??å??管ç??æ?¨ç??è£?置表示æ?¨å?¯ä»¥æ??æ?¾é ?ç?®å?°æ­¤è£?ç½®ï¼?並ä¸?æ??å??移é?¤å®?å??ã??"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
-msgid "Last.fm Account Login"
-msgstr "Last.fm 帳è??ç?»å?¥"
+#~ msgid "Synchronize"
+#~ msgstr "å??æ­¥"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
-msgid "Please enter your Last.fm account credentials."
-msgstr "è«?輸å?¥æ?¨ç?? Last.fm 帳è??æ??è­?ã??"
+#~ msgid "Synchronize {0}"
+#~ msgstr "å??æ­¥ {0}"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:105
-msgid "Save and Log In"
-msgstr "��並��"
+#~ msgid "Delete From {0}"
+#~ msgstr "� {0} ��"
 
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:113
-msgid "Sign up for Last.fm"
-msgstr "註å?? Last.fm"
+#~ msgid "Eject {0}"
+#~ msgstr "é??å?º {0}"
 
-#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:439
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:458
-msgid "Last.fm username or password is invalid."
-msgstr "Last.fm 使ç?¨è??å??稱æ??å¯?碼ç?¡æ??ã??"
+#~ msgid "Preparing..."
+#~ msgstr "æ­£å?¨æº?å??..."
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:301
-msgid "Failed to Login to Last.fm"
-msgstr "ç?»å?¥ Last.fm 失æ??"
+#~ msgid "_Configure..."
+#~ msgstr "設�(_C)..."
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
-msgid "Either your username or password is invalid."
-msgstr "æ?¨ç??使ç?¨è??å??稱æ??å¯?碼æ?¯ç?¡æ??ã??"
+#~ msgid "Configure the Last.fm Extension"
+#~ msgstr "設å®? Last.fm æ?´å??å¥?件"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:440
-msgid "There is not enough content to play this station."
-msgstr "é??裡æ²?æ??足夠ç??å?§å®¹å?¯ä»¥æ?­æ?¾é??å??é?»å?°ã??"
+#~ msgid "Station Name"
+#~ msgstr "é?»å?°å??稱"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:441
-msgid "This group does not have enough members for radio."
-msgstr "é??å??群çµ?é??ä¸?å?°å»£æ?­æ??é??ç??æ??å?¡ã??"
+#~ msgid "Station Type"
+#~ msgstr "é?»å?°é¡?å??"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:442
-msgid "This artist does not have enough fans for radio."
-msgstr "é??ä½?表æ¼?è??æ²?æ??足夠廣æ?­ç??æ­?è¿·ã??"
+#~ msgid "Edit Last.fm Settings"
+#~ msgstr "編輯 Last.fm 設��"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:443
-msgid "This station is not available."
-msgstr "é??å??é?»å?°ç?¡æ³?使ç?¨ã??"
+#~ msgid "Current source:"
+#~ msgstr "ç?®å??ç??ä¾?æº?:"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:444
-msgid "This station is only available to subscribers."
-msgstr "é??å??é?»å?°å?ªæ??ä¾?給è¨?é?±è??ã??"
+#~ msgid "Update Podcasts"
+#~ msgstr "æ?´æ?° Podcast"
+
+#~ msgid "Hide <i>{0}</i>"
+#~ msgstr "é?±è?? <i>{0}</i>"
+
+#~ msgid "Banshee Encountered a Fatal Error"
+#~ msgstr "Banshee é??å?°ä¸?å??é??大ç??é?¯èª¤"
+
+#~ msgid "An unhandled exception was thrown: "
+#~ msgstr "ä¸?æ£?ä¸?å??æ?ªè??ç??ç??ç?°å¸¸ä¾?å¤?ï¼?"
+
+#~ msgid "Assembly Version Information"
+#~ msgstr "çµ?件ç??æ?¬è³?è¨?"
+
+#~ msgid "Assembly Name"
+#~ msgstr "çµ?件å??稱"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "_Match"
+#~ msgstr "符å??(_M)"
+
+#~ msgid "any"
+#~ msgstr "任�"
+
+#~ msgid "_Limit to"
+#~ msgstr "é??å?¶ç?º(_L)"
+
+#~ msgid "ago"
+#~ msgstr "å??"
+
+#~ msgid "seconds"
+#~ msgstr "��"
+
+#~ msgid "days"
+#~ msgstr "天"
+
+#~ msgid "months"
+#~ msgstr "æ??"
+
+#~ msgid "years"
+#~ msgstr "å¹´"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:445
 #, fuzzy
-msgid "There are not enough neighbours for this station."
-msgstr "é??裡æ²?æ??足夠ç??å?§å®¹å?¯ä»¥æ?­æ?¾é??å??é?»å?°ã??"
+#~ msgid "before"
+#~ msgstr "é??æ?´æ¸?å?®"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:446
-msgid ""
-"The streaming system is offline for maintenance, please try again later."
-msgstr "串統系統ç?®å??æ­£é?¢ç·?維謢中ï¼?è«?ç¨?å¾?å??試ã??"
+#~ msgid "after"
+#~ msgstr "ä¹?å¾?"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:447
-msgid "There was an unknown error."
-msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
+#~ msgid "is"
+#~ msgstr "æ?¯"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:455
-msgid "Not connected to Last.fm."
-msgstr "å°?æ?ªé?£ç·?å?° Last.fmã??"
+#~ msgid "is not"
+#~ msgstr "��"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:456
-msgid "Account details are needed before you can connect to Last.fm"
-msgstr "å?¨æ?¨å?¯ä»¥é?£ç·?å?° Last.fm ä¹?å??é??è¦?帳è??ç??詳細è³?è¨?"
+#, fuzzy
+#~ msgid "at most"
+#~ msgstr "表æ¼?è??å??稱"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:457
-msgid "No network connection detected."
-msgstr "æ²?æ??å?µæ¸¬å?°ç¶²è·¯é?£ç·?ã??"
+#, fuzzy
+#~ msgid "at least"
+#~ msgstr "�������"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:459
-msgid "Connecting to Last.fm."
-msgstr "é?£ç·?è?³ Last.fmã??"
+#~ msgid "empty"
+#~ msgstr "空ç??"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:460
-msgid "Connected to Last.fm."
-msgstr "å·²é?£ç·?è?³ Last.fmã??"
+#~ msgid "{0} ago"
+#~ msgstr "{0}å??"
 
-#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:149
-msgid "Unknown Podcast"
-msgstr "ä¸?æ??ç?? Podcast"
+#, fuzzy
+#~ msgid "doesn't contain"
+#~ msgstr "å??å?«"
+
+#~ msgid "starts with"
+#~ msgstr "以此é??å§?"
+
+#~ msgid "ends with"
+#~ msgstr "以此��"
 
-#~ msgid "Download paused"
-#~ msgstr "ä¸?è¼?å·²æ?«å??"
+#~ msgid "Failed to Login to Last.fm"
+#~ msgstr "ç?»å?¥ Last.fm 失æ??"
+
+#~ msgid "Either your username or password is invalid."
+#~ msgstr "æ?¨ç??使ç?¨è??å??稱æ??å¯?碼æ?¯ç?¡æ??ã??"
 
 #~ msgid "Download failed"
 #~ msgstr "ä¸?è¼?失æ??"
@@ -4540,27 +6908,12 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "All Columns"
 #~ msgstr "æ??æ??æ¬?ä½?"
 
-#~ msgid "Cannot Convert File"
-#~ msgstr "ä¸?è?½è½?æ??æª?æ¡?"
-
-#~ msgid "_Restart Video"
-#~ msgstr "é??æ?°æ?­æ?¾å½±ç??(_R)"
-
-#~ msgid "_Jump to Playing Video"
-#~ msgstr "è·³å?°æ?­æ?¾å½±ç??(_J)"
-
-#~ msgid "Downloading"
-#~ msgstr "��中"
-
 #~ msgid "Waiting to download"
 #~ msgstr "����"
 
 #~ msgid "Heard"
 #~ msgstr "å·²è?½é??"
 
-#~ msgid "<b>Loading...</b>"
-#~ msgstr "<b>��中...</b>"
-
 #~ msgid "Disk Usage:"
 #~ msgstr "ç£?ç¢?使ç?¨æ??å½¢ï¼?"
 
@@ -4723,9 +7076,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "<b>CD Importing</b>"
 #~ msgstr "<b>CD ��中</b>"
 
-#~ msgid "<b>Digital Audio Player</b>"
-#~ msgstr "<b>�������</b>"
-
 #, fuzzy
 #~ msgid "<b>Duration:</b>"
 #~ msgstr "<b>CD ��中</b>"
@@ -4768,22 +7118,9 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "<b>_Title:</b>"
 #~ msgstr "<b>é?³æ¨?è³?æ??夾</b>"
 
-#~ msgid "Conversion Format:"
-#~ msgstr "è½?æ??æ ¼å¼?ï¼?"
-
-#~ msgid "Create a new preset"
-#~ msgstr "建ç«?æ?°ç??é ?設"
-
-#~ msgid "Delete the active preset"
-#~ msgstr "å?ªé?¤ç?®å??ç??é ?設"
-
 #~ msgid "Eject disc after writing"
 #~ msgstr "寫å?¥å®?æ??å¾?é??å?ºå??ç¢?"
 
-#, fuzzy
-#~ msgid "Metadata"
-#~ msgstr "編輯�� Metadata"
-
 #~ msgid "Write disc to:"
 #~ msgstr "å°?å??ç¢?寫å?¥ï¼?"
 
@@ -4797,10 +7134,10 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "ç?¡æ³?å??å§?å?? cdparanoia"
 
 #~ msgid "Could not create mbtrm plugin"
-#~ msgstr "ç?¡æ³?建ç«? mbtrm å¤?æ??"
+#~ msgstr "ç?¡æ³?建ç«? mbtrm æ??件"
 
 #~ msgid "Could not create GNOME VFS output plugin"
-#~ msgstr "ç?¡æ³?建ç«? GNOME VFS 輸å?ºå¤?æ??"
+#~ msgstr "ç?¡æ³?建ç«? GNOME VFS 輸å?ºæ??件"
 
 #~ msgid "Encoding element does not support tagging!"
 #~ msgstr "編碼å??件ä¸?æ?¯æ?´æ¨?籤å??è?½ï¼?"
@@ -4812,7 +7149,7 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "ç?¡æ³?é??å§?æª?æ¡?編碼"
 
 #~ msgid "Could not create 'gnomevfssink' plugin"
-#~ msgstr "ç?¡æ³?建ç«?å¤?æ??ã??gnomevfssinkã??"
+#~ msgstr "ç?¡æ³?建ç«?æ??件ã??gnomevfssinkã??"
 
 #~ msgid "Could not create new HAL context"
 #~ msgstr "ç?¡æ³?建ç«?æ?°ç?? HAL å?§å®¹"
@@ -4848,10 +7185,10 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "å??å??é?¸å??æ¸?å?®ä¸­ç??æ??æ??æ?²ç?®"
 
 #~ msgid "Plugins..."
-#~ msgstr "å¤?æ??..."
+#~ msgstr "æ??件..."
 
 #~ msgid "Configure Banshee plugins"
-#~ msgstr "é??ç½® Banshee å¤?æ??"
+#~ msgstr "é??ç½® Banshee æ??件"
 
 #~ msgid "Select which columns to display in the song list"
 #~ msgstr "é?¸æ??顯示æ?²ç?®æ¸?å?®ç??æ¬?ä½?"
@@ -4862,18 +7199,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "View a detailed log of events"
 #~ msgstr "檢è¦?äº?件ç´?é??ç´°ç¯?"
 
-#~ msgid "Source"
-#~ msgstr "��"
-
-#~ msgid "Debug"
-#~ msgstr "��"
-
-#~ msgid "Toggle display of album cover art"
-#~ msgstr "å??æ??å°?輯å°?é?¢å??ç??顯示"
-
-#~ msgid "Search for songs"
-#~ msgstr "æ??å°?æ?²ç?®"
-
 #~ msgid "By matching genre"
 #~ msgstr "符å??風格"
 
@@ -4905,9 +7230,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "HAL is not initialized"
 #~ msgstr "HAL å°?æ?ªå??å§?å??"
 
-#~ msgid "Audio CD Core Initialized"
-#~ msgstr "é?³è¨? CD æ ¸å¿?å??å§?å??"
-
 #~ msgid "Cannot Eject CD"
 #~ msgstr "ç?¡æ³?é??å?º CD"
 
@@ -5016,9 +7338,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Low"
 #~ msgstr "ä½?"
 
-#~ msgid "{0}x"
-#~ msgstr "{0}x"
-
 #, fuzzy
 #~ msgid "Could not run nautilus-cd-burner"
 #~ msgstr "ç?¡æ³?建ç«?編碼è½?æ??å?¨"
@@ -5047,9 +7366,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Message"
 #~ msgstr "��"
 
-#~ msgid "Show:"
-#~ msgstr "顯示�"
-
 #~ msgid "Only Error Messages"
 #~ msgstr "å??顯示é?¯èª¤è¨?æ?¯"
 
@@ -5065,10 +7381,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Entry Details:"
 #~ msgstr "��細��"
 
-#, fuzzy
-#~ msgid "Set all track counts to this value"
-#~ msgstr "以此å?¼è¨­å®?æ??æ??é?³è»?è¨?æ?¸"
-
 #~ msgid "HAL context could not be created"
 #~ msgstr "��建� HAL �容"
 
@@ -5116,16 +7428,13 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "正�����"
 
 #~ msgid "Banshee Plugins"
-#~ msgstr "Banshee å¤?æ??"
+#~ msgstr "Banshee æ??件"
 
 #~ msgid "Plugin Name"
-#~ msgstr "å¤?æ??å??稱"
-
-#~ msgid "Overview"
-#~ msgstr "�覽"
+#~ msgstr "æ??件å??稱"
 
 #~ msgid "This plugin could not be initialized."
-#~ msgstr "å¤?æ??ç?¡æ³?å??å§?å??ã??"
+#~ msgstr "æ??件ç?¡æ³?å??å§?å??ã??"
 
 #~ msgid "Reading table of contents from CD..."
 #~ msgstr "æ­£å?¨å¾? CD è®?å??ç?®é??..."
@@ -5149,9 +7458,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "You are currently importing from {0}. Would you like to stop it?"
 #~ msgstr "æ?¨ç?®å??æ­£å?¨å¾? {0} é?²è¡?å?¯å?¥ã??æ?¨æ?³è¦?å??æ­¢å??ï¼?"
 
-#~ msgid "Copying from {0}"
-#~ msgstr "正�� {0} ���製"
-
 #, fuzzy
 #~ msgid "Import Errors"
 #~ msgstr "����"
@@ -5178,9 +7484,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Copying Songs"
 #~ msgstr "正��製��"
 
-#~ msgid "Audio Device"
-#~ msgstr "���置"
-
 #~ msgid ": Found"
 #~ msgstr "���"
 
@@ -5199,9 +7502,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Removing Songs"
 #~ msgstr "正�移���"
 
-#~ msgid "Device Error"
-#~ msgstr "è£?ç½®ç?¼ç??é?¯èª¤"
-
 #~ msgid "Could not set the owner of the device."
 #~ msgstr "ç?¡æ³?設å®?è£?ç½®ç??æ??æ??è??"
 
@@ -5233,10 +7533,10 @@ msgstr "ä¸?æ??ç?? Podcast"
 
 #~ msgid ""
 #~ "Allow engine to submit song data to last.fm in the Audioscrobbler plugin"
-#~ msgstr "å??許å¼?æ??以 Audioscrobbler å¤?æ??é??å?ºæ?²ç?®è³?æ??å?° last.fm"
+#~ msgstr "å??許å¼?æ??以 Audioscrobbler æ??件é??å?ºæ?²ç?®è³?æ??å?° last.fm"
 
 #~ msgid "Enable the Audioscrobbler plugin"
-#~ msgstr "å??ç?¨é?³è¨? scrobbler å¤?æ??"
+#~ msgstr "å??ç?¨é?³è¨? scrobbler æ??件"
 
 #~ msgid "Your last.fm password"
 #~ msgstr "æ?¨ç?? last.fm å¯?碼"
@@ -5261,10 +7561,7 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgstr "å??ç?¨ DAAP 伺æ??å?¨æ?¯æ?´"
 
 #~ msgid "Enable the DAAP Music Sharing plugin"
-#~ msgstr "å??ç?¨ DAAP é?³æ¨?å??享å¤?æ??"
-
-#~ msgid "Name of DAAP server share"
-#~ msgstr "DAAP 伺æ??å?¨å??享å??稱"
+#~ msgstr "å??ç?¨ DAAP é?³æ¨?å??享æ??件"
 
 #~ msgid "Cannot login to DAAP share"
 #~ msgstr "ç?¡æ³?ç?»å?¥ DAAP å??享"
@@ -5298,27 +7595,21 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ "ç??ï¼?è¦?寫 metadata"
 
 #~ msgid "Enable the MetadataSearch plugin"
-#~ msgstr "å??ç?¨ Metadata æ??å°?å¤?æ??"
+#~ msgstr "å??ç?¨ Metadata æ??å°?æ??件"
 
 #~ msgid "Method of fetching cover art and supplementary metadata"
 #~ msgstr "å°?é?¢å??ç??è??é??å?  metadata ç??å??ç?¨æ?¹æ³?"
 
-#~ msgid "Multimedia Keyboard Shortcuts"
-#~ msgstr "���快��"
-
 #~ msgid ""
 #~ "Configuration of multimedia keyboard shortcuts is done through the Gnome "
 #~ "Keyboard Shortcuts configuration applet."
 #~ msgstr "ç¶?ç?± Gnome å¿«æ?·é?µé??ç½® appletï¼?å¤?åª?é«?å¿«æ?·é?µå·²ç¶?é??ç½®å®?æ??ã??"
 
 #~ msgid "Enable the MultimediaKeys plugin"
-#~ msgstr "å??ç?¨å¤?åª?é«?æ??é?µå¤?æ??"
-
-#~ msgid "Notification Area Icon"
-#~ msgstr "ç¨?å¼?ç??æ??é??ç?¥å??å??示"
+#~ msgstr "å??ç?¨å¤?åª?é«?æ??é?µæ??件"
 
 #~ msgid "Enable the Notification Area Icon plugin"
-#~ msgstr "å??ç?¨ç¨?å¼?ç??æ??é??ç?¥å??å??示å¤?æ??"
+#~ msgstr "å??ç?¨ç¨?å¼?ç??æ??é??ç?¥å??å??示æ??件"
 
 #~ msgid "Searching: {0}"
 #~ msgstr "æ­£å?¨æ??å°?ï¼?{0}"
@@ -5335,9 +7626,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Play/pause current song"
 #~ msgstr "æ?­æ?¾ï¼?æ?«å??ç?¶å??ç??æ?²ç?®"
 
-#~ msgid "Play next song"
-#~ msgstr "�������"
-
 #~ msgid "Device disk usage"
 #~ msgstr "è£?ç½®ç£?ç¢?使ç?¨æ??å½¢"
 
@@ -5347,9 +7635,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ msgid "Adjust volume"
 #~ msgstr "調æ?´é?³é??"
 
-#~ msgid "Toggle shuffle playback mode"
-#~ msgstr "å??æ??æ´?ç??æ?­æ?¾æ¨¡å¼?"
-
 #~ msgid "Edit and view metadata of selected songs"
 #~ msgstr "編輯並檢è¦?é?¸æ??æ?²ç?®ç?? metadata"
 
@@ -5363,9 +7648,6 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ "  <big>â?¢</big> 該æ?²ç?®å??å?°ä¿?è­· (DRM)\n"
 #~ "  <big>�</big> 該��� DAP ��被����\n"
 
-#~ msgid "Playback Error"
-#~ msgstr "æ?­æ?¾ç?¼ç??é?¯èª¤"
-
 #~ msgid ""
 #~ "You have made changes to your {0}. Please choose a method for updating "
 #~ "the contents of your {0}.\n"
@@ -5387,18 +7669,12 @@ msgstr "ä¸?æ??ç?? Podcast"
 #~ "<b>è­¦å??ï¼?</b>æ?¨ç??å??ä½?å°?æ??æ?¹è®?æ??æ¸?é?¤ç?¾å­?ç?? iPod å?§å®¹ä¸¦æ??å?¯è?½é? æ??è?? iTunes "
 #~ "��容�"
 
-#~ msgid "Synchronize Library"
-#~ msgstr "å??æ­¥è³?æ??庫"
-
 #~ msgid "Save Manual Changes"
 #~ msgstr "å?²å­?æ??å??è®?æ?´"
 
 #~ msgid "Invalid column width"
 #~ msgstr "ç?¡æ??ç??æ¬?寬"
 
-#~ msgid "Choose Columns"
-#~ msgstr "é?¸æ??æ¬?ä½?"
-
 #~ msgid "Visible Playlist Columns"
 #~ msgstr "è¦?顯示ç??æ?­æ?¾æ¸?å?®æ¬?ä½?"
 
@@ -5443,11 +7719,3 @@ msgstr "ä¸?æ??ç?? Podcast"
 
 #~ msgid "File: {0}"
 #~ msgstr "���{0}"
-
-#~ msgid "{0} KHz"
-#~ msgstr "{0} KHz"
-
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60
-#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
-msgid "media"
-msgstr "��"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]