[rhythmbox] Updated zh_CN translation.



commit 9993bce935fc20d45438e8436b43d35158286b39
Author: Funda Wang <fundawang gmail com>
Date:   Tue Jun 29 11:18:55 2010 +0800

    Updated zh_CN translation.

 po/ChangeLog |    4 +
 po/zh_CN.po  | 1610 +++++++++++++++++++++++++---------------------------------
 2 files changed, 705 insertions(+), 909 deletions(-)
---
diff --git a/po/ChangeLog b/po/ChangeLog
index a7b9b59..1f35727 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-29  Funda Wang  <fundawang gmail com>
+
+	* zh_CN.po: Updated zh_CN translation.
+
 2009-06-02  Manoj Kumar Giri <mgiri redhat com>
 
 	* or.po: Updated Oriya Translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a781321..326f908 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: rhythmbox master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=rhythmbox&component=general\n"
-"POT-Creation-Date: 2010-04-11 21:37+0000\n"
+"POT-Creation-Date: 2010-06-25 13:14+0000\n"
 "PO-Revision-Date: 2010-04-15 21:27+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -23,24 +23,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../backends/gstreamer/rb-encoder-gst.c:607
-#, c-format
-msgid "Do you want to overwrite the file \"%s\"?"
-msgstr "ç??ç??æ?³è¦?è¦?ç??æ??件â??%sâ??ï¼?"
-
-#: ../backends/gstreamer/rb-encoder-gst.c:679
+#: ../backends/gstreamer/rb-encoder-gst.c:694
 #, c-format
 msgid "Could not create a GStreamer sink element to write to %s"
 msgstr "æ? æ³?å??建 GStreamer sink å??素以å??å?¥ %s"
 
 #. ?
-#: ../backends/gstreamer/rb-player-gst.c:497
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2714
+#: ../backends/gstreamer/rb-player-gst.c:512
+#: ../backends/gstreamer/rb-player-gst-xfade.c:2729
 #, c-format
 msgid "Failed to open output device: %s"
 msgstr "æ? æ³?æ??å¼?è¾?å?ºè®¾å¤?ï¼?%s"
 
-#: ../backends/gstreamer/rb-player-gst.c:635
+#: ../backends/gstreamer/rb-player-gst.c:653
 #, c-format
 msgid "Failed to create playbin2 element; check your GStreamer installation"
 msgstr "å??建 playbin2 å??素失败ï¼?请æ£?æ?¥æ?¨ç?? GStreamer å®?è£?"
@@ -57,74 +52,65 @@ msgid "Failed to start new stream"
 msgstr "å¼?å§?æ?°ç??æµ?åª?ä½?失败"
 
 #. ?
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2639
+#: ../backends/gstreamer/rb-player-gst-xfade.c:2654
 #, c-format
 msgid "Failed to open output device"
 msgstr "æ??å¼?è¾?å?ºè®¾å¤?失败"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2990
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3061
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3005
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3076
 #, c-format
 msgid "Failed to create GStreamer element; check your installation"
 msgstr "å??建 GStreamer å??素失败ï¼?请æ£?æ?¥æ?¨ç??å®?è£?"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3001
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3016
 #, c-format
 msgid "Failed to create audio output element; check your installation"
 msgstr "å??建é?³é¢?è¾?å?ºå??素失败ï¼?请æ£?æ?¥æ?¨ç??å®?è£?"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3035
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3077
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3103
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3112
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3121
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3050
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3092
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3118
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3127
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3136
 #, c-format
 msgid "Failed to link GStreamer pipeline; check your installation"
 msgstr "é?¾æ?¥ GStreamer æµ?水线失败ï¼?请æ£?æ?¥æ?¨ç??å®?è£?"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3216
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3231
 #, c-format
 msgid "Failed to create GStreamer pipeline to play %s"
 msgstr "æ? æ³?å??建 GStreamer æµ?水线以æ?­æ?¾ %s"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3232
-#, c-format
-msgid "Failed to start playback of %s"
-msgstr "æ? æ³?å¼?å§?å??æ?¾ %s"
-
 #: ../data/ui/create-playlist.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../data/ui/create-playlist.ui.h:2
 msgid "A_dd if any criteria are matched"
 msgstr "å¦?æ??æ??ä»»ä½?æ ?å??å?¹é??å??æ·»å? (_D)"
 
-#: ../data/ui/create-playlist.ui.h:3
+#: ../data/ui/create-playlist.ui.h:2
 msgid "Create automatically updating playlist where:"
 msgstr "å?¨ç¬¦å??å¦?ä¸?æ?¡ä»¶ç??å?°æ?¹å??建è?ªå?¨æ?´æ?°æ?­æ?¾å??表ï¼?"
 
-#: ../data/ui/create-playlist.ui.h:4
+#: ../data/ui/create-playlist.ui.h:3
 msgid "GB"
 msgstr "GB"
 
-#: ../data/ui/create-playlist.ui.h:5
+#: ../data/ui/create-playlist.ui.h:4
 msgid "MB"
 msgstr "MB"
 
-#: ../data/ui/create-playlist.ui.h:6
+#: ../data/ui/create-playlist.ui.h:5
 msgid "Minutes"
 msgstr "å??é??"
 
-#: ../data/ui/create-playlist.ui.h:7
+#: ../data/ui/create-playlist.ui.h:6
 msgid "_Limit to: "
 msgstr "é??å?¶å?°(_L)ï¼?"
 
-#: ../data/ui/create-playlist.ui.h:8
+#: ../data/ui/create-playlist.ui.h:7
 msgid "_When sorted by:"
 msgstr "æ??åº?æ?¹å¼?(_W)ï¼?"
 
-#: ../data/ui/create-playlist.ui.h:9
+#: ../data/ui/create-playlist.ui.h:8
 msgid "songs"
 msgstr "��"
 
@@ -132,91 +118,99 @@ msgstr "��"
 msgid "A_lbum"
 msgstr "��(_L)"
 
-#: ../data/ui/general-prefs.ui.h:2
+#: ../data/ui/general-prefs.ui.h:2 ../widgets/rb-entry-view.c:1683
+msgid "BPM"
+msgstr "BPM"
+
+#: ../data/ui/general-prefs.ui.h:3
 msgid "Browser Views"
 msgstr "�����"
 
-#: ../data/ui/general-prefs.ui.h:3
+#: ../data/ui/general-prefs.ui.h:4
+msgid "C_omment"
+msgstr "注é??(_O)"
+
+#: ../data/ui/general-prefs.ui.h:5
 msgid "Da_te added"
 msgstr "æ·»å? ç??æ?¥æ??(_T)"
 
-#: ../data/ui/general-prefs.ui.h:4
+#: ../data/ui/general-prefs.ui.h:6
 msgid "Default"
 msgstr "�认"
 
-#: ../data/ui/general-prefs.ui.h:5
+#: ../data/ui/general-prefs.ui.h:7
 msgid "G_enres, artists and albums"
 msgstr "æµ?æ´¾ã??è?ºäººå??ä¸?è¾?(_E)"
 
-#: ../data/ui/general-prefs.ui.h:6
+#: ../data/ui/general-prefs.ui.h:8
 msgid "Icons only"
 msgstr "���"
 
-#: ../data/ui/general-prefs.ui.h:7
+#: ../data/ui/general-prefs.ui.h:9
 msgid "Lo_cation"
 msgstr "ä½?ç½®(_C)"
 
-#: ../data/ui/general-prefs.ui.h:8
+#: ../data/ui/general-prefs.ui.h:10
 msgid "Text below icons"
 msgstr "æ??æ?¬å?¨å?¾æ ?ä¸?"
 
-#: ../data/ui/general-prefs.ui.h:9
+#: ../data/ui/general-prefs.ui.h:11
 msgid "Text beside icons"
 msgstr "æ??æ?¬å?¨å?¾æ ?æ??"
 
-#: ../data/ui/general-prefs.ui.h:10
+#: ../data/ui/general-prefs.ui.h:12
 msgid "Text only"
 msgstr "ä»?æ??æ?¬"
 
-#: ../data/ui/general-prefs.ui.h:11
+#: ../data/ui/general-prefs.ui.h:13
 msgid "Ti_me"
 msgstr "��(_M)"
 
-#: ../data/ui/general-prefs.ui.h:12
+#: ../data/ui/general-prefs.ui.h:14
 msgid "Toolbar Button Labels"
 msgstr "å·¥å?·æ ?æ??é?®æ ?ç­¾"
 
-#: ../data/ui/general-prefs.ui.h:13
+#: ../data/ui/general-prefs.ui.h:15
 msgid "Track _number"
 msgstr "����(_N)"
 
-#: ../data/ui/general-prefs.ui.h:14
+#: ../data/ui/general-prefs.ui.h:16
 msgid "Visible Columns"
 msgstr "å?¯è§?å??"
 
-#: ../data/ui/general-prefs.ui.h:15
+#: ../data/ui/general-prefs.ui.h:17
 msgid "_Artist"
 msgstr "�人(_A)"
 
-#: ../data/ui/general-prefs.ui.h:16
+#: ../data/ui/general-prefs.ui.h:18
 msgid "_Artists and albums"
 msgstr "è?ºäººå??ä¸?è¾?(_A)"
 
-#: ../data/ui/general-prefs.ui.h:17
+#: ../data/ui/general-prefs.ui.h:19
 msgid "_Genre"
 msgstr "æµ?æ´¾(_G)"
 
-#: ../data/ui/general-prefs.ui.h:18
+#: ../data/ui/general-prefs.ui.h:20
 msgid "_Genres and artists"
 msgstr "æµ?æ´¾å??è?ºäºº(_G)"
 
-#: ../data/ui/general-prefs.ui.h:19
+#: ../data/ui/general-prefs.ui.h:21
 msgid "_Last played"
 msgstr "�次��(_L)"
 
-#: ../data/ui/general-prefs.ui.h:20
+#: ../data/ui/general-prefs.ui.h:22
 msgid "_Play count"
 msgstr "���计(_P)"
 
-#: ../data/ui/general-prefs.ui.h:21
+#: ../data/ui/general-prefs.ui.h:23
 msgid "_Quality"
 msgstr "è´¨é??(_Q)"
 
-#: ../data/ui/general-prefs.ui.h:22
+#: ../data/ui/general-prefs.ui.h:24
 msgid "_Rating"
 msgstr "è¯?å??(_R)"
 
-#: ../data/ui/general-prefs.ui.h:23
+#: ../data/ui/general-prefs.ui.h:25
 msgid "_Year"
 msgstr "年份(_Y)"
 
@@ -264,26 +258,23 @@ msgstr "ç??è§?æ??é?³ä¹?åº?中ç??æ?°æ??件(_W)"
 msgid "<b>Information</b>"
 msgstr "<b>ä¿¡æ?¯</b>"
 
-#: ../data/ui/media-player-properties.ui.h:2
+#: ../data/ui/media-player-properties.ui.h:2 ../data/ui/sync-dialog.ui.h:1
 msgid "<b>Sync Preferences</b>"
 msgstr "<b>å??æ­¥é¦?é??项</b>"
 
-#: ../data/ui/media-player-properties.ui.h:3
+#: ../data/ui/media-player-properties.ui.h:3 ../data/ui/sync-dialog.ui.h:2
 msgid "<b>Sync Preview</b>"
 msgstr "<b>å??æ­¥é¢?è§?</b>"
 
-#: ../data/ui/media-player-properties.ui.h:4
+#. Translators: This refers to the usage of media space
+#: ../data/ui/media-player-properties.ui.h:5
 msgid "<b>Volume usage</b>"
 msgstr "<b>å?·ä½¿ç?¨æ??å?µ</b>"
 
-#: ../data/ui/media-player-properties.ui.h:5
-msgid "Added files:"
-msgstr "æ?°å¢?æ??件ï¼?"
-
 #: ../data/ui/media-player-properties.ui.h:6
 #: ../data/ui/podcast-feed-properties.ui.h:2
-#: ../data/ui/podcast-properties.ui.h:1 ../data/ui/song-info-multiple.ui.h:2
-#: ../data/ui/song-info.ui.h:2 ../plugins/iradio/station-properties.ui.h:1
+#: ../data/ui/podcast-properties.ui.h:1 ../data/ui/song-info-multiple.ui.h:5
+#: ../data/ui/song-info.ui.h:6 ../plugins/iradio/station-properties.ui.h:1
 msgid "Basic"
 msgstr "��"
 
@@ -292,11 +283,6 @@ msgid "Media Player Properties"
 msgstr "�������"
 
 #: ../data/ui/media-player-properties.ui.h:8
-msgid "Removed files:"
-msgstr "已移é?¤æ??件ï¼?"
-
-#: ../data/ui/media-player-properties.ui.h:9
-#: ../sources/rb-media-player-source.c:100
 msgid "Sync"
 msgstr "å??æ­¥"
 
@@ -354,7 +340,7 @@ msgid "Site:"
 msgstr "ç½?ç«?ï¼?"
 
 #: ../data/ui/podcast-feed-properties.ui.h:5
-#: ../data/ui/podcast-properties.ui.h:5 ../data/ui/song-info.ui.h:5
+#: ../data/ui/podcast-properties.ui.h:5 ../data/ui/song-info.ui.h:9
 #: ../plugins/iradio/station-properties.ui.h:3
 msgid "Details"
 msgstr "ç»?è??"
@@ -413,7 +399,7 @@ msgstr "é??æ?©æ?­å®¢ç??æ??件夹"
 msgid "_Download location:"
 msgstr "ä¸?è½½å?°å??(_D)ï¼?"
 
-#: ../data/ui/podcast-properties.ui.h:2 ../data/ui/song-info.ui.h:3
+#: ../data/ui/podcast-properties.ui.h:2 ../data/ui/song-info.ui.h:7
 #: ../plugins/iradio/station-properties.ui.h:2
 msgid "Bitrate:"
 msgstr "æ¯?ç?¹ç??ï¼?"
@@ -426,7 +412,7 @@ msgstr "æ?¥æ??ï¼?"
 msgid "Download location:"
 msgstr "ä¸?è½½å?°å??ï¼?"
 
-#: ../data/ui/podcast-properties.ui.h:7 ../data/ui/song-info.ui.h:6
+#: ../data/ui/podcast-properties.ui.h:7 ../data/ui/song-info.ui.h:10
 msgid "Duration:"
 msgstr "���"
 
@@ -434,18 +420,18 @@ msgstr "���"
 msgid "Feed:"
 msgstr "���"
 
-#: ../data/ui/podcast-properties.ui.h:9 ../data/ui/song-info.ui.h:10
+#: ../data/ui/podcast-properties.ui.h:9 ../data/ui/song-info.ui.h:14
 #: ../plugins/iradio/station-properties.ui.h:6
 msgid "Last played:"
 msgstr "�次���"
 
-#: ../data/ui/podcast-properties.ui.h:10 ../data/ui/song-info.ui.h:12
+#: ../data/ui/podcast-properties.ui.h:10 ../data/ui/song-info.ui.h:16
 #: ../plugins/iradio/station-properties.ui.h:7
 msgid "Play count:"
 msgstr "���计�"
 
-#: ../data/ui/podcast-properties.ui.h:13 ../data/ui/song-info-multiple.ui.h:9
-#: ../data/ui/song-info.ui.h:19 ../plugins/iradio/station-properties.ui.h:9
+#: ../data/ui/podcast-properties.ui.h:13 ../data/ui/song-info-multiple.ui.h:11
+#: ../data/ui/song-info.ui.h:24 ../plugins/iradio/station-properties.ui.h:9
 msgid "_Rating:"
 msgstr "è¯?å??(_R)ï¼?"
 
@@ -453,65 +439,97 @@ msgstr "è¯?å??(_R)ï¼?"
 msgid "Albu_m sort order:"
 msgstr "æ??ä¸?è¾?æ??åº?(_M)ï¼?"
 
-#: ../data/ui/song-info-multiple.ui.h:3 ../data/ui/song-info.ui.h:13
-msgid "Sorting"
-msgstr "æ­£å?¨æ??åº?"
+#: ../data/ui/song-info-multiple.ui.h:2 ../data/ui/song-info.ui.h:2
+msgid "Albu_m:"
+msgstr "��(_M)�"
+
+#: ../data/ui/song-info-multiple.ui.h:3 ../data/ui/song-info.ui.h:3
+msgid "Album a_rtist sort order:"
+msgstr "ä¸?è¾?è?ºäººæ??åº?(_R)ï¼?"
 
-#: ../data/ui/song-info-multiple.ui.h:4 ../data/ui/song-info.ui.h:14
-msgid "_Album:"
-msgstr "��(_A)�"
+#: ../data/ui/song-info-multiple.ui.h:4 ../data/ui/song-info.ui.h:4
+msgid "Album a_rtist:"
+msgstr "���人(_R)�"
 
-#: ../data/ui/song-info-multiple.ui.h:5 ../data/ui/song-info.ui.h:15
+#: ../data/ui/song-info-multiple.ui.h:6 ../data/ui/song-info.ui.h:17
+msgid "Sorting"
+msgstr "æ??åº?"
+
+#: ../data/ui/song-info-multiple.ui.h:7 ../data/ui/song-info.ui.h:19
 msgid "_Artist sort order:"
 msgstr "æ??è?ºäººæ??åº?(_A)ï¼?"
 
