[banshee] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit d27672f7d2d9a610cee1c2570054a46635262286
Author: Aron Xu <aronxu gnome org>
Date:   Sun Jul 25 19:32:18 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 2348 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 1164 insertions(+), 1184 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 138773a..59eff65 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,22 +1,23 @@
 # translation of banshee.pot to zh_CN
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the banshee package.
-# ç??é?²(Gan Lu) <rhythm gan gmail com>, 2008.
-# Aron Xu <happyaron xu gmail com>, 2009.
+# Aron Xu <happyaron xu gmail com>, 2009, 2010.
+# ç??é?²(Gan Lu) <rhythm gan gmail com>, 2008, 2010.
+# Tao Wang <dancefire gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: banshee master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=banshee&component=general\n"
-"POT-Creation-Date: 2010-03-28 02:34+0000\n"
-"PO-Revision-Date: 2010-03-29 13:51+0800\n"
-"Last-Translator: ç??é?²(Gan Lu) <rhythm gan gmail com>\n"
+"POT-Creation-Date: 2010-07-24 14:23+0000\n"
+"PO-Revision-Date: 2010-07-25 19:32+0800\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. ../src/Backends/Banshee.Gio/Banshee.Gio.addin.xml
 #: ../data/addin-xml-strings.cs:8
@@ -31,79 +32,80 @@ msgid ""
 msgstr "GNOME å¹³å?°ç??å??端æ??ä¾?è??ã??å??æ?¬ GConf æ?¯æ??å??常è§?ç?? GNOME é??æ??ã??"
 
 #. ../src/Backends/Banshee.GStreamer/Banshee.GStreamer.addin.xml
-#: ../data/addin-xml-strings.cs:14
+#. ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.addin.xml
+#: ../data/addin-xml-strings.cs:14 ../data/addin-xml-strings.cs:17
 msgid ""
 "GStreamer multimedia services including playback, CD ripping, and "
 "transcoding."
 msgstr "GStreamer å¤?åª?ä½?æ??å?¡å??æ?¬å??æ?¾ï¼?CD å¤?å?¶å??转ç ?ã??"
 
 #. ../src/Backends/Banshee.Hal/Banshee.Hal.addin.xml
-#: ../data/addin-xml-strings.cs:17
+#: ../data/addin-xml-strings.cs:20
 msgid "Provides hardware support through HAL."
 msgstr "é??è¿? HAL æ??ä¾?硬件æ?¯æ??"
 
 #. ../src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.addin.xml
-#: ../data/addin-xml-strings.cs:20
+#: ../data/addin-xml-strings.cs:23
 msgid ""
 "Provides an X11 backend for video support, which enables proper fullscreen "
 "support."
 msgstr "为è§?é¢?æ?¯æ??æ??ä¾?ä¸?个 X11 å??端ï¼?使å?¶å?¯å?¯ç?¨æ­£ç¡®ç??å?¨å±?æ?¯æ??ã??"
 
 #. ../src/Backends/Banshee.Osx/Banshee.Osx.addin.xml
-#: ../data/addin-xml-strings.cs:23
+#: ../data/addin-xml-strings.cs:26
 msgid ""
 "Backend providers for the OSX platform. Includes general OSX integration."
 msgstr "OSX å¹³å?°ç??å??端æ??ä¾?è??ã??å??æ?¬å¸¸è§?ç?? OSX é??æ??ã??"
 
 #. ../src/Backends/Banshee.Unix/Banshee.Unix.addin.xml
-#: ../data/addin-xml-strings.cs:26
+#: ../data/addin-xml-strings.cs:29
 msgid "Provides POSIX/UNIX support, including IO."
 msgstr "æ??ä¾? POSIX/UNIX æ?¯æ??ï¼?å??æ?¬ IOã??"
 
 #. ../src/Core/Banshee.Core/Banshee.Core.addin.xml
-#: ../data/addin-xml-strings.cs:29
+#: ../data/addin-xml-strings.cs:32
 msgid "Provides low level non-GUI utilities."
 msgstr "æ??ä¾?ä½?å±?ç??é??å?¾å½¢ç??é?¢ç??å®?ç?¨å·¥å?·é??"
 
 #. ../src/Core/Banshee.Services/Banshee.Services.addin.xml
-#: ../data/addin-xml-strings.cs:32
+#: ../data/addin-xml-strings.cs:35
 msgid "Provides non-GUI utilities and services."
 msgstr "æ??ä¾?é??å?¾å½¢ç??é?¢ç??å·¥å?·é??å??æ??å?¡"
 
 #. ../src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml
-#: ../data/addin-xml-strings.cs:35
+#: ../data/addin-xml-strings.cs:38
 msgid "Provides GUI utilities and services."
 msgstr "æ??ä¾?å?¾å½¢ç??é?¢ç??å®?ç?¨å·¥å?·é??å??æ??å?¡"
 
 #. ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml
-#: ../data/addin-xml-strings.cs:38
+#: ../data/addin-xml-strings.cs:41
 msgid "iPod Support"
 msgstr "iPod æ?¯æ??"
 
-#: ../data/addin-xml-strings.cs:39
+#: ../data/addin-xml-strings.cs:42
 msgid "Support for most iPod devices."
 msgstr "æ?¯æ??大å¤?æ?° iPod 设å¤?"
 
-#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:45
-#: ../data/addin-xml-strings.cs:50 ../data/addin-xml-strings.cs:55
+#: ../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:43
+#: ../data/addin-xml-strings.cs:46
 msgid "Karma Support"
 msgstr "Karma æ?¯æ??"
 
-#: ../data/addin-xml-strings.cs:44
+#: ../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:48
+#: ../data/addin-xml-strings.cs:51
 msgid "Mass Storage Media Player Support"
 msgstr "大容é??åª?ä½?æ?­æ?¾å?¨æ?¯æ??"
 
-#: ../data/addin-xml-strings.cs:49
+#: ../data/addin-xml-strings.cs:52
 msgid ""
 "Support for USB-drive based devices, including many iAudio devices and "
 "Android, Pre, and Galaxy phones."
@@ -112,323 +114,358 @@ msgstr ""
 "è¯?ã??"
 
 #. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
-#: ../data/addin-xml-strings.cs:53
+#: ../data/addin-xml-strings.cs:56
 msgid "MTP Media Player Support"
 msgstr "MTP åª?ä½?æ?­æ?¾å?¨æ?¯æ??"
 
-#: ../data/addin-xml-strings.cs:54
+#: ../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:58
+#: ../data/addin-xml-strings.cs:61
 msgid "Digital Media Player Support"
 msgstr "æ?°ç ?åª?ä½?æ?­æ?¾å?¨æ?¯æ??"
 
-#: ../data/addin-xml-strings.cs:59
+#: ../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 Store �"
+
+#: ../data/addin-xml-strings.cs:66
+msgid "Browse, search, and purchase music from the Amazon MP3 store"
+msgstr "ä»? Amazon MP3 store æµ?è§?ã??æ??ç´¢å??è´­ä¹°é?³ä¹?"
+
+#: ../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:62
+#: ../data/addin-xml-strings.cs:75
 msgid "Audiobooks Library"
 msgstr "æ??声读ç?©åº?"
 
-#: ../data/addin-xml-strings.cs:63
+#: ../data/addin-xml-strings.cs:76
 msgid "Organize audiobooks, lectures, etc."
 msgstr "ç»?ç»?æ??声读ç?©ï¼?æ¼?讲ï¼?ç­?ç­?ã??"
 
-#: ../data/addin-xml-strings.cs:64 ../data/addin-xml-strings.cs:69
-#: ../data/addin-xml-strings.cs:104 ../data/addin-xml-strings.cs:114
-#: ../data/addin-xml-strings.cs:157 ../data/addin-xml-strings.cs:162
+#: ../data/addin-xml-strings.cs: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:67
+#: ../data/addin-xml-strings.cs:80
 msgid "Audio CD Support"
 msgstr "é?³é¢? CD æ?¯æ??"
 
-#: ../data/addin-xml-strings.cs:68
+#: ../data/addin-xml-strings.cs:81
 msgid "Listen to and rip Audio CDs."
 msgstr "��并���� CD"
 
-#. ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks.addin.xml
-#: ../data/addin-xml-strings.cs:72
-msgid "Bookmarks"
-msgstr "书签"
-
-#: ../data/addin-xml-strings.cs:73
-msgid "Save your position in tracks so you can resume playback later."
-msgstr "ä¿?å­?é?³è½¨ä¸­ç??ä½?置以便æ?¨å?¯ä»¥å??头é??æ?°å¼?å§?å??æ?¾ã??"
-
-#: ../data/addin-xml-strings.cs:74 ../data/addin-xml-strings.cs:79
-#: ../data/addin-xml-strings.cs:84 ../data/addin-xml-strings.cs:89
-#: ../data/addin-xml-strings.cs:94 ../data/addin-xml-strings.cs:124
-#: ../data/addin-xml-strings.cs:133 ../data/addin-xml-strings.cs:138
-#: ../data/addin-xml-strings.cs:143 ../data/addin-xml-strings.cs:152
-#: ../data/addin-xml-strings.cs:181
-msgid "Utilities"
-msgstr "��工�"
-
 #. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
-#: ../data/addin-xml-strings.cs:77
+#: ../data/addin-xml-strings.cs:85
 msgid "Boo Scripting"
 msgstr "Boo è??æ?¬"
 
-#: ../data/addin-xml-strings.cs:78
+#: ../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:82
+#: ../data/addin-xml-strings.cs:90
 msgid "BPM Detection"
 msgstr "BPM ��"
 
-#: ../data/addin-xml-strings.cs:83
+#: ../data/addin-xml-strings.cs:91
 msgid "Detect the beats per minute (BPM) of your music."
 msgstr "æ?¢æµ?æ?¨é?³ä¹?ç??æ¯?å??é??æ??æ?°(BPM)"
 
 #. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
-#: ../data/addin-xml-strings.cs:87
+#: ../data/addin-xml-strings.cs:95
 msgid "Cover Art Fetching"
 msgstr "å°?é?¢å?¾ç??è?·å??中"
 
-#: ../data/addin-xml-strings.cs:88
+#: ../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:92
+#: ../data/addin-xml-strings.cs:100
 msgid "DAAP Sharing"
 msgstr "DAAP å??享"
 
-#: ../data/addin-xml-strings.cs:93
+#: ../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:97
+#: ../data/addin-xml-strings.cs:105
 msgid "eMusic Import"
 msgstr "eMusic 导�"
 
-#: ../data/addin-xml-strings.cs:98
+#: ../data/addin-xml-strings.cs:106
 msgid "Download and import music purchased from eMusic"
 msgstr "ä¸?载并导å?¥ä»? eMusic å¤?è´­ä¹°ç??é?³ä¹?"
 
-#: ../data/addin-xml-strings.cs:99 ../data/addin-xml-strings.cs:109
-#: ../data/addin-xml-strings.cs:119
-msgid "Online Sources"
-msgstr "�线��"
-
 #. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
-#: ../data/addin-xml-strings.cs:102
+#: ../data/addin-xml-strings.cs:110
 msgid "File System Preview Queue"
 msgstr "æ??件系ç»?é¢?è§?é??å??"
 
-#: ../data/addin-xml-strings.cs:103
+#: ../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
+msgid "Metadata Fixup"
+msgstr "å??æ?°æ?®ä¿®å¤?"
+
+#: ../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:107
+#: ../data/addin-xml-strings.cs:120
 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:58
 msgid "Internet Archive"
 msgstr "äº?è??ç½?æ¡£æ¡?é¦?"
 
-#: ../data/addin-xml-strings.cs:108
+#: ../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:112
+#: ../data/addin-xml-strings.cs:125
 msgid "Internet Radio"
 msgstr "äº?è??ç½?广æ?­"
 
-#: ../data/addin-xml-strings.cs:113
+#: ../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:117
-#, fuzzy
-msgid "Last.fm Radio and Scrobbling"
-msgstr "Last.fm 广æ?­å??"
+#: ../data/addin-xml-strings.cs:130
+msgid "Last.fm Scrobbling"
+msgstr "Last.fm Scrobbling"
 
-#: ../data/addin-xml-strings.cs:118
-#, fuzzy
-msgid "Last.fm streaming radio, scrobbling, and context pane recommendations."
-msgstr "Last.fm æµ?广æ?­ï¼?å??å?³è??çª?æ ¼æ?¨è??"
+#: ../data/addin-xml-strings.cs:131
+msgid "Last.fm scrobbling and context pane recommendations."
+msgstr "Last.fm scrobbling å??å?³è??çª?æ ¼æ?¨è??"
+
+#. ../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:122
+#: ../data/addin-xml-strings.cs:140
 msgid "Library Watcher"
-msgstr "����"
+msgstr "åº?ç??è§?å?¨"
 
-#: ../data/addin-xml-strings.cs:123
+#: ../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:127
+#: ../data/addin-xml-strings.cs:145
 msgid "MeeGo Support"
 msgstr "MeeGo æ?¯æ??"
 
-#: ../data/addin-xml-strings.cs:128
-#| msgid "Provides Moblin integration, including a custom media panel."
+#: ../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:131
+#: ../data/addin-xml-strings.cs:149
 msgid "Mini Mode"
 msgstr "è¿·ä½ æ¨¡å¼?"
 
-#: ../data/addin-xml-strings.cs:132
+#: ../data/addin-xml-strings.cs:150
 msgid ""
 "Control Banshee through a small window with only playback controls and track "
 "information."
-msgstr "é??è¿?ä¸?个ä»?æ??å??æ?¾æ?§å?¶å??é?³è½¨ä¿¡æ?¯ç??å°?çª?å?£æ?§å?¶ Bansheeã??"
+msgstr "é??è¿?ä¸?个ä»?æ??å??æ?¾æ?§å?¶å??æ?²ç?®ä¿¡æ?¯ç??å°?çª?å?£æ?§å?¶ Bansheeã??"
+
+#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
+#: ../data/addin-xml-strings.cs:154
+msgid "Miro Guide Podcast Directory"
+msgstr "Miro Guide Podcast ��"
+
+#: ../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:136
+#: ../data/addin-xml-strings.cs:159
 msgid "Multimedia Keys"
 msgstr "����"
 
-#: ../data/addin-xml-strings.cs:137
+#: ../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:141
+#: ../data/addin-xml-strings.cs:164
 msgid "Notification Area Icon"
 msgstr "é??ç?¥å?ºå??å?¾æ ?"
 
-#: ../data/addin-xml-strings.cs:142
+#: ../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:146
+#: ../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:147
+#: ../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:150
+#: ../data/addin-xml-strings.cs:173
 msgid "Importers for Amarok, Rhythmbox and iTunes"
 msgstr "Amarokã??Rhythmbox å?? iTunes 导å?¥å?¨"
 