-#: ../data/ui/song-info-multiple.ui.h:6 ../data/ui/song-info.ui.h:16
+#: ../data/ui/song-info-multiple.ui.h:8 ../data/ui/song-info.ui.h:20
 #: ../plugins/audiocd/album-info.ui.h:3
 msgid "_Artist:"
 msgstr "�人(_A)�"
 
-#: ../data/ui/song-info-multiple.ui.h:7 ../data/ui/song-info.ui.h:17
+#: ../data/ui/song-info-multiple.ui.h:9 ../data/ui/song-info.ui.h:22
 msgid "_Disc number:"
 msgstr "ç??ç??åº?å?·(_D)ï¼?"
 
-#: ../data/ui/song-info-multiple.ui.h:8 ../data/ui/song-info.ui.h:18
+#: ../data/ui/song-info-multiple.ui.h:10 ../data/ui/song-info.ui.h:23
 #: ../plugins/audiocd/album-info.ui.h:5
 #: ../plugins/iradio/station-properties.ui.h:8
 msgid "_Genre:"
 msgstr "æµ?æ´¾(_G)ï¼?"
 
-#: ../data/ui/song-info-multiple.ui.h:10 ../data/ui/song-info.ui.h:22
+#: ../data/ui/song-info-multiple.ui.h:12 ../data/ui/song-info.ui.h:26
 #: ../plugins/audiocd/album-info.ui.h:6
 msgid "_Year:"
 msgstr "年份(_Y)�"
 
-#: ../data/ui/song-info.ui.h:4
+#: ../data/ui/song-info.ui.h:5
+msgid "BPM:"
+msgstr "BPMï¼?"
+
+#: ../data/ui/song-info.ui.h:8
 msgid "Date added:"
 msgstr "æ·»å? ç??æ?¥æ??ï¼?"
 
-#: ../data/ui/song-info.ui.h:7 ../plugins/iradio/station-properties.ui.h:4
+#: ../data/ui/song-info.ui.h:11 ../plugins/iradio/station-properties.ui.h:4
 msgid "Error message"
 msgstr "é??误æ¶?æ?¯"
 
-#: ../data/ui/song-info.ui.h:8
+#: ../data/ui/song-info.ui.h:12
 msgid "File name:"
 msgstr "æ??件å??ï¼?"
 
-#: ../data/ui/song-info.ui.h:9
+#: ../data/ui/song-info.ui.h:13
 msgid "File size:"
 msgstr "æ??件大å°?ï¼?"
 
-#: ../data/ui/song-info.ui.h:11
+#: ../data/ui/song-info.ui.h:15
 msgid "Location:"
 msgstr "�置�"
 
-#: ../data/ui/song-info.ui.h:20 ../plugins/iradio/station-properties.ui.h:10
+#: ../data/ui/song-info.ui.h:18
+msgid "Track _number:"
+msgstr "����(_N)�"
+
+#: ../data/ui/song-info.ui.h:21
+msgid "_Comment:"
+msgstr "注é??(_C)ï¼?"
+
+#: ../data/ui/song-info.ui.h:25 ../plugins/iradio/station-properties.ui.h:10
 msgid "_Title:"
 msgstr "��(_T)�"
 
-#: ../data/ui/song-info.ui.h:21
-msgid "_Track number:"
-msgstr "����(_T)�"
+#: ../data/ui/sync-state.ui.h:1
+msgid "Added files:"
+msgstr "æ?°å¢?æ??件ï¼?"
+
+#: ../data/ui/sync-state.ui.h:2
+msgid "Contents after sync"
+msgstr "å??æ­¥å??ç??å??容"
+
+#: ../data/ui/sync-state.ui.h:3
+msgid "Current contents"
+msgstr "å½?å??å??容"
+
+#: ../data/ui/sync-state.ui.h:4
+msgid "Removed files:"
+msgstr "å·²å? é?¤æ??件ï¼?"
 
 #: ../data/playlists.xml.in.h:1
 msgid "My Top Rated"
@@ -527,8 +545,8 @@ msgstr "æ??è¿?æ?­æ?¾"
 
 #: ../data/rhythmbox.desktop.in.in.h:1
 #: ../plugins/status-icon/rb-status-icon-plugin.c:59
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1529 ../shell/rb-shell.c:1181
-#: ../shell/rb-shell.c:2179
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1511 ../shell/rb-shell.c:1220
+#: ../shell/rb-shell.c:2196
 msgid "Music Player"
 msgstr "�����"
 
@@ -555,56 +573,56 @@ msgstr "æ??件ä¸?æ?¯æ??æ??ç?? .desktop æ??件"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "æ? æ³?è¯?å?«ç??æ¡?é?¢æ??件ç??æ?¬â??%sâ??"
 
-#: ../lib/eggdesktopfile.c:958
+#: ../lib/eggdesktopfile.c:968
 #, c-format
 msgid "Starting %s"
 msgstr "正��� %s"
 
-#: ../lib/eggdesktopfile.c:1100
+#: ../lib/eggdesktopfile.c:1110
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "åº?ç?¨ç¨?åº?å?¨å?½ä»¤è¡?中ä¸?æ?¥å??æ??æ¡£"
 
-#: ../lib/eggdesktopfile.c:1168
+#: ../lib/eggdesktopfile.c:1178
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "æ? æ³?è¯?å?«ç??å?¯å?¨é??项ï¼?%d"
 
-#: ../lib/eggdesktopfile.c:1373
+#: ../lib/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "ä¸?è?½ä¼ é??æ??æ¡£ URI å?° â??Type=Linkâ?? (é?¾æ?¥ç±»å??)æ¡?é?¢å?¥å?£"
+msgstr "æ? æ³?ä¼ é??æ??æ¡£ URI å?°â??Type=Linkâ??(é?¾æ?¥ç±»å??)æ¡?é?¢å?¥å?£"
 
-#: ../lib/eggdesktopfile.c:1392
+#: ../lib/eggdesktopfile.c:1404
 #, c-format
 msgid "Not a launchable item"
 msgstr "ä¸?æ?¯å?¯è¿?è¡?ç??项ç?®"
 
-#: ../lib/eggsmclient.c:225
+#: ../lib/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "ç¦?æ­¢è¿?æ?¥å?°ä¼?è¯?管ç??å?¨"
 
-#: ../lib/eggsmclient.c:228
+#: ../lib/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "æ??å®?ä¿?å­?é??ç½®ç??æ??件"
 
-#: ../lib/eggsmclient.c:228
+#: ../lib/eggsmclient.c:229
 msgid "FILE"
 msgstr "æ??件"
 
-#: ../lib/eggsmclient.c:231
+#: ../lib/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "æ??å®?ä¼?è¯?管ç?? ID"
 
-#: ../lib/eggsmclient.c:231
+#: ../lib/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../lib/eggsmclient.c:252
+#: ../lib/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "ä¼?è¯?管ç??é??项ï¼?"
 
-#: ../lib/eggsmclient.c:253
+#: ../lib/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "æ?¾ç¤ºä¼?è¯?管ç??é??项"
 
@@ -651,17 +669,15 @@ msgstr "%Yå¹´%mæ??%dæ?¥"
 #: ../lib/rb-util.c:1024
 #: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:98
 #: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:100
-#: ../plugins/artdisplay/artdisplay/CoverArtDatabase.py:179
-#: ../plugins/artdisplay/artdisplay/CoverArtDatabase.py:180
-#: ../plugins/artdisplay/artdisplay/LastFMCoverArtSearch.py:126
-#: ../plugins/artdisplay/artdisplay/LastFMCoverArtSearch.py:130
-#: ../plugins/audiocd/rb-audiocd-source.c:503
+#: ../plugins/artdisplay/artdisplay/LastFMCoverArtSearch.py:128
+#: ../plugins/artdisplay/artdisplay/LastFMCoverArtSearch.py:132
+#: ../plugins/audiocd/rb-audiocd-source.c:492
 #: ../plugins/audioscrobbler/rb-audioscrobbler-entry.c:94
 #: ../plugins/audioscrobbler/rb-audioscrobbler-entry.c:101
 #: ../plugins/audioscrobbler/rb-audioscrobbler.c:475
 #: ../plugins/audioscrobbler/rb-audioscrobbler.c:479
-#: ../plugins/daap/rb-daap-connection.c:699
-#: ../plugins/generic-player/rb-generic-player-source.c:993
+#: ../plugins/daap/rb-rhythmdb-dmap-db-adapter.c:119
+#: ../plugins/generic-player/rb-generic-player-source.c:1005
 #: ../plugins/ipod/rb-ipod-source.c:404
 #: ../plugins/jamendo/jamendo/JamendoSaxHandler.py:67
 #: ../plugins/iradio/rb-iradio-source.c:520
@@ -669,23 +685,24 @@ msgstr "%Yå¹´%mæ??%dæ?¥"
 #: ../plugins/iradio/rb-station-properties-dialog.c:488
 #: ../plugins/lyrics/lyrics/__init__.py:81
 #: ../plugins/lyrics/lyrics/__init__.py:83
-#: ../plugins/mtpdevice/rb-mtp-source.c:636
-#: ../plugins/mtpdevice/rb-mtp-source.c:1085
-#: ../plugins/mtpdevice/rb-mtp-source.c:1368
+#: ../plugins/mtpdevice/rb-mtp-source.c:640
+#: ../plugins/mtpdevice/rb-mtp-source.c:1118
+#: ../plugins/mtpdevice/rb-mtp-source.c:1514
 #: ../plugins/status-icon/rb-status-icon-plugin.c:782
 #: ../podcast/rb-feed-podcast-properties-dialog.c:341
-#: ../podcast/rb-podcast-manager.c:1918
+#: ../podcast/rb-podcast-manager.c:1908
 #: ../podcast/rb-podcast-properties-dialog.c:601
 #: ../podcast/rb-podcast-properties-dialog.c:696
-#: ../remote/dbus/rb-client.c:142 ../rhythmdb/rhythmdb-tree.c:1295
-#: ../rhythmdb/rhythmdb-tree.c:1299 ../rhythmdb/rhythmdb-tree.c:1303
-#: ../rhythmdb/rhythmdb-tree.c:1307 ../rhythmdb/rhythmdb.c:2050
-#: ../rhythmdb/rhythmdb.c:2056 ../rhythmdb/rhythmdb.c:2061
-#: ../shell/rb-shell-player.c:1720 ../sources/rb-podcast-source.c:1659
-#: ../widgets/rb-entry-view.c:1057 ../widgets/rb-entry-view.c:1079
-#: ../widgets/rb-entry-view.c:1533 ../widgets/rb-entry-view.c:1545
-#: ../widgets/rb-entry-view.c:1557 ../widgets/rb-song-info.c:897
-#: ../widgets/rb-song-info.c:1089 ../widgets/rb-song-info.c:1428
+#: ../remote/dbus/rb-client.c:142 ../rhythmdb/rhythmdb-tree.c:1339
+#: ../rhythmdb/rhythmdb-tree.c:1343 ../rhythmdb/rhythmdb-tree.c:1347
+#: ../rhythmdb/rhythmdb-tree.c:1351 ../rhythmdb/rhythmdb.c:2059
+#: ../rhythmdb/rhythmdb.c:2065 ../rhythmdb/rhythmdb.c:2080
+#: ../shell/rb-shell-player.c:1729 ../sources/rb-podcast-source.c:1658
+#: ../widgets/rb-entry-view.c:1082 ../widgets/rb-entry-view.c:1104
+#: ../widgets/rb-entry-view.c:1572 ../widgets/rb-entry-view.c:1584
+#: ../widgets/rb-entry-view.c:1596 ../widgets/rb-song-info.c:925
+#: ../widgets/rb-song-info.c:937 ../widgets/rb-song-info.c:1158
+#: ../widgets/rb-song-info.c:1497
 msgid "Unknown"
 msgstr "��"
 
@@ -699,7 +716,7 @@ msgstr "��� %s 移�� %s�%s"
 msgid "Too many symlinks"
 msgstr "符���太�"
 
-#: ../lib/rb-file-helpers.c:1226
+#: ../lib/rb-file-helpers.c:1235
 #, c-format
 msgid "Cannot get free space at %s: %s"
 msgstr "æ? æ³?è?·å¾? %s ç??å?©ä½?空é?´ï¼?%s"
@@ -810,11 +827,11 @@ msgstr "Last.fm æ??ä¾?ç??å?¾å??"
 
 #: ../plugins/artdisplay/artdisplay/__init__.py:326
 msgid "Searching... drop artwork here"
-msgstr "æ­£å?¨æ??ç´¢... å°?ä½?å??æ??æ?¾å?°æ­¤å¤?"
+msgstr "æ­£å?¨æ??ç´¢... å°?ç¾?å·¥æ??æ?¾å?°æ­¤å¤?"
 
 #: ../plugins/artdisplay/artdisplay/__init__.py:331
 msgid "Drop artwork here"
-msgstr "å°?ä½?å??æ??æ?¾å?°æ­¤å¤?"
+msgstr "å°?ç¾?å·¥æ??æ?¾å?°æ­¤å¤?"
 
 #: ../plugins/audiocd/audiocd.rb-plugin.in.h:1
 msgid "Audio CD Player"
@@ -826,11 +843,11 @@ msgstr "æ?¯æ??以é?³ä¹?æº?ç??æ?¹å¼?æ?­æ?¾é?³é¢? CD"
 
 #: ../plugins/audiocd/album-info.ui.h:1
 msgid "A_lbum:"
-msgstr "��(_L)"
+msgstr "��(_L)�"
 
 #: ../plugins/audiocd/album-info.ui.h:2
 msgid "Artist s_ort order:"
-msgstr "æ??è?ºäººæ??åº?(_o)ï¼?"
+msgstr "æ??è?ºäººæ??åº?(_O)ï¼?"
 
 #: ../plugins/audiocd/album-info.ui.h:4
 msgid "_Disc:"
@@ -851,85 +868,85 @@ msgstr ""
 msgid "_Continue"
 msgstr "继续(_C)"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:152
+#: ../plugins/audiocd/rb-audiocd-source.c:150
 msgid "_Extract to Library"
 msgstr "æ??å??å?°åº?(_E)"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:153
+#: ../plugins/audiocd/rb-audiocd-source.c:151
 msgid "Copy tracks to the library"
 msgstr "���轨��中"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:156
+#: ../plugins/audiocd/rb-audiocd-source.c:154
 msgid "Reload"
 msgstr "é??æ?°å? è½½"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:157
+#: ../plugins/audiocd/rb-audiocd-source.c:155
 msgid "Reload Album Information"
 msgstr "é??æ?°å? è½½ä¸?è¾?ä¿¡æ?¯"
 
 #. Translators: this is the toolbar button label
 #. for Copy to Library action.
-#: ../plugins/audiocd/rb-audiocd-source.c:291
+#: ../plugins/audiocd/rb-audiocd-source.c:288
 msgid "Extract"
 msgstr "æ??å??"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:333
+#: ../plugins/audiocd/rb-audiocd-source.c:330
 msgid "Select tracks to be extracted"
 msgstr "é??æ?©è¦?æ??å??ç??é?³è½¨"
 
 #. Info bar for non-Musicbrainz data
-#: ../plugins/audiocd/rb-audiocd-source.c:374
+#: ../plugins/audiocd/rb-audiocd-source.c:361
 msgid "S_ubmit Album"
 msgstr "æ??交ä¸?è¾?(_U)"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:375
+#: ../plugins/audiocd/rb-audiocd-source.c:362
 msgid "Hide"
 msgstr "é??è??"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:377
+#: ../plugins/audiocd/rb-audiocd-source.c:364
 msgid "Could not find this album on MusicBrainz."
 msgstr "æ? æ³?å?¨ MusicBrainz ä¸?æ?¾å?°æ­¤ä¸?è¾?ã??"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:378
+#: ../plugins/audiocd/rb-audiocd-source.c:365
 msgid "You can improve the MusicBrainz database by adding this album."
 msgstr "æ?¨å?¯ä»¥é??è¿?æ·»å? æ­¤ä¸?è¾?æ?¹è¿? MusicBrainz æ?°æ?®åº?ã??"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:509
+#: ../plugins/audiocd/rb-audiocd-source.c:498
 msgid "<Invalid unicode>"
 msgstr "<æ? æ??ç?? Unicode>"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:553
+#: ../plugins/audiocd/rb-audiocd-source.c:542
 #, c-format
 msgid "Track %u"
 msgstr "第 %u ��轨"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:616
-#: ../plugins/audiocd/rb-audiocd-source.c:624
-#: ../plugins/audiocd/rb-audiocd-source.c:1015
+#: ../plugins/audiocd/rb-audiocd-source.c:605
+#: ../plugins/audiocd/rb-audiocd-source.c:613
+#: ../plugins/audiocd/rb-audiocd-source.c:1005
 msgid "Couldn't load Audio CD"
 msgstr "��载��� CD"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:617
+#: ../plugins/audiocd/rb-audiocd-source.c:606
 msgid "Rhythmbox couldn't access the CD."
 msgstr "Rhythmbox æ? æ³?访é?®è¯¥ CDã??"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:625
+#: ../plugins/audiocd/rb-audiocd-source.c:614
 msgid "Rhythmbox couldn't read the CD information."
 msgstr "Rhythmbox æ? æ³?读å??该 CD ä¿¡æ?¯ã??"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:726