-#: ../data/addin-xml-strings.cs:151
+#: ../data/addin-xml-strings.cs:174
 msgid "Import your library from Amarok, Rhythmbox or iTunes."
 msgstr "ä»? Amarokã??Rhythmbox æ?? iTunes 导å?¥æ?¨ç??åº?ã??"
 
 #. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml
-#: ../data/addin-xml-strings.cs:155
+#: ../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:156
+#: ../data/addin-xml-strings.cs:179
 msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
-msgstr "以ä¸?个æ ?å??æ?­æ?¾æ¸?å??æ??é??é?³è½¨ï¼?æ??让è?ªå?¨ DJ æ?¥ç®¡ã??"
+msgstr "以ä¸?个æ ?å??æ?­æ?¾æ¸?å??æ??é??æ?²ç?®ï¼?æ??让è?ªå?¨ DJ æ?¥ç®¡ã??"
 
 #. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
-#: ../data/addin-xml-strings.cs:160
+#: ../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 "�客"
 
-#: ../data/addin-xml-strings.cs:161
+#: ../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:165
+#: ../data/addin-xml-strings.cs:188
 msgid "Remote Audio"
 msgstr "�端��"
 
-#: ../data/addin-xml-strings.cs:166
+#: ../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:169
+#: ../data/addin-xml-strings.cs:192
 #: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40
 msgid "Sample"
 msgstr "æ ·æ?¬"
 
-#: ../data/addin-xml-strings.cs:170
+#: ../data/addin-xml-strings.cs:193
 msgid "A sample source useful to developers."
 msgstr "æ??å?©äº?å¼?å??è??ç??ä¾?å­?æº?"
 
-#: ../data/addin-xml-strings.cs:171
+#: ../data/addin-xml-strings.cs:194
 msgid "Sources"
 msgstr "��"
 
 #. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
-#: ../data/addin-xml-strings.cs:174
+#: ../data/addin-xml-strings.cs:197
 msgid "SQL Debug Console"
 msgstr "SQL ���端"
 
-#: ../data/addin-xml-strings.cs:175
+#: ../data/addin-xml-strings.cs:198
 msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries."
 msgstr "为ç??æ?§ Banshee ç?? SQL 使ç?¨å??è¿?è¡?æ?¥è¯¢æ??ä¾?ä¸?个ç?¨æ?·ç??é?¢"
 
-#: ../data/addin-xml-strings.cs:176
+#: ../data/addin-xml-strings.cs:199
 msgid "Debug"
 msgstr "��"
 
 #. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
-#: ../data/addin-xml-strings.cs:179
+#: ../data/addin-xml-strings.cs:202
 msgid "Torrent Downloader"
 msgstr "Torrent �载�"
 
-#: ../data/addin-xml-strings.cs:180
+#: ../data/addin-xml-strings.cs:203
 msgid "Support downloading BitTorrent files from podcasts."
 msgstr "æ?¯æ??ä»?å??客ä¸?è½½ BitTorrent æ??件"
 
 #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
-#: ../data/addin-xml-strings.cs:184
+#: ../data/addin-xml-strings.cs:207
 #: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44
 msgid "Wikipedia"
 msgstr "维���"
 
-#: ../data/addin-xml-strings.cs:185
-#, fuzzy
+#: ../data/addin-xml-strings.cs:208
 msgid "View artist information from Wikipedia in the context pane."
 msgstr "å?¨å?³è??çª?æ ¼ä¸­æ?¥ç??ä»?ç»´å?ºç?¾ç§?è?·å¾?ç??è?ºäººä¿¡æ?¯ã??"
 
-#: ../data/addin-xml-strings.cs:186 ../data/addin-xml-strings.cs:191
-#, fuzzy
+#: ../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:189
+#: ../data/addin-xml-strings.cs:212
 #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
 msgid "YouTube"
-msgstr ""
+msgstr "YouTube"
 
-#: ../data/addin-xml-strings.cs:190
+#: ../data/addin-xml-strings.cs:213
 msgid "Show related YouTube videos in the context pane"
-msgstr ""
+msgstr "å?¨å?³è??çª?æ ¼ä¸­æ?¾ç¤ºç?¸å?³ç?? YouTube è§?é¢?"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:1
 msgid "3GPP"
-msgstr ""
+msgstr "3GPP"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:2
 msgid "AAC (Novell Encoder)"
-msgstr ""
+msgstr "AAC (Novell ç¼?ç ?å?¨)"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:3
 #: ../data/audio-profiles/mp3-lame.xml.in.h:4
@@ -439,44 +476,40 @@ msgid "Bitrate"
 msgstr "æ¯?ç?¹ç??"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:4
-#, fuzzy
-#| msgid "Continue"
 msgid "Container"
-msgstr "继续"
+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 ""
+"设计为 MP3 æ ¼å¼?ç??继任è??ï¼?AAC é??常å?¨è®¸å¤?æ¯?ç?¹ç??ä¸?é?½å?¯è?·å¾?æ¯? MP3 æ?´å¥½ç??声é?³è´¨"
+"é??ã??"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:6
 msgid "Long Term Prediction"
-msgstr ""
+msgstr "�����"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:7
 msgid "Low Complexity"
-msgstr ""
+msgstr "ä½?å¤?æ??æ?§"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:8
 msgid "MPEG-4 ISO"
-msgstr ""
+msgstr "MPEG-4 ISO"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:9
 msgid "MPEG-4 QuickTime"
-msgstr ""
+msgstr "MPEG-4 QuickTime"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:10
-#, fuzzy
-#| msgid "Format"
 msgid "Output Format"
-msgstr "æ ¼å¼?"
+msgstr "è¾?å?ºæ ¼å¼?"
 
 #: ../data/audio-profiles/aac-novell.xml.in.h:11
-#, fuzzy
-#| msgid "file"
 msgid "Profile"
-msgstr "æ??件"
+msgstr "ç®?è¦?æ??è¿°æ??件"
 
 #: ../data/audio-profiles/base.xml.in.h:1
 msgid "Channels"
@@ -664,8 +697,8 @@ msgstr "Windows Media Audio"
 
 #: ../data/desktop-files/common.desktop.in.h:1
 #: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:94
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:201
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs: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 �����"
@@ -679,7 +712,7 @@ msgstr "�����"
 msgid "Play and organize your media collection"
 msgstr "æ?­æ?¾å??管ç??æ?¨ç??åª?ä½?æ?¶è??"
 
-#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:268
+#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
 msgid "Could not create pipeline"
 msgstr "æ? æ³?å??建æµ?水线"
 
@@ -704,37 +737,37 @@ msgid "Could not create fakesink plugin"
 msgstr "æ? æ³?å??建â??fakesinkâ??æ??件"
 
 #: ../libbanshee/banshee-bpmdetector.c:241
-#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:309
+#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
 msgid "Could not link pipeline elements"
 msgstr "æ? æ³?é?¾æ?¥æµ?水线å??ç´ "
 
-#: ../libbanshee/banshee-ripper.c:274
+#: ../libbanshee/banshee-ripper.c:276
 msgid "Could not initialize element from cdda URI"
 msgstr "æ? æ³?ä»? cdda URI å?°å??å??å§?å??å??件"
 
-#: ../libbanshee/banshee-ripper.c:288
+#: ../libbanshee/banshee-ripper.c:290
 msgid "Could not create encoder pipeline"
 msgstr "æ? æ³?å??建ç¼?ç ?å?¨æµ?水线"
 
-#: ../libbanshee/banshee-ripper.c:294
+#: ../libbanshee/banshee-ripper.c:296
 msgid "Could not create queue plugin"
 msgstr "æ? æ³?å??建é??å??æ??件"
 
-#: ../libbanshee/banshee-ripper.c:302
+#: ../libbanshee/banshee-ripper.c:304
 msgid "Could not create filesink plugin"
 msgstr "æ? æ³?å??建 filesink æ??件"
 
 #: ../libbanshee/banshee-transcoder.c:240
-msgid "Could not create 'filesrc' plugin"
-msgstr "æ? æ³?å??建â??filesrcâ??æ??件"
+msgid "Could not create source element"
+msgstr "æ? æ³?å??建æº?å??ç´ "
 
 #: ../libbanshee/banshee-transcoder.c:246
 msgid "Could not create 'decodebin' plugin"
 msgstr "æ? æ³?å??建â??decodebinâ??æ??件"
 
 #: ../libbanshee/banshee-transcoder.c:252
-msgid "Could not create 'filesink' plugin"
-msgstr "æ? æ³?å??建â??filesinkâ??æ??件"
+msgid "Could not create sink element"
+msgstr "æ? æ³?å??建æ?¥æ?¶å??ç´ "
 
 #: ../libbanshee/banshee-transcoder.c:258
 msgid "Could not create 'sinkben' plugin"
@@ -752,7 +785,7 @@ msgstr "æ? æ³?å??建ç¼?ç ?æµ?水线"
 msgid "Could not get sink pad from encoder"
 msgstr "æ? æ³?ä»?ç¼?ç ?å?¨ä¸­è?·å¾? sink pad"
 
-#: ../libbanshee/banshee-transcoder.c:344
+#: ../libbanshee/banshee-transcoder.c:341
 msgid "Could not construct pipeline"
 msgstr "æ? æ³?æ??建æµ?水线"
 
@@ -762,7 +795,7 @@ msgstr "å??å?¥å??ç??..."
 
 #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:66
 msgid "Write selected tracks to an audio CD"
-msgstr "å°?é??中é?³è½¨å??å?¥é?³é¢?å??ç??"
+msgstr "å°?é??中æ?²ç?®å??å?¥é?³é¢?å??ç??"
 
 #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
 msgid "Could not write CD"
@@ -788,244 +821,244 @@ msgstr "æ? æ³?å??建å??ç??æ??轨ç¨?åº?"
 msgid "Could not create BPM detection driver."
 msgstr "æ? æ³?å??建 BPM æ£?æµ?驱å?¨"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:71
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:710
+#: ../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:72
+#: ../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 "æ¶?é?¤é?³è½¨å??å??æ?¶ç??å°?ç??å??æ?¾ç©ºç?½ã??æ??å?©äº?æ¦?念å?±ç??å??å?¤å?¸é?³ä¹?ã??"
+msgstr "æ¶?é?¤æ?²ç?®å??å??æ?¶ç??å°?ç??å??æ?¾ç©ºç?½ã??æ??å?©äº?æ¦?念å?±ç??å??å?¤å?¸é?³ä¹?ã??"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:137
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:176
+#: ../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:391
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
 msgid "Unknown Error"
 msgstr "æ?ªç?¥é??误"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:704
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
 msgid "_Enable ReplayGain correction"
 msgstr "å?¯ç?¨å??æ?¾å¢?ç??修正(_E)"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:705
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
 msgid ""
 "For tracks that have ReplayGain data, automatically scale (normalize) "
 "playback volume"
-msgstr "对äº?æ??å??æ?¾å¢?ç??æ?°æ?®ç??é?³è½¨ï¼?è?ªå?¨è°?è??(正常å??)å??æ?¾é?³é??ã??"
+msgstr "对äº?æ??å??æ?¾å¢?ç??æ?°æ?®ç??æ?²ç?®ï¼?è?ªå?¨è°?è??(正常å??)å??æ?¾é?³é??ã??"
 
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:711
-#, fuzzy
-#| msgid ""
-#| "Eliminate the small playback gap on track change.  Useful for concept "
-#| "albums and classical music"
+#: ../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 "æ¶?é?¤é?³è½¨å??å??æ?¶ç??å°?ç??å??æ?¾ç©ºç?½ã??æ??å?©äº?æ¦?念å?±ç??å??å?¤å?¸é?³ä¹?ã??"
+msgstr "æ¶?é?¤æ?²ç?®å??å??æ?¶ç??å°?ç??å??æ?¾ç©ºç?½ã??å¤?ç?¨äº?æ¦?念å?±ç??å??å?¤å?¸é?³ä¹?ã??"
 
 #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
 msgid "Could not create transcoder"
 msgstr "æ? æ³?å??建转ç ?å?¨"
 
+#: ../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:128
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:131
 msgid "_Close"
 msgstr "��(_C)"
 
 #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:129
+#: ../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 "æ?­æ?¾ä¸?ä¸?é¦?é?³è½¨ï¼?å?¯é??é??æ?°å¼?å§?å¦?æ??设置æ??â??é??æ?°å¼?å§?â??å?¼"
+msgstr "æ?­æ?¾ä¸?ä¸?é¦?æ?²ç?®ï¼?å?¯é??é??æ?°å¼?å§?å¦?æ??设置æ??â??é??æ?°å¼?å§?â??å?¼"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:161
 msgid ""
 "Play the previous track, optionally restarting if the 'restart value is set"
-msgstr "æ?­æ?¾ä¸?ä¸?é¦?é?³è½¨ï¼?å?¯é??é??æ?°å¼?å§?å¦?æ??设置æ??â??é??æ?°å¼?å§?â??å?¼"
+msgstr "æ?­æ?¾ä¸?ä¸?é¦?æ?²ç?®ï¼?å?¯é??é??æ?°å¼?å§?å¦?æ??设置æ??â??é??æ?°å¼?å§?â??å?¼"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:162
 msgid ""
 "If the current song has been played longer than 4 seconds then restart it, "
 "otherwise the same as --previous"
 msgstr "å¦?æ??å½?å??æ­?æ?²å·²ç»?æ?­æ?¾è¶?è¿?4ç§?å??é??æ?°å¼?å§?ï¼?å?¦å??è¿?å??ä¸?ä¸?é¦?ã??"
 
-#: ../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 "è?ªå?¨å¼?å§?æ?­æ?¾å?½ä»¤è¡?中æ??é??ç??ä»»ä½?é?³è½¨"
+msgstr "è?ªå?¨å¼?å§?æ?­æ?¾å?½ä»¤è¡?中æ??é??ç??ä»»ä½?æ?²ç?®"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:164
 msgid "Start playback"
 msgstr "����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:165
 msgid "Pause playback"
 msgstr "æ??å??å??æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:164
+#: ../src/Clients/Booter/Booter/Entry.cs:166
 msgid "Toggle playback"
 msgstr "å??æ?¢æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:167
 msgid "Completely stop playback"
 msgstr "å®?å?¨å??æ­¢æ?­æ?¾"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:169
 msgid ""
 "Enable or disable playback stopping after the currently playing track (value "
 "should be either 'true' or 'false')"
-msgstr "å?¯ç?¨æ??ç¦?ç?¨å?¨å½?å??æ?­æ?¾ç??é?³è½¨å??æ?­æ?¾å??æ­¢(åº?å½?设置为â??ç??â??æ??â??å??â??å?¼)"
+msgstr "å?¯ç?¨æ??ç¦?ç?¨å?¨å½?å??æ?­æ?¾ç??æ?²ç?®å??æ?­æ?¾å??æ­¢(åº?å½?设置为â??ç??â??æ??â??å??â??å?¼)"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:168
-#, fuzzy
-#| msgid "Set the playback volume (0-100)"
+#: ../src/Clients/Booter/Booter/Entry.cs:170
 msgid "Set the playback volume (0-100), prefix with +/- for relative values"
-msgstr "设置æ?­æ?¾é?³é??(0-100)"
+msgstr "设置æ?­æ?¾é?³é??(0-100)ï¼?å??å?  +/- ä½?为ç?¸å¯¹å?¼ã??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:171
 msgid "Seek to a specific point (seconds, float)"
 msgstr "æ??ç´¢å?°æ??å®?ä½?ç½®(ç§?ï¼?æµ®æ ?)"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:172
 msgid "Set the currently played track's rating (0 to 5)"
-msgstr "设置å½?å??æ?­æ?¾é?³è½¨ç??è¯?级(0 è?³ 5)"
+msgstr "设置å½?å??æ?­æ?¾æ?²ç?®ç??è¯?级(0 è?³ 5)"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:173
+#: ../src/Clients/Booter/Booter/Entry.cs:175
 msgid "Player Engine Query Options"
 msgstr "æ?­æ?¾å?¨å¼?æ??æ?¥è¯¢é??项"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:174
+#: ../src/Clients/Booter/Booter/Entry.cs:176
 msgid "Current player state"
 msgstr "å½?å??æ?­æ?¾å?¨ç?¶æ??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:177
 msgid "Last player state"
 msgstr "ä¸?次æ?­æ?¾ç?¶æ??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:178
 msgid "Query whether the player can be paused"
 msgstr "询é?®æ?­æ?¾å?¨æ?¯å?¦è?½è¢«æ??å??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:179
 msgid "Query whether the player can seek"
 msgstr "询é?®æ?­æ?¾å?¨æ?¯å?¦è?½æ??ç´¢"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:180
 msgid "Player volume"
 msgstr "æ?­æ?¾å?¨é?³é??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:181
 msgid "Player position in currently playing track"
-msgstr "å½?å??æ?­æ?¾ç??é?³è½¨ç??æ?­æ?¾å?¨ä½?ç½®"
+msgstr "å½?å??æ?­æ?¾ç??æ?²ç?®ç??æ?­æ?¾å?¨ä½?ç½®"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:182
+#: ../src/Clients/Booter/Booter/Entry.cs:184
 msgid "Playing Track Metadata Query Options"
-msgstr "æ?­æ?¾é?³è½¨å??æ?°æ?®è¯¢é?®é??项"
+msgstr "æ?­æ?¾æ?²ç?®å??æ?°æ?®è¯¢é?®é??项"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:183
+#: ../src/Clients/Booter/Booter/Entry.cs:185
 msgid "URI"
 msgstr "URI"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:184
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:148
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:85
+#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:161
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
 msgid "Artist Name"
 msgstr "è?ºäººå§?å??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:185
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:149
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:86
+#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
 msgid "Album Title"
 msgstr "ä¸?è¾?æ ?é¢?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:186
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:147
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:84
+#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
 msgid "Track Title"
-msgstr "é?³è½¨æ ?é¢?"
+msgstr "æ?²ç?®æ ?é¢?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:189
 msgid "Duration"
 msgstr "��"
 
 #. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:190
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
 msgid "Track Number"
-msgstr "�轨��"
+msgstr "����"
 
 #. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:189
+#: ../src/Clients/Booter/Booter/Entry.cs:191
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
 msgid "Track Count"
-msgstr "�轨计�"
+msgstr "��计�"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Booter/Booter/Entry.cs:192
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
 #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113
 msgid "Disc Number"
 msgstr "ç??ç??ç¼?å?·"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:191
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
 #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77
 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92
 msgid "Year"
 msgstr "年代"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:194
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1033,58 +1066,78 @@ msgstr "年代"
 msgid "Rating"
 msgstr "�级"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:195
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
 msgid "Score"
 msgstr "å¾?å??"
 
 #. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:196
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
 msgid "Bit Rate"
 msgstr "æ¯?ç?¹ç??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Booter/Booter/Entry.cs:199
 msgid "User Interface Options"
 msgstr "ç?¨æ?·ç??é?¢é??项"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Clients/Booter/Booter/Entry.cs:200
 msgid "Present the user interface on the active workspace"
 msgstr "å?¨å½?å??å·¥ä½?å?ºå??æ??ä¾?ç?¨æ?·ç??é?¢"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:201
+msgid "Enter the full-screen mode"
+msgstr "����模�"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:202
 msgid "Hide the user interface"
 msgstr "é??è??ç?¨æ?·ç??é?¢"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:203
 msgid "Do not present the user interface, regardless of any other options"
 msgstr "ä¸?æ??ä¾?ç?¨æ?·ç??é?¢ï¼?æ? 论任ä½?å?¶ä»?é??项"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:204
+msgid "Present the import media dialog box"
+msgstr "�示导���对��"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:205
+msgid "Present the about dialog"
+msgstr "æ??ä¾?å?³äº?对è¯?æ¡?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:206
+msgid "Present the open location dialog"
+msgstr "æ?¾ç¤ºæ??å¼?ä½?置对è¯?æ¡?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:207
+msgid "Present the preferences dialog"
+msgstr "æ?¾ç¤ºé¦?é??项对è¯?æ¡?"
+
+#: ../src/Clients/Booter/Booter/Entry.cs:210
 msgid "Debugging and Development Options"
 msgstr "è°?è¯?å??å¼?å??è??é??项"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:204
+#: ../src/Clients/Booter/Booter/Entry.cs:211
 msgid "Enable general debugging features"
 msgstr "å?¯ç?¨é??ç?¨è°?è¯?ç?¹æ?§"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:212
 msgid "Enable debugging output of SQL queries"
 msgstr "�� SQL �询 ����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:213
 msgid "Enable debugging output of Mono.Addins"
 msgstr "�� Mono.Addins ����"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:214
 msgid "Specify an alternate database to use"
 msgstr "æ??å®?使ç?¨å?¦å¤?ç??æ?°æ?®åº?"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:208
+#: ../src/Clients/Booter/Booter/Entry.cs:215
 msgid "Specify an alternate key, default is /apps/banshee-1/"
 msgstr "æ??å®?使ç?¨å?¦å¤?å?¯é??é?®å?¼ï¼?é»?认为 /apps/banshee-1/"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:209
+#: ../src/Clients/Booter/Booter/Entry.cs:216
 msgid ""
 "Optimize instance for running uninstalled; most notably, this will create an "
 "alternate Mono.Addins database in the working directory"
@@ -1092,16 +1145,16 @@ msgstr ""
 "为è¿?è¡?æ?ªå®?è£?ç??è¿?ç¨?ä¼?å??ï¼?æ??å?¯è§?ç??æ?¯ï¼?è¿?å°?å?¨å½?å??ç??å·¥ä½?ç?®å½?é??å??建ä¸?个å?¦å¤?ç?? "
 "Mono.Addins æ?°æ?®åº?ã??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:218
 msgid "Disable DBus support completely"
 msgstr "å®?å?¨ç¦?æ­¢ DBus æ?¯æ??"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:220
 #, csharp-format
 msgid "Skip loading a custom gtkrc file ({0}) if it exists"
 msgstr "è·³è¿?è½½å?¥è?ªå®?ä¹?ç?? gtkrc æ??件 ({0}) ï¼?å¦?æ??å­?å?¨"
 
-#: ../src/Clients/Booter/Booter/Entry.cs:244
+#: ../src/Clients/Booter/Booter/Entry.cs:251
 #, csharp-format
 msgid "The following help arguments are invalid: {0}"
 msgstr "ä¸?å??帮å?©å??æ?°æ? æ??ï¼?{0}"
@@ -1145,37 +1198,44 @@ msgstr "å?©ä½? {0}"
 msgid "Play Song"
 msgstr "����"
 
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:146
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:83
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87
 msgid "Artist, Album, or Title"
 msgstr "è?ºäººã??ä¸?è¾?æ??æ ?é¢?"
 
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:150
+#. Alias for %album_artist%
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
+msgid "Album Artist"
+msgstr "���人"
+
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:91
 msgid "Genre"
 msgstr "æµ?æ´¾"
 
 #. Translators: noun
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:152
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:166
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
 msgid "Comment"
 msgstr "�论"
 
 #. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:173
-#, fuzzy, csharp-format
-#| msgid "Search:"
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:187
+#, csharp-format
 msgid "Search"
-msgstr "æ??ç´¢ï¼?"
+msgstr "æ??ç´¢"
 
 #: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
 #: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
 #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:100
 #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:90
 msgid "Unknown Artist"
 msgstr "���人"
 
@@ -1186,71 +1246,86 @@ msgstr "���人"
 msgid "Unknown Album"
 msgstr "����"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:48
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:49
 msgid "Unknown Title"
 msgstr "æ?ªç?¥æ ?é¢?"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:185
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:92
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
 msgid "Various Artists"
 msgstr "��人"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:345
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
 msgid "Stream location not found"
-msgstr ""
+msgstr "没æ??æ?¾å?°æµ?ä½?ç½®"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:345
+#: ../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.Collection/TrackInfo.cs:347
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344
 msgid "Codec for playing this media type not available"
 msgstr "æ?­æ?¾æ­¤ç±»å??åª?ä½?ç??解ç ?å?¨ä¸?å?¯ç?¨"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346
 msgid "File protected by Digital Rights Management (DRM)"
 msgstr "æ??件被æ?°å­?ç??æ??管ç??ç³»ç»?ä¿?æ?¤(DRM)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
 msgid "Unknown error"
 msgstr "æ?ªç?¥é??误"
 
 #. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417
 msgid "_Restart Podcast"
 msgstr "é??æ?°å¼?å§?æ?­å®¢(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418
+msgid "_Restart Audiobook"
+msgstr "é??æ?°å¼?å§?æ??声读ç?©(_R)"
+
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419
 msgid "_Restart Video"
 msgstr "é??æ?°å¼?å§?è§?é¢?(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
 msgid "_Restart Song"
 msgstr "é??æ?°å¼?å§?æ?²ç?®(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421
 msgid "_Restart Item"
 msgstr "é??æ?°å¼?å§?项ç?®(_R)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:436
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437
 msgid "_Jump to Playing Podcast"
 msgstr "è·³å?°å½?å??æ?­æ?¾æ?­å®¢(_J)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437
+#: ../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:438
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
 msgid "_Jump to Playing Song"
 msgstr "è·³å?°å½?å??æ?­æ?¾æ?²ç?®(_J)"
 
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441
 msgid "_Jump to Playing Item"
 msgstr "è·³å?°å½?å??æ?­æ?¾é¡¹ç?®(_J)(_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 "{0} ({1}:{2:00})"
+msgstr "{0} ({1}:{2:00})"
+
 #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
 #, csharp-format
 msgid "All Albums ({0})"
@@ -1343,7 +1418,7 @@ msgid "Scanning for media"
 msgstr "æ­£å?¨æ?«æ??ä»?è´¨"
 
 #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1359
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1375
 msgid "Scanning..."
 msgstr "æ­£å?¨æ?«æ??..."
 
@@ -1373,92 +1448,86 @@ msgstr "导å?¥å?±{1}个中ç??第{0}个"
 msgid "Rescanning {0} of {1}"
 msgstr "æ­£å?¨é??æ?°æ?«æ?? {1} 个中ç??第 {0} 个"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:230
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
 msgid "Upgrading your Banshee Database"
 msgstr "æ­£å?¨æ?´æ?°æ?¨ç?? Banshee æ?°æ?®åº?"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:231
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
 msgid ""
 "Please wait while your old Banshee database is migrated to the new format."
 msgstr "请ç­?å¾?æ?¨ç??æ?§ Banshee æ?°æ?®åº?转æ?¢ä¸ºæ?°ç??æ ¼å¼?ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1356
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1372
 msgid "Refreshing Metadata"
 msgstr "æ­£å?¨å?·æ?°å??æ?°æ?®"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:257
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:252
 msgid "Classical"
 msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:260
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:255
 msgid "Club"
-msgstr ""
+msgstr "俱��"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:263
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:258
 msgid "Dance"
 msgstr "è??æ?²"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:266
-#, fuzzy
-#| msgid "Full Path:"
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:261
 msgid "Full Bass"
-msgstr ""
+msgstr "é??ä½?é?³"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:269
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:264
 msgid "Full Bass and Treble"
-msgstr ""
+msgstr "é??ä½?é?³å??é«?é?³"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:272
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:267
 msgid "Full Treble"
-msgstr ""
+msgstr "é«?é?³"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:275
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:270
 msgid "Laptop Speakers and Headphones"
-msgstr ""
+msgstr "便æ?ºå¼?æ?¬å£°å?¨å??è?³æ?º"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:278
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:273
 msgid "Large Hall"
-msgstr ""
+msgstr "é?³ä¹?å??"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:281
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:276
 msgid "Live"
-msgstr ""
+msgstr "ç?°å?º"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:284
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:279
 msgid "Party"
-msgstr ""
+msgstr "æ??ä¼?"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:287
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:282
 msgid "Pop"
 msgstr "æµ?è¡?"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:290
-#, fuzzy
-#| msgid "Rename"
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:285
 msgid "Reggae"
-msgstr "é??å?½å??"
+msgstr "ç??æ ¼"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:293
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:288
 msgid "Rock"
-msgstr ""
+msgstr "æ??æ»?"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:296
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:291
 msgid "Ska"
-msgstr ""
+msgstr "��"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:299
-#, fuzzy
-#| msgid "of"
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:294
 msgid "Soft"
-msgstr "轻��"
+msgstr "è½»æ??"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:302
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:297
 msgid "Soft Rock"
-msgstr ""
+msgstr "æ?¢æ??æ»?"
 
-#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:305
+#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:300
 msgid "Techno"
-msgstr ""
+msgstr "��"
 
 #: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
 msgid "Home Folder"
@@ -1476,14 +1545,7 @@ msgstr "{0} ��"
 
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:67
 msgid "Track Artist"
-msgstr "�轨�人"
-
-#. Alias for %album_artist%
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
-msgid "Album Artist"
-msgstr "���人"
+msgstr "���人"
 
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83
 msgid "Album Artist Initial"
@@ -1559,7 +1621,7 @@ msgstr "æ??项"
 
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
 msgid "_Sort an artist's albums by year, not title"
-msgstr ""
+msgstr "æ ¹æ?®å¹´ä»£è??ä¸?æ?¯æ ?é¢?æ??åº?è?ºäººä¸?è¾?(_S)"
 
 #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:107
 #: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:85