-#: ../sources/rb-library-source.c:148 ../widgets/rb-entry-view.c:1489
+#: ../plugins/audiocd/rb-audiocd-source.c:715
+#: ../sources/rb-library-source.c:151 ../widgets/rb-entry-view.c:1518
 msgid "Title"
 msgstr "��"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:733
+#: ../plugins/audiocd/rb-audiocd-source.c:722
 #: ../plugins/context/context/ArtistTab.py:52
-#: ../sources/rb-library-source.c:139 ../widgets/rb-entry-view.c:1499
+#: ../sources/rb-library-source.c:142 ../widgets/rb-entry-view.c:1528
 #: ../widgets/rb-library-browser.c:141
 msgid "Artist"
 msgstr "�人"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:1016
+#: ../plugins/audiocd/rb-audiocd-source.c:1006
 msgid "Rhythmbox could not get access to the CD device."
 msgstr "Rhythmbox æ? æ³?è?·å¾?对 CD 驱å?¨å?¨ç??访é?®ã??"
 
@@ -1000,7 +1017,7 @@ msgid "Cannot read CD: %s"
 msgstr "æ? æ³?读å?? CDï¼?%s"
 
 #: ../plugins/audioscrobbler/audioscrobbler.rb-plugin.in.h:1
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:704
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:703
 msgid "Last.fm"
 msgstr "Last.fm"
 
@@ -1027,9 +1044,9 @@ msgstr "ä¸?次æ??交æ?¶é?´ï¼?"
 #: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:5
 #: ../plugins/audioscrobbler/rb-audioscrobbler.c:962
 #: ../plugins/iradio/rb-station-properties-dialog.c:499
-#: ../rhythmdb/rhythmdb.c:3740 ../widgets/rb-entry-view.c:1005
-#: ../widgets/rb-entry-view.c:1592 ../widgets/rb-entry-view.c:1605
-#: ../widgets/rb-song-info.c:1401
+#: ../rhythmdb/rhythmdb.c:3666 ../widgets/rb-entry-view.c:1030
+#: ../widgets/rb-entry-view.c:1631 ../widgets/rb-entry-view.c:1644
+#: ../widgets/rb-song-info.c:1470
 msgid "Never"
 msgstr "��"
 
@@ -1099,130 +1116,130 @@ msgstr "è¿?个ç??æ?¬ç?? Rhythmbox å·²ç»?被 Last.fm å±?è?½äº?ã??"
 msgid "Track submission failed too many times"
 msgstr "é?³è½¨æ??交失败ç??次æ?°å¤ªå¤?"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:191
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:190
 msgid "Similar Artists radio"
 msgstr "�似�人��"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:191
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:190
 #: ../plugins/audioscrobbler/rb-lastfm-source.c:1260
 #, c-format
 msgid "Artists similar to %s"
 msgstr "ä¸? %s ç?¸ä¼¼ç??è?ºäºº"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:192
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:191
 msgid "Tag radio"
 msgstr "�签��"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:192
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:191
 #, c-format
 msgid "Tracks tagged with %s"
 msgstr "带æ?? %s æ ?ç­¾ç??é?³è½¨"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:193
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:192
 msgid "Artist Fan radio"
 msgstr "�人����"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:193
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:192
 #: ../plugins/audioscrobbler/rb-lastfm-source.c:1262
 #, c-format
 msgid "Artists liked by fans of %s"
 msgstr "%s ç²?ä¸?æ??å??ç?±ç??è?ºäºº"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:193
 msgid "Group radio"
 msgstr "����"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:193
 #, c-format
 msgid "Tracks liked by the %s group"
 msgstr "%s å°?ç»?æ??ç?±ç??é?³è½¨"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
 msgid "Neighbour radio"
 msgstr "����"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
 #: ../plugins/audioscrobbler/rb-lastfm-source.c:1270
 #, c-format
 msgid "%s's Neighbour Radio"
 msgstr "%s ç??é?»å±?ç?µå?°"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
 msgid "Personal radio"
 msgstr "个人��"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
 #: ../plugins/audioscrobbler/rb-lastfm-source.c:1274
 #, c-format
 msgid "%s's Personal Radio"
 msgstr "%s ç??个人ç?µå?°"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
 msgid "Loved tracks"
 msgstr "å??ç?±ç??æ?²ç?®"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
 #: ../plugins/audioscrobbler/rb-lastfm-source.c:1276
 #, c-format
 msgid "%s's Loved Tracks"
 msgstr "%s ç??å??ç?±æ?²ç?®"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
 msgid "Recommended tracks"
 msgstr "æ?¨è??æ?²ç?®"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
 #, c-format
 msgid "Tracks recommended to %s"
 msgstr "æ?¨è??ç»? %s ç??æ?²ç?®"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
 msgid "Playlist"
 msgstr "æ?­æ?¾å??表"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
 #, c-format
 msgid "%s's playlist"
 msgstr "%s ç??æ?­æ?¾å??表 "
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:283
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:282
 msgid "Love"
 msgstr "å??ç?±"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:284
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:283
 msgid "Mark this song as loved"
 msgstr "æ ?è®°æ?¬æ­?æ?²ä¸ºå??ç?±ç??"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:286
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:285
 msgid "Ban"
 msgstr "�止"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:287
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:286
 msgid "Ban the current track from being played again"
 msgstr "ç¦?æ­¢å½?å??æ?²ç?®å??次æ?­æ?¾"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:289
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:288
 msgid "Delete Station"
 msgstr "����"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:290
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:289
 msgid "Delete the selected station"
 msgstr "å? é?¤é??中ç??ç?µå?°"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:292
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:291
 msgid "Download song"
 msgstr "�载��"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:293
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:292
 msgid "Download this song"
 msgstr "�载���"
 
 #. awful
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:496
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:495
 msgid "Enter the item to build a Last.fm station out of:"
 msgstr "å??å? è¯¥é¡¹ç?®å»ºç«?ä¸?个 Last.fm ç?µå?°ï¼?"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:499
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:498
 msgid "Add"
 msgstr "添�"
 
@@ -1570,6 +1587,8 @@ msgid "This may result in an unusable disc."
 msgstr "è¿?å?¯è?½å¯¼è?´åº?ç??ã??"
 
 #: ../plugins/cd-recorder/rb-playlist-source-recorder.c:810
+#: ../shell/rb-track-transfer-queue.c:142
+#: ../shell/rb-track-transfer-queue.c:402
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
@@ -1893,10 +1912,6 @@ msgstr "å?±äº«é?³ä¹?å??(_N)ï¼?"
 msgid "_Share my music"
 msgstr "å?±äº«æ??ç??é?³ä¹?(_S)"
 
-#: ../plugins/daap/rb-daap-connection.c:544
-msgid "Rhythmbox is not able to connect to iTunes 7 shares"
-msgstr "Rhythmbox ����� iTunes 7 �享"
-
 #: ../plugins/daap/rb-daap-dialog.c:55
 msgid "Invalid share name"
 msgstr "æ? æ??ç??å?±äº«å??"
@@ -1906,91 +1921,53 @@ msgstr "æ? æ??ç??å?±äº«å??"
 msgid "The shared music name '%s' is already taken. Please choose another."
 msgstr "å?±äº«é?³ä¹?å??â??%sâ??å·²ç»?使ç?¨äº?ã??请å?¦é??ä¸?个ã??"
 
-#: ../plugins/daap/rb-daap-mdns-browser-avahi.c:237
-#: ../plugins/daap/rb-daap-mdns-browser-avahi.c:280
-msgid "mDNS service is not running"
-msgstr "mDNS æ??å?¡æ?ªè¿?è¡?"
-
-#: ../plugins/daap/rb-daap-mdns-browser-avahi.c:245
-msgid "Browser already active"
-msgstr "���已�活"
-
-#: ../plugins/daap/rb-daap-mdns-browser-avahi.c:263
-msgid "Unable to activate browser"
-msgstr "���活���"
-
-#: ../plugins/daap/rb-daap-mdns-browser-avahi.c:288
-msgid "Browser is not active"
-msgstr "æµ?è§?å?¨æ²¡æ??æ¿?æ´»"
-
-#: ../plugins/daap/rb-daap-mdns-publisher-avahi.c:130
-msgid "Could not create AvahiEntryGroup for publishing"
-msgstr "æ? æ³?为å??å¸?å??建 AvahiEntryGroup"
-
-#: ../plugins/daap/rb-daap-mdns-publisher-avahi.c:164
-msgid "Could not add service"
-msgstr "æ? æ³?æ·»å? æ??å?¡"
-
-#: ../plugins/daap/rb-daap-mdns-publisher-avahi.c:176
-msgid "Could not commit service"
-msgstr "æ? æ³?æ??交æ??å?¡"
-
-#: ../plugins/daap/rb-daap-mdns-publisher-avahi.c:281
-#: ../plugins/daap/rb-daap-mdns-publisher-avahi.c:301
-msgid "The avahi mDNS service is not running"
-msgstr "avahi mDNS æ??å?¡æ²¡æ??è¿?è¡?"
-
-#: ../plugins/daap/rb-daap-mdns-publisher-avahi.c:310
-msgid "The mDNS service is not published"
-msgstr "mDNS æ??å?¡æ?ªå??å¸?"
-
-#: ../plugins/daap/rb-daap-plugin.c:125
+#: ../plugins/daap/rb-daap-plugin.c:129
 msgid "Connect to _DAAP share..."
 msgstr "��� DAAP �享(_D)..."
 
-#: ../plugins/daap/rb-daap-plugin.c:126
+#: ../plugins/daap/rb-daap-plugin.c:130
 msgid "Connect to a new DAAP share"
 msgstr "è¿?æ?¥å?°æ?°ç?? DAAP å?±äº«"
 
-#: ../plugins/daap/rb-daap-plugin.c:132
+#: ../plugins/daap/rb-daap-plugin.c:136
 msgid "_Disconnect"
 msgstr "æ?­å¼?è¿?æ?¥(_D)"
 
-#: ../plugins/daap/rb-daap-plugin.c:133
+#: ../plugins/daap/rb-daap-plugin.c:137
 msgid "Disconnect from DAAP share"
 msgstr "� DAAP �享����"
 
-#: ../plugins/daap/rb-daap-plugin.c:657
+#: ../plugins/daap/rb-daap-plugin.c:680
 msgid "New DAAP share"
 msgstr "�建 DAAP �享"
 
-#: ../plugins/daap/rb-daap-plugin.c:657
+#: ../plugins/daap/rb-daap-plugin.c:680
 msgid "Host:port of DAAP share:"
 msgstr "DAAP å??享ç??主æ?º:端å?£ï¼?"
 
-#: ../plugins/daap/rb-daap-plugin.c:879
+#: ../plugins/daap/rb-daap-plugin.c:902
 msgid "DAAP Music Sharing Preferences"
 msgstr "DAAP é?³ä¹?å?±äº«é¦?é??项"
 
-#: ../plugins/daap/rb-daap-sharing.c:62
+#: ../plugins/daap/rb-daap-sharing.c:65
 #, c-format
 msgid "%s's Music"
 msgstr "%s ç??é?³ä¹?"
 
-#: ../plugins/daap/rb-daap-source.c:352
+#: ../plugins/daap/rb-daap-source.c:354
 #, c-format
 msgid "The music share '%s' requires a password to connect"
 msgstr "é?³ä¹?å?±äº«â??%sâ??é??è¦?å¯?ç ?æ??è?½è¿?æ?¥"
 
-#: ../plugins/daap/rb-daap-source.c:458
+#: ../plugins/daap/rb-daap-source.c:460
 msgid "Connecting to music share"
 msgstr "正�������享"
 
-#: ../plugins/daap/rb-daap-source.c:465
+#: ../plugins/daap/rb-daap-source.c:467
 msgid "Retrieving songs from music share"
 msgstr "æ­£å?¨ä»?é?³ä¹?å?±äº«ä¸­è?·å??é?³ä¹?"
 
-#: ../plugins/daap/rb-daap-source.c:552
+#: ../plugins/daap/rb-daap-source.c:554
 msgid "Could not connect to shared music"
 msgstr "æ? æ³?è¿?æ?¥å?°å?±äº«ç??é?³ä¹?"
 
@@ -2086,19 +2063,19 @@ msgstr "å? é?¤æ­¤æ?­æ?¾å??表"
 
 #: ../plugins/generic-player/rb-generic-player-plugin.c:101
 #: ../plugins/ipod/rb-ipod-plugin.c:106
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:129 ../shell/rb-shell-clipboard.c:190
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:125 ../shell/rb-shell-clipboard.c:190
 #: ../sources/rb-podcast-source.c:314
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
 #: ../plugins/generic-player/rb-generic-player-plugin.c:102
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:130
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:126
 msgid "Display device properties"
 msgstr "�示设���"
 
-#: ../plugins/generic-player/rb-generic-player-source.c:1282
-#: ../plugins/ipod/rb-ipod-source.c:1913
-#: ../plugins/mtpdevice/rb-mtp-source.c:1463
+#: ../plugins/generic-player/rb-generic-player-source.c:1294
+#: ../plugins/ipod/rb-ipod-source.c:1931
+#: ../plugins/mtpdevice/rb-mtp-source.c:1608
 msgid "Advanced"
 msgstr "�级"
 
@@ -2218,7 +2195,7 @@ msgid "Unable to initialize new iPod"
 msgstr "æ? æ³?å??å§?å??æ?° iPod"
 
 #: ../plugins/ipod/rb-ipod-plugin.c:103 ../plugins/ipod/rb-ipod-plugin.c:112
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:126 ../shell/rb-playlist-manager.c:182
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:122 ../shell/rb-playlist-manager.c:182
 msgid "_Rename"
 msgstr "é??å?½å??(_R)"
 
@@ -2251,13 +2228,14 @@ msgstr "å? é?¤(_D)"
 msgid "Delete playlist"
 msgstr "å? é?¤æ?­æ?¾å??表"
 
-#: ../plugins/ipod/rb-ipod-source.c:1422
-#: ../sources/rb-media-player-source.c:627
-#: ../sources/rb-media-player-source.c:628 ../sources/rb-podcast-source.c:834
+#: ../plugins/ipod/rb-ipod-source.c:1437 ../sources/rb-podcast-source.c:833
+#: ../sources/sync/rb-sync-settings-ui.c:261
+#: ../sources/sync/rb-sync-settings-ui.c:262
+#: ../sources/sync/rb-sync-state-ui.c:78
 msgid "Podcasts"
 msgstr "�客"
 
-#: ../plugins/ipod/rb-ipod-source.c:1803
+#: ../plugins/ipod/rb-ipod-source.c:1821
 msgid "New playlist"
 msgstr "æ?°å»ºæ?­æ?¾å??表"
 
@@ -2433,7 +2411,7 @@ msgctxt "Radio"
 msgid "New"
 msgstr "æ?°ç??"
 
-#: ../plugins/iradio/rb-iradio-source.c:351 ../widgets/rb-entry-view.c:1519
+#: ../plugins/iradio/rb-iradio-source.c:351 ../widgets/rb-entry-view.c:1548
 #: ../widgets/rb-library-browser.c:140
 msgid "Genre"
 msgstr "æµ?æ´¾"
@@ -2460,14 +2438,14 @@ msgstr "Internet �� URL�"
 #: ../plugins/iradio/rb-station-properties-dialog.c:398
 #: ../podcast/rb-feed-podcast-properties-dialog.c:216
 #: ../podcast/rb-podcast-properties-dialog.c:486
-#: ../sources/rb-media-player-source.c:533 ../widgets/rb-song-info.c:1022
+#: ../sources/rb-media-player-source.c:392 ../widgets/rb-song-info.c:1083
 #, c-format
 msgid "%s Properties"
 msgstr "%s å±?æ?§"
 
 #: ../plugins/iradio/rb-station-properties-dialog.c:490
 #: ../podcast/rb-podcast-properties-dialog.c:599
-#: ../widgets/rb-entry-view.c:1083 ../widgets/rb-song-info.c:1091
+#: ../widgets/rb-entry-view.c:1108 ../widgets/rb-song-info.c:1160
 #, c-format
 msgid "%lu kbps"
 msgstr "%lu kbps"
@@ -2528,26 +2506,30 @@ msgstr "为正å?¨æ?­æ?¾ç??æ­?æ?²æ?¾ç¤ºæ­?è¯?"
 msgid "Choose lyrics folder..."
 msgstr "é??æ?©æ­?è¯?æ??件夹..."
 
-#: ../plugins/lyrics/lyrics/LyricsSites.py:35
+#: ../plugins/lyrics/lyrics/LyricsSites.py:36
 msgid "Lyrc (lyrc.com.ar)"
 msgstr "Lyrc (lyrc.com.ar)"
 
-#: ../plugins/lyrics/lyrics/LyricsSites.py:36
+#: ../plugins/lyrics/lyrics/LyricsSites.py:37
 msgid "Astraweb (www.astraweb.com)"
 msgstr "Astraweb (www.astraweb.com)"
 
-#: ../plugins/lyrics/lyrics/LyricsSites.py:37
+#: ../plugins/lyrics/lyrics/LyricsSites.py:38
 msgid "Leo's Lyrics (www.leoslyrics.com)"
 msgstr "Leo's Lyrics (www.leoslyrics.com)"
 
-#: ../plugins/lyrics/lyrics/LyricsSites.py:38
+#: ../plugins/lyrics/lyrics/LyricsSites.py:39
 msgid "WinampCN (www.winampcn.com)"
 msgstr "ä¹?è¾? WinampCN (www.winampcn.com)"
 
-#: ../plugins/lyrics/lyrics/LyricsSites.py:39
+#: ../plugins/lyrics/lyrics/LyricsSites.py:40
 msgid "TerraBrasil (terra.com.br)"
 msgstr "TerraBrasil (terra.com.br)"
 
+#: ../plugins/lyrics/lyrics/LyricsSites.py:41
+msgid "Dark Lyrics (darklyrics.com)"
+msgstr "Dark Lyrics (darklyrics.com)"
+
 #: ../plugins/lyrics/lyrics.rb-plugin.in.h:1
 msgid "Fetch song lyrics from the Internet"
 msgstr "ä»? Internet ä¸?è?·å??æ­?è¯?"
@@ -2947,7 +2929,7 @@ msgstr ""
 "%s"
 
 #: ../plugins/magnatune/magnatune/MagnatuneSource.py:462
-#: ../widgets/rb-entry-view.c:1643
+#: ../widgets/rb-entry-view.c:1692
 msgid "Error"
 msgstr "é??误"
 
@@ -3021,55 +3003,51 @@ msgstr "便���� - MTP"
 msgid "Support for MTP devices (show the content, transfer, play from device)"
 msgstr "æ?¯æ?? MTP 设å¤? (æ?¾ç¤ºå??容ï¼?ä¼ è¾?å??ä»?设å¤?è¿?è¡?æ?­æ?¾)"
 
-#: ../plugins/mtpdevice/rb-mtp-gst-sink.c:154
-#: ../plugins/mtpdevice/rb-mtp-thread.c:466
+#: ../plugins/mtpdevice/rb-mtp-gst-sink.c:157
+#: ../plugins/mtpdevice/rb-mtp-thread.c:543
 #, c-format
 msgid "Unable to open temporary file: %s"
 msgstr "æ? æ³?æ??å¼?临æ?¶æ??件ï¼?%s"
 
 #: ../plugins/mtpdevice/rb-mtp-plugin.c:123
-#: ../shell/rb-removable-media-manager.c:172
-msgid "_Eject"
-msgstr "弹�(_E)"
-
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:124
-msgid "Eject MTP-device"
-msgstr "弹� MTP 设�"
-
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:127
 msgid "Rename MTP-device"
 msgstr "é??å?½å?? MTP 设å¤?"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:850
-#: ../plugins/mtpdevice/rb-mtp-thread.c:749
+#: ../plugins/mtpdevice/rb-mtp-source.c:854
+#: ../plugins/mtpdevice/rb-mtp-thread.c:851
 msgid "Media player device error"
 msgstr "åª?ä½?æ?­æ?¾è®¾å¤?å?ºé??"
 
 #. Translators: first %s is the device manufacturer,
 #. * second is the product name.
 #.
-#: ../plugins/mtpdevice/rb-mtp-source.c:854
+#: ../plugins/mtpdevice/rb-mtp-source.c:858
 #, c-format
 msgid "Unable to open the %s %s device"
 msgstr "æ? æ³?æ??å¼? %s %s 设å¤?"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:886
+#: ../plugins/mtpdevice/rb-mtp-source.c:902
 msgid "Digital Audio Player"
 msgstr "�������"
 
-#: ../plugins/mtpdevice/rb-mtp-thread.c:421
-#: ../plugins/mtpdevice/rb-mtp-thread.c:479
-#: ../plugins/mtpdevice/rb-mtp-thread.c:497
+#: ../plugins/mtpdevice/rb-mtp-thread.c:498
+#: ../plugins/mtpdevice/rb-mtp-thread.c:556
+#: ../plugins/mtpdevice/rb-mtp-thread.c:574
 #, c-format
 msgid "Unable to copy file from MTP device: %s"
 msgstr "æ? æ³?ä»? MTP 设å¤?å¤?å?¶æ??件ï¼? %s"
 
-#: ../plugins/mtpdevice/rb-mtp-thread.c:442
+#: ../plugins/mtpdevice/rb-mtp-thread.c:519
 #, c-format
 msgid "Not enough space in %s"
 msgstr "å?¨ %s 没æ??足å¤?空é?´"
 
-#: ../plugins/mtpdevice/rb-mtp-thread.c:521
+#: ../plugins/mtpdevice/rb-mtp-thread.c:600
+#, c-format
+msgid "No space left on MTP device"
+msgstr "MTP 设å¤?ä¸?没æ??å?©ä½?ç??空é?´"
+
+#: ../plugins/mtpdevice/rb-mtp-thread.c:603
 #, c-format
 msgid "Unable to send file to MTP device: %s"
 msgstr "æ? æ³?å??é??æ??件å?° MTP 设å¤?ï¼? %s"
@@ -3381,25 +3359,25 @@ msgstr "æ¡?é?¢"
 msgid "Window"
 msgstr "��"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:727
+#: ../plugins/visualizer/rb-visualizer-plugin.c:709
 #, c-format
 msgid "Unable to start video output"
 msgstr "��������"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:762
+#: ../plugins/visualizer/rb-visualizer-plugin.c:744
 #, c-format
 msgid "Failed to link new visual effect into the GStreamer pipeline"
 msgstr "æ? æ³?é?¾æ?¥æ?°è§?è§?æ??æ??å?° GStreamer æµ?水线"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:810
+#: ../plugins/visualizer/rb-visualizer-plugin.c:792
 msgid "Unable to start visualization"
 msgstr "æ? æ³?å?¯å?¨è§?è§?æ??æ??"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1395
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1377
 msgid "Enable visual effects?"
 msgstr "å?¯ç?¨è§?è§?æ??æ??ï¼?"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1397
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1379
 msgid ""
 "It seems you are running Rhythmbox remotely.\n"
 "Are you sure you want to enable the visual effects?"
@@ -3407,7 +3385,7 @@ msgstr ""
 "æ?¨ä¼¼ä¹?æ­£å?¨è¿?端è¿?è¡? Rhythmboxã??\n"
 "æ?¨ç¡®å®?æ?³å?¯ç?¨è§?è§?æ??æ??å??ï¼?"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1731
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1713
 msgid "Music Player Visualization"
 msgstr "é?³ä¹?æ?­æ?¾å?¨è§?è§?æ??æ??"
 
@@ -3439,37 +3417,37 @@ msgstr "æ?¾ç¤ºè§?è§?æ??æ??"
 msgid "Visualization"
 msgstr "è§?è§?æ??æ??"
 
-#: ../podcast/rb-podcast-manager.c:835
+#: ../podcast/rb-podcast-manager.c:824
 msgid "Error creating podcast download directory"
 msgstr "å??建æ?­å®¢ä¸?è½½ç?®å½?æ?¶å?ºé??"
 
-#: ../podcast/rb-podcast-manager.c:836
+#: ../podcast/rb-podcast-manager.c:825
 #, c-format
 msgid "Unable to create the download directory for %s: %s"
 msgstr "æ? æ³?为 %s å??建ä¸?è½½ç?®å½?ï¼?%s"
 
-#: ../podcast/rb-podcast-manager.c:961
+#: ../podcast/rb-podcast-manager.c:950
 msgid "Invalid URL"
 msgstr "æ? æ??ç?? URL"
 
-#: ../podcast/rb-podcast-manager.c:962
+#: ../podcast/rb-podcast-manager.c:951
 #, c-format
 msgid "The URL \"%s\" is not valid, please check it."
 msgstr "URLâ??%sâ??æ? æ??ï¼?请æ£?æ?¥ã??"
 
 #. added as something else, probably iradio
-#: ../podcast/rb-podcast-manager.c:972
+#: ../podcast/rb-podcast-manager.c:961
 msgid "URL already added"
 msgstr "URL 已添��"
 
-#: ../podcast/rb-podcast-manager.c:973
+#: ../podcast/rb-podcast-manager.c:962
 #, c-format
 msgid ""
 "The URL \"%s\" has already been added as a radio station. If this is a "
 "podcast feed, please remove the radio station."
 msgstr "URL â??%sâ?? 已添å? ä¸ºä¸?个ç?µå?°ï¼?å¦?æ??è¿?æ?¯ä¸?个æ?­å®¢ç§?å­?ï¼?请å? é?¤å??ç?µå?°ã??"
 
-#: ../podcast/rb-podcast-manager.c:1041
+#: ../podcast/rb-podcast-manager.c:1030
 #, c-format
 msgid ""
 "The URL '%s' does not appear to be a podcast feed. It may be the wrong URL, "
@@ -3479,11 +3457,11 @@ msgstr ""
 "URLâ??%sâ??ä¸?å??æ?¯ä¸?个æ?­å®¢ç§?å­?ã??ä¹?许æ?¯ä¸ªé??误ç?? URLï¼?æ??è??ç§?å­?å·²æ??å??ã??æ?¨å¸?æ?? "
 "Rhythmbox æ? è®ºå¦?ä½?é?½è¯?ç??使ç?¨å®?å??ï¼?"
 
-#: ../podcast/rb-podcast-manager.c:1179
+#: ../podcast/rb-podcast-manager.c:1168
 msgid "Podcast"
 msgstr "�客"
 
-#: ../podcast/rb-podcast-manager.c:2101
+#: ../podcast/rb-podcast-manager.c:2091
 #, c-format
 msgid "There was a problem adding this podcast: %s.  Please verify the URL: %s"
 msgstr "æ·»å? è¯¥æ?­å®¢æ?¶å?ºç?°é?®é¢?ï¼?%sã??请æ£?æ?¥ URLï¼? %s"
@@ -3510,7 +3488,7 @@ msgstr "该ç§?å­?ä¸?å??å?«ä»»ä½?å?¯ä¸?载项ç?®"
 
 #: ../podcast/rb-podcast-properties-dialog.c:176
 msgid "Unable to display requested URI"
-msgstr ""
+msgstr "æ? æ³?æ?¾ç¤ºæ??请æ±?ç?? URI"
 
 #: ../podcast/rb-podcast-properties-dialog.c:549
 msgid "Not Downloaded"
@@ -3520,7 +3498,7 @@ msgstr "��载"
 msgid "Don't start a new instance of Rhythmbox"
 msgstr "ä¸?è¦?å¼?å§?ä¸?个æ?°ç?? Rhythmbox å®?ä¾?"
 
-#: ../remote/dbus/rb-client.c:83 ../shell/main.c:118
+#: ../remote/dbus/rb-client.c:83 ../shell/main.c:120
 msgid "Quit Rhythmbox"
 msgstr "é??å?º Rhythmbox"
 
@@ -3626,7 +3604,7 @@ msgstr "æ?­æ?¾é?³é??æ?¯ %fã??\n"
 msgid "All"
 msgstr "��"
 
-#: ../rhythmdb/rhythmdb-tree.c:405
+#: ../rhythmdb/rhythmdb-tree.c:411
 #, c-format
 msgid ""
 "The database was created by a later version of Rhythmbox.  This version of "
@@ -3634,7 +3612,7 @@ msgid ""
 msgstr ""
 "该æ?°æ?®åº?ç?±è¾?æ?°ç??æ?¬ç?? Rhythmbox å??建ã??æ?¬ç??æ?¬ç?? Rhythmbox æ? æ³?读å??该æ?°æ?®åº?ã??"
 
-#: ../rhythmdb/rhythmdb.c:772
+#: ../rhythmdb/rhythmdb.c:782
 #, c-format
 msgid "Couldn't access %s: %s"
 msgstr "��访� %s�%s"
@@ -3644,7 +3622,7 @@ msgstr "��访� %s�%s"
 #. * a local artist name if desired.  Ensure the album name
 #. * and song title are also replaced in this case.
 #.
-#: ../rhythmdb/rhythmdb.c:1799
+#: ../rhythmdb/rhythmdb.c:1807
 msgid "The Beatles"
 msgstr "ç?²å£³è?«ä¹?é??"
 
@@ -3652,7 +3630,7 @@ msgstr "ç?²å£³è?«ä¹?é??"
 #. * example artist name is localised, this should be replaced
 #. * with the name of an album by that artist.
 #.
-#: ../rhythmdb/rhythmdb.c:1805
+#: ../rhythmdb/rhythmdb.c:1813
 msgid "Help!"
 msgstr "帮��"
 
@@ -3660,51 +3638,56 @@ msgstr "帮��"
 #. * artist and album names are localised, this should be replaced
 #. * with the name of the seventh song from the localised album.
 #.
-#: ../rhythmdb/rhythmdb.c:1811
+#: ../rhythmdb/rhythmdb.c:1819
 msgid "Ticket To Ride"
 msgstr "Ticket To Ride"
 
-#: ../rhythmdb/rhythmdb.c:2308
-msgid "invalid unicode in error message"
-msgstr "é??误信æ?¯ä¸­å?«æ??æ? æ??ç?? unicode"
-
-#: ../rhythmdb/rhythmdb.c:2369
-#, c-format
-msgid "Empty file"
-msgstr "空æ??件"
-
 #. Translators: the parameter here is a list of GStreamer plugins.
 #. * The plugin names are already translated.
 #.
-#: ../rhythmdb/rhythmdb.c:2484
+#: ../rhythmdb/rhythmdb.c:2355
 #, c-format
 msgid "Additional GStreamer plugins are required to play this file: %s"
 msgstr "æ?­æ?¾è¯¥æ??件é??è¦?é??å?  GStreamer æ??件ï¼? %s"
 
-#: ../rhythmdb/rhythmdb.c:3226
+#: ../rhythmdb/rhythmdb.c:2387
+msgid "invalid unicode in error message"
+msgstr "é??误信æ?¯ä¸­å?«æ??æ? æ??ç?? unicode"
+
+#: ../rhythmdb/rhythmdb.c:2453
+#, c-format
+msgid "Empty file"
+msgstr "空æ??件"
+
+#: ../rhythmdb/rhythmdb.c:3135
 msgid "Could not load the music database:"
 msgstr "��载�������"
 
-#: ../rhythmdb/rhythmdb.c:4705
+#: ../rhythmdb/rhythmdb.c:4543
+#, c-format
+msgid "Checking (%d/%d)"
+msgstr "正��� (%d/%d)"
+
+#: ../rhythmdb/rhythmdb.c:4588
 #, c-format
 msgid "%ld minute"
 msgid_plural "%ld minutes"
 msgstr[0] "%ld å??é??"
 
-#: ../rhythmdb/rhythmdb.c:4706
+#: ../rhythmdb/rhythmdb.c:4589
 #, c-format
 msgid "%ld hour"
 msgid_plural "%ld hours"
 msgstr[0] "%ld å°?æ?¶"
 
-#: ../rhythmdb/rhythmdb.c:4707
+#: ../rhythmdb/rhythmdb.c:4590
 #, c-format
 msgid "%ld day"
 msgid_plural "%ld days"
 msgstr[0] "%ld 天"
 
 #. Translators: the format is "X days, X hours and X minutes"
-#: ../rhythmdb/rhythmdb.c:4713
+#: ../rhythmdb/rhythmdb.c:4596
 #, c-format
 msgid "%s, %s and %s"
 msgstr "%s %s %s"
@@ -3712,52 +3695,52 @@ msgstr "%s %s %s"
 #. Translators: the format is "X days and X hours"
 #. Translators: the format is "X days and X minutes"
 #. Translators: the format is "X hours and X minutes"
-#: ../rhythmdb/rhythmdb.c:4719 ../rhythmdb/rhythmdb.c:4727
-#: ../rhythmdb/rhythmdb.c:4738
+#: ../rhythmdb/rhythmdb.c:4602 ../rhythmdb/rhythmdb.c:4610
+#: ../rhythmdb/rhythmdb.c:4621
 #, c-format
 msgid "%s and %s"
 msgstr "%s %s"
 
-#: ../shell/main.c:111
+#: ../shell/main.c:113
 msgid "Enable debug output"
 msgstr "������"
 
-#: ../shell/main.c:112
+#: ../shell/main.c:114
 msgid "Enable debug output matching a specified string"
 msgstr "å?¯ç?¨å?¹é??æ??æ??å®?å­?符串ç??è°?è¯?è¾?å?º"
 
-#: ../shell/main.c:113
+#: ../shell/main.c:115
 msgid "Do not update the library with file changes"
 msgstr "æ??件æ?¹å??æ?¶ä¸?æ?´æ?°åº?"
 
-#: ../shell/main.c:114
+#: ../shell/main.c:116
 msgid "Do not register the shell"
 msgstr "ä¸?注å?? shell"
 
-#: ../shell/main.c:115
+#: ../shell/main.c:117
 msgid "Don't save any data permanently (implies --no-registration)"
 msgstr "ä¸?æ°¸ä¹?ä¿?å­?ä»»ä½?æ?°æ?® (æ??å?« --no-registration)"
 
-#: ../shell/main.c:116
+#: ../shell/main.c:118
 msgid "Path for database file to use"
 msgstr "è¦?使ç?¨ç??æ?°æ?®åº?æ??件路å¾?"
 