@@ -1680,70 +1742,70 @@ msgstr "没æ??å??ç?°æ?­æ?¾å?¨å¼?æ??ã??请确认 Banshee å·²ç»?å®?è£?ã??"
 msgid "Problem with Player Engine"
 msgstr "æ?­æ?¾å?¨å¼?æ??å?ºé??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:134
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135
 #, csharp-format
 msgid "Converting {0} of {1}"
 msgstr "æ­£å?¨è½¬æ?¢ {1} 个中ç??第 {0} 个"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:134
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135
 msgid "Initializing"
 msgstr "æ­£å?¨å??å§?å??"
 
-#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:137
+#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138
 msgid ""
 "Files are currently being converted to another format. Would you like to "
 "stop this?"
 msgstr "æ­£å?¨è½¬æ?¢æ??件为å?¦å¤?ç??æ ¼å¼?ã??æ?¨æ?³å??æ­¢å??ï¼?"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
 msgid "Saving Metadata to File"
 msgstr "ä¿?å­?å??æ?°æ?®å?°æ??件"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
 msgid "Write _metadata to files"
 msgstr "å??å??æ?°æ?®å?°æ??件å??(_M)"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
 msgid "Save tags and other metadata inside supported media files"
 msgstr "å?¨æ?¯æ??ç??é?³é¢?æ??件å??ä¿?å­?æ ?ç­¾å??å?¶ä»?å??æ?°æ?®ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:54
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:136
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:174
 msgid "Write _ratings and play counts to files"
 msgstr "å°?è¯?级å??æ?­æ?¾è®¡æ?°å??å?¥å?°æ??件(_R)"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
 msgid ""
 "Enable this option to save rating and playcount metadata inside supported "
 "audio files"
 msgstr "å?¯ç?¨æ­¤é??项å?¯ä»¥å?¨æ?¯æ??ç??é?³é¢?æ??件å??ä¿?å­?è¯?级å??æ?­æ?¾è®¡æ?°å??æ?°æ?®ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60
 msgid "_Update file and folder names"
 msgstr "æ?´æ?°æ??件å??ç?®å½?å??å­?(_U)"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
 msgid "Rename files and folders according to media metadata"
 msgstr "å°?æ??件å??ç?®å½?æ ¹æ?®åª?ä½?ç??å??æ?°æ?®æ?¥é??å?½å??ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:137
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:175
 msgid ""
 "Enable this option to save rating and play count metadata inside supported "
 "audio files whenever the rating is changed."
 msgstr "å?¯ç?¨æ­¤é??项å?¯ä»¥å?¨æ?¯æ??ç??é?³é¢?æ??件å??ä¿?å­?è¯?级å??æ?­æ?¾è®¡æ?°å??æ?°æ?®ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:176
 msgid "Import _ratings"
 msgstr "导��级(_R)"
 
-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:139
+#: ../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 ""
+msgstr "é??è¿?å??é??å?¿å??使ç?¨æ?°æ?®ä»¥æ?¹è¿? Banshee "
 
 #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
 msgid "There is no available network connection"
@@ -1767,9 +1829,9 @@ msgid ""
 "cover art fetching"
 msgstr "ä¸?äº?ç?¹æ?§è¯¸å¦? Last.fm æ??å°?é?¢å?¾ç??è?·å??é??è¦?宽带äº?è??ç½?è¿?æ?¥ã??"
 
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:219
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:223
 msgid "The track's rating was set differently on the device and in Banshee"
-msgstr "æ­¤é?³è½¨å?¨è®¾å¤?ä¸?ç??è¯?级å?? Banshee 中ç??ä¸?å??"
+msgstr "æ­¤æ?²ç?®å?¨è®¾å¤?ä¸?ç??è¯?级å?? Banshee 中ç??ä¸?å??"
 
 #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
@@ -1785,12 +1847,12 @@ msgid "Delete Playlist"
 msgstr "å? é?¤æ?­æ?¾å??表"
 
 #. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:390
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:396
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:169
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:367
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:475
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:375
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:494
 #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213
 msgid "New Playlist"
 msgstr "æ?°å»ºæ?­æ?¾å??表"
@@ -1842,22 +1904,18 @@ msgid "items"
 msgstr "项�"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60
 msgid "minutes"
 msgstr "å??é??"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61
 msgid "hours"
 msgstr "å°?æ?¶"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63
 msgid "MB"
 msgstr "MB"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64
 msgid "GB"
 msgstr "GB"
 
@@ -1930,24 +1988,24 @@ 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:119
 msgid "track"
-msgstr "�轨"
+msgstr "��"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
 msgid "trackno"
-msgstr "�轨��"
+msgstr "����"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
 msgid "tracknum"
-msgstr "�轨�"
+msgstr "���"
 
 #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
 msgid "tracks"
-msgstr "�轨"
+msgstr "��"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
 msgid "trackcount"
-msgstr "�轨计�"
+msgstr "��计�"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:134
 msgid "Beats per Minute"
@@ -1973,43 +2031,35 @@ msgstr "kps"
 
 #. Translators: noun
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:152
-#, fuzzy
-#| msgid "Audio Sample Rate:"
 msgid "Sample Rate"
-msgstr "é?³é¢?æ ·æ?¬é??æ ·ç??ï¼?"
+msgstr "æ ·æ?¬é??æ ·ç??"
 
 #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
-#, fuzzy
-#| msgid "Sample"
 msgid "samplerate"
-msgstr "æ ·æ?¬"
+msgstr "æ ·æ?¬é??æ ·ç??"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
 msgid "Hz"
-msgstr ""
+msgstr "Hz"
 
 #. Translators: noun
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:161
 msgid "Bits Per Sample"
-msgstr ""
+msgstr "é??æ ·ç²¾åº¦"
 
 #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
-#, fuzzy
-#| msgid "bitrate"
 msgid "bitspersample"
-msgstr "æ¯?ç?¹ç??"
+msgstr "é??æ ·ç²¾åº¦"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
 msgid "bitdepth"
-msgstr ""
+msgstr "ä½?æ·±"
 
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
-#, fuzzy
-#| msgid "Station"
 msgid "quantization"
-msgstr "��"
+msgstr "é??å??"
 
 #. Translators: noun
 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:169
@@ -2423,7 +2473,7 @@ msgstr "请å?³äº?æ?¬æ¬¡é??误æ??交ä¸?个é??误æ?¥å??ï¼?{0}"
 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 "å? é?¤æ?ºè?½æ?­æ?¾å??表"
 
@@ -2480,37 +2530,37 @@ msgstr "é??误"
 msgid "Details"
 msgstr "详�信�"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:165
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:152
 msgid "Errors"
 msgstr "é??误"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:218
-msgid "Sort Playlists by"
-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:227
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:214
 msgid "Drive"
 msgstr "驱��"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:248
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:238
 msgid "File Organization"
 msgstr "æ??件ç»?ç»?"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:239
 msgid "Folder hie_rarchy"
 msgstr "���次(_R)"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:240
 msgid "File _name"
 msgstr "æ??件å??(_N)"
 
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:699
+#: ../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:718
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708
 #, csharp-format
 msgid "Deleting {0} of {1} From {2}"
 msgstr "æ­£å?¨ä»? {2} å? é?¤ {1} ç??第 {0} "
@@ -2525,9 +2575,9 @@ msgstr "æ??大å°?é??åº?æ??å??"
 
 #: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:765
 #, csharp-format
-msgid "{0} item"
-msgid_plural "{0} items"
-msgstr[0] "{0} 项"
+msgid "{0:N0} item"
+msgid_plural "{0:N0} items"
+msgstr[0] "{0:N0} items"
 
 #: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:82
 #: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:91
@@ -2579,15 +2629,24 @@ msgstr "���"
 msgid "Search:"
 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.Collection.Gui/BaseTrackListView.cs:77
 msgid "Cannot Reorder While Sorted"
-msgstr ""
+msgstr "æ??åº?æ?¶æ? æ³?é??æ?°æ??åº?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:78
 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}
@@ -2611,57 +2670,52 @@ msgstr "æ??å??"
 msgid "Protected"
 msgstr "å??ä¿?æ?¤ç??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
 msgid "Choose New Cover Art..."
 msgstr "é??æ?©æ?°ç??å°?é?¢å?¾ç??..."
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:97
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98
 msgid "Delete This Cover Art"
 msgstr "å? é?¤è¯¥å°?é?¢å?¾ç??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
 msgid "Track #"
-msgstr "�轨 #"
+msgstr "�� #"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:128
 msgid "Track & Count"
-msgstr "é?³è½¨å??计æ?°"
+msgstr "æ?²ç?®å??计æ?°"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:131
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132
 msgid "Disc #"
 msgstr "å??ç?? #"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:133
 msgid "Disc & Count"
 msgstr "å??ç??å??计æ?°"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:136
 #, csharp-format
 msgid "{0} kbps"
 msgstr "{0} kbps"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:138
-#, fuzzy, csharp-format
-#| msgid "{0} day"
-#| msgid_plural "{0} days"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139
+#, csharp-format
 msgid "{0} Hz"
-msgstr "{0} 天"
+msgstr "{0} Hz"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:141
-#, fuzzy, csharp-format
-#| msgid "{0} item"
-#| msgid_plural "{0} items"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:142
+#, csharp-format
 msgid "{0} bits"
-msgstr "{0} 项"
+msgstr "{0} ��"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119
-#, fuzzy
 msgid "Make the context pane larger or smaller"
 msgstr "使å?³è??çª?æ ¼å??大æ??å??å°?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123
 msgid "Hide context pane"
-msgstr "é??è??è??æ?¯çª?æ ¼"
+msgstr "é??è??å?³è??çª?æ ¼"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
 msgid "Waiting for playback to begin..."
@@ -2681,11 +2735,27 @@ 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:198
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:203
 #, csharp-format
 msgid "{0} by {1}"
 msgstr "{0} - {1}"
 
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+msgid "_Bookmarks"
+msgstr "书签(_B)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+msgid "_Add Bookmark"
+msgstr "æ·»å? 书签(_A)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+msgid "Bookmark the Position in the Current Track"
+msgstr "å°?å½?å??æ?²ç?®ä½?置设为书签"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
+msgid "_Remove Bookmark"
+msgstr "å? é?¤ä¹¦ç­¾(_R)"
+
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:54
 msgid "Maintainers"
 msgstr "ç»´æ?¤è??"
@@ -2726,14 +2796,10 @@ msgstr ""
 "æ?¢å¤?ã??"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
-#, fuzzy
-#| msgid "Quit anyway"
 msgid "Quit Anyway"
 msgstr "æ? 论å¦?ä½?é?½é??å?º"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:61
-#, fuzzy
-#| msgid "Continue running"
 msgid "Continue Running"
 msgstr "继续��"
 
@@ -2748,7 +2814,7 @@ msgid ""
 msgstr "å½?å??æ??å?¦å¤?ç??ç¨?åº?é??置为é»?认ç??åª?ä½?æ?­æ?¾å?¨ã??æ?¨æ??ç®?设置 Banshee 为é»?认å??ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:427
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:435
 #, csharp-format
 msgid "Do not ask me this again"
 msgstr "ä¸?å??询é?®"
@@ -2864,7 +2930,7 @@ msgid "_Tools"
 msgstr "工�(_T)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:133
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
 msgid "_Help"
 msgstr "帮�(_H)"
 
@@ -2913,11 +2979,11 @@ msgid "View detailed version and configuration information"
 msgstr "æ?¥ç??详ç»?ç??æ?¬å??é??置信æ?¯"
 
 #. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:160
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:180
 msgid "Import Playlist"
 msgstr "导å?¥æ?­æ?¾å??表"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:161
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:181
 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
 msgid "Playlists"
 msgstr "æ?­æ?¾å??表"
@@ -3012,241 +3078,244 @@ msgstr "é??å¤?æ?­æ?¾å½?å??æ?²ç?®"
 msgid "Shuffle"
 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
+#: ../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:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:107
 msgid "Sort Children by"
 msgstr "æ??åº?å­?项ç?®é??è¿?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:111
+msgid "Switch Source"
+msgstr "å??æ?¢æº?"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:112
+msgid "Switch to a source by typing its name"
+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:109
+#: ../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:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:120
 msgid "New _Smart Playlist"
 msgstr "æ?°å»ºæ?ºè?½æ?­æ?¾å??表(_S)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:122
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:74
+#: ../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:123
+#: ../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:290
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:297
 msgid "Could not export playlist"
 msgstr "æ? æ³?导å?ºæ?­æ?¾å??表"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:418
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:426
 #, csharp-format
 msgid "Are you sure you want to delete this {0}?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤æ?¬ {0}ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:461
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:469
 msgid "Separate by Type"
 msgstr "æ??ç±»å??å?ºå??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:69
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
 msgid "Select _All"
 msgstr "å?¨é??(_A)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
 msgid "Select all tracks"
-msgstr "é??æ?©æ??æ??é?³è½¨"
+msgstr "é??æ?©æ??æ??æ?²ç?®"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
 msgid "Select _None"
 msgstr "ä¸?é??(_N)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
 msgid "Unselect all tracks"
-msgstr "æ??æ??é?³è½¨å??ä¸?é??æ?©"
+msgstr "æ??æ??æ?²ç?®å??ä¸?é??æ?©"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:77
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
 msgid "_Edit Track Information"
-msgstr "���轨信�(_E)"
+msgstr "����信�(_E)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
 msgid "Edit information on selected tracks"
-msgstr "ç¼?è¾?é??å®?é?³è½¨ç??ä¿¡æ?¯"
+msgstr "ç¼?è¾?é??å®?æ?²ç?®ç??ä¿¡æ?¯"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:81
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:113
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:155
 msgid "Properties"
 msgstr "å±?æ?§"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
 msgid "View information on selected tracks"
-msgstr "æ?¥ç??é??å®?é?³è½¨ç??ä¿¡æ?¯"
+msgstr "æ?¥ç??é??å®?æ?²ç?®ç??ä¿¡æ?¯"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:85
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
 msgid "Add _to Playlist"
 msgstr "æ·»å? å?°æ?­æ?¾å??表(_T)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
+#: ../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:91
+#: ../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:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
+#: ../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:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
 msgid "Remove From _Library"
 msgstr "ä»?åº?中å? é?¤(_L)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
+#: ../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:103
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "æ??å¼?å??å?«æ??件夹(_O)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
 msgid "Open the folder that contains the selected item"