-#: ../shell/main.c:117
+#: ../shell/main.c:119
 msgid "Path for playlists file to use"
 msgstr "è¦?使ç?¨ç??æ?­æ?¾æ¸?å??æ??件路å¾?"
 
-#: ../shell/main.c:119
+#: ../shell/main.c:121
 msgid "[URI...]"
 msgstr "[URI...]"
 
-#: ../shell/main.c:149
+#: ../shell/main.c:153
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "%s\n"
-"è¿?è¡? '%s --help' æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é??项ç??å®?æ?´å??表ã??\n"
+"è¿?è¡?â??%s --helpâ??æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é??项ç??å®?æ?´å??表ã??\n"
 
 #: ../shell/rb-playlist-manager.c:159
 msgid "MPEG Version 3.0 URL"
@@ -3860,7 +3843,7 @@ msgstr "å?¨é?¨æ??件"
 msgid "Load Playlist"
 msgstr "è½½å?¥æ?­æ?¾å??表"
 
-#: ../shell/rb-playlist-manager.c:1469 ../sources/rb-playlist-source.c:707
+#: ../shell/rb-playlist-manager.c:1469 ../sources/rb-playlist-source.c:708
 msgid "Couldn't save playlist"
 msgstr "æ? æ³?ä¿?å­?æ?­æ?¾æ¸?å??"
 
@@ -3901,26 +3884,22 @@ msgstr "æ??件é??误"
 msgid "Unable to activate plugin %s"
 msgstr "æ? æ³?æ¿?æ´»æ??件 %s"
 
-#: ../shell/rb-removable-media-manager.c:173
+#: ../shell/rb-removable-media-manager.c:150
+msgid "_Eject"
+msgstr "弹�(_E)"
+
+#: ../shell/rb-removable-media-manager.c:151
 msgid "Eject this medium"
 msgstr "弹�此�质"
 
-#: ../shell/rb-removable-media-manager.c:175
+#: ../shell/rb-removable-media-manager.c:153
 msgid "_Scan Removable Media"
 msgstr "æ?«æ??å?¯ç§»å?¨ä»?è´¨(_S)"
 
-#: ../shell/rb-removable-media-manager.c:176
+#: ../shell/rb-removable-media-manager.c:154
 msgid "Scan for new Removable Media"
 msgstr "æ?«æ??æ?°å?¯ç§»å?¨åª?ä»?"
 
-#: ../shell/rb-removable-media-manager.c:882
-msgid "Unable to eject"
-msgstr "��弹�"
-
-#: ../shell/rb-removable-media-manager.c:903
-msgid "Unable to unmount"
-msgstr "���载"
-
 #: ../shell/rb-shell-clipboard.c:151
 msgid "Select _All"
 msgstr "å?¨é?¨é??中(_A)"
@@ -4013,174 +3992,174 @@ msgstr "å±?æ?§(_O)"
 msgid "Show information on each selected song"
 msgstr "æ?¾ç¤ºé??中ç??æ­?æ?²ç??ä¿¡æ?¯"
 
-#: ../shell/rb-shell-player.c:304
+#: ../shell/rb-shell-player.c:308
 msgid "Pre_vious"
 msgstr "���(_V)"
 
-#: ../shell/rb-shell-player.c:305
+#: ../shell/rb-shell-player.c:309
 msgid "Start playing the previous song"
 msgstr "���������"
 
-#: ../shell/rb-shell-player.c:307
+#: ../shell/rb-shell-player.c:311
 msgid "_Next"
 msgstr "���(_N)"
 
-#: ../shell/rb-shell-player.c:308
+#: ../shell/rb-shell-player.c:312
 msgid "Start playing the next song"
 msgstr "���������"
 
-#: ../shell/rb-shell-player.c:310
+#: ../shell/rb-shell-player.c:314
 msgid "_Increase Volume"
 msgstr "å¢?å? é?³é??(_I)"
 
-#: ../shell/rb-shell-player.c:311
+#: ../shell/rb-shell-player.c:315
 msgid "Increase playback volume"
 msgstr "å¢?å? å??æ?¾é?³é??"
 
-#: ../shell/rb-shell-player.c:313
+#: ../shell/rb-shell-player.c:317
 msgid "_Decrease Volume"
 msgstr "å??å°?é?³é??(_D)"
 
-#: ../shell/rb-shell-player.c:314
+#: ../shell/rb-shell-player.c:318
 msgid "Decrease playback volume"
 msgstr "å??å°?å??æ?¾é?³é??"
 
-#: ../shell/rb-shell-player.c:321
+#: ../shell/rb-shell-player.c:325
 msgid "_Play"
 msgstr "æ?­æ?¾(_P)"
 
-#: ../shell/rb-shell-player.c:322 ../shell/rb-shell-player.c:3769
+#: ../shell/rb-shell-player.c:326 ../shell/rb-shell-player.c:3775
 msgid "Start playback"
 msgstr "å¼?å§?å??æ?¾"
 
-#: ../shell/rb-shell-player.c:324
+#: ../shell/rb-shell-player.c:328
 msgid "Sh_uffle"
 msgstr "乱�(_U)"
 
-#: ../shell/rb-shell-player.c:325
+#: ../shell/rb-shell-player.c:329
 msgid "Play songs in a random order"
 msgstr "以é??æ?ºé¡ºåº?æ?­æ?¾æ­?æ?²"
 
-#: ../shell/rb-shell-player.c:327
+#: ../shell/rb-shell-player.c:331
 msgid "_Repeat"
 msgstr "é??å¤?(_R)"
 
-#: ../shell/rb-shell-player.c:328
+#: ../shell/rb-shell-player.c:332
 msgid "Play first song again after all songs are played"
 msgstr "æ??æ??æ­?æ?²æ?­æ?¾ä¹?å??å??次æ?­æ?¾ç¬¬ä¸?é¦?æ­?æ?²"
 
-#: ../shell/rb-shell-player.c:330
+#: ../shell/rb-shell-player.c:334
 msgid "_Song Position Slider"
 msgstr "���置���(_S)"
 
-#: ../shell/rb-shell-player.c:331
+#: ../shell/rb-shell-player.c:335
 msgid "Change the visibility of the song position slider"
 msgstr "æ?¹å??æ­?æ?²ä½?ç½®æ»?å?¨æ?¡ç??å?¯è§?æ?§"
 
-#: ../shell/rb-shell-player.c:836
+#: ../shell/rb-shell-player.c:818
 msgid "Stream error"
 msgstr "åª?ä½?æµ?å?ºé??"
 
-#: ../shell/rb-shell-player.c:837
+#: ../shell/rb-shell-player.c:819
 msgid "Unexpected end of stream!"
 msgstr "æ?ªé¢?计ç??æµ?ç»?å°¾ï¼?"
 
-#: ../shell/rb-shell-player.c:969
+#: ../shell/rb-shell-player.c:976
 msgid "Linear"
 msgstr "线�"
 
-#: ../shell/rb-shell-player.c:971
+#: ../shell/rb-shell-player.c:978
 msgid "Linear looping"
 msgstr "线�循�"
 
-#: ../shell/rb-shell-player.c:973
+#: ../shell/rb-shell-player.c:980
 msgid "Shuffle"
 msgstr "乱�"
 
-#: ../shell/rb-shell-player.c:975
+#: ../shell/rb-shell-player.c:982
 msgid "Random with equal weights"
 msgstr "æ ¹æ?®ç?¸ç­?ç??æ??é??æ?º"
 
-#: ../shell/rb-shell-player.c:977
+#: ../shell/rb-shell-player.c:984
 msgid "Random by time since last play"
 msgstr "æ ¹æ?®è?ªä»?ä¸?次æ?­æ?¾æ?¶é?´é??æ?º"
 
-#: ../shell/rb-shell-player.c:979
+#: ../shell/rb-shell-player.c:986
 msgid "Random by rating"
 msgstr "æ ¹æ?®è¯?å??é??æ?º"
 
-#: ../shell/rb-shell-player.c:981
+#: ../shell/rb-shell-player.c:988
 msgid "Random by time since last play and rating"
 msgstr "æ ¹æ?®è?ªä»?ä¸?次æ?­æ?¾æ?¶é?´å??è¯?å??é??æ?º"
 
-#: ../shell/rb-shell-player.c:983
+#: ../shell/rb-shell-player.c:990
 msgid "Linear, removing entries once played"
 msgstr "线æ?§ï¼?移é?¤æ?¾æ?­æ?¾è¿?ç??è®°å½?"
 
-#: ../shell/rb-shell-player.c:993
+#: ../shell/rb-shell-player.c:1000
 #, c-format
 msgid "Failed to create the player: %s"
 msgstr "æ? æ³?å??建æ?­æ?¾å?¨ï¼?%s"
 
-#: ../shell/rb-shell-player.c:1539
+#: ../shell/rb-shell-player.c:1551
 #, c-format
 msgid "Playlist was empty"
 msgstr "æ?­æ?¾å??表æ?¯ç©ºç??"
 
-#: ../shell/rb-shell-player.c:2027
+#: ../shell/rb-shell-player.c:2036
 #, c-format
 msgid "Not currently playing"
 msgstr "ä¸?æ?¯å½?å??æ?­æ?¾ç??"
 
-#: ../shell/rb-shell-player.c:2085
+#: ../shell/rb-shell-player.c:2094
 #, c-format
 msgid "No previous song"
 msgstr "没æ??ä¸?ä¸?é¦?æ­?æ?²"
 
-#: ../shell/rb-shell-player.c:2185
+#: ../shell/rb-shell-player.c:2194
 #, c-format
 msgid "No next song"
 msgstr "�����"
 
-#: ../shell/rb-shell-player.c:2306 ../shell/rb-shell-player.c:3416
+#: ../shell/rb-shell-player.c:2315 ../shell/rb-shell-player.c:3425
 msgid "Couldn't start playback"
 msgstr "æ? æ³?å¼?å§?å??æ?¾"
 
-#: ../shell/rb-shell-player.c:3178
+#: ../shell/rb-shell-player.c:3187
 msgid "Couldn't stop playback"
 msgstr "æ? æ³?å??æ­¢å??æ?¾"
 
-#: ../shell/rb-shell-player.c:3288
+#: ../shell/rb-shell-player.c:3297
 #, c-format
 msgid "Playback position not available"
 msgstr "å??æ?¾ä½?ç½®ä¸?å?¯ç?¨"
 
-#: ../shell/rb-shell-player.c:3320
+#: ../shell/rb-shell-player.c:3329
 #, c-format
 msgid "Current song is not seekable"
 msgstr "å½?å??æ­?æ?²æ? æ³?æ??å?¨"
 
-#: ../shell/rb-shell-player.c:3764
+#: ../shell/rb-shell-player.c:3770
 msgid "Pause playback"
 msgstr "æ??å??æ?­æ?¾"
 
-#: ../shell/rb-shell-player.c:3766
+#: ../shell/rb-shell-player.c:3772
 msgid "Stop playback"
 msgstr "å??æ­¢å??æ?¾"
 
-#: ../shell/rb-shell-preferences.c:157 ../shell/rb-shell.c:2385
+#: ../shell/rb-shell-preferences.c:159 ../shell/rb-shell.c:2402
 msgid "Couldn't display help"
 msgstr "���示帮�"
 
-#: ../shell/rb-shell-preferences.c:193
+#: ../shell/rb-shell-preferences.c:195
 msgid "Music Player Preferences"
 msgstr "é?³ä¹?æ?­æ?¾å?¨é¦?é??项"
 
-#: ../shell/rb-shell-preferences.c:248
+#: ../shell/rb-shell-preferences.c:254
 msgid "General"
 msgstr "常�"
 
-#: ../shell/rb-shell-preferences.c:297
+#: ../shell/rb-shell-preferences.c:303
 msgid "Playback"
 msgstr "å??æ?¾"
 
@@ -4324,35 +4303,25 @@ msgstr "ç?¶æ??æ ?(_T)"
 msgid "Change the visibility of the statusbar"
 msgstr "æ?¹å??ç?¶æ??æ ?ç??å?¯è§?æ?§"
 
-#: ../shell/rb-shell.c:1144 ../shell/rb-shell.c:1367
+#: ../shell/rb-shell.c:1183 ../shell/rb-shell.c:1411
 msgid "Unable to move user data files"
 msgstr "æ? æ³?移å?¨ç?¨æ?·æ?°æ?®æ??件"
 
-#: ../shell/rb-shell.c:1453
+#: ../shell/rb-shell.c:1498
 msgid "Change the music volume"
 msgstr "æ?´æ?¹é?³ä¹?é?³é??"
 
-#: ../shell/rb-shell.c:1859
+#: ../shell/rb-shell.c:1904
 msgid "Error while saving song information"
 msgstr "ä¿?å­?æ­?æ?²ä¿¡æ?¯æ?¶å?ºé??"
 
-#: ../shell/rb-shell.c:1994
-#, c-format
-msgid "Transferring track %d out of %d (%.0f%%)"
-msgstr "正�传�第 %d ������ %d �(%.0f%%)"
-
-#: ../shell/rb-shell.c:1997
-#, c-format
-msgid "Transferring track %d out of %d"
-msgstr "正�传�第 %d ������ %d �"
-
 #. Translators: %s is the song name
-#: ../shell/rb-shell.c:2199
+#: ../shell/rb-shell.c:2216
 #, c-format
 msgid "%s (Paused)"
 msgstr "%s (å·²æ??å??)"
 
-#: ../shell/rb-shell.c:2303
+#: ../shell/rb-shell.c:2320
 msgid "translator-credits"
 msgstr ""
 "Funda Wang <fundawang gmail com>, 2003, 2004\n"
@@ -4360,7 +4329,7 @@ msgstr ""
 "YunQiang Su <wzssyqa gmail com>, 2010\n"
 "ç??é?²(Gan Lu) <rhythm gan gmail com>, 2010"
 
-#: ../shell/rb-shell.c:2306
+#: ../shell/rb-shell.c:2323
 msgid ""
 "Rhythmbox is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -4371,7 +4340,7 @@ msgstr ""
 "å??å¸?ç?? GNU é??ç?¨å?¬å?±è®¸å?¯è¯?ç??æ?¡æ¬¾ä¸?é??æ?°å??å??å??(æ??)ä¿®æ?¹å®?ï¼?\n"
 "æ?¨å?¯ä»¥é??æ?©ä½¿ç?¨ GPL 第äº?ç??ï¼?æ??(æ??ç?§æ?¨ç??æ??æ?¿)ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??\n"
 
-#: ../shell/rb-shell.c:2310
+#: ../shell/rb-shell.c:2327
 msgid ""
 "Rhythmbox is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -4382,7 +4351,7 @@ msgstr ""
 "没æ??对å?¶é??é??æ?§å??æ??ä¸?ç?¹å®?ç?®ç??ä¸?ç??é??ç?¨æ?§ç??ä»»ä½?å?³ä¾¿æ?¯æ??示ç??æ??ä¿?ã??\n"
 "请æ?¥é?? GNU é??ç?¨å?¬å?±è®¸å?¯è¯?以è?·å¾?æ?´å¤?ä¿¡æ?¯ã??\n"
 
-#: ../shell/rb-shell.c:2314
+#: ../shell/rb-shell.c:2331
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with Rhythmbox; if not, write to the Free Software Foundation, Inc.,\n"
@@ -4392,54 +4361,54 @@ msgstr ""
 "å¦?æ??没æ??ï¼?请å??ä¿¡è?³ï¼?Free Software Foundation, Inc.ï¼?\n"
 "51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA\n"
 
-#: ../shell/rb-shell.c:2321
+#: ../shell/rb-shell.c:2338
 msgid "Maintainers:"
 msgstr "ç»´æ?¤è??ï¼?"
 
-#: ../shell/rb-shell.c:2324
+#: ../shell/rb-shell.c:2341
 msgid "Former Maintainers:"
 msgstr "å??ç»´æ?¤è??ï¼?"
 
-#: ../shell/rb-shell.c:2327
+#: ../shell/rb-shell.c:2344
 msgid "Contributors:"
 msgstr "è´¡ç?®è??ï¼?"
 
-#: ../shell/rb-shell.c:2329
+#: ../shell/rb-shell.c:2346
 msgid "Music management and playback software for GNOME."
 msgstr "GNOME é?³ä¹?管ç??å??æ?­æ?¾è½¯ä»¶ã??"
 
-#: ../shell/rb-shell.c:2338
+#: ../shell/rb-shell.c:2355
 msgid "Rhythmbox Website"
 msgstr "Rhythmbox ç½?ç«?"
 
-#: ../shell/rb-shell.c:2433
+#: ../shell/rb-shell.c:2450
 msgid "Configure Plugins"
 msgstr "é??ç½®æ??件"
 
-#: ../shell/rb-shell.c:2505
+#: ../shell/rb-shell.c:2522
 msgid "Import Folder into Library"
 msgstr "å°?æ??件夹导å?¥å?°åº?"
 
-#: ../shell/rb-shell.c:2527
+#: ../shell/rb-shell.c:2544
 msgid "Import File into Library"
 msgstr "å°?æ??件导å?¥å?°åº?"
 
-#: ../shell/rb-shell.c:3129
+#: ../shell/rb-shell.c:3146
 #, c-format
 msgid "No registered source can handle URI %s"
 msgstr "没æ??已注å??æº?è?½å¤?å¤?ç?? URI %s"
 
-#: ../shell/rb-shell.c:3509 ../shell/rb-shell.c:3552
+#: ../shell/rb-shell.c:3526 ../shell/rb-shell.c:3569
 #, c-format
 msgid "Unknown song URI: %s"
 msgstr "æ?ªç?¥ç??æ­?æ?² URIï¼?%s"
 
-#: ../shell/rb-shell.c:3561
+#: ../shell/rb-shell.c:3578
 #, c-format
 msgid "Unknown property %s"
 msgstr "���� %s"
 
-#: ../shell/rb-shell.c:3575
+#: ../shell/rb-shell.c:3592
 #, c-format
 msgid "Invalid property type %s for property %s"
 msgstr "æ? æ??ç??å±?æ?§ç±»å?? %s 为å±?æ?§ %s"
@@ -4456,9 +4425,63 @@ msgstr "æ?¹å??æµ?è§?å?¨ç??å?¯è§?æ?§"
 msgid "Filter music display by genre, artist, album, or title"
 msgstr "æ ¹æ?®æµ?æ´¾ï¼?è?ºäººï¼?ä¸?è¾?æ??æ ?é¢?è¿?滤é?³ä¹?æ?¾ç¤º"
 
-#: ../shell/rb-statusbar.c:172
-msgid "Loading..."
-msgstr "正�载�..."
+#: ../shell/rb-track-transfer-queue.c:129
+#, c-format
+msgid "The file \"%s\" already exists. Do you want to replace it?"
+msgstr "æ??件â??%sâ??å·²å­?å?¨ã??æ?¨æ?¯å?¦æ?³è¦?æ?¿æ?¢å®?ï¼?"
+
+#: ../shell/rb-track-transfer-queue.c:143
+msgid "_Skip"
+msgstr "跳�(_S)"
+
+#: ../shell/rb-track-transfer-queue.c:144
+msgid "_Replace"
+msgstr "æ?¿æ?¢(_R)"
+
+#: ../shell/rb-track-transfer-queue.c:145
+msgid "S_kip All"
+msgstr "��跳�(_K)"
+
+#: ../shell/rb-track-transfer-queue.c:146
+msgid "Replace _All"
+msgstr "����(_A)"
+
+#: ../shell/rb-track-transfer-queue.c:368
+msgid "Unable to transfer tracks"
+msgstr "æ? æ³?ä¼ é??é?³è½¨"
+
+#: ../shell/rb-track-transfer-queue.c:369
+msgid ""
+"None of the tracks to be transferred are in a format supported by the target "
+"device, and no encoders are available  for the supported formats."
+msgstr ""
+"æ? æ³?å°?å?¶ä¸­ç??ä»»ä½?ä¸?æ?¡é?³è½¨ä»¥ç?®æ ?设å¤?æ?¯æ??ç??æ ¼å¼?ä¼ é??ï¼?è??该设å¤?æ?¯æ??ç??æ ¼å¼?ä¹?没æ??å?¯ç?¨ç??ç¼?ç ?å?¨ã??"
+
+#: ../shell/rb-track-transfer-queue.c:386
+#, c-format
+msgid ""
+"%d of the %d files to be transferred are not in a format supported by the "
+"target device, and no encoders are available for the supported formats."
+msgstr ""
+"æ? æ³?å°? %2$d 个æ??件中ç?? %1$d 个æ??件以ç?®æ ?设å¤?æ?¯æ??ç??æ ¼å¼?ä¼ é??ï¼?è??该设å¤?æ?¯æ??ç??æ ¼å¼?ä¹?没æ??å?¯ç?¨ç??ç¼?ç ?å?¨ã??"
+
+#: ../shell/rb-track-transfer-queue.c:395
+msgid "Unable to transfer all tracks. Do you want to continue?"
+msgstr "æ? æ³?ä¼ é??å?¨é?¨é?³è½¨ã??æ?¨æ?¯å?¦æ?³è¦?继续ï¼?"
+
+#: ../shell/rb-track-transfer-queue.c:403
+msgid "C_ontinue"
+msgstr "继续(_O)"
+
+#: ../shell/rb-track-transfer-queue.c:501
+#, c-format
+msgid "Transferring track %d out of %d (%.0f%%)"
+msgstr "正�传�第 %d ������ %d �(%.0f%%)"
+
+#: ../shell/rb-track-transfer-queue.c:504
+#, c-format
+msgid "Transferring track %d out of %d"
+msgstr "正�传�第 %d ������ %d �"
 
 #: ../sources/rb-auto-playlist-source.c:104 ../sources/rb-browser-source.c:166
 #: ../sources/rb-podcast-source.c:330
@@ -4491,11 +4514,19 @@ msgstr "æ?²å??"
 msgid "Search titles"
 msgstr "æ??ç´¢æ?²å??"
 
-#: ../sources/rb-removable-media-source.c:894
-#: ../sources/rb-library-source.c:1266
+#: ../sources/rb-removable-media-source.c:892
+#: ../sources/rb-library-source.c:1268 ../sources/rb-library-source.c:1272
 msgid "Error transferring track"
 msgstr "ä¼ è¾?é?³è½¨æ?¶å?ºé??"
 
+#: ../sources/rb-removable-media-source.c:943
+msgid "Unable to eject"
+msgstr "��弹�"
+
+#: ../sources/rb-removable-media-source.c:961
+msgid "Unable to unmount"
+msgstr "���载"
+
 #: ../sources/rb-browser-source.c:153
 msgid "Browse This _Genre"
 msgstr "��此�派(_G)"
@@ -4520,99 +4551,113 @@ msgstr "��此��(_L)"
 msgid "Set the browser to view only this album"
 msgstr "设置æµ?è§?å?¨ä¸ºä»?æ?¥ç??该ä¸?è¾?"
 
-#: ../sources/rb-import-errors-source.c:221
+#. set up info bar for triggering codec installation
+#: ../sources/rb-import-errors-source.c:240
+msgid "Install Plugins"
+msgstr "å®?è£?æ??件"
+
+#: ../sources/rb-import-errors-source.c:246
+msgid "Additional GStreamer plugins are required to play some of these files."
+msgstr "è¦?æ?­æ?¾è¿?äº?æ??件ï¼?é??è¦?é¢?å¤?ç?? GStreamer æ??件ã??"
+
+#: ../sources/rb-import-errors-source.c:350
 msgid "Import Errors"
 msgstr "导å?¥å?ºé??"
 
-#: ../sources/rb-import-errors-source.c:257
+#: ../sources/rb-import-errors-source.c:388
 #, c-format
 msgid "%d import errors"
 msgid_plural "%d import errors"
 msgstr[0] "%d 个导å?¥é??误"
 
-#: ../sources/rb-library-source.c:135
+#: ../sources/rb-library-source.c:138
 msgid "Artist/Artist - Album"
 msgstr "�人/�人 - ��"
 
-#: ../sources/rb-library-source.c:136
+#: ../sources/rb-library-source.c:139
 msgid "Artist/Album"
 msgstr "�人/��"
 
-#: ../sources/rb-library-source.c:137
+#: ../sources/rb-library-source.c:140
 msgid "Artist - Album"
 msgstr "�人 - ��"
 
-#: ../sources/rb-library-source.c:138 ../widgets/rb-entry-view.c:1509
+#: ../sources/rb-library-source.c:141 ../widgets/rb-entry-view.c:1538
 #: ../widgets/rb-library-browser.c:142
 msgid "Album"
 msgstr "��"
 
-#: ../sources/rb-library-source.c:144
+#: ../sources/rb-library-source.c:147
 msgid "Number - Title"
 msgstr "�� - ��"
 
-#: ../sources/rb-library-source.c:145
+#: ../sources/rb-library-source.c:148
 msgid "Artist - Title"
 msgstr "�人 - ��"
 
-#: ../sources/rb-library-source.c:146
+#: ../sources/rb-library-source.c:149
 msgid "Artist - Number - Title"
 msgstr "�人 - �� - ��"
 
-#: ../sources/rb-library-source.c:147
+#: ../sources/rb-library-source.c:150
 msgid "Artist (Album) - Number - Title"
 msgstr "�人(��) - �� - ��"
 
-#: ../sources/rb-library-source.c:149
+#: ../sources/rb-library-source.c:152
 msgid "Number. Artist - Title"
 msgstr "��. �人 - ��"
 
-#: ../sources/rb-library-source.c:403 ../sources/rb-media-player-source.c:581
-#: ../sources/rb-media-player-source.c:582
+#: ../sources/rb-library-source.c:406
+#: ../sources/sync/rb-sync-settings-ui.c:215
+#: ../sources/sync/rb-sync-settings-ui.c:216
+#: ../sources/sync/rb-sync-state-ui.c:77
 msgid "Music"
 msgstr "��"
 
-#: ../sources/rb-library-source.c:437
+#: ../sources/rb-library-source.c:440
 msgid "Choose Library Location"
 msgstr "é??æ?©åº?ä½?ç½®"
 
-#: ../sources/rb-library-source.c:612
+#: ../sources/rb-library-source.c:615
 msgid "Multiple locations set"
 msgstr "�个�置设�"
 
-#: ../sources/rb-library-source.c:1047
+#: ../sources/rb-library-source.c:1045
 msgid "Example Path:"
 msgstr "示�路��"
 
-#: ../sources/rb-media-player-source.c:101
+#: ../sources/rb-media-player-source.c:108
+msgid "Sync with Library"
+msgstr "ä¸?åº?å??æ­¥"
+
+#: ../sources/rb-media-player-source.c:109
 msgid "Synchronize media player with the library"
 msgstr "使ç?¨åº?æ?¥å??æ­¥åª?ä½?æ?­æ?¾å?¨"
 
-#. Translators: this is used to display the amount of storage space which will be
-#. * used and the total storage space on a device after it is synced.
-#.
-#. Translators: this is used to display the amount of storage space
-#. * used and the total storage space on an device.
-#.
-#: ../sources/rb-media-player-source.c:345
-#: ../sources/rb-media-player-source.c:552
-#, c-format
-msgid "%s of %s"
-msgstr "%s 已��� %s"
+#: ../sources/rb-media-player-source.c:624
+msgid ""
+"You have not selected any music, playlists, or podcasts to transfer to this "
+"device."
+msgstr "æ?¨æ²¡æ??é??中è¦?ä¼ é??å?°è¿?ä¸?设å¤?ç??ä»»ä½?é?³ä¹?ã??æ?­æ?¾å??表æ??æ?­å®¢ã??"
 
-#: ../sources/rb-media-player-source.c:593
-msgid "All Music"
-msgstr "æ??æ??é?³ä¹?"
+#: ../sources/rb-media-player-source.c:628
+msgid ""
+"There is not enough space on the device to transfer the selected music, "
+"playlists and podcasts."
+msgstr "该设å¤?ä¸?没æ??足å¤?空ä½?空é?´æ?¥ä¼ è¾?é??中ç??é?³ä¹?ã??æ?­æ?¾å??表å??æ?­å®¢ã??"
 
-#: ../sources/rb-media-player-source.c:1174
-msgid "Not enough free space to sync"
-msgstr "没æ??足å¤?空é?´è¿?è¡?å??æ­¥"
+#: ../sources/rb-media-player-source.c:679
+#, c-format
+msgid "%s Sync Settings"
+msgstr "%s å??步设置"
 
-#: ../sources/rb-media-player-source.c:1175
-msgid ""
-"There is not enough free space on this device to transfer the selected "
-"music, playlists, and podcasts."
-msgstr "该设å¤?ä¸?没æ??足å¤?空ä½?空é?´æ?¥ä¼ è¾?é??å®?ç??é?³ä¹?ï¼?æ?­æ?¾å??表å??æ?­å®¢ã??"
+#: ../sources/rb-media-player-source.c:684
+msgid "Sync with the device"
+msgstr "ä¸?设å¤?å??æ­¥"
+
+#: ../sources/rb-media-player-source.c:686
+msgid "Don't sync"
+msgstr "ä¸?å??æ­¥"
 
 #: ../sources/rb-missing-files-source.c:281
 msgid "Missing Files"
@@ -4736,47 +4781,47 @@ msgstr "æ??ç´¢æ?­å®¢æ??æ?²"
 
 #. Translators: this is the toolbar button label
 #. for New Podcast Feed action.
-#: ../sources/rb-podcast-source.c:521
+#: ../sources/rb-podcast-source.c:520
 msgctxt "Podcast"
 msgid "New"
 msgstr "æ?°"
 
 #. Translators: this is the toolbar button label
 #. for Update All Feeds action.
-#: ../sources/rb-podcast-source.c:527
+#: ../sources/rb-podcast-source.c:526
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../sources/rb-podcast-source.c:571 ../sources/rb-podcast-source.c:582
+#: ../sources/rb-podcast-source.c:570 ../sources/rb-podcast-source.c:581
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../sources/rb-podcast-source.c:603 ../sources/rb-podcast-source.c:671
-#: ../sources/rb-podcast-source.c:725
+#: ../sources/rb-podcast-source.c:602 ../sources/rb-podcast-source.c:670
+#: ../sources/rb-podcast-source.c:724
 msgid "Feed"
 msgstr "Feed"
 
-#: ../sources/rb-podcast-source.c:622 ../sources/rb-podcast-source.c:640
+#: ../sources/rb-podcast-source.c:621 ../sources/rb-podcast-source.c:639
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../sources/rb-podcast-source.c:623 ../sources/rb-podcast-source.c:1484
+#: ../sources/rb-podcast-source.c:622 ../sources/rb-podcast-source.c:1483
 msgid "Downloaded"
 msgstr "已�载"
 
-#: ../sources/rb-podcast-source.c:624 ../sources/rb-podcast-source.c:1492
+#: ../sources/rb-podcast-source.c:623 ../sources/rb-podcast-source.c:1491
 msgid "Waiting"
 msgstr "��中"
 
-#: ../sources/rb-podcast-source.c:625 ../sources/rb-podcast-source.c:1488
+#: ../sources/rb-podcast-source.c:624 ../sources/rb-podcast-source.c:1487
 msgid "Failed"
 msgstr "已失败"
 
-#: ../sources/rb-podcast-source.c:910
+#: ../sources/rb-podcast-source.c:909
 msgid "Delete the podcast episode and downloaded file?"
-msgstr "å? é?¤è¯¥æ?­å®¢æ??æ?²å??å·²ä¸?è½½æ??件ï¼?"
+msgstr "å? é?¤è¯¥æ?­å®¢æ??æ?²å??å·²ä¸?è½½æ??件å??ï¼?"
 
-#: ../sources/rb-podcast-source.c:913
+#: ../sources/rb-podcast-source.c:912
 msgid ""
 "If you choose to delete the episode and file, they will be permanently "
 "lost.  Please note that you can delete the episode but keep the downloaded "
@@ -4785,19 +4830,19 @@ msgstr ""
 "å¦?æ??æ?¨é??æ?©å? é?¤è¯¥æ?²ç?®å??æ??件ï¼?å®?们å°?æ°¸è¿?丢失ã??请注æ??æ?¨å?¯ä»¥é??è¿?é??æ?©ä»?å? é?¤æ??æ?²æ?¥"
 "å? é?¤æ??æ?²ä½?ä¿?æ??å·²ä¸?è½½æ??件ã??"
 
-#: ../sources/rb-podcast-source.c:921
+#: ../sources/rb-podcast-source.c:920
 msgid "Delete _Episode Only"
 msgstr "ä»?å? é?¤æ??æ?²(_E)"
 
-#: ../sources/rb-podcast-source.c:927
+#: ../sources/rb-podcast-source.c:926
 msgid "_Delete Episode And File"
 msgstr "å? é?¤æ??æ?²å??æ??件(_D)"
 
-#: ../sources/rb-podcast-source.c:1377
+#: ../sources/rb-podcast-source.c:1376
 msgid "Delete the podcast feed and downloaded files?"
 msgstr "å? é?¤æ?­å®¢ç§?å­?å??å·²ä¸?è½½æ??件å??ï¼?"
 
-#: ../sources/rb-podcast-source.c:1380
+#: ../sources/rb-podcast-source.c:1379
 msgid ""
 "If you choose to delete the feed and files, they will be permanently lost.  "
 "Please note that you can delete the feed but keep the downloaded files by "
@@ -4806,66 +4851,66 @@ msgstr ""
 "å¦?æ??æ?¨é??æ?©å? é?¤è¯¥ç§?å­?å??æ??件ï¼?å®?们å°?æ°¸è¿?丢失ã??请注æ??æ?¨å?¯ä»¥é??è¿?é??æ?©ä»?å? é?¤ç§?å­?æ?¥"
 "å? é?¤ç§?å­?ä½?ä¿?æ??å·²ä¸?è½½æ??件ã??"
 
-#: ../sources/rb-podcast-source.c:1388
+#: ../sources/rb-podcast-source.c:1387
 msgid "Delete _Feed Only"
 msgstr "�����(_F)"
 
-#: ../sources/rb-podcast-source.c:1395
+#: ../sources/rb-podcast-source.c:1394
 msgid "_Delete Feed And Files"
 msgstr "å? é?¤ç§?å­?å??æ??件(_D)"
 