-msgstr ""
+msgstr "æ??å¼?å??å?«æ??é??å®?项ç?®ç??æ??件夹"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:107
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
 msgid "_Delete From Drive"
 msgstr "ä»?硬ç??中å? é?¤(_D)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
 msgid "Permanently delete selected item(s) from medium"
 msgstr "ä»?åª?ä»?中永ä¹?å? é?¤å·²é??å®?项ç?®"
 
 #. Translators: this is a verb (command), not a noun (things)
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:169
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs: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:115
+#: ../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:118
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
 msgid "By Matching _Album"
 msgstr "æ ¹æ?®ä¸?è¾?å?¹é??(_A)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
+#: ../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:122
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
 msgid "By Matching A_rtist"
 msgstr "æ ¹æ?®è?ºäººå?¹é??(_R)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
+#: ../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:252
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:253
 #, csharp-format
 msgid "_Delete From \"{0}\""
 msgstr "ä»? {0} å? é?¤(_D)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:437
-#, fuzzy
-#| msgid "The preferences service could not be found."
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:445
 msgid "The folder could not be found."
-msgstr "没æ??æ?¾å?°é¦?é??æ??å?¡ã??"
+msgstr "没æ??æ?¾å?°è¯¥æ??件夹ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:438
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:446
 msgid "Please check that the track's location is accessible by the system."
-msgstr ""
+msgstr "请æ£?æ?¥æ?¬ç³»ç»?æ?¯å?¦å?¯è®¿é?®è¯¥æ?²ç?®ä½?ç½®ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:504
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:512
 #, csharp-format
 msgid "Are you sure you want to permanently delete this item?"
 msgid_plural ""
 "Are you sure you want to permanently delete the selected {0} items?"
 msgstr[0] "æ?¨ç¡®å®?è¦?æ°¸ä¹?å? é?¤è¯¥ {0} 项ç?®å??ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:508
+#: ../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:511
+#: ../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:514
+#: ../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 ""
 "Are you sure you want to remove the selected {0} items from your {1}?"
 msgstr[0] "æ?¨ç¡®å®?æ?¨æ?³ä»?æ?¨ç?? {1} 中å? é?¤é??å®?ç?? {0} 项ç?®ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543
-#, fuzzy
-#| msgid "_Edit Track Information"
-msgid "View Track Information"
-msgstr "���轨信�(_E)"
-
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
 msgid "Com_pilation Album Artist:"
 msgstr "�����人"
@@ -3254,7 +3323,7 @@ msgstr "�����人"
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57
 msgid ""
 "Check this if this track is part of an album with tracks by various artists"
-msgstr "å¦?æ??该é?³è½¨æ?¯ç¾¤æ??é?³ä¹?ä¸?è¾?中ç??ä¸?é?¨å??å??å¤?é??å®?"
+msgstr "å¦?æ??该æ?²ç?®æ?¯ç¾¤æ??é?³ä¹?ä¸?è¾?中ç??ä¸?é?¨å??å??å¤?é??å®?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
 msgid ""
@@ -3270,15 +3339,15 @@ msgstr "å?ºæ?¬è¯¦æ??"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:69
 msgid "Track _Title:"
-msgstr "é?³è½¨æ ?é¢?(_T)ï¼?"
+msgstr "æ?²ç?®æ ?é¢?(_T)ï¼?"
 
 #: ../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:78
 msgid "Track _Artist:"
-msgstr "�轨�人(_A)�"
+msgstr "���人(_A)�"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:86
 msgid "Set all compilation album artists to these values"
@@ -3308,11 +3377,11 @@ msgstr "ä¹?"
 
 #: ../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:144
 msgid "Track _Number:"
-msgstr "�轨��(_N)�"
+msgstr "����(_N)�"
 
 #. Catalog.GetString ("Automatically set disc number and count"),
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166
@@ -3409,41 +3478,41 @@ msgstr " ��"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74
 msgid "Advance to the next track and edit its title"
-msgstr "å??å??å?°ä¸?ä¸?个é?³è½¨å¹¶ç¼?è¾?å?¶æ ?é¢?"
+msgstr "å??å??å?°ä¸?ä¸?个æ?²ç?®å¹¶ç¼?è¾?å?¶æ ?é¢?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:42
 msgid "Sorting"
 msgstr "æ??åº?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:48
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:52
 msgid "Set all sort track titles to this value"
-msgstr "å°?æ??æ??é?³è½¨æ ?é¢?设å®?为该å?¼æ??示类å??"
+msgstr "å°?æ??æ??æ?²ç?®æ ?é¢?设å®?为该å?¼æ??示类å??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:49
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:53
 msgid "Sort Track Title:"
-msgstr "å??ç±»é?³è½¨æ ?é¢?ï¼?"
+msgstr "å??ç±»æ?²ç?®æ ?é¢?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:56
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:60
 msgid "Set all sort track artists to this value"
-msgstr "å°?æ??æ??ç±»ç??é?³è½¨è¡¨æ¼?è??设å®?为该å?¼"
+msgstr "å°?æ??æ??ç±»ç??æ?²ç?®è¡¨æ¼?è??设å®?为该å?¼"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:57
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:61
 msgid "Sort Track Artist:"
-msgstr "å??ç±»é?³è½¨è?ºäººï¼?"
+msgstr "å??ç±»æ?²ç?®è?ºäººï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:63
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:67
 msgid "Set all sort album artists to this value"
 msgstr "å°?æ??æ??ç±»ç??ä¸?è¾?è?ºäººè®¾å®?为该å?¼"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:64
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:68
 msgid "Sort Album Artist:"
 msgstr "å??ç±»ä¸?è¾?è?ºäºº"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:74
 msgid "Set all sort album titles to this value"
 msgstr "å°?æ??æ??ç±»ç??ä¸?è¾?æ ?é¢?设å®?为该å?¼"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:75
 msgid "Sort Album Title:"
 msgstr "å??ç±»ä¸?è¾?æ ?é¢?ï¼?"
 
@@ -3481,7 +3550,7 @@ msgstr "é?³é¢?声é??æ?°ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:185
 msgid "Bits Per Sample:"
-msgstr ""
+msgstr "é??æ ·ç²¾åº¦ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:190
 msgid "Video Dimensions:"
@@ -3526,64 +3595,63 @@ msgid "File Size:"
 msgstr "æ??件大å°?ï¼?"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61
 msgid "bytes"
 msgstr "å­?è??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:85
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
 msgid "Track Editor"
-msgstr "�轨���"
+msgstr "�����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:85
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
 msgid "Track Properties"
-msgstr "�轨��"
+msgstr "����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:133
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
 msgid "Show the previous track"
-msgstr "�示����轨"
+msgstr "�示�����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
 msgid "Show the next track"
-msgstr "�示����轨"
+msgstr "�示�����"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:169
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
 msgid "Title:"
 msgstr "æ ?é¢?ï¼?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:170
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
 msgid "Artist:"
 msgstr "�人�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:171
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
 msgid "Album:"
 msgstr "���"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:279
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
 msgid "Sync all field _values"
 msgstr "å??æ­¥æ??æ??å­?段å?¼(_V)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:284
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
 msgid ""
 "Apply the values of all common fields set for this track to all of the "
 "tracks selected in this editor"
-msgstr "å°?æ?¬é?³è½¨ç??æ??æ??常è§?å­?段å?¼è®¾å®?åº?ç?¨äº?æ?¬ç¼?è¾?å?¨ä¸­æ??æ??å·²é??å®?ç??é?³è½¨ã??"
+msgstr "å°?æ?¬æ?²ç?®ç??æ??æ??常è§?å­?段å?¼è®¾å®?åº?ç?¨äº?æ?¬ç¼?è¾?å?¨ä¸­æ??æ??å·²é??å®?ç??æ?²ç?®ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:383
+#: ../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:636
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
 #, csharp-format
 msgid "Save the changes made to the open track?"
 msgid_plural "Save the changes made to {0} of {1} open tracks?"
-msgstr[0] "ä¿?å­? {1} å¼?æ?¾é?³è½¨ç?? {0} æ?´æ?¹"
+msgstr[0] "ä¿?å­? {1} å¼?æ?¾æ?²ç?®ç?? {0} æ?´æ?¹"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:653
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
 msgid "Close _without Saving"
 msgstr "å?³é?­è??ä¸?ä¿?å­?(_W)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:689
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
 #, csharp-format
 msgid "If you don't save, changes from the last {0} will be permanently lost."
 msgstr "å¦?æ??æ?¨ä¸?ä¿?å­?ï¼?ä»?æ??å?? {0} ç??å??å??é?½å°?æ°¸ä¹?丢失ã??"
@@ -3605,9 +3673,8 @@ msgid "_Context Pane"
 msgstr "è??æ?¯çª?æ ¼(_C)"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:73
-#, fuzzy
 msgid "Show the context pane beneath the track list"
-msgstr "å?¨é?³è½¨æ¸?å??ä¸?è¾¹æ?¾ç¤ºå?³è??çª?æ ¼"
+msgstr "å?¨æ?²ç?®æ¸?å??ä¸?è¾¹æ?¾ç¤ºå?³è??çª?æ ¼"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:80
 msgid "_Fullscreen"
@@ -3633,24 +3700,24 @@ msgstr[0] "活�任���中"
 #. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
 #. are Podcast Name and Published Date, respectively;
 #. e.g. 'from BBtv published 7/26/2007'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:496
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:525
 #, csharp-format
 msgid "{0}from{1} {2} {0}published{1} {3}"
 msgstr "{0} - {1} {2} {0} - {1} {3}"
 
 #. simply: "Chicago Public Radio" or whatever the artist name is
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:509
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538
 msgid "Unknown Stream"
 msgstr "���"
 
 #. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:512
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541
 #, csharp-format
 msgid "{0}on{1} {2}"
 msgstr "{0} - {1} {2}"
 
 #. Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:515
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:544
 #, csharp-format
 msgid "{0} {1}"
 msgstr "{0} {1}"
@@ -3658,23 +3725,23 @@ 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:551
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:580
 #, csharp-format
 msgid "{0}by{1} {2} {0}from{1} {3}"
 msgstr "{0} - {1} {2} {0} - {1} {3}"
 
 #. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title;
 #. e.g. 'from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:555
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:512
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:584
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs: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:559
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:516
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:588
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:525
 #, csharp-format
 msgid "{0}by{1} {2}"
 msgstr "{0} - {1} {2}"
@@ -3728,6 +3795,7 @@ 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)"
@@ -3768,32 +3836,32 @@ msgstr "导���(_F)�"
 msgid "Select Folders"
 msgstr "é??æ?©ç?®å½?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:72
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:73
 msgid "<big><b>Import Media to Library</b></big>"
 msgstr "<big><b>导�����</b></big>"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:79
 msgid ""
 "Your media library is empty. You may import new music and videos into your "
 "library now, or choose to do so later."
 msgstr ""
 "æ?¨ç??åª?ä»?åº?为空ã??æ?¨å?¯ä»¥ç?°å?¨å¯¼å?¥æ?°ç??é?³ä¹?å??è§?é¢?å?°æ?¨ç??åº?中ï¼?æ??è??é??æ?©æ??ç?¹å??å??ã??"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:88
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
 msgid "Import _from:"
 msgstr "导��(_F)�"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:97
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:99
 msgid "Do not show this dialog again"
 msgstr "ä¸?å??æ?¾ç¤ºæ?¬å¯¹è¯?æ¡?"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:125
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
 msgid "_Import"
 msgstr "导�(_I)"
 
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:67
+#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
 msgid "Videos From Photos Folder"
 msgstr "æ?¥è?ªäº?ç?§ç??ç?®å½?ç??è§?é¢?"
 
@@ -3855,8 +3923,6 @@ msgid "New Smart Playlist"
 msgstr "æ?°æ?ºè?½æ?­æ?¾å??表"
 
 #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:96
-#, fuzzy
-#| msgid "Playlist _Name: "
 msgid "Playlist _Name:"
 msgstr "æ?­æ?¾å??表å??称(_N)ï¼?"
 
@@ -3874,7 +3940,7 @@ msgstr "�左侧�示���"
 
 #: ../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:114
 msgid "Browser on Top"
@@ -3882,7 +3948,7 @@ msgstr "�顶端�示���"
 
 #: ../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:120
 msgid "Show Browser"
@@ -3892,6 +3958,11 @@ msgstr "�示���"
 msgid "Show or hide the artist/album browser"
 msgstr "æ?¾ç¤ºæ??é??è??è?ºäºº/ä¸?è¾?æµ?è§?å?¨"
 
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:117
+#, csharp-format
+msgid "Loading {0}..."
+msgstr "æ­£å?¨å? è½½ {0}..."
+
 #: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
 msgid ""
 "Insert\n"
@@ -3909,6 +3980,7 @@ msgid "Idle"
 msgstr "空�"
 
 #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:55
 msgid "Contacting..."
 msgstr "è??系中..."
 
@@ -4000,19 +4072,15 @@ msgstr "å??æ­¥é¦?é??项"
 #, csharp-format
 msgid "The sync operation will remove one track from your device."
 msgid_plural "The sync operation will remove {0} tracks from your device."
-msgstr[0] ""
+msgstr[0] "å??æ­¥æ??ä½?å°?ä»?æ?¨ç??设å¤?中移é?¤ {0} é¦?æ?²ç?®ã??"
 
 #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:368
-#, fuzzy
-#| msgid "Are you sure you want to delete this {0}?"
 msgid "Are you sure you want to continue?"
-msgstr "æ?¨ç¡®å®?è¦?å? é?¤æ?¬ {0}ï¼?"
+msgstr "æ?¨ç¡®å®?è¦?继续å??ï¼?"
 
 #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:376
-#, fuzzy
-#| msgid "Love Track"
 msgid "Remove tracks"
-msgstr "å??ç?±é?³è½¨"
+msgstr "移���"
 
 #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:52
 msgid "Sync"
@@ -4109,11 +4177,11 @@ msgstr "æ­£å?¨æ?«æ?? iPod..."
 
 #: ../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:147
 msgid "Ordering Tracks..."
-msgstr "æ­£å?¨æ??åº?é?³è½¨..."
+msgstr "æ­£å?¨æ??åº?æ?²ç?®..."
 
 #: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/DatabaseRebuilder.cs:218
 msgid "Saving new database..."
@@ -4123,72 +4191,72 @@ msgstr "æ­£å?¨ä¿?å­?æ?°ç??æ?°æ?®åº?"
 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
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
 msgid "Generation"
 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.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
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
 msgid "Produced on"
 msgstr "å?ºå??äº?"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs: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:465
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468
 msgid "Track duration is zero"
-msgstr "�轨�度为�"
+msgstr "���度为�"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:627
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
 msgid "Out of space on device"
 msgstr "设å¤?æ? å¤?ä½?空é?´"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:627
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
 msgid "Please manually remove some songs"
 msgstr "请æ??å?¨å? é?¤ä¸?äº?æ?²ç?®"
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:643
+#: ../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:644
+#: ../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:665
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:672
 msgid "Updating..."
 msgstr "正���..."
 
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:669
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:676
 msgid "Flushing to disk..."
 msgstr "æ­£å?¨å?²å?·å?°ç¡¬ç??..."
 
@@ -4264,7 +4332,7 @@ msgstr "æ­£å?¨é??建 iPod æ?°æ?®åº?..."
 msgid "Purchased Music"
 msgstr "已�费��"
 
-#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:82
+#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:87
 msgid "Rockbox Device"
 msgstr "Rockbox 设�"
 
@@ -4325,7 +4393,6 @@ msgid ""
 msgstr "æ?¢æµ?å?°ä¸?个 MTP 设å¤?ï¼?ä½? Banshee æ? æ³?è½½å?¥å¯¹å®?ç??æ?¯æ??ã??"
 
 #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:149
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
 msgid "Version"
 msgstr "ç??æ?¬"
 
@@ -4341,8 +4408,122 @@ msgstr "ç?µæ± æ°´å¹³"
 msgid "Loading {0} - {1} of {2}"
 msgstr "æ­£å?¨è½½å?¥ {1} ç?? {0} å?° {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:54
+msgid "Amazon MP3 Purchases"
+msgstr "Amazon MP3 è´­ä¹°"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:87
+#, csharp-format
+msgid "{0} download at {1}/s"
+msgid_plural "{0} downloads at {1}/s"
+msgstr[0] "{0} ä¸?è½½ï¼?é??度为 {1}/s"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:95
+#, 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} ç­?å??)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/SignOutButton.cs:38
+msgid "Sign out of Amazon"
+msgstr "�� Amazon"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:38
+msgid "Amazon MP3 Store"
+msgstr "Amazon MP3 Store"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:57
+msgid "Country"
+msgstr "�家/��"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:60
+msgid "Which Amazon MP3 storefront to use by default."
+msgstr "é»?认使ç?¨ç?? Amazon MP3 åº?é?¢ã??"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:88
+msgid "Automatic (Geo IP detection)"
+msgstr "��(Geo IP ��)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90
+msgid "France (amazon.fr)"
+msgstr "æ³?å?½(amazon.fr)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:91
+msgid "Germany, Switzerland, Austria (amazon.de)"
+msgstr "å¾·å?½ã??ç??士ã??奥å?°å?©(amazon.de)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:92
+msgid "Japan (amazon.co.jp)"
+msgstr "��(amazon.co.jp)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:93
+msgid "United Kingdom (amazon.co.uk)"
+msgstr "��(amazon.co.uk)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:94
+msgid "United States (amazon.com)"
+msgstr "ç¾?å?½(amazon.com)"
+
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:47
+#, csharp-format
+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} 个é??中ç??å?±ç??å?°ä¸?个å??ï¼?"
+
+#: ../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:67
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:91
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:87
 msgid "Author"
 msgstr "ä½?è??ï¼?"
@@ -4355,10 +4536,18 @@ msgstr "å??å§?è?ºäºº"
 msgid "Book Title"
 msgstr "å?¾ä¹¦æ ?é¢?"
 
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:44
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
 msgid "Audiobooks, etc"
 msgstr "æ??声读ç?©ç­?"
 
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/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/AudioCdSource.cs:55
 msgid "Audio CD"
@@ -4367,7 +4556,7 @@ msgstr "é?³ä¹?å??ç??"
 #: ../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:121
 msgid "Importing Audio CD"
@@ -4489,60 +4678,39 @@ msgstr "å¼¹å?ºå??ç??"
 msgid "Import â??{0}â??"
 msgstr "导å?¥ â??{0}â??"
 
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:84
-msgid "_Bookmarks"
-msgstr "书签(_B)"
-
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:87
-msgid "_Add Bookmark"
-msgstr "æ·»å? 书签(_A)"
-
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:88
-msgid "Bookmark the Position in the Current Track"
-msgstr "å°?å½?å??é?³è½¨ä½?置设为书签"
-
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:100
-msgid "_Remove Bookmark"
-msgstr "å? é?¤ä¹¦ç­¾(_R)"
-
-#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
-#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs:210
-#, csharp-format
-msgid "{0} ({1}:{2:00})"
-msgstr "{0} ({1}:{2:00})"
-
 #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs:64
 msgid "Detecting BPM"
 msgstr "正��� BPM"
 
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:86
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
 msgid "D_etect"
 msgstr "��(_E)"
 
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:98
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
 msgid "T_ap"
-msgstr ""
+msgstr "轻�(_A)"
 
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:106
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
 msgid "Have Banshee attempt to auto-detect the BPM of this song"
 msgstr "让 Banshee å°?è¯?è?ªå?¨æ?¢æµ?该æ­?æ?²ç?? BPM"
 
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:108
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
 msgid "Play this song"
 msgstr "��此�"
 
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
 msgid "Tap this button to the beat to set the BPM for this song manually"
-msgstr ""
+msgstr "æ??è??æ??è½»æ?²æ?¬æ??é?®ä»¥æ??å?¨è®¾å®?该æ­?æ?²ç??æ¯?å??é??è??æ??æ?°"
 
 #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
 msgid "_Automatically detect BPM for all songs"
 msgstr "è?ªå?¨æ£?æµ?æ??æ??æ?²ç?®ç?? BPM"
 
 #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
-msgid "Detect BPM for all songs that don't already have a value set"
-msgstr "è?ªå?¨æ£?æµ?æ??æ??æ? 设置å?¼æ?²ç?®ç?? BPM"
+msgid ""
+"Detect beats per minute (BPM) for all songs that don't already have a value "
+"set"
+msgstr "为æ??æ??没æ??设å®?å?¼ç??æ?²ç?®æ?¢æµ?æ¯?å??é??è??æ??æ?°(BPM)"
 
 #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
 msgid "Downloading Cover Art"
@@ -4567,7 +4735,7 @@ msgstr "ä¸?è½½å°?é?¢å?¾ç??(_D)"
 
 #: ../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:42
 msgid "Shared Music"
@@ -4650,15 +4818,24 @@ msgstr "å¯?ç ?ï¼?"
 msgid "Login"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:60
-msgid "Music Share"
-msgstr "���享"
-
+#: ../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/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}."
@@ -4668,12 +4845,20 @@ msgstr "ç?»å½?å?° {0}ã??"
 #, csharp-format
 msgid "Loading {0} track"
 msgid_plural "Loading {0} tracks"
-msgstr[0] "正�载�第 {0} ��轨"
+msgstr[0] "正�载�第 {0} ���"
 
 #: ../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
@@ -4684,7 +4869,7 @@ msgstr "�载"
 
 #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:50
 msgid "Downloading eMusic Track(s)"
-msgstr "正��载 eMusic �轨"
+msgstr "正��载 eMusic ��"
 
 #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:51
 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:51
@@ -4722,7 +4907,7 @@ msgstr "eMusic æ??件"
 
 #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
 msgid "eMusic Tracks"
-msgstr "eMusic �轨"
+msgstr "eMusic ��"
 
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:57
 #: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:58
@@ -4736,7 +4921,7 @@ 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:78
@@ -4747,6 +4932,65 @@ msgstr "é??å?ºæ?¶æ¸?空"
 msgid "Clear the file system queue when quitting"
 msgstr "é??å?ºæ?¶æ¸?空æ??件系ç»?é??å??"
 
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:46
+msgid "Duplicate Albums"
+msgstr "é??å¤?ç??ä¸?è¾?"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47
+msgid ""
+"Displayed are albums that should likely be merged.  For each row, click the "
+"desired title to make it bold, or uncheck it to take no action."
+msgstr ""
+"æ?¾ç¤ºè¦?å??并ç??å?±ç??ã??对äº?æ¯?ä¸?è¡?ï¼?ç?¹å?»é??è¦?å??并ç??æ ?é¢?ä¼?让å®?å­?ä½?å? ç²?ï¼?æ??è??ä¸?é??æ?©å®?"
+"è??ä¸?对å®?è¿?è¡?ä»»ä½?æ??ä½?ã??"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:73
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:76
+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
+msgid "Duplicate Artists"
+msgstr "é??å¤?ç??è?ºäºº"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47
+msgid ""
+"Displayed are artists that should likely be merged.  For each row, click the "
+"desired name to make it bold, or uncheck it to take no action."
+msgstr ""
+"æ?¾ç¤ºè¦?å??并ç??è?ºäººã??对äº?æ¯?ä¸?è¡?ï¼?ç?¹å?»é??è¦?å??并ç??å??å­?ä¼?让å®?å­?ä½?å? ç²?ï¼?æ??è??ä¸?é??æ?©"
+"å®?è??ä¸?对å®?è¿?è¡?ä»»ä½?æ??ä½?ã??"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
+msgid "Fix Music Metadata..."
+msgstr "ä¿®å¤?é?³ä¹?å??æ?°æ?®..."
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48
+msgid "Metadata Fixer"
+msgstr "å??æ?°æ?®ä¿®å¤?å·¥å?·"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:54
+msgid "Problem Type:"
+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 "æ?¥ç??æ?¡ç?®è¯¦æ??"
@@ -4763,20 +5007,21 @@ msgstr "访� Archive.org"
 msgid "Close Item"
 msgstr "����"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:96
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:97
 msgid "Getting item details from the Internet Archive"
 msgstr "æ­£å?¨ä»?äº?è??ç½?æ¡£æ¡?é¦?中è?·å??项ç?®ç»?è??"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:147
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148
 msgid "Timed out getting item details from the Internet Archive"
 msgstr "ä»?äº?è??ç½?æ¡£æ¡?é¦?中è?·å??项ç?®ç»?è??æ?¶è¶?æ?¶"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:149
 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:190
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:301
 msgid "Try Again"
 msgstr "é??è¯?"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:150
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:151
 msgid "Error getting item details from the Internet Archive"
 msgstr "ä»?äº?è??ç½?æ¡£æ¡?é¦?中è?·å??项ç?®ç»?è??æ?¶å?ºé??"
 
@@ -4794,7 +5039,6 @@ msgid "Creator:"
 msgstr "å??建è??ï¼?"
 
 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:222
-#, fuzzy
 msgid "Venue:"
 msgstr "���"
 
@@ -4861,12 +5105,11 @@ msgstr "���"
 
 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:248
 msgid "Lineage:"
-msgstr ""
+msgstr "�系�"
 
 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:249
-#, fuzzy
 msgid "Transferred by:"
-msgstr "ä¼ è¾?ï¼?"
+msgstr "ä¼ è¾?ç?±ï¼?"
 
 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:266
 msgid "Reviews"
@@ -4898,7 +5141,7 @@ msgstr "æ?¶é??ï¼?"
 msgid "Optional Query"
 msgstr "å?¯é??æ?¥è¯¢"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:163
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
 msgid "Sort by:"
 msgstr "æ??åº?é??è¿?ï¼?"
 
@@ -4923,70 +5166,68 @@ msgstr "æ??æ?¬(_T)"
 msgid "Search..."
 msgstr "æ??ç´¢..."
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:109
-#, fuzzy
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:111
 msgid "_Go"
-msgstr "å?»(_G)"
+msgstr "转�(_G)"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:117
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:119
 msgid "Staff Picks"
-msgstr ""
+msgstr "å??å·¥æ?¨è??"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:118
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:587
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:120
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:588
 msgid "Creative Commons"
 msgstr "å??ä½?å?±äº«"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:119
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:121
 msgid "History"
 msgstr "å??å?²"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:120
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:122
 msgid "Classic Cartoons"
 msgstr "ä¼ ç»?å?¨ç?»ç??"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:121
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:123
 msgid "Speeches"
 msgstr "�说"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:122
-#, fuzzy
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:124
 msgid "For Children"
 msgstr "�童�"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:123
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:125
 msgid "Poetry"
 msgstr "è¯?é??"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:124
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:126
 msgid "Creator is United States"
 msgstr "å??建è??为ç¾?å?½"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:125
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:127
 msgid "Old Movies"
 msgstr "��影"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:126
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:128
 msgid "New From LibriVox"
 msgstr "LibriVox æ?°æ?²"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:127
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:129
 msgid "Old Texts"
 msgstr "æ?§æ??æ?¬"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:128
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:130
 msgid "Charlie Chaplin"
-msgstr ""
+msgstr "æ?¥ç??·å??å?«æ??"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:129
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:131
 msgid "NASA"
 msgstr "NASA"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:130
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:132
 msgid "Library of Congress"
-msgstr ""
+msgstr "�����书�"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:146
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148
 msgid ""
 "The Internet Archive, a 501(c)(3) non-profit, is building a digital library "
 "of Internet sites and other cultural artifacts in digital form. Like a paper "
@@ -4997,28 +5238,28 @@ msgstr ""
 "å?¤ç?©ç??æ?°å­?æ ¼å¼?ç??æ?°ç ?å?¾ä¹¦é¦?ã??å??çº¸å¼ å?¾ä¹¦é¦?ä¸?æ ·ï¼?æ??们为ç ?究è??ï¼?å??å?²å­¦è??以å??æ?®é??"
 "大ä¼?æ??ä¾?å??费使ç?¨ã??"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:149
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
 msgid "Visit the Internet Archive online at archive.org"
 msgstr "访é?®å?¨ archive.org ç??线ä¸?äº?è??ç½?æ¡£æ¡?é¦?"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:305
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
 msgid "Audiobooks"
 msgstr "æ??声读ç?©"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:306
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
 msgid "Movies"
 msgstr "�影"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:309
 msgid "Lectures"
 msgstr "�讲"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:310
 msgid "Concerts"
 msgstr "���"
 
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:309
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:311
 msgid "Books"
 msgstr "书"
 
@@ -5149,7 +5390,7 @@ msgstr "å¼?æ?¾æº?代ç ?ç?µå½±"
 
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:81
 msgid "Prelinger Archives"
-msgstr ""
+msgstr "Prelinger 档��"
 
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:82
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:109
@@ -5169,9 +5410,8 @@ msgid "Vlogs"
 msgstr "è§?é¢?å??客"
 
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:86
-#, fuzzy
 msgid "Youth Media"
-msgstr "正�导���"
+msgstr "年轻人��"
 
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:88
 msgid "Texts"
@@ -5191,7 +5431,7 @@ msgstr "���"
 
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:92
 msgid "Project Gutenberg"
-msgstr ""
+msgstr "å?¤ç?»å ¡è®¡å??"
 
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:93
 msgid "Children's Library"
@@ -5210,9 +5450,8 @@ msgid "Audio Books & Poetry"
 msgstr "æ??声读ç?© & è¯?é??"
 
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:100
-#, fuzzy
 msgid "Grateful Dead"
-msgstr "è¡·å¿?æ??è°¢"
+msgstr "â??æ??æ?©è??æ­»â??ä¹?é??"
 
 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:101
 msgid "Live Music Archive"