-#: ../sources/rb-podcast-source.c:1603
+#: ../sources/rb-podcast-source.c:1602
 #, c-format
 msgid "%d feed"
 msgid_plural "All %d feeds"
 msgstr[0] "%d 个��"
 
-#: ../sources/rb-podcast-source.c:1740
+#: ../sources/rb-podcast-source.c:1739
 msgid "Downloading podcast"
 msgstr "正��载�客"
 
-#: ../sources/rb-podcast-source.c:1755
+#: ../sources/rb-podcast-source.c:1754
 msgid "Finished downloading podcast"
 msgstr "å·²å®?æ??ç??ä¸?è½½æ?­å®¢"
 
-#: ../sources/rb-podcast-source.c:1770
+#: ../sources/rb-podcast-source.c:1769
 msgid "New updates available from"
 msgstr "������"
 
-#: ../sources/rb-podcast-source.c:1888
+#: ../sources/rb-podcast-source.c:1887
 msgid "Error in podcast"
 msgstr "æ?­å®¢ä¸­æ??é??误"
 
-#: ../sources/rb-podcast-source.c:1895
+#: ../sources/rb-podcast-source.c:1894
 #, c-format
 msgid "%s. Would you like to add the podcast feed anyway?"
 msgstr "%sã??æ?¨ç??ç??æ?³æ·»å? è¿?个æ?­å®¢ç§?å­?å??ï¼?"
 
-#: ../sources/rb-podcast-source.c:2022
+#: ../sources/rb-podcast-source.c:2021
 msgid "New Podcast Feed"
 msgstr "��客��"
 
-#: ../sources/rb-podcast-source.c:2022
+#: ../sources/rb-podcast-source.c:2021
 msgid "URL of podcast feed:"
 msgstr "æ?­å®¢ç§?å­?ç?? URL å?°å??ï¼?"
 
-#: ../sources/rb-podcast-source.c:2038
+#: ../sources/rb-podcast-source.c:2037
 #, c-format
 msgid "%d episode"
 msgid_plural "%d episodes"
 msgstr[0] "%d 个æ??æ?²"
 
-#: ../sources/rb-podcast-source.c:2147
+#: ../sources/rb-podcast-source.c:2146
 msgid "Podcast Error"
 msgstr "æ?­å®¢å?ºé??"
 
-#: ../sources/rb-source.c:721
+#: ../sources/rb-source.c:724
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d ��"
 
-#: ../sources/rb-source.c:1939
+#: ../sources/rb-source.c:1950
 #, c-format
 msgid "Importing (%d/%d)"
 msgstr "正�导� (%d/%d)"
@@ -4898,6 +4943,46 @@ msgstr "正���"
 msgid "Buffering"
 msgstr "��中"
 
+#: ../sources/sync/rb-sync-settings-ui.c:227
+msgid "All Music"
+msgstr "æ??æ??é?³ä¹?"
+
+#: ../sources/sync/rb-sync-state-ui.c:79
+msgid "Other"
+msgstr "��"
+
+#: ../sources/sync/rb-sync-state-ui.c:80
+msgid "Available"
+msgstr "��"
+
+#: ../widgets/rb-alert-dialog.c:87
+msgid "Image/label border"
+msgstr "å?¾å??/æ ?签边æ¡?"
+
+#: ../widgets/rb-alert-dialog.c:88
+msgid "Width of border around the label and image in the alert dialog"
+msgstr "è­¦å??对è¯?æ¡?中æ ?ç­¾å??å?¾å??ç??è¾¹æ¡?宽度"
+
+#: ../widgets/rb-alert-dialog.c:97
+msgid "Alert Type"
+msgstr "è­¦å??ç±»å??"
+
+#: ../widgets/rb-alert-dialog.c:98
+msgid "The type of alert"
+msgstr "è­¦å??ç±»å??"
+
+#: ../widgets/rb-alert-dialog.c:106
+msgid "Alert Buttons"
+msgstr "è­¦å??æ??é?®"
+
+#: ../widgets/rb-alert-dialog.c:107
+msgid "The buttons shown in the alert dialog"
+msgstr "è­¦å??对è¯?æ¡?中ç??æ??é?®"
+
+#: ../widgets/rb-alert-dialog.c:172
+msgid "Show more _details"
+msgstr "æ?¾ç¤ºæ?´å¤?ç»?è??(_D)"
+
 #: ../widgets/rb-cell-renderer-pixbuf.c:118
 msgid "Pixbuf Object"
 msgstr "Pixbuf 对象"
@@ -4906,60 +4991,64 @@ msgstr "Pixbuf 对象"
 msgid "The pixbuf to render."
 msgstr "è¦?渲æ??ç?? pixbufã??"
 
-#: ../widgets/rb-entry-view.c:1077 ../widgets/rb-entry-view.c:1558
-#: ../widgets/rb-song-info.c:1087
+#: ../widgets/rb-entry-view.c:1102 ../widgets/rb-entry-view.c:1597
+#: ../widgets/rb-song-info.c:1156
 msgid "Lossless"
 msgstr "æ? æ??ç??"
 
-#: ../widgets/rb-entry-view.c:1478
+#: ../widgets/rb-entry-view.c:1507
 msgid "Track"
 msgstr "�轨"
 
-#: ../widgets/rb-entry-view.c:1529
+#: ../widgets/rb-entry-view.c:1558
+msgid "Comment"
+msgstr "注é??"
+
+#: ../widgets/rb-entry-view.c:1568
 msgid "Time"
 msgstr "��"
 
-#: ../widgets/rb-entry-view.c:1541
+#: ../widgets/rb-entry-view.c:1580
 msgid "Year"
 msgstr "年份"
 
-#: ../widgets/rb-entry-view.c:1553
+#: ../widgets/rb-entry-view.c:1592
 msgid "Quality"
 msgstr "è´¨é??"
 
-#: ../widgets/rb-entry-view.c:1556
+#: ../widgets/rb-entry-view.c:1595
 msgid "000 kbps"
 msgstr "000 kbps"
 
-#: ../widgets/rb-entry-view.c:1567
+#: ../widgets/rb-entry-view.c:1606
 msgid "Rating"
 msgstr "è¯?å??"
 
-#: ../widgets/rb-entry-view.c:1589
+#: ../widgets/rb-entry-view.c:1628
 msgid "Play Count"
 msgstr "��计�"
 
-#: ../widgets/rb-entry-view.c:1601
+#: ../widgets/rb-entry-view.c:1640
 msgid "Last Played"
 msgstr "�次��"
 
-#: ../widgets/rb-entry-view.c:1613
+#: ../widgets/rb-entry-view.c:1652
 msgid "Date Added"
 msgstr "æ·»å? ç??æ?¥æ??"
 
-#: ../widgets/rb-entry-view.c:1624
+#: ../widgets/rb-entry-view.c:1663
 msgid "Last Seen"
 msgstr "ä¸?次ç??è¿?"
 
-#: ../widgets/rb-entry-view.c:1635
+#: ../widgets/rb-entry-view.c:1674
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../widgets/rb-entry-view.c:1892
+#: ../widgets/rb-entry-view.c:1942
 msgid "Now Playing"
 msgstr "正���"
 
-#: ../widgets/rb-entry-view.c:1953
+#: ../widgets/rb-entry-view.c:2003
 msgid "Playback Error"
 msgstr "å??æ?¾é??误"
 
@@ -4996,208 +5085,254 @@ msgstr[0] "%d  (å?± %d)"
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: ../widgets/rb-query-creator-properties.c:73
+#: ../widgets/rb-query-creator-properties.c:77
 msgctxt "query-criteria"
 msgid "Title"
 msgstr "��"
 
-#: ../widgets/rb-query-creator-properties.c:74
+#: ../widgets/rb-query-creator-properties.c:78
 msgctxt "query-criteria"
 msgid "Artist"
 msgstr "�人"
 
-#: ../widgets/rb-query-creator-properties.c:75
+#: ../widgets/rb-query-creator-properties.c:79
 msgctxt "query-criteria"
 msgid "Album"
 msgstr "��"
 
-#: ../widgets/rb-query-creator-properties.c:76
+#: ../widgets/rb-query-creator-properties.c:80
+msgctxt "query-criteria"
+msgid "Album Artist"
+msgstr "���人"
+
+#: ../widgets/rb-query-creator-properties.c:81
 msgctxt "query-criteria"
 msgid "Genre"
 msgstr "æµ?æ´¾"
 
-#: ../widgets/rb-query-creator-properties.c:77
+#: ../widgets/rb-query-creator-properties.c:82
 msgctxt "query-criteria"
 msgid "Year"
 msgstr "年份"
 
-#: ../widgets/rb-query-creator-properties.c:78
+#: ../widgets/rb-query-creator-properties.c:83
 msgctxt "query-criteria"
 msgid "Rating"
 msgstr "è¯?å??"
 
-#: ../widgets/rb-query-creator-properties.c:79
+#: ../widgets/rb-query-creator-properties.c:84
 msgctxt "query-criteria"
 msgid "Path"
 msgstr "路�"
 
-#: ../widgets/rb-query-creator-properties.c:81
+#: ../widgets/rb-query-creator-properties.c:85
+msgctxt "query-criteria"
+msgid "Comment"
+msgstr "注é??"
+
+#: ../widgets/rb-query-creator-properties.c:87
 msgctxt "query-criteria"
 msgid "Play Count"
 msgstr "��计�"
 
-#: ../widgets/rb-query-creator-properties.c:82
+#: ../widgets/rb-query-creator-properties.c:88
 msgctxt "query-criteria"
 msgid "Track Number"
 msgstr "����"
 
-#: ../widgets/rb-query-creator-properties.c:83
+#: ../widgets/rb-query-creator-properties.c:89
 msgctxt "query-criteria"
 msgid "Disc Number"
 msgstr "ç??ç??ç¼?å?·"
 
-#: ../widgets/rb-query-creator-properties.c:84
+#: ../widgets/rb-query-creator-properties.c:90
 msgctxt "query-criteria"
 msgid "Bitrate"
 msgstr "æ¯?ç?¹ç??"
 
-#: ../widgets/rb-query-creator-properties.c:86
+#: ../widgets/rb-query-creator-properties.c:92
 msgctxt "query-criteria"
 msgid "Duration"
 msgstr "��"
 
-#: ../widgets/rb-query-creator-properties.c:88
+#: ../widgets/rb-query-creator-properties.c:93
+msgctxt "query-criteria"
+msgid "Beats Per Minute"
+msgstr "æ¯?å??é??æ??æ?°"
+
+#: ../widgets/rb-query-creator-properties.c:94
 msgctxt "query-criteria"
 msgid "Time of Last Play"
 msgstr "�次����"
 
-#: ../widgets/rb-query-creator-properties.c:89
+#: ../widgets/rb-query-creator-properties.c:95
 msgctxt "query-criteria"
 msgid "Time Added to Library"
 msgstr "æ·»å? å?°åº?中ç??æ?¶é?´"
 
-#: ../widgets/rb-query-creator-properties.c:100
+#: ../widgets/rb-query-creator-properties.c:106
 msgctxt "query-sort"
 msgid "Artist"
 msgstr "�人"
 
-#: ../widgets/rb-query-creator-properties.c:100
-#: ../widgets/rb-query-creator-properties.c:101
-#: ../widgets/rb-query-creator-properties.c:102
-#: ../widgets/rb-query-creator-properties.c:103
+#: ../widgets/rb-query-creator-properties.c:106
+#: ../widgets/rb-query-creator-properties.c:107
+#: ../widgets/rb-query-creator-properties.c:108
+#: ../widgets/rb-query-creator-properties.c:109
+#: ../widgets/rb-query-creator-properties.c:110
+#: ../widgets/rb-query-creator-properties.c:118
 msgid "_In reverse alphabetical order"
 msgstr "以å??å­?æ¯?顺åº?(_I)"
 
-#: ../widgets/rb-query-creator-properties.c:101
+#: ../widgets/rb-query-creator-properties.c:107
 msgctxt "query-sort"
 msgid "Album"
 msgstr "��"
 
-#: ../widgets/rb-query-creator-properties.c:102
+#: ../widgets/rb-query-creator-properties.c:108
+msgctxt "query-sort"
+msgid "Album Artist"
+msgstr "���人"
+
+#: ../widgets/rb-query-creator-properties.c:109
 msgctxt "query-sort"
 msgid "Genre"
 msgstr "æµ?æ´¾"
 
-#: ../widgets/rb-query-creator-properties.c:103
+#: ../widgets/rb-query-creator-properties.c:110
 msgctxt "query-sort"
 msgid "Title"
 msgstr "��"
 
-#: ../widgets/rb-query-creator-properties.c:104
+#: ../widgets/rb-query-creator-properties.c:111
 msgctxt "query-sort"
 msgid "Rating"
 msgstr "è¯?å??"
 
-#: ../widgets/rb-query-creator-properties.c:104
+#: ../widgets/rb-query-creator-properties.c:111
 msgid "W_ith more highly rated tracks first"
 msgstr "æ?´é«?è¯?å??é?³è½¨ä¼?å??(_I)"
 
-#: ../widgets/rb-query-creator-properties.c:105
+#: ../widgets/rb-query-creator-properties.c:112
 msgctxt "query-sort"
 msgid "Play Count"
 msgstr "��计�"
 
-#: ../widgets/rb-query-creator-properties.c:105
+#: ../widgets/rb-query-creator-properties.c:112
 msgid "W_ith more often played songs first"
 msgstr "æ?´ç»?常æ?­æ?¾ç??æ­?æ?²ä¼?å??(_I)"
 
-#: ../widgets/rb-query-creator-properties.c:106
+#: ../widgets/rb-query-creator-properties.c:113
 msgctxt "query-sort"
 msgid "Year"
 msgstr "年份"
 
-#: ../widgets/rb-query-creator-properties.c:106
+#: ../widgets/rb-query-creator-properties.c:113
 msgid "W_ith newer tracks first"
 msgstr "è¾?æ?°é?³è½¨ä¼?å??(_I)"
 
-#: ../widgets/rb-query-creator-properties.c:107
+#: ../widgets/rb-query-creator-properties.c:114
 msgctxt "query-sort"
 msgid "Duration"
 msgstr "��"
 
-#: ../widgets/rb-query-creator-properties.c:107
+#: ../widgets/rb-query-creator-properties.c:114
 msgid "W_ith longer tracks first"
 msgstr "è¾?é?¿é?³è½¨ä¼?å??(_I)"
 
-#: ../widgets/rb-query-creator-properties.c:108
+#: ../widgets/rb-query-creator-properties.c:115
 msgctxt "query-sort"
 msgid "Track Number"
 msgstr "����"
 
-#: ../widgets/rb-query-creator-properties.c:108
+#: ../widgets/rb-query-creator-properties.c:115
 msgid "_In decreasing order"
 msgstr "æ??é??åº?(_I)"
 
-#: ../widgets/rb-query-creator-properties.c:109
+#: ../widgets/rb-query-creator-properties.c:116
 msgctxt "query-sort"
 msgid "Last Played"
 msgstr "�次��"
 
-#: ../widgets/rb-query-creator-properties.c:109
+#: ../widgets/rb-query-creator-properties.c:116
 msgid "W_ith more recently played tracks first"
 msgstr "æ?´è¿?æ?­æ?¾è¿?ç??æ?²ç?®ä¼?å??(_I)"
 
-#: ../widgets/rb-query-creator-properties.c:110
+#: ../widgets/rb-query-creator-properties.c:117
 msgctxt "query-sort"
 msgid "Date Added"
 msgstr "æ·»å? ç??æ?¥æ??"
 
-#: ../widgets/rb-query-creator-properties.c:110
+#: ../widgets/rb-query-creator-properties.c:117
 msgid "W_ith more recently added tracks first"
 msgstr "æ?´è¿?æ·»å? è¿?ç??é?³è½¨ä¼?å??(_I)"
 
-#: ../widgets/rb-query-creator-properties.c:123
+#: ../widgets/rb-query-creator-properties.c:118
+msgctxt "query-sort"
+msgid "Comment"
+msgstr "注é??"
+
+#: ../widgets/rb-query-creator-properties.c:119
+msgctxt "query-sort"
+msgid "Beats Per Minute"
+msgstr "æ¯?å??é??æ??æ?°"
+
+#: ../widgets/rb-query-creator-properties.c:119
+msgid "W_ith faster tempo tracks first"
+msgstr "é??度æ??å¿«ç??é?³è½¨é? å??(_I)"
+
+#: ../widgets/rb-query-creator-properties.c:132
 msgid "contains"
 msgstr "å??å?«"
 
-#: ../widgets/rb-query-creator-properties.c:124
+#: ../widgets/rb-query-creator-properties.c:133
 msgid "does not contain"
 msgstr "ä¸?å??å?«"
 
-#: ../widgets/rb-query-creator-properties.c:125
-#: ../widgets/rb-query-creator-properties.c:154
+#: ../widgets/rb-query-creator-properties.c:134
+#: ../widgets/rb-query-creator-properties.c:164
 msgid "equals"
 msgstr "��"
 
-#: ../widgets/rb-query-creator-properties.c:126
+#: ../widgets/rb-query-creator-properties.c:135
+#: ../widgets/rb-query-creator-properties.c:165
+msgid "not equal to"
+msgstr "���"
+
+#: ../widgets/rb-query-creator-properties.c:136
 msgid "starts with"
 msgstr "���"
 
-#: ../widgets/rb-query-creator-properties.c:127
+#: ../widgets/rb-query-creator-properties.c:137
 msgid "ends with"
 msgstr "ç»?æ??äº?"
 
-#: ../widgets/rb-query-creator-properties.c:155
+#: ../widgets/rb-query-creator-properties.c:166
 msgid "at least"
 msgstr "��"
 
 #. matches if A >= B
-#: ../widgets/rb-query-creator-properties.c:156
+#: ../widgets/rb-query-creator-properties.c:167
 msgid "at most"
 msgstr "æ??å¤?"
 
 #. Translators: this matches songs within 1-Jan-YEAR to 31-Dec-YEAR
-#: ../widgets/rb-query-creator-properties.c:166
+#: ../widgets/rb-query-creator-properties.c:177
 msgid "in"
 msgstr "å?¨ä¹?å??"
 
+#. Translators: this matches songs before 1-Jan-YEAR or after 31-Dec-YEAR
+#: ../widgets/rb-query-creator-properties.c:179
+msgid "not in"
+msgstr "ä¸?å?¨ä¹?å??"
+
 #. Translators: this matches songs after 31-Dec-YEAR
-#: ../widgets/rb-query-creator-properties.c:168
+#: ../widgets/rb-query-creator-properties.c:181
 msgid "after"
 msgstr "ä¹?å??"
 
 #. Translators: this matches songs before 1-Jan-YEAR
-#: ../widgets/rb-query-creator-properties.c:170
+#: ../widgets/rb-query-creator-properties.c:183
 msgid "before"
 msgstr "ä¹?å??"
 
@@ -5205,7 +5340,7 @@ msgstr "ä¹?å??"
 #. * Translators: this will match when within <value> of the current time
 #. * e.g. "in the last" "7 days" will match if within 7 days of the current time
 #.
-#: ../widgets/rb-query-creator-properties.c:225
+#: ../widgets/rb-query-creator-properties.c:247
 msgid "in the last"
 msgstr "å?¨æ??å??"
 
@@ -5213,27 +5348,27 @@ msgstr "å?¨æ??å??"
 #. * Translators: this is the opposite of the above, and will match if not
 #. * within <value> of the current time
 #.
-#: ../widgets/rb-query-creator-properties.c:231
+#: ../widgets/rb-query-creator-properties.c:253
 msgid "not in the last"
 msgstr "ä¸?å?¨æ??å??"
 
-#: ../widgets/rb-query-creator-properties.c:245
+#: ../widgets/rb-query-creator-properties.c:267
 msgid "seconds"
 msgstr "�"
 
-#: ../widgets/rb-query-creator-properties.c:246
+#: ../widgets/rb-query-creator-properties.c:268
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../widgets/rb-query-creator-properties.c:247
+#: ../widgets/rb-query-creator-properties.c:269
 msgid "hours"
 msgstr "å°?æ?¶"
 
-#: ../widgets/rb-query-creator-properties.c:248
+#: ../widgets/rb-query-creator-properties.c:270
 msgid "days"
 msgstr "天"
 
-#: ../widgets/rb-query-creator-properties.c:249
+#: ../widgets/rb-query-creator-properties.c:271
 msgid "weeks"
 msgstr "å?¨"
 
@@ -5264,365 +5399,22 @@ msgstr "æ??ç´¢(_S)ï¼?"
 msgid "Clear the search text"
 msgstr "æ¸?é?¤æ??ç´¢æ??æ?¬"
 
-#: ../widgets/rb-song-info.c:370
+#: ../widgets/rb-song-info.c:375
 msgid "Song Properties"
 msgstr "����"
 
-#: ../widgets/rb-song-info.c:418
+#: ../widgets/rb-song-info.c:432
 msgid "Multiple Song Properties"
 msgstr "������"
 
-#: ../widgets/rb-song-info.c:1150
+#: ../widgets/rb-song-info.c:1219
 msgid "Unknown file name"
 msgstr "æ?ªç?¥æ??件å??"
 
-#: ../widgets/rb-song-info.c:1172
+#: ../widgets/rb-song-info.c:1241
 msgid "On the desktop"
 msgstr "����"
 
-#: ../widgets/rb-song-info.c:1195
+#: ../widgets/rb-song-info.c:1264
 msgid "Unknown location"
 msgstr "���置"
-
-#~ msgid "Unable to start playback pipeline"
-#~ msgstr "�������水线"
-
-#~ msgid "Purchase Album"
-#~ msgstr "购买��"
-
-#~ msgid "Purchase this album from Magnatune"
-#~ msgstr "� Magnatune 购买���"
-
-#~ msgid "Password Required"
-#~ msgstr "é??è¦?å¯?ç ?"
-
-#~ msgid "Connection to %s:%d refused."
-#~ msgstr "è¿?æ?¥å?° %s:%d 被æ??ç»?ã??"
-
-#~ msgid "<b>Content</b>"
-#~ msgstr "<b>å??容</b>"
-
-#~ msgid "Number of Playlists:"
-#~ msgstr "æ?­æ?¾å??表æ?°é??ï¼?"
-
-#~ msgid "Number of Tracks:"
-#~ msgstr "�轨��"
-
-#~ msgid "iPod Properties"
-#~ msgstr "iPod å±?æ?§"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" foreground=\"red\">Your credit card is past the "
-#~ "expiration date listed.</span>"
-#~ msgstr "<span weight=\"bold\" foreground=\"red\">æ?¨ç??ä¿¡ç?¨å?¡å·²è¿?æ??ã??</span>"
-
-#~ msgid "C_redit Card:"
-#~ msgstr "信��(_R)�"
-
-#~ msgid "Default _amount to pay:"
-#~ msgstr "é»?认ç??æ?¯ä»?æ?°é??(_A)ï¼?"
-
-#~ msgid "Expiry:"
-#~ msgstr "è¿?æ??ï¼?"
-
-#~ msgid "Remember my credit card details"
-#~ msgstr "è®°ä½?æ??ç??ä¿¡ç?¨å?¡ç»?è??"
-
-#~ msgid "Visit Magnatune at "
-#~ msgstr "访� Magnatune �"
-
-#~ msgid "_Email:"
-#~ msgstr "���件(_E)�"
-
-#~ msgid "_Month:"
-#~ msgstr "æ??份(_M)ï¼?"
-
-#~ msgid "C_redit Card number:"
-#~ msgstr "信����(_R)�"
-
-#~ msgid "Credit Card"
-#~ msgstr "信��"
-
-#~ msgid "Expiry _month:"
-#~ msgstr "å?°æ??æ??份(_M)ï¼?"
-
-#~ msgid "Expiry _year (last two digits):"
-#~ msgstr "æ?ªæ­¢å¹´ä»½(æ??å??2ä½?æ?°å­?)(_Y)ï¼?"
-
-#~ msgid "Gift Card"
-#~ msgstr "礼å??å?¡"
-
-#~ msgid "Gift card number:"
-#~ msgstr "礼å??å?¡åº?å?·ï¼?"
-
-#~ msgid "Purchase Magnatune Tracks"
-#~ msgstr "购买 Magnatune �轨"
-
-#~ msgid "_Amount to pay (US Dollars):"
-#~ msgstr "ä»?款æ?°é??(ç¾?å??)(_A)ï¼?"
-
-#~ msgid "_Email address:"
-#~ msgstr "ç?µå­?é?®ä»¶å?°å??(_E)ï¼?"
-
-#~ msgid "_Name (as printed on card):"
-#~ msgstr "å§?å?? (å°?æ??å?°å?¨å?¡ä¸?) (_N)ï¼?"
-
-#~ msgid "_Purchase"
-#~ msgstr "è´­ä¹°(_P)"
-
-#~ msgid "_Remember my credit card details"
-#~ msgstr "è®°ä½?æ??ç??ä¿¡ç?¨å?¡ç»?è??(_R)"
-
-#~ msgid ""
-#~ "Would you like to purchase the album <i>%(album)s</i> by '%(artist)s'?"
-#~ msgstr "��购买�张�� <i>%(album)s</i> � '%(artist)s'�"
-
-#~ msgid "Authorizing Purchase"
-#~ msgstr "è´­ä¹°æ??æ??"
-
-#~ msgid "Authorizing purchase with the Magnatune server. Please wait..."
-#~ msgstr "æ­£é??è¿? Magnatune æ??å?¡è´­ä¹°æ??æ??ã??请ç¨?ç­?..."
-
-#~ msgid "Purchase Error"
-#~ msgstr "è´­ä¹°å?ºé??"
-
-#~ msgid "Purchase Physical CD"
-#~ msgstr "è´­ä¹°ç?©ç??å??ç??"
-
-#~ msgid "Purchase a physical CD from Magnatune"
-#~ msgstr "ä»? Magnatune è´­ä¹°ä¸?å¼ ç?©ç??å??ç??"
-
-#~ msgid "Orientation"
-#~ msgstr "æ?¹å??"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "æ??ç??æ?¹å??ã??"
-
-#~ msgid "Remove selection"
-#~ msgstr "å? é?¤é??中å??容"
-
-#~ msgid "Unknown playback error"
-#~ msgstr "æ?ªç?¥ç??å??æ?¾é??误"
-
-#~ msgid ""
-#~ "songs\n"
-#~ "MB\n"
-#~ "GB\n"
-#~ "Minutes"
-#~ msgstr ""
-#~ "æ­?æ?²\n"
-#~ "MB\n"
-#~ "GB\n"
-#~ "å??é??"
-
-#~ msgid ""
-#~ "Default\n"
-#~ "-\n"
-#~ "Text below icons\n"
-#~ "Text beside icons\n"
-#~ "Icons only\n"
-#~ "Text only"
-#~ msgstr ""
-#~ "�认\n"
-#~ "-\n"
-#~ "æ??å­?å?¨å?¾æ ?ä¸?\n"
-#~ "æ??å­?å?¨å?¾æ ?æ??\n"
-#~ "å?ªæ??å?¾æ ?\n"
-#~ "å?ªæ??æ??å­?"
-
-#~ msgid "C_rossfade between songs on the same album"
-#~ msgstr "å?¨å??ä¸?è¾?ç??æ­?æ?²ä¸­ä½¿ç?¨å¹³æ»?转æ?¢(_R)"
-
-#~ msgid "Crossfade Type"
-#~ msgstr "å¹³æ»?转æ?¢ç±»å??"
-
-#~ msgid "Rhythmbox Plugins"
-#~ msgstr "Rhythmbox æ??件"
-
-#~ msgid "-"
-#~ msgstr "ï¼?"
-
-#~ msgid ""
-#~ "Every hour\n"
-#~ "Every day\n"
-#~ "Every week\n"
-#~ "Manually"
-#~ msgstr ""
-#~ "���\n"
-#~ "�天\n"
-#~ "��\n"
-#~ "æ??å?¨"
-
-#~ msgid "HTTP proxy configuration error"
-#~ msgstr "HTTP 代ç??æ??å?¡å?¨é??ç½®é??误"
-
-#~ msgid "Rhythmbox does not support automatic proxy configuration"
-#~ msgstr "Rhythmbox ä¸?æ?¯æ??è?ªå?¨é??置代ç??æ??å?¡å?¨"
-
-#~ msgid "The GStreamer plugins to decode \"%s\" files cannot be found"
-#~ msgstr "ç?¨äº?解ç ?â??%sâ??æ??件ç?? GStreamer æ??件æ?¾ä¸?å?°"
-
-#~ msgid "The file contains a stream of type %s, which is not decodable"
-#~ msgstr "æ??件å??å?« %s ç±»å??ç??æµ?åª?ä½?ï¼?该类å??ä¸?å?¯è§£ç ?"
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "Incorrect password"
-#~ msgstr "���正确"
-
-#~ msgid "Handshake failed"
-#~ msgstr "æ?¡æ??失败"
-
-#~ msgid "Client update required"
-#~ msgstr "é??è¦?æ?´æ?°å®¢æ?·ç«¯"
-
-#~ msgid "Track submission failed"
-#~ msgstr "é?³è½¨æ??交失败"
-
-#~ msgid "Queue is too long"
-#~ msgstr "é??å??太é?¿"
-
-#~ msgid "Unable to resolve hostname %s"
-#~ msgstr "æ? æ³?解æ??主æ?ºå?? %s"
-
-#~ msgid "Minimize to the tray when closing the main window"
-#~ msgstr "å½?å?³é?­ä¸»çª?å?£æ?¶æ??å°?å??å?°æ??ç??"
-
-#~ msgid "Minimize to tray"
-#~ msgstr "æ??å°?å??å?°æ??ç??"
-
-#~ msgid "Your Name:"
-#~ msgstr "æ?¨ç??å§?å??ï¼?"
-
-#~ msgid ""
-#~ "$5 US\n"
-#~ "$6 US\n"
-#~ "$7 US\n"
-#~ "$8 US (typical)\n"
-#~ "$9 US\n"
-#~ "$10 US (better than average)\n"
-#~ "$11 US\n"
-#~ "$12 US (generous)\n"
-#~ "$13 US\n"
-#~ "$14 US\n"
-#~ "$15 US (very generous)\n"
-#~ "$16 US\n"
-#~ "$17 US\n"
-#~ "$18 US (we love you)"
-#~ msgstr ""
-#~ "$5 ç¾?é??\n"
-#~ "$6 ç¾?é??\n"
-#~ "$7 ç¾?é??\n"
-#~ "$8 ç¾?é?? (å?¸å??)\n"
-#~ "$9 ç¾?é??\n"
-#~ "$10 ç¾?é?? (好äº?å¹³å??)\n"
-#~ "$11 ç¾?é??\n"
-#~ "$12 ç¾?é?? (æ?·æ?¨è§£å??)\n"
-#~ "$13 ç¾?é??\n"
-#~ "$14 ç¾?é??\n"
-#~ "$15 ç¾?é?? (é??常æ?·æ?¨)\n"
-#~ "$16 ç¾?é??\n"
-#~ "$17 ç¾?é??\n"
-#~ "$18 ç¾?é?? (æ??们ç??ç??好ç?±æ?¨)"
-
-#~ msgid ""
-#~ "01\n"
-#~ "02\n"
-#~ "03\n"
-#~ "04\n"
-#~ "05\n"
-#~ "06\n"
-#~ "07\n"
-#~ "08\n"
-#~ "09\n"
-#~ "10\n"
-#~ "11\n"
-#~ "12"
-#~ msgstr ""
-#~ "01\n"
-#~ "02\n"
-#~ "03\n"
-#~ "04\n"
-#~ "05\n"
-#~ "06\n"
-#~ "07\n"
-#~ "08\n"
-#~ "09\n"
-#~ "10\n"
-#~ "11\n"
-#~ "12"
-
-#~ msgid ""
-#~ "Ogg Vorbis\n"
-#~ "FLAC\n"
-#~ "WAV\n"
-#~ "VBR MP3\n"
-#~ "128K MP3"
-#~ msgstr ""
-#~ "Ogg Vorbis\n"
-#~ "FLAC\n"
-#~ "WAV\n"
-#~ "VBR MP3\n"
-#~ "128K MP3"
-
-#~ msgid ""
-#~ "$5\n"
-#~ "$6\n"
-#~ "$7\n"
-#~ "$8 (typical)\n"
-#~ "$9\n"
-#~ "$10 (better than average)\n"
-#~ "$11\n"
-#~ "$12 (generous)\n"
-#~ "$13\n"
-#~ "$14\n"
-#~ "$15 (VERY generous!)\n"
-#~ "$16\n"
-#~ "$17\n"
-#~ "$18 (We love you!)"
-#~ msgstr ""
-#~ "$5\n"
-#~ "$6\n"
-#~ "$7\n"
-#~ "$8 (å?¸å??)\n"
-#~ "$9\n"
-#~ "$10 (好äº?å¹³å??)\n"
-#~ "$11\n"
-#~ "$12 (æ?·æ?¨è§£å??)\n"
-#~ "$13\n"
-#~ "$14\n"
-#~ "$15 (é??常æ?·æ?¨ï¼?)\n"
-#~ "$16\n"
-#~ "$17\n"
-#~ "$18 (æ??ç??ç??好ç?±æ?¨ï¼?)"
-
-#~ msgid ""
-#~ "January (01)\n"
-#~ "February (02)\n"
-#~ "March (03)\n"
-#~ "April (04)\n"
-#~ "May (05)\n"
-#~ "June (06)\n"
-#~ "July (07)\n"
-#~ "August (08)\n"
-#~ "September (09)\n"
-#~ "October (10)\n"
-#~ "November (11)\n"
-#~ "December (12)"
-#~ msgstr ""
-#~ "1æ?? (01)\n"
-#~ "2æ?? (02)\n"
-#~ "3æ?? (03)\n"
-#~ "4æ?? (04)\n"
-#~ "5æ?? (05)\n"
-#~ "6æ?? (06)\n"
-#~ "7æ?? (07)\n"
-#~ "8æ?? (08)\n"
-#~ "9æ?? (09)\n"
-#~ "10æ?? (10)\n"
-#~ "11æ?? (11)\n"
-#~ "12æ?? (12)"
-
-#~ msgid "%u kbps"
-#~ msgstr "%u kbps"



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