@@ -5279,7 +5518,7 @@ msgid "Add a new Internet Radio station or playlist"
 msgstr "æ·»å? ä¸?个äº?è??ç½?广æ?­ç?µå?°æ??æ?­æ?¾å??表"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:81
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:59
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60
 msgid "Edit Station"
 msgstr "����"
 
@@ -5336,7 +5575,6 @@ msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
 #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
-#: ../src/Libraries/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:48
 msgid "Rating:"
 msgstr "�级�"
 
@@ -5353,10 +5591,12 @@ msgid "Visit _User Profile Page"
 msgstr "访é?®ç?¨æ?·ä¸ªäººèµ?æ??页é?¢(_U)"
 
 #: ../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:132
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:91
 msgid "_Enable Song Reporting"
 msgstr "å?¯ç?¨æ?²ç?®æ?¥å??(_E)"
 
@@ -5364,391 +5604,407 @@ msgstr "å?¯ç?¨æ?²ç?®æ?¥å??(_E)"
 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:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
 msgid "Connect"
 msgstr "è¿?æ?¥"
 
-#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:86
-#, csharp-format
-msgid "Listen to {0} Station"
-msgstr "�� {0} ��"
-
-#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:88
-#, csharp-format
-msgid "Listen to the Last.fm {0} station for this artist"
-msgstr "æ?¶å?¬è¯¥è?ºäººç?? Last.fm {0} ç?µå?°"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:93
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:127
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:152
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:74
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:98
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:113
 msgid "View on Last.fm"
 msgstr "å?¨ Last.fm ä¸?æ?¥ç??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:94
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:75
 msgid "View this artist's Last.fm page"
 msgstr "æ?¥ç??该è?ºäººç?? Last.fm 页é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:97
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:78
 msgid "View Artist on Wikipedia"
 msgstr "å?¨ç»´å?ºç?¾ç§?ä¸?æ?¥ç??è?ºäººå??ç±»"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:98
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:79
 msgid "Find this artist on Wikipedia"
 msgstr "�维������该�人"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:105
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:86
 msgid "View Artist's Videos"
 msgstr "æ?¥ç??è?ºäººç??è§?é¢?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:106
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:87
 msgid "Find videos by this artist"
 msgstr "æ ¹æ?®è¯¥è?ºäººå??ç?°è§?é¢?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:109
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:110
-msgid "Fans of"
-msgstr "æ­?è¿·"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:114
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:115
-msgid "Similar to"
-msgstr "类似�"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:119
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:135
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:156
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:90
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:106
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:117
 msgid "Recommend to"
 msgstr "æ?¨è??å?°"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:120
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:91
 msgid "Recommend this artist to someone"
 msgstr "æ?¨è??该è?ºäººç»?æ??人"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:128
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:99
 msgid "View this album's Last.fm page"
 msgstr "æ?¥ç??该ä¸?è¾?ç?? Last.fm 页é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:136
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:107
 msgid "Recommend this album to someone"
 msgstr "æ?¨è??æ?¬ä¸?è¾?ç»?æ??人"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:143
-msgid "Love Track"
-msgstr "å??ç?±é?³è½¨"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:144
-msgid "Mark current track as loved"
-msgstr "æ ?å¿?å½?å??é?³è½¨ä¸ºå??欢ç??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:148
-msgid "Ban Track"
-msgstr "�止�轨"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:149
-msgid "Mark current track as banned"
-msgstr "æ ?å¿?å½?å??é?³è½¨ä¸ºç¦?æ­¢ç??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:153
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:114
 msgid "View this track's Last.fm page"
-msgstr "æ?¥ç??该é?³è½¨ç?? Last.fm 页é?¢"
+msgstr "æ?¥ç??该æ?²ç?®ç?? Last.fm 页é?¢"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:157
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:118
 msgid "Recommend this track to someone"
-msgstr "æ?¨è??æ?¬é?³è½¨ç»?æ??人"
+msgstr "æ?¨è??æ?¬æ?²ç?®ç»?æ??人"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:241
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:150
 #, csharp-format
 msgid "http://last.fm/music/{0}";
 msgstr "http://last.fm/music/{0}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:249
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:158
 #, csharp-format
 msgid "http://last.fm/music/{0}/{1}";
 msgstr "http://last.fm/music/{0}/{1}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:257
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:166
 #, csharp-format
 msgid "http://last.fm/music/{0}/_/{1}";
 msgstr "http://last.fm/music/{0}/_/{1}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:265
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:174
 #, csharp-format
 msgid "http://www.last.fm/music/{0}/+videos";
 msgstr "http://www.last.fm/music/{0}/+videos";
 
 #. Translators: this is used for looking up artist pages on Wikipedia; change to your wikipedia language if you want
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:273
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:182
 #: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs:48
 #, csharp-format
 msgid "http://en.wikipedia.org/wiki/{0}";
 msgstr "http://en.wikipedia.org/wiki/{0}";
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:307
-#, csharp-format
-msgid "Fans of {0}"
-msgstr "ç??æ­?è¿· {0} "
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:78
+msgid "Account"
+msgstr "��"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:80
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:270
+msgid "_Username"
+msgstr "ç?¨æ?·å??(_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 "å?¨æµ?è§?å?¨ä¸­æ??å¼? Last.fmï¼?å??æ?¶ç»?æ?¨ä¸?个æ??æ?? Banshee 使ç?¨æ?¨è´¦æ?·ç??é??项ã??"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:265
+#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
+msgid "Log in to Last.fm"
+msgstr "��� Last.fm"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:286
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294
+#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321
+msgid "You need to allow Banshee to access your Last.fm account."
+msgstr "æ?¨é??è¦?å??许 Banshee è?½å¤?访é?®æ?¨ç?? Last.fm å¸?æ?·ã??"
+
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:296
+msgid "Finish Logging In"
+msgstr "å®?æ??ç?»å½?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:328
+#: ../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 "æ?¨å·²ç»?ä½?为ç?¨æ?· <i>{0}</i> ç?»å½?å?°äº? Last.fmã??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:401
-msgid "_Add Station"
-msgstr "æ·»å? ç?µå?°(_A)"
+#: ../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:123
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
 msgid "Recently Loved Tracks"
-msgstr "æ??è¿?å??欢ç??é?³è½¨"
+msgstr "æ??è¿?å??欢ç??æ?²ç?®"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:124
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:124
 msgid "Recently Played Tracks"
-msgstr "æ??è¿?æ?­æ?¾è¿?ç??é?³è½¨"
+msgstr "æ??è¿?æ?­æ?¾è¿?ç??æ?²ç?®"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:125
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:125
 msgid "My Top Artists"
 msgstr "æ??æ??å??欢ä¼?è?ºäºº"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs:206
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:206
 #, csharp-format
 msgid "{0} plays"
 msgstr "{0} æ?­æ?¾"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:103
-msgid "Sort Stations by"
-msgstr "æ??åº?ç?µå?°æ ¹æ?®"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:163
-msgid "Total Play Count"
-msgstr "����次�"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:270
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs:243
 msgid "Account Settings"
 msgstr "账�设�"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:274
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs:247
 msgid "Join Last.fm"
 msgstr "å? å?¥ Last.fm"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:294
-msgid "Account"
-msgstr "��"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/ContextPage.cs:44
+msgid "Last.fm Recommendations"
+msgstr "Last.fm æ?¨è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:297
-msgid "_Username"
-msgstr "ç?¨æ?·å??(_U)"
+#: ../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.Radio/LastfmSource.cs:326
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:354
-msgid "Authorized!"
-msgstr "å·²æ??æ??ï¼?"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:178
+msgid "Recommended Artists"
+msgstr "æ?¨è??è?ºäºº"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:326
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:355
-msgid "Authorize..."
-msgstr "æ??æ??中..."
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:206
+msgid "No similar artists found"
+msgstr "没æ??æ?¾å?°ç±»ä¼¼è?ºäºº"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:329
-msgid ""
-"Open Last.fm in a browser, giving you the option to authorize Banshee to "
-"work with your account"
-msgstr "å?¨æµ?è§?å?¨ä¸­æ??å¼? Last.fmï¼?å??æ?¶ç»?æ?¨ä¸?个æ??æ?? Banshee 使ç?¨æ?¨è´¦æ?·ç??é??项ã??"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60
+#, csharp-format
+msgid "{0}% Similarity"
+msgstr "{0}% �似度"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:335
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:86
-msgid "Sign up for Last.fm"
-msgstr "注å?? Last.fm"
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62
+msgid "Unknown Similarity"
+msgstr "���似度"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59
+msgid "_Add Station..."
+msgstr "æ·»å? ç?µå?°(_A)..."
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:341
-msgid "Check if Banshee has been authorized"
-msgstr "æ£?æ?¥æ?¯å?¦ Banshee å·²è?·å¾?æ??æ??"
+#: ../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.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs:67
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:80
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:81
+msgid "Fans of"
+msgstr "æ­?è¿·"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:85
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:86
+msgid "Similar to"
+msgstr "类似�"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:94
+msgid "Love Track"
+msgstr "å??ç?±æ?²ç?®"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:95
+msgid "Mark current track as loved"
+msgstr "æ ?å¿?å½?å??æ?²ç?®ä¸ºå??欢ç??"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:99
+msgid "Ban Track"
+msgstr "�止��"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:100
+msgid "Mark current track as banned"
+msgstr "æ ?å¿?å½?å??æ?²ç?®ä¸ºç¦?æ­¢ç??"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
+#, csharp-format
+msgid "Fans of {0}"
+msgstr "ç??æ­?è¿· {0} "
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
+#, csharp-format
+msgid "Similar to {0}"
+msgstr "类似� {0}"
+
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
+msgid "_Add Station"
+msgstr "æ·»å? ç?µå?°(_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/StationEditor.cs:89
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
 msgid "Station _Type:"
 msgstr "ç?µå?°ç±»å??(_T)ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:57
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58
 msgid "Last.fm Station"
 msgstr "Last.fm ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:150
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:151
 msgid "Edit Last.fm Station"
 msgstr "�� Last.fm ��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:151
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:152
 msgid "Delete Last.fm Station"
 msgstr "å? é?¤ Last.fm ç?µå?°"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:238
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239
 #, csharp-format
 msgid "Tuning Last.fm to {0}."
 msgstr "è°?è°? Last.fm å?° {0}"
 
 #. Translators: {0} is an error message sentence from RadioConnection.cs.
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:248
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249
 #, csharp-format
 msgid "Failed to tune in station. {0}"
 msgstr "æ? æ³?è°?è°?ç?µå?°ã??{0}"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:356
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:357
 #, csharp-format
 msgid "Getting new songs for {0}."
 msgstr "正�为 {0} ����"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:363
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:364
 #, csharp-format
 msgid "No new songs available for {0}."
 msgstr "没æ?? {0} ç??æ?°æ­?å?¯è?·å¾?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:389
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:390
 #, csharp-format
 msgid "Failed to get new songs for {0}."
 msgstr "æ? æ³?è?·å¾? {0} ç??æ?°æ­?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:450
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:451
 #, csharp-format
 msgid "{0} song played"
 msgid_plural "{0} songs played"
 msgstr[0] "{0} �����"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:582
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:84
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:583
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:84
 msgid "Recommended"
 msgstr "æ?¨è??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:583
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:93
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:584
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:93
 msgid "Personal"
 msgstr "个人"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:584
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:102
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:585
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:102
 msgid "Loved"
 msgstr "å??ç?±"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:585
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:586
 msgid "Banshee Group"
 msgstr "Banshee 群"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:586
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:111
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:587
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:111
 msgid "Neighbors"
 msgstr "��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:85
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:94
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:85
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:94
 msgid "For User:"
 msgstr "为���"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:103
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:103
 msgid "By User:"
 msgstr "����"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:112
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:112
 msgid "Of User:"
 msgstr "ç??ç?¨æ?·ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:120
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:120
 msgid "Group"
 msgstr "ç»?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:121
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:121
 msgid "Group Name:"
 msgstr "群å??ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:129
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:129
 msgid "Tag"
 msgstr "æ ?ç­¾"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:130
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:130
 msgid "Tag Name:"
 msgstr "æ ?ç­¾å??"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:138
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:138
 msgid "Fan"
 msgstr "æ­?è¿·"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:139
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:139
 msgid "Fans of:"
 msgstr "ç??æ­?è¿·ï¼?"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:147
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:147
 msgid "Similar"
 msgstr "类似"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:148
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:148
 msgid "Similar to:"
 msgstr "类似��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:156
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:156
 msgid "lastfm:// URL"
 msgstr "lastfm:// URL"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs:157
+#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:157
 msgid "lastfm://"
 msgstr "lastfm://"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/ContextPage.cs:44
-msgid "Last.fm Recommendations"
-msgstr "Last.fm æ?¨è??"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:81
-#, csharp-format
-msgid "Top Albums by {0}"
-msgstr "æ??æµ?è¡?ä¸?è¾? - {0}"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:82
-#, csharp-format
-msgid "Top Tracks by {0}"
-msgstr "æ??æµ?è¡?é?³è½¨ - {0} "
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:179
-msgid "Recommended Artists"
-msgstr "æ?¨è??è?ºäºº"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109
+msgid "Media"
+msgstr "��"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:207
-msgid "No similar artists found"
-msgstr "没æ??æ?¾å?°ç±»ä¼¼è?ºäºº"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119
+msgid "Library"
+msgstr "�"
 
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60
-#, csharp-format
-msgid "{0}% Similarity"
-msgstr "{0}% �似度"
-
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62
-msgid "Unknown Similarity"
-msgstr "���似度"
-
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:72
-#, fuzzy
-#| msgid "Banshee Media Player"
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131
 msgid "Launch the Banshee Media Player"
-msgstr "Banshee �����"
-
-#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
-msgid "Quick access panel for your media"
-msgstr ""
+msgstr "�� Banshee �����"
 
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs:60
 #: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2
-#, fuzzy
-#| msgid "Media"
 msgid "media"
 msgstr "��"
 
+#: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:1
+msgid "Quick access panel for your media"
+msgstr "(æ?¨åª?ä½?æ??件ç??)å¿«é??访é?®çª?æ ¼"
+
 #: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeService.cs:25
 msgid "_Mini Mode"
 msgstr "è¿·ä½ æ¨¡å¼?(_M)"
@@ -5765,56 +6021,70 @@ msgstr "è¿?å??å®?æ?´æ¨¡å¼?"
 msgid "Change repeat playback mode"
 msgstr "æ?¹å??é??å¤?æ?­æ?¾æ¨¡å¼?"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:135
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:47
+msgid "Miro Guide"
+msgstr "Miro Guide"
+
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:56
+msgid "Search for Podcasts"
+msgstr "æ??ç´¢æ?­å®¢"
+
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:57
+msgid "Search for Video Podcasts"
+msgstr "æ??ç´¢è§?é¢?æ?­å®¢"
+
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:138
 msgid "_Show Notifications"
 msgstr "æ?¾ç¤ºé??ç?¥(_S)"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:136
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
 msgid "Show notifications when item changes"
 msgstr "å½?项ç?®å??å??æ?¶æ?¾ç¤ºé??ç?¥"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:340
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:343
 msgid "Still Running"
 msgstr "����中"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:341
+#: ../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:470
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:479
 msgid "Skip this item"
 msgstr "跳�此项"
 
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:474
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
 msgid "Cannot show notification"
 msgstr "æ? æ³?æ?¾ç¤ºé??ç?¥"
 
 #. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
 #. are Artist Name and Album Title, respectively;
 #. e.g. 'by Parkway Drive from Killing with a Smile'
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508
-#, fuzzy, csharp-format
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:517
+#, csharp-format
 msgid ""
 "{0}by{1} {2}\n"
 "{0}from{1} {3}"
-msgstr "{0} - {1} {2} {0} - {1} {3}"
+msgstr ""
+"{0}ç?±{1} {2}\n"
+"{0}��{1} {3}"
 
 #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
 msgid "Banshee"
 msgstr "Banshee"
 
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
 #, csharp-format
 msgid "Unable to import track: {0}"
-msgstr "æ? æ³?导å?¥é?³è½¨ï¼?{0}"
+msgstr "æ? æ³?导å?¥æ?²ç?®ï¼?{0}"
 
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
 msgid "Importing from Amarok failed"
 msgstr "� Amarok 导�失败"
 
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
 msgid "Amarok"
 msgstr "Amarok"
 
@@ -5860,8 +6130,7 @@ msgid ""
 "The iTunes library refers to your music directory as \"{0}\" but Banshee was "
 "not able to infer the location of this directory. Please locate it."
 msgstr ""
-"iTunes åº?æ??å?°æ?¨ç??é?³ä¹?ç?®å½?为 {0}ï¼?ä½? Banshee æ? æ³?æ?¨æ?­è¯¥ç?®å½?ç??ä½?ç½®ï¼?请æ??"
-"å®?ã??"
+"iTunes åº?æ??å?°æ?¨ç??é?³ä¹?ç?®å½?为 {0}ï¼?ä½? Banshee æ? æ³?æ?¨æ?­è¯¥ç?®å½?ç??ä½?ç½®ï¼?请æ??å®?ã??"
 
 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
@@ -5910,7 +6179,7 @@ msgstr "æ·»å? é??å®?ç??æ?²ç?®å?°æ?­æ?¾é??å??"
 
 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
 msgid "Refresh random tracks in the play queue"
-msgstr "ä»?æ?­æ?¾é??å??中å?·æ?°é??æ?ºé?³è½¨"
+msgstr "ä»?æ?­æ?¾é??å??中å?·æ?°é??æ?ºæ?²ç?®"
 
 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:64
 msgid "Add More"
@@ -5918,11 +6187,11 @@ msgstr "æ·»å? æ?´å¤?"
 
 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:65
 msgid "Add more random tracks to the play queue"
-msgstr "æ·»å? æ?´å¤?ç??é??æ?ºé?³è½¨å?°æ?­æ?¾é??å??"
+msgstr "æ·»å? æ?´å¤?ç??é??æ?ºæ?²ç?®å?°æ?­æ?¾é??å??"
 
 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
 msgid "Remove all tracks from the play queue"
-msgstr "ä»?æ?­æ?¾é??å??中å? é?¤æ??æ??é?³è½¨"
+msgstr "ä»?æ?­æ?¾é??å??中å? é?¤æ??æ??æ?²ç?®"
 
 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
 msgid "Clear the play queue when quitting"
@@ -5932,11 +6201,11 @@ msgstr "é??å?ºæ?¶æ¸?空æ?­æ?¾é??å??"
 msgid "Remove From Play Queue"
 msgstr "ä»?æ?­æ?¾é??å??中å? é?¤"
 
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:821
+#: ../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:827
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:832
 msgid "Number of _upcoming songs to show"
 msgstr "è¦?æ?¾ç¤ºç??å?³å°?æ?­è¿?æ­?æ?²ç??æ?°é??(_u)"
 
@@ -6171,174 +6440,6 @@ msgstr "� Web ���中��..."
 msgid "No videos found"
 msgstr "�����"
 
-#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36
-msgid "open context menu"
-msgstr "æ??å¼?å?³è??è??å??"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37
-msgid "click"
-msgstr "��"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37
-msgid "menu"
-msgstr "è??å??"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
-#, csharp-format
-msgid "Hide <i>{0}</i>"
-msgstr "é??è?? <i>{0}</i>"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
-msgid "Banshee Encountered a Fatal Error"
-msgstr "Banshee é??å?°ä¸?个è?´å?½é??误"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:90
-msgid "Error Details"
-msgstr "é??误ç»?è??"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:134
-msgid "An unhandled exception was thrown: "
-msgstr "å?ºç?°ä¸?个æ?ªå¤?ç??ç??ä¾?å¤?ï¼?"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
-msgid "Assembly Version Information"
-msgstr "ç»?件ç??æ?¬ä¿¡æ?¯"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64
-msgid "Assembly Name"
-msgstr "ç»?件å??称"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62
-msgid "KB"
-msgstr "KB"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86
-msgid "Condition:"
-msgstr "�件�"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104
-msgid "_Match"
-msgstr "符å??(_M) "
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111
-msgid "all"
-msgstr "��"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112
-msgid "any"
-msgstr "任�"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117
-msgid "of the following:"
-msgstr "ä¸?å??ä¹?中ç??ï¼?"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58
-msgid "_Limit to"
-msgstr "é??å?¶å?°(_L)"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85
-#, fuzzy
-msgid "selected by"
-msgstr "é??å®?ç?±"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42
-msgid "ago"
-msgstr "ä¹?å??"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59
-msgid "seconds"
-msgstr "�"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62
-msgid "days"
-msgstr "天"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63
-msgid "weeks"
-msgstr "æ??æ??"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64
-msgid "months"
-msgstr "æ??"
-
-#: ../src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65
-msgid "years"
-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
-msgid "before"
-msgstr "ä¹?å??"
-
-#: ../src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs:48
-msgid "after"
-msgstr "ä¹?å??"
-
-#: ../src/Libraries/Hyena/Hyena.Query/EnumQueryValue.cs:43
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:41
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:45
-msgid "is"
-msgstr "æ?¯"
-
-#: ../src/Libraries/Hyena/Hyena.Query/EnumQueryValue.cs:44
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:42
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:46
-msgid "is not"
-msgstr "��"
-
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:43
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47
-msgid "at most"
-msgstr "æ??å¤?"
-
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:44
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46
-msgid "at least"
-msgstr "æ??å°?"
-
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:45
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45
-msgid "less than"
-msgstr "��"
-
-#. The SQL operators in these Operators are reversed from normal on purpose
-#: ../src/Libraries/Hyena/Hyena.Query/IntegerQueryValue.cs:46
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44
-msgid "more than"
-msgstr "��"
-
-#: ../src/Libraries/Hyena/Hyena.Query/NullQueryValue.cs:41
-msgid "empty"
-msgstr "空�"
-
-#: ../src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90
-#, csharp-format
-msgid "{0} ago"
-msgstr "{0} 以å??"
-
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:43
-msgid "contains"
-msgstr "å??å?«"
-
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:44
-msgid "doesn't contain"
-msgstr "ä¸?å??å?«"
-
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:47
-msgid "starts with"
-msgstr "���"
-
-#: ../src/Libraries/Hyena/Hyena.Query/StringQueryValue.cs:48
-msgid "ends with"
-msgstr "ç»?æ??äº?"
-
-#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
-msgid "Log in to Last.fm"
-msgstr "��� Last.fm"
-
 #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
 msgid "Last.fm Account Login"
 msgstr "Last.fm 账���"
@@ -6355,11 +6456,11 @@ msgstr "��并��"
 msgid "Authorize for Last.fm"
 msgstr "为 Last.fm 认�"
 
-#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:448
+#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:447
 msgid ""
-"Last.fm username is invalid or Banshee is not authorized to access you "
+"Last.fm username is invalid or Banshee is not authorized to access your "
 "account."
-msgstr "Last.fm ç?¨æ?·å??æ? æ??æ?? Banshee 没æ??è?·å¾?使ç?¨æ?¨è´¦æ?·ç??æ??æ??ã??"
+msgstr "Last.fm ç?¨æ?·å??æ? æ??ï¼?æ?? Banshee 没æ??è?·å¾?使ç?¨æ?¨è´¦æ?·ç??æ??æ??ã??"
 
 #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
 msgid "This service does not exist."
@@ -6402,11 +6503,6 @@ msgstr "æµ?ç³»ç»?ä¸?线维æ?¤ï¼?请ç¨?å??å??è¯?ã??"
 msgid "The method signature is invalid."
 msgstr "该æ?¹å¼?ç­¾å??æ? æ??ã??"
 
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294
-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321
-msgid "You need to allow Banshee to access your Last.fm account."
-msgstr "æ?¨é??è¦?å??许 Banshee è?½å¤?访é?®æ?¨ç?? Last.fm å¸?æ?·ã??"
-
 #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
 msgid "There is not enough content to play this station."
 msgstr "没æ??足å¤?å??容æ?¥æ?­æ?¾è¯¥ç?µå?°"
@@ -6457,127 +6553,11 @@ msgstr "å·²è¿?æ?¥å?° Last.fmã??"
 msgid "Unknown Podcast"
 msgstr "���客"
 
-#~ msgid "Moblin Support"
-#~ msgstr "Moblin æ?¯æ??"
-
-#~ msgid "_Search:"
-#~ msgstr "æ??ç´¢(_S)ï¼?"
-
-#~ msgid "Filter Results"
-#~ msgstr "è¿?滤ç»?æ??"
-
-#~ msgid "<b>Details</b>"
-#~ msgstr "<b>详æ??</b>"
-
-#~ msgid "Predefined Smart Playlists"
-#~ msgstr "é¢?设ç??æ?ºè?½æ?­æ?¾å??表"
-
-#~ msgid "Current source:"
-#~ msgstr "å½?å??æº?ï¼?"
-
-#~ msgid "Music Library"
-#~ msgstr "���"
-
-#~ msgid "Version:"
-#~ msgstr "ç??æ?¬ï¼?"
-
-#~ msgid "Authors:"
-#~ msgstr "ä½?è??ï¼?"
-
-#~ msgid "Copyright/License:"
-#~ msgstr "ç??æ??/许å?¯ï¼?"
-
-#~ msgid "Extension Dependencies:"
-#~ msgstr "�������系"
-
-#~ msgid "Disable"
-#~ msgstr "�止"
-
-#~ msgid "Enable"
-#~ msgstr "��"
-
-#~ msgid "Primary Development"
-#~ msgstr "主è¦?å¼?å??è??"
-
-#~ msgid "{0} to add, {1} to remove"
-#~ msgstr "æ·»å?  {0} 个ï¼?å? é?¤ {1} 个"
-
-#~ msgid "Manually manage this device"
-#~ msgstr "人工管ç??该设å¤?"
-
-#~ msgid ""
-#~ "Manually managing your device means you can drag and drop items onto the "
-#~ "device, and manually remove them."
-#~ msgstr "人工管ç??æ?¨ç??设å¤?æ??å?³ç??æ?¨å?¯ä»¥æ??æ?¾é¡¹ç?®å?°è®¾å¤?ä¸?ï¼?æ??è??æ??å?¨å? é?¤å®?们ã??"
-
-#~ msgid "Synchronize"
-#~ msgstr "å??æ­¥"
-
-#~ msgid "Synchronize {0}"
-#~ msgstr "å??æ­¥ {0}"
-
-#~ msgid "Eject {0}"
-#~ msgstr "弹� {0}"
-
-#~ msgid "Home Directory"
-#~ msgstr "主��"
-
-#~ msgid "Choose an import _source:"
-#~ msgstr "é??æ?©ä¸?个导å?¥æº?(_S)ï¼?"
-
-#~ msgid "I_mport Media Source"
-#~ msgstr "导����(_M)"
-
-#~ msgid "Import Media to Library"
-#~ msgstr "导�����中"
-
-#~ msgid "_Configure..."
-#~ msgstr "é??ç½®(_C)..."
-
-#~ msgid "Configure the Last.fm Extension"
-#~ msgstr "é??ç½® Last.fm æ?©å±?"
-
-#~ msgid "Edit Last.fm Settings"
-#~ msgstr "�� Last.fm 设�"
-
-#~ msgid "Failed to Login to Last.fm"
-#~ msgstr "æ? æ³?ç?»å½?å?° Last.fm"
-
-#~ msgid "Either your username or password is invalid."
-#~ msgstr "æ?¨ç??ç?¨æ?·å??æ??å¯?ç ?æ? æ??"
-
-#~ msgid "Unknown Genre"
-#~ msgstr "���派"
-
-#~ msgid "Song"
-#~ msgstr "��"
-
-#~ msgid "Item"
-#~ msgstr "项�"
-
-#~ msgid "Saving tags for {0}"
-#~ msgstr "æ­£å?¨ä¸º {0} ä¿?å­?æ ?ç­¾"
-
-#~ msgid "Renaming {0}"
-#~ msgstr "æ­£å?¨é??å?½å?? {0}"
-
-#~ msgid "Name Ascending"
-#~ msgstr "æ??å??å­?å??åº?æ??å??"
-
-#~ msgid "Name Descending"
-#~ msgstr "æ??å??å­?é??åº?æ??å??"
-
-#~ msgid "Delete From {0}"
-#~ msgstr "æ­£å?¨ä»? {0} å? é?¤"
-
-#~ msgid "Preparing..."
-#~ msgstr "æ­£å?¨å??å¤?..."
-
-#~ msgid "Station Name"
-#~ msgstr "ç?µå?°å??"
+#~ msgid "Save your position in tracks so you can resume playback later."
+#~ msgstr "ä¿?å­?æ?²ç?®ä¸­ç??ä½?置以便æ?¨å?¯ä»¥å??头é??æ?°å¼?å§?å??æ?¾ã??"
 
-#~ msgid "Station Type"
-#~ msgstr "ç?µå?°ç±»å??"
+#~ msgid "Could not create 'filesrc' plugin"
+#~ msgstr "æ? æ³?å??建â??filesrcâ??æ??件"
 
-#~ msgid "Update Podcasts"
-#~ msgstr "���客"
+#~ msgid "Could not create 'filesink' plugin"
+#~ msgstr "æ? æ³?å??建â??filesinkâ??æ??件"