[rhythmbox] Updated British English translation



commit 51e9efc97d27dd74cd0959e3685de3109d5544cd
Author: Bruce Cowan <bcowan fastmail co uk>
Date:   Thu Aug 20 06:43:58 2009 +0100

    Updated British English translation

 po/en_GB.po | 2950 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 1670 insertions(+), 1280 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 05b31e5..ebe8de7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,10 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rhythmbox HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=rhythmbox&component=general\n"
-"POT-Creation-Date: 2009-03-27 00:08+0000\n"
-"PO-Revision-Date: 2009-03-27 15:43+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-20 06:41+0100\n"
+"PO-Revision-Date: 2009-06-29 15:47+0100\n"
 "Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
 "Language-Team: British English <en li org>\n"
 "MIME-Version: 1.0\n"
@@ -19,479 +18,454 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../backends/gstreamer/rb-encoder-gst.c:584
+#: ../backends/gstreamer/rb-encoder-gst.c:591
 #, c-format
 msgid "Do you want to overwrite the file \"%s\"?"
 msgstr "Do you want to overwrite the file \"%s\"?"
 
-#: ../backends/gstreamer/rb-encoder-gst.c:655
+#: ../backends/gstreamer/rb-encoder-gst.c:663
 #, c-format
 msgid "Could not create a GStreamer sink element to write to %s"
 msgstr "Could not create a GStreamer sink element to write to %s"
 
-#: ../backends/gstreamer/rb-player-gst.c:695 ../metadata/rb-metadata-gst.c:850
-#: ../metadata/rb-metadata-gst.c:1413
-#: ../plugins/cd-recorder/rb-recorder-gst.c:508
+#: ../backends/gstreamer/rb-player-gst.c:368
 #, c-format
-msgid "Failed to create %s element; check your installation"
-msgstr "Failed to create %s element; check your installation"
+msgid "Failed to create playbin2 element; check your GStreamer installation"
+msgstr "Failed to create playbin2 element; check your GStreamer installation"
 
-#: ../backends/gstreamer/rb-player-gst.c:763
+#. ?
+#: ../backends/gstreamer/rb-player-gst.c:582
+#: ../backends/gstreamer/rb-player-gst-xfade.c:2754
 #, c-format
-msgid "Unknown playback error"
-msgstr "Unknown playback error"
+msgid "Failed to open output device: %s"
+msgstr "Failed to open output device: %s"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:1138
-#: ../backends/gstreamer/rb-player-gst-xfade.c:1152
+#: ../backends/gstreamer/rb-player-gst.c:627
+#, c-format
+msgid "Unable to start playback pipeline"
+msgstr "Unable to start playback pipeline"
+
+#: ../backends/gstreamer/rb-player-gst-xfade.c:1151
+#: ../backends/gstreamer/rb-player-gst-xfade.c:1165
 #, c-format
 msgid "Failed to link new stream into GStreamer pipeline"
 msgstr "Failed to link new stream into GStreamer pipeline"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:1180
+#: ../backends/gstreamer/rb-player-gst-xfade.c:1193
 #, c-format
 msgid "Failed to start new stream"
 msgstr "Failed to start new stream"
 
 #. ?
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2719
+#: ../backends/gstreamer/rb-player-gst-xfade.c:2679
 #, c-format
 msgid "Failed to open output device"
 msgstr "Failed to open output device"
 
-#. ?
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2798
-#, c-format
-msgid "Failed to open output device: %s"
-msgstr "Failed to open output device: %s"
-
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3035
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3117
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3020
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3102
 #, c-format
 msgid "Failed to create GStreamer element; check your installation"
 msgstr "Failed to create GStreamer element; check your installation"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3046
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3031
 #, c-format
 msgid "Failed to create audio output element; check your installation"
 msgstr "Failed to create audio output element; check your installation"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3091
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3133
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3159
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3168
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3177
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3076
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3118
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3144
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3153
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3162
 #, c-format
 msgid "Failed to link GStreamer pipeline; check your installation"
 msgstr "Failed to link GStreamer pipeline; check your installation"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3272
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3257
 #, c-format
 msgid "Failed to create GStreamer pipeline to play %s"
 msgstr "Failed to create GStreamer pipeline to play %s"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3288
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3273
 #, c-format
 msgid "Failed to start playback of %s"
 msgstr "Failed to start playback of %s"
 
-#: ../data/glade/create-playlist.glade.h:1
+#: ../data/ui/create-playlist.ui.h:1
 msgid " "
 msgstr " "
 
-#: ../data/glade/create-playlist.glade.h:2
+#: ../data/ui/create-playlist.ui.h:2
 msgid "A_dd if any criteria are matched"
 msgstr "A_dd if any criteria are matched"
 
-#: ../data/glade/create-playlist.glade.h:3
+#: ../data/ui/create-playlist.ui.h:3
 msgid "Create automatically updating playlist where:"
 msgstr "Create automatically updating playlist where:"
 
-#: ../data/glade/create-playlist.glade.h:4
+#: ../data/ui/create-playlist.ui.h:4
+msgid "GB"
+msgstr "GB"
+
+#: ../data/ui/create-playlist.ui.h:5
+msgid "MB"
+msgstr "MB"
+
+#: ../data/ui/create-playlist.ui.h:6
+msgid "Minutes"
+msgstr "Minutes"
+
+#: ../data/ui/create-playlist.ui.h:7
 msgid "_Limit to: "
 msgstr "_Limit to: "
 
-#: ../data/glade/create-playlist.glade.h:5
+#: ../data/ui/create-playlist.ui.h:8
 msgid "_When sorted by:"
 msgstr "_When sorted by:"
 
-#: ../data/glade/create-playlist.glade.h:6
-msgid ""
-"songs\n"
-"MB\n"
-"GB\n"
-"Minutes"
-msgstr ""
-"songs\n"
-"MB\n"
-"GB\n"
-"Minutes"
+#: ../data/ui/create-playlist.ui.h:9
+msgid "songs"
+msgstr "songs"
 
-#: ../data/glade/general-prefs.glade.h:1
+#: ../data/ui/general-prefs.ui.h:1
 msgid "A_lbum"
 msgstr "A_lbum"
 
-#: ../data/glade/general-prefs.glade.h:2
+#: ../data/ui/general-prefs.ui.h:2
 msgid "Browser Views"
 msgstr "Browser Views"
 
-#: ../data/glade/general-prefs.glade.h:3
+#: ../data/ui/general-prefs.ui.h:3
 msgid "Da_te added"
 msgstr "Da_te added"
 
-#: ../data/glade/general-prefs.glade.h:4
-msgid ""
-"Default\n"
-"-\n"
-"Text below icons\n"
-"Text beside icons\n"
-"Icons only\n"
-"Text only"
-msgstr ""
-"Default\n"
-"-\n"
-"Text below icons\n"
-"Text beside icons\n"
-"Icons only\n"
-"Text only"
-
-#: ../data/glade/general-prefs.glade.h:10
+#: ../data/ui/general-prefs.ui.h:4
+msgid "Default"
+msgstr "Default"
+
+#: ../data/ui/general-prefs.ui.h:5
 msgid "G_enres, artists and albums"
 msgstr "G_enres, artists and albums"
 
-#: ../data/glade/general-prefs.glade.h:11
+#: ../data/ui/general-prefs.ui.h:6
+msgid "Icons only"
+msgstr "Icons only"
+
+#: ../data/ui/general-prefs.ui.h:7
 msgid "Lo_cation"
 msgstr "Lo_cation"
 
-#: ../data/glade/general-prefs.glade.h:12
+#: ../data/ui/general-prefs.ui.h:8
+msgid "Text below icons"
+msgstr "Text below icons"
+
+#: ../data/ui/general-prefs.ui.h:9
+msgid "Text beside icons"
+msgstr "Text beside icons"
+
+#: ../data/ui/general-prefs.ui.h:10
+msgid "Text only"
+msgstr "Text only"
+
+#: ../data/ui/general-prefs.ui.h:11
 msgid "Ti_me"
 msgstr "Ti_me"
 
-#: ../data/glade/general-prefs.glade.h:13
+#: ../data/ui/general-prefs.ui.h:12
 msgid "Toolbar Button Labels"
 msgstr "Toolbar Button Labels"
 
-#: ../data/glade/general-prefs.glade.h:14
+#: ../data/ui/general-prefs.ui.h:13
 msgid "Track _number"
 msgstr "Track _number"
 
-#: ../data/glade/general-prefs.glade.h:15
+#: ../data/ui/general-prefs.ui.h:14
 msgid "Visible Columns"
 msgstr "Visible Columns"
 
-#: ../data/glade/general-prefs.glade.h:16
+#: ../data/ui/general-prefs.ui.h:15
 msgid "_Artist"
 msgstr "_Artist"
 
-#: ../data/glade/general-prefs.glade.h:17
+#: ../data/ui/general-prefs.ui.h:16
 msgid "_Artists and albums"
 msgstr "_Artists and albums"
 
-#: ../data/glade/general-prefs.glade.h:18
+#: ../data/ui/general-prefs.ui.h:17
 msgid "_Genre"
 msgstr "_Genre"
 
-#: ../data/glade/general-prefs.glade.h:19
+#: ../data/ui/general-prefs.ui.h:18
 msgid "_Genres and artists"
 msgstr "_Genres and artists"
 
-#: ../data/glade/general-prefs.glade.h:20
+#: ../data/ui/general-prefs.ui.h:19
 msgid "_Last played"
 msgstr "_Last played"
 
-#: ../data/glade/general-prefs.glade.h:21
+#: ../data/ui/general-prefs.ui.h:20
 msgid "_Play count"
 msgstr "_Play count"
 
-#: ../data/glade/general-prefs.glade.h:22
+#: ../data/ui/general-prefs.ui.h:21
 msgid "_Quality"
 msgstr "_Quality"
 
-#: ../data/glade/general-prefs.glade.h:23
+#: ../data/ui/general-prefs.ui.h:22
 msgid "_Rating"
 msgstr "_Rating"
 
-#: ../data/glade/general-prefs.glade.h:24
+#: ../data/ui/general-prefs.ui.h:23
 msgid "_Year"
 msgstr "_Year"
 
-#: ../data/glade/library-prefs.glade.h:1
-#: ../data/glade/playback-prefs.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ../data/glade/library-prefs.glade.h:2
+#: ../data/ui/library-prefs.ui.h:1
 msgid "Artist/Artist - Album/Artist (Album) - 01 - Title.ogg"
 msgstr "Artist/Artist - Album/Artist (Album) - 01 - Title.ogg"
 
-#: ../data/glade/library-prefs.glade.h:3
+#: ../data/ui/library-prefs.ui.h:2
 msgid "F_older hierarchy:"
 msgstr "F_older hierarchy:"
 
-#: ../data/glade/library-prefs.glade.h:4
+#: ../data/ui/library-prefs.ui.h:3
 msgid "Library Location"
 msgstr "Library Location"
 
-#: ../data/glade/library-prefs.glade.h:5
+#: ../data/ui/library-prefs.ui.h:4
 msgid "Library Structure"
 msgstr "Library Structure"
 
-#: ../data/glade/library-prefs.glade.h:6
+#: ../data/ui/library-prefs.ui.h:5
 msgid "_Browse..."
-msgstr "_Browse..."
+msgstr "_Browseâ?¦"
 
-#: ../data/glade/library-prefs.glade.h:7 ../shell/rb-playlist-manager.c:190
+#: ../data/ui/library-prefs.ui.h:6 ../shell/rb-playlist-manager.c:190
 msgid "_Edit..."
-msgstr "_Edit..."
+msgstr "_Editâ?¦"
 
-#: ../data/glade/library-prefs.glade.h:8
+#: ../data/ui/library-prefs.ui.h:7
 msgid "_File name:"
 msgstr "_File name:"
 
-#: ../data/glade/library-prefs.glade.h:9
+#: ../data/ui/library-prefs.ui.h:8
 msgid "_Music files are placed in:"
 msgstr "_Music files are placed in:"
 
-#: ../data/glade/library-prefs.glade.h:10
+#: ../data/ui/library-prefs.ui.h:9
 msgid "_Preferred format:"
 msgstr "_Preferred format:"
 
-#: ../data/glade/library-prefs.glade.h:11
+#: ../data/ui/library-prefs.ui.h:10
 msgid "_Watch my library for new files"
 msgstr "_Watch my library for new files"
 
-#: ../data/glade/playback-prefs.glade.h:2
-msgid "C_rossfade between songs on the same album"
-msgstr "C_rossfade between songs on the same album"
-
-#: ../data/glade/playback-prefs.glade.h:3
+#: ../data/ui/playback-prefs.ui.h:1
 msgid "Crossfade Duration (Seconds)"
 msgstr "Crossfade Duration (Seconds)"
 
-#: ../data/glade/playback-prefs.glade.h:4
-msgid "Crossfade Type"
-msgstr "Crossfade Type"
-
-#: ../data/glade/playback-prefs.glade.h:5
+#: ../data/ui/playback-prefs.ui.h:2
 msgid "Network Buffer Size (kB)"
 msgstr "Network Buffer Size (KB)"
 
-#: ../data/glade/playback-prefs.glade.h:6
+#: ../data/ui/playback-prefs.ui.h:3
 msgid "Player Backend"
 msgstr "Player Backend"
 
-#: ../data/glade/playback-prefs.glade.h:7
+#: ../data/ui/playback-prefs.ui.h:4
 msgid "_Use crossfading backend (requires restart)"
 msgstr "_Use crossfading backend (requires restart)"
 
-#: ../data/glade/playlist-save.glade.h:1
+#: ../data/ui/playlist-save.ui.h:1
 msgid "<b>Playlist format</b>"
 msgstr "<b>Playlist format</b>"
 
-#: ../data/glade/playlist-save.glade.h:2
+#: ../data/ui/playlist-save.ui.h:2
 msgid "By extension"
 msgstr "By extension"
 
-#: ../data/glade/playlist-save.glade.h:3
+#: ../data/ui/playlist-save.ui.h:3
 msgid "Save Playlist"
 msgstr "Save Playlist"
 
-#: ../data/glade/playlist-save.glade.h:4
+#: ../data/ui/playlist-save.ui.h:4
 msgid "Select playlist format:"
 msgstr "Select playlist format:"
 
-#: ../data/glade/plugins.glade.h:1
-#: ../data/glade/podcast-feed-properties.glade.h:2
+#: ../data/ui/plugins.ui.h:1 ../data/ui/podcast-feed-properties.ui.h:1
 msgid "Author:"
 msgstr "Author:"
 
-#: ../data/glade/plugins.glade.h:2
+#: ../data/ui/plugins.ui.h:2
 msgid "C_onfigure..."
-msgstr "C_onfigure..."
+msgstr "C_onfigureâ?¦"
 
-#: ../data/glade/plugins.glade.h:3
-#: ../data/glade/podcast-feed-properties.glade.h:4
+#: ../data/ui/plugins.ui.h:3 ../data/ui/podcast-feed-properties.ui.h:3
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../data/glade/plugins.glade.h:4
-#: ../data/glade/podcast-feed-properties.glade.h:5
-#: ../data/glade/podcast-properties.glade.h:5
+#: ../data/ui/plugins.ui.h:4 ../data/ui/podcast-feed-properties.ui.h:4
+#: ../data/ui/podcast-properties.ui.h:4
 msgid "Description:"
 msgstr "Description:"
 
-#: ../data/glade/plugins.glade.h:5
-msgid "Rhythmbox Plugins"
-msgstr "Rhythmbox Plugins"
-
-#: ../data/glade/plugins.glade.h:6
+#: ../data/ui/plugins.ui.h:5
 msgid "Site:"
 msgstr "Site:"
 
-#: ../data/glade/podcast-feed-properties.glade.h:1
-#: ../data/glade/podcast-properties.glade.h:1
-msgid "-"
-msgstr "-"
-
-#: ../data/glade/podcast-feed-properties.glade.h:3
-#: ../data/glade/podcast-properties.glade.h:2
-#: ../data/glade/song-info.glade.h:1 ../plugins/ipod/ipod-info.glade.h:5
-#: ../plugins/iradio/station-properties.glade.h:1
+#: ../data/ui/podcast-feed-properties.ui.h:2
+#: ../data/ui/podcast-properties.ui.h:1 ../data/ui/song-info.ui.h:1
+#: ../plugins/ipod/ipod-info.ui.h:5
+#: ../plugins/iradio/station-properties.ui.h:1
 msgid "Basic"
 msgstr "Basic"
 
-#: ../data/glade/podcast-feed-properties.glade.h:6
-#: ../data/glade/podcast-properties.glade.h:6
-#: ../data/glade/song-info.glade.h:4
-#: ../plugins/iradio/station-properties.glade.h:3
+#: ../data/ui/podcast-feed-properties.ui.h:5
+#: ../data/ui/podcast-properties.ui.h:5 ../data/ui/song-info.ui.h:4
+#: ../plugins/iradio/station-properties.ui.h:3
 msgid "Details"
 msgstr "Details"
 
-#: ../data/glade/podcast-feed-properties.glade.h:7
+#: ../data/ui/podcast-feed-properties.ui.h:6
 msgid "Language:"
 msgstr "Language:"
 
-#: ../data/glade/podcast-feed-properties.glade.h:8
+#: ../data/ui/podcast-feed-properties.ui.h:7
 msgid "Last episode:"
 msgstr "Last episode:"
 
-#: ../data/glade/podcast-feed-properties.glade.h:9
+#: ../data/ui/podcast-feed-properties.ui.h:8
 msgid "Last updated:"
 msgstr "Last updated:"
 
-#: ../data/glade/podcast-feed-properties.glade.h:10
-#: ../data/glade/podcast-properties.glade.h:12
+#: ../data/ui/podcast-feed-properties.ui.h:9
+#: ../data/ui/podcast-properties.ui.h:11
 msgid "Source:"
 msgstr "Source:"
 
-#: ../data/glade/podcast-feed-properties.glade.h:11
-#: ../data/glade/podcast-properties.glade.h:13
+#: ../data/ui/podcast-feed-properties.ui.h:10
+#: ../data/ui/podcast-properties.ui.h:12
 msgid "Title:"
 msgstr "Title:"
 
-#: ../data/glade/podcast-prefs.glade.h:1
+#: ../data/ui/podcast-prefs.ui.h:1
 msgid "<b>Download Manager</b>"
 msgstr "<b>Download Manager</b>"
 
-#: ../data/glade/podcast-prefs.glade.h:2
+#: ../data/ui/podcast-prefs.ui.h:2
 msgid "Check for _new episodes:"
 msgstr "Check for _new episodes:"
 
-#: ../data/glade/podcast-prefs.glade.h:3
-msgid ""
-"Every hour\n"
-"Every day\n"
-"Every week\n"
-"Manually"
-msgstr ""
-"Every hour\n"
-"Every day\n"
-"Every week\n"
-"Manually"
+#: ../data/ui/podcast-prefs.ui.h:3
+msgid "Every day"
+msgstr "Every day"
+
+#: ../data/ui/podcast-prefs.ui.h:4
+msgid "Every hour"
+msgstr "Every hour"
+
+#: ../data/ui/podcast-prefs.ui.h:5
+msgid "Every week"
+msgstr "Every week"
+
+#: ../data/ui/podcast-prefs.ui.h:6
+msgid "Manually"
+msgstr "Manually"
 
-#: ../data/glade/podcast-prefs.glade.h:7
+#: ../data/ui/podcast-prefs.ui.h:7
 msgid "Select Folder For Podcasts"
 msgstr "Select Folder For Podcasts"
 
-#: ../data/glade/podcast-prefs.glade.h:8
+#: ../data/ui/podcast-prefs.ui.h:8
 msgid "_Download location:"
 msgstr "_Download location:"
 
-#: ../data/glade/podcast-properties.glade.h:3
-#: ../data/glade/song-info.glade.h:2
-#: ../plugins/iradio/station-properties.glade.h:2
+#: ../data/ui/podcast-properties.ui.h:2 ../data/ui/song-info.ui.h:2
+#: ../plugins/iradio/station-properties.ui.h:2
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: ../data/glade/podcast-properties.glade.h:4
+#: ../data/ui/podcast-properties.ui.h:3
 msgid "Date:"
 msgstr "Date:"
 
-#: ../data/glade/podcast-properties.glade.h:7
+#: ../data/ui/podcast-properties.ui.h:6
 msgid "Download location:"
 msgstr "Download location:"
 
-#: ../data/glade/podcast-properties.glade.h:8
-#: ../data/glade/song-info.glade.h:5
+#: ../data/ui/podcast-properties.ui.h:7 ../data/ui/song-info.ui.h:5
 msgid "Duration:"
 msgstr "Duration:"
 
-#: ../data/glade/podcast-properties.glade.h:9
+#: ../data/ui/podcast-properties.ui.h:8
 msgid "Feed:"
 msgstr "Feed:"
 
-#: ../data/glade/podcast-properties.glade.h:10
-#: ../data/glade/song-info.glade.h:9
-#: ../plugins/iradio/station-properties.glade.h:6
+#: ../data/ui/podcast-properties.ui.h:9 ../data/ui/song-info.ui.h:9
+#: ../plugins/iradio/station-properties.ui.h:6
 msgid "Last played:"
 msgstr "Last played:"
 
-#: ../data/glade/podcast-properties.glade.h:11
-#: ../data/glade/song-info.glade.h:11
-#: ../plugins/iradio/station-properties.glade.h:7
+#: ../data/ui/podcast-properties.ui.h:10 ../data/ui/song-info.ui.h:11
+#: ../plugins/iradio/station-properties.ui.h:7
 msgid "Play count:"
 msgstr "Play count:"
 
-#: ../data/glade/podcast-properties.glade.h:14
-#: ../data/glade/song-info-multiple.glade.h:5
-#: ../data/glade/song-info.glade.h:16
-#: ../plugins/iradio/station-properties.glade.h:9
+#: ../data/ui/podcast-properties.ui.h:13 ../data/ui/song-info-multiple.ui.h:5
+#: ../data/ui/song-info.ui.h:16 ../plugins/iradio/station-properties.ui.h:9
 msgid "_Rating:"
 msgstr "_Rating:"
 
-#: ../data/glade/song-info-multiple.glade.h:1
-#: ../data/glade/song-info.glade.h:12
+#: ../data/ui/song-info-multiple.ui.h:1 ../data/ui/song-info.ui.h:12
 msgid "_Album:"
 msgstr "_Album:"
 
-#: ../data/glade/song-info-multiple.glade.h:2
-#: ../data/glade/song-info.glade.h:13
+#: ../data/ui/song-info-multiple.ui.h:2 ../data/ui/song-info.ui.h:13
+#: ../plugins/audiocd/album-info.ui.h:3
 msgid "_Artist:"
 msgstr "_Artist:"
 
-#: ../data/glade/song-info-multiple.glade.h:3
-#: ../data/glade/song-info.glade.h:14
+#: ../data/ui/song-info-multiple.ui.h:3 ../data/ui/song-info.ui.h:14
 msgid "_Disc number:"
 msgstr "_Disc number:"
 
-#: ../data/glade/song-info-multiple.glade.h:4
-#: ../data/glade/song-info.glade.h:15
-#: ../plugins/iradio/station-properties.glade.h:8
+#: ../data/ui/song-info-multiple.ui.h:4 ../data/ui/song-info.ui.h:15
+#: ../plugins/audiocd/album-info.ui.h:5
+#: ../plugins/iradio/station-properties.ui.h:8
 msgid "_Genre:"
 msgstr "_Genre:"
 
-#: ../data/glade/song-info-multiple.glade.h:6
-#: ../data/glade/song-info.glade.h:19
-#: ../plugins/magnatune/magnatune-prefs.glade.h:46
+#: ../data/ui/song-info-multiple.ui.h:6 ../data/ui/song-info.ui.h:19
+#: ../plugins/audiocd/album-info.ui.h:6
+#: ../plugins/magnatune/magnatune-prefs.ui.h:46
 msgid "_Year:"
 msgstr "_Year:"
 
-#: ../data/glade/song-info.glade.h:3
+#: ../data/ui/song-info.ui.h:3
 msgid "Date added:"
 msgstr "Date added:"
 
-#: ../data/glade/song-info.glade.h:6
-#: ../plugins/iradio/station-properties.glade.h:4
+#: ../data/ui/song-info.ui.h:6 ../plugins/iradio/station-properties.ui.h:4
 msgid "Error message"
 msgstr "Error message"
 
-#: ../data/glade/song-info.glade.h:7
+#: ../data/ui/song-info.ui.h:7
 msgid "File name:"
 msgstr "File name:"
 
-#: ../data/glade/song-info.glade.h:8
+#: ../data/ui/song-info.ui.h:8
 msgid "File size:"
 msgstr "File size:"
 
-#: ../data/glade/song-info.glade.h:10
+#: ../data/ui/song-info.ui.h:10
 msgid "Location:"
 msgstr "Location:"
 
-#: ../data/glade/song-info.glade.h:17
-#: ../plugins/iradio/station-properties.glade.h:10
+#: ../data/ui/song-info.ui.h:17 ../plugins/iradio/station-properties.ui.h:10
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../data/glade/song-info.glade.h:18
+#: ../data/ui/song-info.ui.h:18
 msgid "_Track number:"
 msgstr "_Track number:"
 
@@ -509,8 +483,9 @@ msgstr "Recently Played"
 
 #: ../data/rhythmbox.desktop.in.in.h:1
 #: ../plugins/power-manager/rb-power-manager-plugin.c:207
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1492 ../shell/rb-shell.c:1045
-#: ../shell/rb-shell.c:2183 ../shell/rb-tray-icon.c:49
+#: ../plugins/status-icon/rb-status-icon-plugin.c:60
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1524 ../shell/rb-shell.c:1022
+#: ../shell/rb-shell.c:1989
 msgid "Music Player"
 msgstr "Music Player"
 
@@ -522,6 +497,69 @@ msgstr "Play and organise your music collection"
 msgid "Rhythmbox Music Player"
 msgstr "Rhythmbox Music Player"
 
+#: ../lib/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "File is not a valid .desktop file"
+
+#: ../lib/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "Unrecognised desktop file Version '%s'"
+
+#: ../lib/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "Starting %s"
+
+#: ../lib/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "Application does not accept documents on command line"
+
+#: ../lib/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "Unrecognised launch option: %d"
+
+#: ../lib/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
+
+#: ../lib/eggdesktopfile.c:1392
+#, c-format
+msgid "Not a launchable item"
+msgstr "Not a launchable item"
+
+#: ../lib/eggsmclient.c:225
+msgid "Disable connection to session manager"
+msgstr "Disable connection to session manager"
+
+#: ../lib/eggsmclient.c:228
+msgid "Specify file containing saved configuration"
+msgstr "Specify file containing saved configuration"
+
+#: ../lib/eggsmclient.c:228
+msgid "FILE"
+msgstr "FILE"
+
+#: ../lib/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr "Specify session management ID"
+
+#: ../lib/eggsmclient.c:231
+msgid "ID"
+msgstr "ID"
+
+#: ../lib/eggsmclient.c:252
+msgid "Session management options:"
+msgstr "Session management options:"
+
+#: ../lib/eggsmclient.c:253
+msgid "Show session management options"
+msgstr "Show session management options"
+
 #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am"
 #: ../lib/rb-cut-and-paste-code.c:270
 msgid "Today %I:%M %p"
@@ -556,82 +594,71 @@ msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. impossible time or broken locale settings
-#. TODO: Improve to decrease wrong cover downloads, maybe add severity?
-#. Assemble list of search keywords (and thus search queries)
-#. If we still have no definite hit, use first result where artist matches
 #. we really do need to fix this so untagged entries actually have NULL rather than
 #. * a translated string.
 #.
+#. don't search for 'unknown' when we don't have the artist or title information
 #. Translators: unknown track title
 #: ../lib/rb-cut-and-paste-code.c:326 ../lib/rb-util.c:576
 #: ../lib/rb-util.c:816
-#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:85
-#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:86
-#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:88
-#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:123
-#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:129
-#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:248
-#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:269
-#: ../plugins/artdisplay/artdisplay/CoverArtDatabase.py:179
+#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:93
+#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:95
 #: ../plugins/artdisplay/artdisplay/CoverArtDatabase.py:180
-#: ../plugins/audiocd/rb-audiocd-source.c:217
-#: ../plugins/audioscrobbler/rb-audioscrobbler-entry.c:95
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:510
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:514
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:534
+#: ../plugins/artdisplay/artdisplay/CoverArtDatabase.py:181
+#: ../plugins/audiocd/rb-audiocd-source.c:436
+#: ../plugins/audioscrobbler/rb-audioscrobbler-entry.c:94
+#: ../plugins/audioscrobbler/rb-audioscrobbler-entry.c:101
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:493
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:497
 #: ../plugins/daap/rb-daap-connection.c:698
-#: ../plugins/generic-player/rb-generic-player-source.c:1295
-#: ../plugins/ipod/rb-ipod-source.c:305
+#: ../plugins/generic-player/rb-generic-player-source.c:1063
+#: ../plugins/ipod/rb-ipod-source.c:307
 #: ../plugins/jamendo/jamendo/JamendoSaxHandler.py:67
-#: ../plugins/iradio/rb-iradio-source.c:530
-#: ../plugins/iradio/rb-iradio-source.c:1094
-#: ../plugins/iradio/rb-station-properties-dialog.c:495
-#: ../plugins/mtpdevice/rb-mtp-source.c:495
-#: ../podcast/rb-feed-podcast-properties-dialog.c:320
+#: ../plugins/iradio/rb-iradio-source.c:527
+#: ../plugins/iradio/rb-iradio-source.c:1092
+#: ../plugins/iradio/rb-station-properties-dialog.c:491
+#: ../plugins/lyrics/lyrics/__init__.py:81
+#: ../plugins/lyrics/lyrics/__init__.py:83
+#: ../plugins/mtpdevice/rb-mtp-source.c:536
+#: ../plugins/mtpdevice/rb-mtp-source.c:907
+#: ../plugins/mtpdevice/rb-mtp-source.c:995
+#: ../plugins/status-icon/rb-status-icon-plugin.c:727
+#: ../podcast/rb-feed-podcast-properties-dialog.c:316
 #: ../podcast/rb-podcast-manager.c:1873
-#: ../podcast/rb-podcast-properties-dialog.c:487
-#: ../podcast/rb-podcast-properties-dialog.c:539
-#: ../remote/dbus/rb-client.c:140 ../rhythmdb/rhythmdb-tree.c:1284
-#: ../rhythmdb/rhythmdb-tree.c:1288 ../rhythmdb/rhythmdb-tree.c:1292
-#: ../rhythmdb/rhythmdb-tree.c:1296 ../rhythmdb/rhythmdb.c:1770
-#: ../shell/rb-shell-player.c:1711 ../shell/rb-shell.c:3106
-#: ../sources/rb-podcast-source.c:1668 ../widgets/rb-entry-view.c:1041
-#: ../widgets/rb-entry-view.c:1066 ../widgets/rb-entry-view.c:1469
-#: ../widgets/rb-entry-view.c:1481 ../widgets/rb-entry-view.c:1493
-#: ../widgets/rb-song-info.c:889 ../widgets/rb-song-info.c:1054
-#: ../widgets/rb-song-info.c:1374
+#: ../podcast/rb-podcast-properties-dialog.c:483
+#: ../podcast/rb-podcast-properties-dialog.c:535
+#: ../remote/dbus/rb-client.c:142 ../rhythmdb/rhythmdb-tree.c:1287
+#: ../rhythmdb/rhythmdb-tree.c:1291 ../rhythmdb/rhythmdb-tree.c:1295
+#: ../rhythmdb/rhythmdb-tree.c:1299 ../rhythmdb/rhythmdb.c:1817
+#: ../shell/rb-shell-player.c:1672 ../sources/rb-podcast-source.c:1657
+#: ../widgets/rb-entry-view.c:1044 ../widgets/rb-entry-view.c:1066
+#: ../widgets/rb-entry-view.c:1520 ../widgets/rb-entry-view.c:1532
+#: ../widgets/rb-entry-view.c:1544 ../widgets/rb-song-info.c:882
+#: ../widgets/rb-song-info.c:1048 ../widgets/rb-song-info.c:1372
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../lib/rb-file-helpers.c:217
+#: ../lib/rb-file-helpers.c:211
 #, c-format
 msgid "Unable to move %s to %s: %s"
 msgstr "Unable to move %s to %s: %s"
 
-#: ../lib/rb-file-helpers.c:386
+#: ../lib/rb-file-helpers.c:380
 #, c-format
 msgid "Too many symlinks"
 msgstr "Too many symlinks"
 
-#: ../lib/rb-file-helpers.c:994
+#: ../lib/rb-file-helpers.c:988
 #, c-format
 msgid "Cannot get free space at %s: %s"
 msgstr "Cannot get free space at %s: %s"
 
-#: ../lib/rb-proxy-config.c:218
-msgid "HTTP proxy configuration error"
-msgstr "HTTP proxy configuration error"
-
-#: ../lib/rb-proxy-config.c:219
-msgid "Rhythmbox does not support automatic proxy configuration"
-msgstr "Rhythmbox does not support automatic proxy configuration"
-
-#: ../lib/rb-util.c:578 ../remote/dbus/rb-client.c:142
+#: ../lib/rb-util.c:578 ../remote/dbus/rb-client.c:144
 #, c-format
 msgid "%d:%02d"
 msgstr "%d:%02d"
 
-#: ../lib/rb-util.c:580 ../remote/dbus/rb-client.c:144
+#: ../lib/rb-util.c:580 ../remote/dbus/rb-client.c:146
 #, c-format
 msgid "%d:%02d:%02d"
 msgstr "%d:%02d:%02d"
@@ -656,71 +683,56 @@ msgstr "%d:%02d of %d:%02d"
 msgid "%d:%02d:%02d of %d:%02d:%02d"
 msgstr "%d:%02d:%02d of %d:%02d:%02d"
 
-#: ../metadata/rb-metadata-dbus-client.c:324
+#: ../metadata/rb-metadata-dbus-client.c:381
 #, c-format
 msgid "Internal GStreamer problem; file a bug"
 msgstr "Internal GStreamer problem; file a bug"
 
-#: ../metadata/rb-metadata-dbus-client.c:342
-#: ../metadata/rb-metadata-dbus-client.c:403
-#: ../metadata/rb-metadata-dbus-client.c:408
-#: ../metadata/rb-metadata-dbus-client.c:428
-#: ../metadata/rb-metadata-dbus-client.c:438
-#: ../metadata/rb-metadata-dbus-client.c:448
-#: ../metadata/rb-metadata-dbus-client.c:467
-#: ../metadata/rb-metadata-dbus-client.c:479
-#: ../metadata/rb-metadata-dbus-client.c:710
-#: ../metadata/rb-metadata-dbus-client.c:720
+#: ../metadata/rb-metadata-dbus-client.c:399
+#: ../metadata/rb-metadata-dbus-client.c:435
+#: ../metadata/rb-metadata-dbus-client.c:773
+#: ../metadata/rb-metadata-dbus-client.c:783
 #, c-format
 msgid "D-BUS communication error"
 msgstr "D-BUS communication error"
 
-#: ../metadata/rb-metadata-gst.c:645
-#, c-format
-msgid "The GStreamer plugins to decode \"%s\" files cannot be found"
-msgstr "The GStreamer plugins to decode \"%s\" files cannot be found"
-
-#: ../metadata/rb-metadata-gst.c:648
+#: ../metadata/rb-metadata-gst.c:517 ../metadata/rb-metadata-gst.c:1063
+#: ../plugins/cd-recorder/rb-recorder-gst.c:507
 #, c-format
-msgid "The file contains a stream of type %s, which is not decodable"
-msgstr "The file contains a stream of type %s, which is not decodable"
+msgid "Failed to create %s element; check your installation"
+msgstr "Failed to create %s element; check your installation"
 
-#: ../metadata/rb-metadata-gst.c:1040
+#: ../metadata/rb-metadata-gst.c:735
 #, c-format
 msgid "Failed to create a source element; check your installation"
 msgstr "Failed to create a source element; check your installation"
 
-#: ../metadata/rb-metadata-gst.c:1103
+#: ../metadata/rb-metadata-gst.c:797
 #, c-format
 msgid "GStreamer error: failed to change state"
 msgstr "GStreamer error: failed to change state"
 
-#: ../metadata/rb-metadata-gst.c:1199
-#, c-format
-msgid "Empty file"
-msgstr "Empty file"
-
-#: ../metadata/rb-metadata-gst.c:1207
+#: ../metadata/rb-metadata-gst.c:848
 #, c-format
 msgid "The MIME type of the file could not be identified"
 msgstr "The MIME type of the file could not be identified"
 
-#: ../metadata/rb-metadata-gst.c:1341
+#: ../metadata/rb-metadata-gst.c:991
 #, c-format
 msgid "Unsupported file type: %s"
 msgstr "Unsupported file type: %s"
 
-#: ../metadata/rb-metadata-gst.c:1350
+#: ../metadata/rb-metadata-gst.c:1000
 #, c-format
 msgid "Unable to create tag-writing elements"
 msgstr "Unable to create tag-writing elements"
 
-#: ../metadata/rb-metadata-gst.c:1365
+#: ../metadata/rb-metadata-gst.c:1015
 #, c-format
 msgid "Timeout while setting pipeline to NULL"
 msgstr "Timeout while setting pipeline to NULL"
 
-#: ../metadata/rb-metadata-gst.c:1389
+#: ../metadata/rb-metadata-gst.c:1039
 #, c-format
 msgid "File corrupted during write"
 msgstr "File corrupted during write"
@@ -733,11 +745,11 @@ msgstr "Cover art"
 msgid "Fetch album covers from the Internet"
 msgstr "Fetch album covers from the Internet"
 
-#: ../plugins/artdisplay/artdisplay/__init__.py:288
+#: ../plugins/artdisplay/artdisplay/__init__.py:308
 msgid "Searching... drop artwork here"
-msgstr "Searching... drop artwork here"
+msgstr "Searchingâ?¦ drop artwork here"
 
-#: ../plugins/artdisplay/artdisplay/__init__.py:290
+#: ../plugins/artdisplay/artdisplay/__init__.py:310
 msgid "Drop artwork here"
 msgstr "Drop artwork here"
 
@@ -749,11 +761,23 @@ msgstr "Audio CD Player"
 msgid "Support for playing of audio CDs as music source"
 msgstr "Support for playing of audio CDs as music source"
 
-#: ../plugins/audiocd/multiple-album.glade.h:1
+#: ../plugins/audiocd/album-info.ui.h:1
+msgid "A_lbum:"
+msgstr "A_lbum:"
+
+#: ../plugins/audiocd/album-info.ui.h:2
+msgid "Artist s_ort order:"
+msgstr "Artist s_ort order:"
+
+#: ../plugins/audiocd/album-info.ui.h:4
+msgid "_Disc:"
+msgstr "_Disc:"
+
+#: ../plugins/audiocd/multiple-album.ui.h:1
 msgid "Multiple Albums Found"
 msgstr "Multiple Albums Found"
 
-#: ../plugins/audiocd/multiple-album.glade.h:2
+#: ../plugins/audiocd/multiple-album.ui.h:2
 msgid ""
 "This CD could be more than one album. Please select which album it is below "
 "and press <i>Continue</i>."
@@ -761,49 +785,74 @@ msgstr ""
 "This CD could be more than one album. Please select which album it is below "
 "and press <i>Continue</i>."
 
-#: ../plugins/audiocd/multiple-album.glade.h:3
+#: ../plugins/audiocd/multiple-album.ui.h:3
 msgid "_Continue"
 msgstr "_Continue"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:221
+#: ../plugins/audiocd/rb-audiocd-source.c:138
+msgid "Reload"
+msgstr "Reload"
+
+#: ../plugins/audiocd/rb-audiocd-source.c:139
+msgid "Reload Album Information"
+msgstr "Reload Album Information"
+
+#. Info bar for non-Musicbrainz data
+#: ../plugins/audiocd/rb-audiocd-source.c:309
+msgid "S_ubmit Album"
+msgstr "S_ubmit Album"
+
+#: ../plugins/audiocd/rb-audiocd-source.c:310
+msgid "Hide"
+msgstr "Hide"
+
+#: ../plugins/audiocd/rb-audiocd-source.c:312
+msgid "Could not find this album on MusicBrainz."
+msgstr "Could not find this album on MusicBrainz."
+
+#: ../plugins/audiocd/rb-audiocd-source.c:313
+msgid "You can improve the MusicBrainz database by adding this album."
+msgstr "You can improve the MusicBrainz database by adding this album."
+
+#: ../plugins/audiocd/rb-audiocd-source.c:440
 msgid "<Invalid unicode>"
 msgstr "<Invalid unicode>"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:267
+#: ../plugins/audiocd/rb-audiocd-source.c:486
 #, c-format
 msgid "Track %u"
 msgstr "Track %u"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:327
-#: ../plugins/audiocd/rb-audiocd-source.c:335
-#: ../plugins/audiocd/rb-audiocd-source.c:668
+#: ../plugins/audiocd/rb-audiocd-source.c:546
+#: ../plugins/audiocd/rb-audiocd-source.c:554
+#: ../plugins/audiocd/rb-audiocd-source.c:942
 msgid "Couldn't load Audio CD"
 msgstr "Couldn't load Audio CD"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:328
+#: ../plugins/audiocd/rb-audiocd-source.c:547
 msgid "Rhythmbox couldn't access the CD."
 msgstr "Rhythmbox couldn't access the CD."
 
-#: ../plugins/audiocd/rb-audiocd-source.c:336
+#: ../plugins/audiocd/rb-audiocd-source.c:555
 msgid "Rhythmbox couldn't read the CD information."
 msgstr "Rhythmbox couldn't read the CD information."
 
-#: ../plugins/audiocd/rb-audiocd-source.c:438
-#: ../sources/rb-library-source.c:150 ../widgets/rb-entry-view.c:1425
+#: ../plugins/audiocd/rb-audiocd-source.c:653
+#: ../sources/rb-library-source.c:150 ../widgets/rb-entry-view.c:1476
 #: ../widgets/rb-query-creator-properties.c:75
 #: ../widgets/rb-query-creator-properties.c:105
 msgid "Title"
 msgstr "Title"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:445
-#: ../sources/rb-library-source.c:141 ../widgets/rb-entry-view.c:1435
+#: ../plugins/audiocd/rb-audiocd-source.c:660
+#: ../sources/rb-library-source.c:141 ../widgets/rb-entry-view.c:1486
 #: ../widgets/rb-library-browser.c:143
 #: ../widgets/rb-query-creator-properties.c:76
 #: ../widgets/rb-query-creator-properties.c:102
 msgid "Artist"
 msgstr "Artist"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:669
+#: ../plugins/audiocd/rb-audiocd-source.c:943
 msgid "Rhythmbox could not get access to the CD device."
 msgstr "Rhythmbox could not get access to the CD device."
 
@@ -817,23 +866,23 @@ msgstr "Could not create CD lookup thread"
 msgid "Cannot access CD"
 msgstr "Cannot access CD"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:106
+#: ../plugins/audiocd/sj-metadata-gvfs.c:105
 #: ../plugins/audiocd/sj-metadata-musicbrainz.c:344
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:110
-#: ../plugins/audiocd/sj-metadata-gvfs.c:133
+#: ../plugins/audiocd/sj-metadata-gvfs.c:109
+#: ../plugins/audiocd/sj-metadata-gvfs.c:132
 #: ../plugins/audiocd/sj-metadata-musicbrainz.c:328
 msgid "Unknown Artist"
 msgstr "Unknown Artist"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:130
+#: ../plugins/audiocd/sj-metadata-gvfs.c:129
 #, c-format
 msgid "Track %d"
 msgstr "Track %d"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:147
+#: ../plugins/audiocd/sj-metadata-gvfs.c:150
 #, c-format
 msgid "Cannot access CD: %s"
 msgstr "Cannot access CD: %s"
@@ -857,340 +906,330 @@ msgstr "Incomplete metadata for this CD"
 msgid "[Untitled]"
 msgstr "[Untitled]"
 
-#: ../plugins/audiocd/sj-metadata.c:187
+#: ../plugins/audiocd/sj-metadata.c:190
 #, c-format
 msgid "Device '%s' does not contain any media"
 msgstr "Device '%s' does not contain any media"
 
-#: ../plugins/audiocd/sj-metadata.c:190
+#: ../plugins/audiocd/sj-metadata.c:193
 #, c-format
 msgid ""
 "Device '%s' could not be opened. Check the access permissions on the device."
 msgstr ""
 "Device '%s' could not be opened. Check the access permissions on the device."
 
-#: ../plugins/audiocd/sj-metadata.c:193 ../plugins/audiocd/sj-metadata.c:205
+#: ../plugins/audiocd/sj-metadata.c:196 ../plugins/audiocd/sj-metadata.c:208
 #, c-format
 msgid "Cannot read CD: %s"
 msgstr "Cannot read CD: %s"
 
 #: ../plugins/audioscrobbler/audioscrobbler.rb-plugin.in.h:1
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:734
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:711
 msgid "Last.fm"
 msgstr "Last.fm"
 
 #: ../plugins/audioscrobbler/audioscrobbler.rb-plugin.in.h:2
-msgid "Submits song information to last.fm and plays last.fm radio streams"
-msgstr "Submits song information to last.fm and plays last.fm radio streams"
+msgid "Submits song information to Last.fm and plays Last.fm radio streams"
+msgstr "Submits song information to Last.fm and plays Last.fm radio streams"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:2
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:1
 msgid "Account Login"
 msgstr "Account Login"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:3
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:2
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:4
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:3
 msgid "Join the Rhythmbox group"
 msgstr "Join the Rhythmbox group"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:5
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:4
 msgid "Last submission time:"
 msgstr "Last submission time:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:6
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1083
-#: ../plugins/iradio/rb-station-properties-dialog.c:506
-#: ../rhythmdb/rhythmdb.c:3587 ../widgets/rb-entry-view.c:989
-#: ../widgets/rb-entry-view.c:1527 ../widgets/rb-entry-view.c:1540
-#: ../widgets/rb-song-info.c:1347
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:5
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:980
+#: ../plugins/iradio/rb-station-properties-dialog.c:502
+#: ../rhythmdb/rhythmdb.c:3706 ../widgets/rb-entry-view.c:992
+#: ../widgets/rb-entry-view.c:1579 ../widgets/rb-entry-view.c:1592
+#: ../widgets/rb-song-info.c:1345
 msgid "Never"
 msgstr "Never"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:7
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:6
 msgid "New to Last.fm?"
 msgstr "New to Last.fm?"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:8
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:7
 msgid "Queued tracks:"
 msgstr "Queued tracks:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:9
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:8
 msgid "Sign up for an account"
 msgstr "Sign up for an account"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:10
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:9
 msgid "Statistics"
 msgstr "Statistics"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:11
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:10
 msgid "Status:"
 msgstr "Status:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:12
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:11
 msgid "Tracks submitted:"
 msgstr "Tracks submitted:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:13
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:12
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:14
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:13
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-plugin.c:216
+#: ../plugins/audioscrobbler/rb-audioscrobbler-plugin.c:211
 msgid "Last.fm Preferences"
 msgstr "Last.fm Preferences"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1106
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1003
 msgid "OK"
 msgstr "OK"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1109
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1816
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1006
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1768
 msgid "Logging in"
 msgstr "Logging in"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1112
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1009
 msgid "Request failed"
 msgstr "Request failed"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1115
-msgid "Incorrect username"
-msgstr "Incorrect username"
-
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1118
-msgid "Incorrect password"
-msgstr "Incorrect password"
-
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1121
-msgid "Handshake failed"
-msgstr "Handshake failed"
-
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1124
-msgid "Client update required"
-msgstr "Client update required"
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1012
+msgid "Incorrect username or password"
+msgstr "Incorrect username or password"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1127
-msgid "Track submission failed"
-msgstr "Track submission failed"
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1015
+msgid "Clock is not set correctly"
+msgstr "Clock is not set correctly"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1130
-msgid "Queue is too long"
-msgstr "Queue is too long"
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1018
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:880
+msgid "This version of Rhythmbox has been banned from Last.fm."
+msgstr "This version of Rhythmbox has been banned from Last.fm."
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1133
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1021
 msgid "Track submission failed too many times"
 msgstr "Track submission failed too many times"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:192
 msgid "Similar Artists radio"
 msgstr "Similar Artists radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1292
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:192
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1267
 #, c-format
 msgid "Artists similar to %s"
 msgstr "Artists similar to %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:193
 msgid "Tag radio"
 msgstr "Tag radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:193
 #, c-format
 msgid "Tracks tagged with %s"
 msgstr "Tracks tagged with %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
 msgid "Artist Fan radio"
 msgstr "Artist Fan radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1294
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1269
 #, c-format
 msgid "Artists liked by fans of %s"
 msgstr "Artists liked by fans of %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
 msgid "Group radio"
 msgstr "Group radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
 #, c-format
 msgid "Tracks liked by the %s group"
 msgstr "Tracks liked by the %s group"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
 msgid "Neighbour radio"
 msgstr "Neighbour radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1302
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1277
 #, c-format
 msgid "%s's Neighbour Radio"
 msgstr "%s's Neighbour Radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
 msgid "Personal radio"
 msgstr "Personal radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1306
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1281
 #, c-format
 msgid "%s's Personal Radio"
 msgstr "%s's Personal Radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:200
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
 msgid "Loved tracks"
 msgstr "Loved tracks"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:200
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1308
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1283
 #, c-format
 msgid "%s's Loved Tracks"
 msgstr "%s's Loved Tracks"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:201
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
 msgid "Recommended tracks"
 msgstr "Recommended tracks"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:201
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
 #, c-format
 msgid "Tracks recommended to %s"
 msgstr "Tracks recommended to %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:287
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:200
+msgid "Playlist"
+msgstr "Playlist"
+
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:200
+#, c-format
+msgid "%s's playlist"
+msgstr "%s's playlist"
+
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:284
 msgid "Love"
 msgstr "Love"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:288
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:285
 msgid "Mark this song as loved"
 msgstr "Mark this song as loved"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:290
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:287
 msgid "Ban"
 msgstr "Ban"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:291
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:288
 msgid "Ban the current track from being played again"
 msgstr "Ban the current track from being played again"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:293
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:290
 msgid "Delete Station"
 msgstr "Delete Station"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:294
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:291
 msgid "Delete the selected station"
 msgstr "Delete the selected station"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:296
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:293
 msgid "Download song"
 msgstr "Download song"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:297
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:294
 msgid "Download this song"
 msgstr "Download this song"
 
 #. awful
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:517
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:501
 msgid "Enter the item to build a Last.fm station out of:"
 msgstr "Enter the item to build a Last.fm station out of:"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:520
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:504
 msgid "Add"
 msgstr "Add"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:876
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:851
 msgid "Account Settings"
 msgstr "Account Settings"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:901
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:876
 msgid ""
 "Account details are needed before you can connect.  Check your settings."
 msgstr ""
 "Account details are needed before you can connect.  Check your settings."
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:905
-msgid "This version of Rhythmbox has been banned from Last.fm."
-msgstr "This version of Rhythmbox has been banned from Last.fm."
-
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:909
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:884
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1283
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1258
 #, c-format
 msgid "Global Tag %s"
 msgstr "Global Tag %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1304
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1279
 #, c-format
 msgid "%s's Recommended Radio: %s percent"
 msgstr "%s's Recommended Radio: %s percent"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1310
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1285
 #, c-format
 msgid "%s's Playlist"
 msgstr "%s's Playlist"
 
 #. Translators: variables are 1: user name, 2: tag name; for user tag radio
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1316
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1291
 #, c-format
 msgid "%s's %s Radio"
 msgstr "%s's %s Radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1320
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1295
 #, c-format
 msgid "%s Group Radio"
 msgstr "%s Group Radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1786
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1738
 msgid "Neighbour Radio"
 msgstr "Neighbour Radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1794
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1746
 msgid "Personal Radio"
 msgstr "Personal Radio"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1884
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1836
 msgid "Server did not respond"
 msgstr "Server did not respond"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1952
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1904
 msgid "There is not enough content available to play this station."
 msgstr "There is not enough content available to play this station."
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1957
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1909
 msgid "This station is available to subscribers only."
 msgstr "This station is available to subscribers only."
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1964
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1916
 msgid ""
 "The streaming system is offline for maintenance, please try again later."
 msgstr ""
 "The streaming system is offline for maintenance, please try again later."
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:2003
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1955
 msgid "Changing station"
 msgstr "Changing station"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:2223
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:2233
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:2176
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:2186
 msgid "Retrieving playlist"
 msgstr "Retrieving playlist"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:2327
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:2280
 msgid "Banning song"
 msgstr "Banning song"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:2345
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:2298
 msgid "Adding song to your Loved tracks"
 msgstr "Adding song to your Loved tracks"
 
@@ -1207,7 +1246,7 @@ msgstr "Record audio CDs from playlists and duplicate audio CDs"
 #: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:98
 #: ../plugins/cd-recorder/rb-cd-recorder-plugin.c:89
 msgid "_Create Audio CD..."
-msgstr "_Create Audio CD..."
+msgstr "_Create Audio CDâ?¦"
 
 #: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:99
 #: ../plugins/cd-recorder/rb-cd-recorder-plugin.c:90
@@ -1217,7 +1256,7 @@ msgstr "Create an audio CD from playlist"
 #: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:101
 #: ../plugins/cd-recorder/rb-cd-recorder-plugin.c:92
 msgid "Duplicate Audio CD..."
-msgstr "Duplicate Audio CD..."
+msgstr "Duplicate Audio CDâ?¦"
 
 #: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:102
 #: ../plugins/cd-recorder/rb-cd-recorder-plugin.c:93
@@ -1284,67 +1323,67 @@ msgstr "Could not duplicate disc"
 msgid "Reason"
 msgstr "Reason"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:420
+#: ../plugins/cd-recorder/rb-recorder-gst.c:419
 #, c-format
 msgid "Failed to create pipeline"
 msgstr "Failed to create pipeline"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:526
-#: ../plugins/cd-recorder/rb-recorder-gst.c:532
+#: ../plugins/cd-recorder/rb-recorder-gst.c:525
+#: ../plugins/cd-recorder/rb-recorder-gst.c:531
 #, c-format
 msgid "Unable to unlink '%s'"
 msgstr "Unable to unlink '%s'"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:587
+#: ../plugins/cd-recorder/rb-recorder-gst.c:586
 msgid "Could not retrieve state from processing pipeline"
 msgstr "Could not retrieve state from processing pipeline"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:602
+#: ../plugins/cd-recorder/rb-recorder-gst.c:601
 msgid "Could not get current track position"
 msgstr "Could not get current track position"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:650
+#: ../plugins/cd-recorder/rb-recorder-gst.c:649
 #, c-format
 msgid "Could not start pipeline playing"
 msgstr "Could not start pipeline playing"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:661
+#: ../plugins/cd-recorder/rb-recorder-gst.c:660
 #, c-format
 msgid "Could not pause playback"
 msgstr "Could not pause playback"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:842
+#: ../plugins/cd-recorder/rb-recorder-gst.c:841
 #, c-format
 msgid "Cannot find drive"
 msgstr "Cannot find drive"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:882
+#: ../plugins/cd-recorder/rb-recorder-gst.c:881
 #, c-format
 msgid "Cannot find drive %s"
 msgstr "Cannot find drive %s"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:891
+#: ../plugins/cd-recorder/rb-recorder-gst.c:890
 #, c-format
 msgid "Drive %s is not a recorder"
 msgstr "Drive %s is not a recorder"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:1019
-#: ../plugins/cd-recorder/rb-recorder-gst.c:1204
+#: ../plugins/cd-recorder/rb-recorder-gst.c:1018
+#: ../plugins/cd-recorder/rb-recorder-gst.c:1203
 #, c-format
-msgid "No writable drives found."
-msgstr "No writable drives found."
+msgid "No writable drives found"
+msgstr "No writable drives found"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:1154
+#: ../plugins/cd-recorder/rb-recorder-gst.c:1153
 #, c-format
 msgid "Could not get track time for file: %s"
 msgstr "Could not get track time for file: %s"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:1213
+#: ../plugins/cd-recorder/rb-recorder-gst.c:1212
 #, c-format
-msgid "Could not determine audio track durations."
-msgstr "Could not determine audio track durations."
+msgid "Could not determine audio track durations"
+msgstr "Could not determine audio track durations"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:1255
+#: ../plugins/cd-recorder/rb-recorder-gst.c:1254
 #, c-format
 msgid ""
 "There was an error writing to the CD:\n"
@@ -1353,34 +1392,34 @@ msgstr ""
 "There was an error writing to the CD:\n"
 "%s"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:1259
+#: ../plugins/cd-recorder/rb-recorder-gst.c:1258
 msgid "There was an error writing to the CD"
 msgstr "There was an error writing to the CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:304
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:279
 msgid "Maximum possible"
 msgstr "Maximum possible"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:371
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:346
 #, c-format
 msgid "Invalid writer device: %s"
 msgstr "Invalid writer device: %s"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:472
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:447
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:474
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:449
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:477
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:452
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1388,42 +1427,42 @@ msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
 #. hour:minutes:seconds
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:482
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:457
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
 
 #. minutes:seconds
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:485
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:460
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. seconds
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:488
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:463
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. 0 seconds
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:491
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:466
 msgid "0 seconds"
 msgstr "0 seconds"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:510
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:485
 #, c-format
 msgid "About %s left"
 msgstr "About %s left"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:538
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:513
 msgid "Writing audio to CD"
 msgstr "Writing audio to CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:554
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:529
 msgid "Finished creating audio CD."
 msgstr "Finished creating audio CD."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:578
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:547
 msgid ""
 "Finished creating audio CD.\n"
 "Create another copy?"
@@ -1431,210 +1470,210 @@ msgstr ""
 "Finished creating audio CD.\n"
 "Create another copy?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:580
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:549
 msgid "Writing failed.  Try again?"
 msgstr "Writing failed.  Try again?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:582
-msgid "Writing cancelled.  Try again?"
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:551
+msgid "Writing canceled.  Try again?"
 msgstr "Writing cancelled.  Try again?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:650
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:619
 msgid "Audio recording error"
 msgstr "Audio recording error"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:679
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:648
 msgid "Audio Conversion Error"
 msgstr "Audio Conversion Error"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:709
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:678
 msgid "Recording error"
 msgstr "Recording error"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:829
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:798
 msgid "Do you wish to interrupt writing this disc?"
 msgstr "Do you wish to interrupt writing this disc?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:832
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:801
 msgid "This may result in an unusable disc."
 msgstr "This may result in an unusable disc."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:839
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:808
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:840
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:809
 msgid "_Interrupt"
 msgstr "_Interrupt"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:862
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:831
 msgid "Could not create audio CD"
 msgstr "Could not create audio CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:884
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:853
 msgid "Please make sure another application is not using the drive."
 msgstr "Please make sure another application is not using the drive."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:885
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:854
 msgid "Drive is busy"
 msgstr "Drive is busy"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:887
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:856
 msgid "Please put a rewritable or blank CD in the drive."
 msgstr "Please put a rewritable or blank CD in the drive."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:888
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:857
 msgid "Insert a rewritable or blank CD"
 msgstr "Insert a rewritable or blank CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:890
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:859
 msgid "Please put a blank CD in the drive."
 msgstr "Please put a blank CD in the drive."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:891
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:860
 msgid "Insert a blank CD"
 msgstr "Insert a blank CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:893
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:862
 msgid "Please replace the disc in the drive with a rewritable or blank CD."
 msgstr "Please replace the disc in the drive with a rewritable or blank CD."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:894
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:863
 msgid "Reload a rewritable or blank CD"
 msgstr "Reload a rewritable or blank CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:896
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:865
 msgid "Please replace the disc in the drive with a blank CD."
 msgstr "Please replace the disc in the drive with a blank CD."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:897
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:866
 msgid "Reload a blank CD"
 msgstr "Reload a blank CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:948
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:917
 msgid "Converting audio tracks"
 msgstr "Converting audio tracks"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:951
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:920
 msgid "Preparing to write CD"
 msgstr "Preparing to write CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:954
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:923
 msgid "Writing CD"
 msgstr "Writing CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:957
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:926
 msgid "Finishing write"
 msgstr "Finishing write"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:960
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:929
 msgid "Erasing CD"
 msgstr "Erasing CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:963
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:932
 msgid "Unhandled action in burn_action_changed_cb"
 msgstr "Unhandled action in burn_action_changed_cb"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:987
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:956
 #, c-format
 msgid "This %s appears to have information already recorded on it."
 msgstr "This %s appears to have information already recorded on it."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:994
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:963
 msgid "Erase information on this disc?"
 msgstr "Erase information on this disc?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1003
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:972
 msgid "_Try Another"
 msgstr "_Try Another"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1010
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:979
 msgid "_Erase Disc"
 msgstr "_Erase Disc"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1169
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1144
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1236
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1221
 #, c-format
 msgid "Failed to create the recorder: %s"
 msgstr "Failed to create the recorder: %s"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1360
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1345
 #, c-format
 msgid "Could not remove temporary directory '%s': %s"
 msgstr "Could not remove temporary directory '%s': %s"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1380
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1365
 msgid "Create Audio CD"
 msgstr "Create Audio CD"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1398
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1383
 #, c-format
 msgid "Create audio CD from '%s'?"
 msgstr "Create audio CD from '%s'?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1444
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1462
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1429
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1447
 #, c-format
 msgid "Unable to build an audio track list."
 msgstr "Unable to build an audio track list."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1472
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1457
 #, c-format
 msgid "This playlist is too long to write to an audio CD."
 msgstr "This playlist is too long to write to an audio CD."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1608
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1593
 #, c-format
 msgid ""
 "This playlist is %s minutes long.  This exceeds the length of a standard "
-"audio CD.  If the destination media is larger than a standard audio CD "
+"audio CD.  If the destination medium is larger than a standard audio CD "
 "please insert it in the drive and try again."
 msgstr ""
 "This playlist is %s minutes long.  This exceeds the length of a standard "
-"audio CD.  If the destination media is larger than a standard audio CD "
+"audio CD.  If the destination medium is larger than a standard audio CD "
 "please insert it in the drive and try again."
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1619
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1604
 msgid "Playlist too long"
 msgstr "Playlist too long"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1659
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1644
 msgid "Could not find temporary space!"
 msgstr "Could not find temporary space!"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1660
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1645
 #, c-format
 msgid ""
-"Could not find enough temporary space to convert audio tracks.  %s MiB "
+"Could not find enough temporary space to convert audio tracks.  %s MB "
 "required."
 msgstr ""
 "Could not find enough temporary space to convert audio tracks.  %s MB "
 "required."
 
-#: ../plugins/cd-recorder/recorder.glade.h:1
+#: ../plugins/cd-recorder/recorder.ui.h:1
 msgid "Create audio CD from playlist?"
 msgstr "Create audio CD from playlist?"
 
-#: ../plugins/cd-recorder/recorder.glade.h:2
+#: ../plugins/cd-recorder/recorder.ui.h:2
 msgid "Options"
 msgstr "Options"
 
-#: ../plugins/cd-recorder/recorder.glade.h:3
+#: ../plugins/cd-recorder/recorder.ui.h:3
 msgid "Progress"
 msgstr "Progress"
 
-#: ../plugins/cd-recorder/recorder.glade.h:4
+#: ../plugins/cd-recorder/recorder.ui.h:4
 msgid "Write _speed:"
 msgstr "Write _speed:"
 
-#: ../plugins/cd-recorder/recorder.glade.h:5
+#: ../plugins/cd-recorder/recorder.ui.h:5
 msgid "Write disc _to:"
 msgstr "Write disc _to:"
 
-#: ../plugins/cd-recorder/recorder.glade.h:6
+#: ../plugins/cd-recorder/recorder.ui.h:6
 msgid "_Make multiple copies"
 msgstr "_Make multiple copies"
 
@@ -1658,19 +1697,19 @@ msgstr "DAAP Music Sharing"
 msgid "Share music and play shared music on your local network"
 msgstr "Share music and play shared music on your local network"
 
-#: ../plugins/daap/daap-prefs.glade.h:1
+#: ../plugins/daap/daap-prefs.ui.h:1
 msgid "<b>Sharing</b>"
 msgstr "<b>Sharing</b>"
 
-#: ../plugins/daap/daap-prefs.glade.h:2
+#: ../plugins/daap/daap-prefs.ui.h:2
 msgid "Require _password:"
 msgstr "Require _password:"
 
-#: ../plugins/daap/daap-prefs.glade.h:3 ../plugins/daap/rb-daap-dialog.c:82
+#: ../plugins/daap/daap-prefs.ui.h:3 ../plugins/daap/rb-daap-dialog.c:82
 msgid "Shared music _name:"
 msgstr "Shared music _name:"
 
-#: ../plugins/daap/daap-prefs.glade.h:4
+#: ../plugins/daap/daap-prefs.ui.h:4
 msgid "_Share my music"
 msgstr "_Share my music"
 
@@ -1689,8 +1728,8 @@ msgstr "The shared music name '%s' is already taken. Please choose another."
 
 #: ../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 service is not running"
+msgid "mDNS service is not running"
+msgstr "mDNS service is not running"
 
 #: ../plugins/daap/rb-daap-mdns-browser-avahi.c:245
 msgid "Browser already active"
@@ -1718,12 +1757,12 @@ msgstr "Could not commit service"
 
 #: ../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 "The avahi MDNS service is not running"
+msgid "The avahi mDNS service is not running"
+msgstr "The avahi mDNS service is not running"
 
 #: ../plugins/daap/rb-daap-mdns-publisher-avahi.c:310
-msgid "The MDNS service is not published"
-msgstr "The MDNS service is not published"
+msgid "The mDNS service is not published"
+msgstr "The mDNS service is not published"
 
 #: ../plugins/daap/rb-daap-plugin.c:125
 msgid "_Disconnect"
@@ -1735,30 +1774,21 @@ msgstr "Disconnect from DAAP share"
 
 #: ../plugins/daap/rb-daap-plugin.c:128
 msgid "Connect to _DAAP share..."
-msgstr "Connect to _DAAP share..."
+msgstr "Connect to _DAAP shareâ?¦"
 
 #: ../plugins/daap/rb-daap-plugin.c:129
 msgid "Connect to a new DAAP share"
 msgstr "Connect to a new DAAP share"
 
-#: ../plugins/daap/rb-daap-plugin.c:647 ../plugins/daap/rb-daap-source.c:525
-msgid "Could not connect to shared music"
-msgstr "Could not connect to shared music"
-
-#: ../plugins/daap/rb-daap-plugin.c:648
-#, c-format
-msgid "Unable to resolve hostname %s"
-msgstr "Unable to resolve hostname %s"
-
-#: ../plugins/daap/rb-daap-plugin.c:699
+#: ../plugins/daap/rb-daap-plugin.c:660
 msgid "New DAAP share"
 msgstr "New DAAP share"
 
-#: ../plugins/daap/rb-daap-plugin.c:699
+#: ../plugins/daap/rb-daap-plugin.c:660
 msgid "Host:port of DAAP share:"
 msgstr "Host:port of DAAP share:"
 
-#: ../plugins/daap/rb-daap-plugin.c:924
+#: ../plugins/daap/rb-daap-plugin.c:882
 msgid "DAAP Music Sharing Preferences"
 msgstr "DAAP Music Sharing Preferences"
 
@@ -1767,36 +1797,32 @@ msgstr "DAAP Music Sharing Preferences"
 msgid "%s's Music"
 msgstr "%s's Music"
 
-#: ../plugins/daap/rb-daap-source.c:357
+#: ../plugins/daap/rb-daap-source.c:360 ../plugins/daap/rb-daap-source.c:414
 #, c-format
 msgid "The music share '%s' requires a password to connect"
 msgstr "The music share '%s' requires a password to connect"
 
-#: ../plugins/daap/rb-daap-source.c:359
+#: ../plugins/daap/rb-daap-source.c:416
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../plugins/daap/rb-daap-source.c:431
+#: ../plugins/daap/rb-daap-source.c:528
 msgid "Connecting to music share"
 msgstr "Connecting to music share"
 
-#: ../plugins/daap/rb-daap-source.c:438
+#: ../plugins/daap/rb-daap-source.c:535
 msgid "Retrieving songs from music share"
 msgstr "Retrieving songs from music share"
 
-#: ../plugins/daap/rb-daap-src.c:480
+#: ../plugins/daap/rb-daap-source.c:622
+msgid "Could not connect to shared music"
+msgstr "Could not connect to shared music"
+
+#: ../plugins/daap/rb-daap-src.c:495
 #, c-format
 msgid "Connection to %s:%d refused."
 msgstr "Connection to %s:%d refused."
 
-#: ../plugins/dontreallyclose/dontreallyclose.rb-plugin.in.h:1
-msgid "Minimize to the tray when closing the main window"
-msgstr "Minimise to the tray when closing the main window"
-
-#: ../plugins/dontreallyclose/dontreallyclose.rb-plugin.in.h:2
-msgid "Minimize to tray"
-msgstr "Minimise to tray"
-
 #: ../plugins/fmradio/fmradio.rb-plugin.in.h:1
 #: ../plugins/fmradio/rb-fm-radio-source.c:203
 msgid "FM Radio"
@@ -1830,28 +1856,72 @@ msgstr "Portable Players"
 msgid "Support for generic audio player devices (plus PSP and Nokia 770)"
 msgstr "Support for generic audio player devices (plus PSP and Nokia 770)"
 
-#: ../plugins/generic-player/rb-generic-player-plugin.c:98
+#: ../plugins/generic-player/rb-generic-player-plugin.c:96
 #: ../shell/rb-playlist-manager.c:1150 ../shell/rb-playlist-manager.c:1193
 msgid "New Playlist"
 msgstr "New Playlist"
 
-#: ../plugins/generic-player/rb-generic-player-plugin.c:99
+#: ../plugins/generic-player/rb-generic-player-plugin.c:97
 msgid "Create a new playlist on this device"
 msgstr "Create a new playlist on this device"
 
-#: ../plugins/generic-player/rb-generic-player-plugin.c:101
+#: ../plugins/generic-player/rb-generic-player-plugin.c:99
 msgid "Delete Playlist"
 msgstr "Delete Playlist"
 
-#: ../plugins/generic-player/rb-generic-player-plugin.c:102
+#: ../plugins/generic-player/rb-generic-player-plugin.c:100
 msgid "Delete this playlist"
 msgstr "Delete this playlist"
 
-#: ../plugins/generic-player/rb-generic-player-source.c:964
+#: ../plugins/generic-player/rb-generic-player-source.c:627
 #, c-format
 msgid "Importing (%d/%d)"
 msgstr "Importing (%d/%d)"
 
+#: ../plugins/im-status/im-status.rb-plugin.in.h:1
+msgid "IM Status"
+msgstr "IM Status"
+
+#: ../plugins/im-status/im-status.rb-plugin.in.h:2
+msgid ""
+"Updates IM status according to the current song (works with Empathy & Gossip)"
+msgstr ""
+"Updates IM status according to the current song (works with Empathy & Gossip)"
+
+#. Translators: do not translate %(artist)s or %(title)s, they are
+#. string substitution markers (like %s) for the artist and title of
+#. the current playing song.  They can be reordered if necessary.
+#: ../plugins/im-status/im-status/__init__.py:153
+#, python-format
+msgid "â?« %(artist)s - %(title)s â?«"
+msgstr "â?« %(artist)s - %(title)s â?«"
+
+#. Translators: do not translate %(artist)s or %(album)s, they are
+#. string substitution markers (like %s) for the artist and album name
+#. of the current playing song.  They can be reordered if necessary.
+#: ../plugins/im-status/im-status/__init__.py:158
+#, python-format
+msgid "â?« %(artist)s - %(album)s â?«"
+msgstr "â?« %(artist)s - %(album)s â?«"
+
+#. Translators: do not translate %(album)s, it is a string substitution
+#. marker (like %s) for the album name of the current playing song.
+#: ../plugins/im-status/im-status/__init__.py:162
+#, python-format
+msgid "â?« %(album)s â?«"
+msgstr "â?« %(album)s â?«"
+
+#. Translators: do not translate %(title)s, it is a string substitution
+#. marker (like %s) for the title of the current playing song.
+#: ../plugins/im-status/im-status/__init__.py:166
+#, python-format
+msgid "â?« %(title)s â?«"
+msgstr "â?« %(title)s â?«"
+
+#: ../plugins/im-status/im-status/__init__.py:168
+msgid "â?« Listening to music... â?«"
+msgstr "â?« Listening to musicâ?¦ â?«"
+
 #: ../plugins/ipod/ipod.rb-plugin.in.h:1
 msgid "Portable Players - iPod"
 msgstr "Portable Players - iPod"
@@ -1860,72 +1930,68 @@ msgstr "Portable Players - iPod"
 msgid "Support for Apple iPod devices (show the content, play from device)"
 msgstr "Support for Apple iPod devices (show the content, play from device)"
 
-#: ../plugins/ipod/ipod-info.glade.h:1
+#: ../plugins/ipod/ipod-info.ui.h:1
 msgid "<b>Content</b>"
 msgstr "<b>Content</b>"
 
-#: ../plugins/ipod/ipod-info.glade.h:2
+#: ../plugins/ipod/ipod-info.ui.h:2
 msgid "<b>Information</b>"
 msgstr "<b>Information</b>"
 
-#: ../plugins/ipod/ipod-info.glade.h:3
+#: ../plugins/ipod/ipod-info.ui.h:3
 msgid "<b>System</b>"
 msgstr "<b>System</b>"
 
-#: ../plugins/ipod/ipod-info.glade.h:4
+#: ../plugins/ipod/ipod-info.ui.h:4
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../plugins/ipod/ipod-info.glade.h:6
+#: ../plugins/ipod/ipod-info.ui.h:6
 msgid "Database Version:"
 msgstr "Database Version:"
 
-#: ../plugins/ipod/ipod-info.glade.h:7
+#: ../plugins/ipod/ipod-info.ui.h:7
 msgid "Device Node:"
 msgstr "Device Node:"
 
-#: ../plugins/ipod/ipod-info.glade.h:8
+#: ../plugins/ipod/ipod-info.ui.h:8
 msgid "Firmware Version:"
 msgstr "Firmware Version:"
 
-#: ../plugins/ipod/ipod-info.glade.h:9
+#: ../plugins/ipod/ipod-info.ui.h:9
 msgid "Model:"
 msgstr "Model:"
 
-#: ../plugins/ipod/ipod-info.glade.h:10
+#: ../plugins/ipod/ipod-info.ui.h:10
 msgid "Mount Point:"
 msgstr "Mount Point:"
 
-#: ../plugins/ipod/ipod-info.glade.h:11
+#: ../plugins/ipod/ipod-info.ui.h:11
 msgid "Number of Playlists:"
 msgstr "Number of Playlists:"
 
-#: ../plugins/ipod/ipod-info.glade.h:12
+#: ../plugins/ipod/ipod-info.ui.h:12
 msgid "Number of Tracks:"
 msgstr "Number of Tracks:"
 
-#: ../plugins/ipod/ipod-info.glade.h:13
+#: ../plugins/ipod/ipod-info.ui.h:13
 msgid "Serial Number:"
 msgstr "Serial Number:"
 
 #. amount of disk space used on the iPod
-#: ../plugins/ipod/ipod-info.glade.h:15
+#: ../plugins/ipod/ipod-info.ui.h:15
 msgid "Volume Usage:"
 msgstr "Volume Usage:"
 
-#: ../plugins/ipod/ipod-info.glade.h:16
-msgid "Your Name:"
-msgstr "Your Name:"
-
-#: ../plugins/ipod/ipod-info.glade.h:17
+#: ../plugins/ipod/ipod-info.ui.h:16
 msgid "iPod Name:"
 msgstr "iPod Name:"
 
-#: ../plugins/ipod/ipod-info.glade.h:18
+#: ../plugins/ipod/ipod-info.ui.h:17
 msgid "iPod Properties"
 msgstr "iPod Properties"
 
-#: ../plugins/ipod/ipod-init.glade.h:1
+#: ../plugins/ipod/ipod-init.ui.h:1
 msgid ""
 "<span size=\"x-large\" weight=\"bold\">Do you want to initialize your iPod?</"
 "span>"
@@ -1933,91 +1999,91 @@ msgstr ""
 "<span size=\"x-large\" weight=\"bold\">Do you want to initialise your iPod?</"
 "span>"
 
-#: ../plugins/ipod/ipod-init.glade.h:2
+#: ../plugins/ipod/ipod-init.ui.h:2
 msgid ""
-"Rhythmbox has detected a device that is probably an uninitialised or "
-"corrupted iPod. It must be initialised before Rhythmbox can use it, but this "
+"Rhythmbox has detected a device that is probably an uninitialized or "
+"corrupted iPod. It must be initialized before Rhythmbox can use it, but this "
 "will destroy any song metadata already present. If you wish Rhythmbox to "
-"initialise the iPod, please fill in the information below. If the device is "
-"not an iPod, or you do not wish to initialise it, please click cancel."
+"initialize the iPod, please fill in the information below. If the device is "
+"not an iPod, or you do not wish to initialize it, please click cancel."
 msgstr ""
 "Rhythmbox has detected a device that is probably an uninitialised or "
 "corrupted iPod. It must be initialised before Rhythmbox can use it, but this "
 "will destroy any song metadata already present. If you wish Rhythmbox to "
 "initialise the iPod, please fill in the information below. If the device is "
-"not an iPod, or you do not wish to initialise it, please click Cancel."
+"not an iPod, or you do not wish to initialise it, please click cancel."
 
-#: ../plugins/ipod/ipod-init.glade.h:3
-msgid "_Initialise"
+#: ../plugins/ipod/ipod-init.ui.h:3
+msgid "_Initialize"
 msgstr "_Initialise"
 
-#: ../plugins/ipod/ipod-init.glade.h:4
+#: ../plugins/ipod/ipod-init.ui.h:4
 msgid "_Model:"
 msgstr "_Model:"
 
-#: ../plugins/ipod/ipod-init.glade.h:5
-#: ../plugins/magnatune/magnatune-prefs.glade.h:45
+#: ../plugins/ipod/ipod-init.ui.h:5
+#: ../plugins/magnatune/magnatune-prefs.ui.h:45
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../plugins/ipod/ipod-init.glade.h:6
+#: ../plugins/ipod/ipod-init.ui.h:6
 msgid "iPod detected"
 msgstr "iPod detected"
 
-#: ../plugins/ipod/rb-ipod-helpers.c:299
-msgid "Unable to initialise new iPod"
+#: ../plugins/ipod/rb-ipod-helpers.c:304
+msgid "Unable to initialize new iPod"
 msgstr "Unable to initialise new iPod"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:104 ../plugins/ipod/rb-ipod-plugin.c:113
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:106 ../shell/rb-playlist-manager.c:184
+#: ../plugins/ipod/rb-ipod-plugin.c:107 ../plugins/ipod/rb-ipod-plugin.c:116
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:123 ../shell/rb-playlist-manager.c:184
 msgid "_Rename"
 msgstr "_Rename"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:105
+#: ../plugins/ipod/rb-ipod-plugin.c:108
 msgid "Rename iPod"
 msgstr "Rename iPod"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:107 ../shell/rb-shell-clipboard.c:188
-#: ../sources/rb-podcast-source.c:323
+#: ../plugins/ipod/rb-ipod-plugin.c:110 ../shell/rb-shell-clipboard.c:188
+#: ../sources/rb-podcast-source.c:317
 msgid "_Properties"
 msgstr "_Properties"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:108
+#: ../plugins/ipod/rb-ipod-plugin.c:111
 msgid "Display iPod properties"
 msgstr "Display iPod properties"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:110 ../shell/rb-shell-clipboard.c:175
+#: ../plugins/ipod/rb-ipod-plugin.c:113 ../shell/rb-shell-clipboard.c:175
 msgid "_New Playlist"
 msgstr "_New Playlist"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:111
+#: ../plugins/ipod/rb-ipod-plugin.c:114
 msgid "Add new playlist to iPod"
 msgstr "Add new playlist to iPod"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:114 ../shell/rb-playlist-manager.c:185
+#: ../plugins/ipod/rb-ipod-plugin.c:117 ../shell/rb-playlist-manager.c:185
 msgid "Rename playlist"
 msgstr "Rename playlist"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:116 ../shell/rb-playlist-manager.c:187
+#: ../plugins/ipod/rb-ipod-plugin.c:119 ../shell/rb-playlist-manager.c:187
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:117 ../shell/rb-playlist-manager.c:188
+#: ../plugins/ipod/rb-ipod-plugin.c:120 ../shell/rb-playlist-manager.c:188
 msgid "Delete playlist"
 msgstr "Delete playlist"
 
-#: ../plugins/ipod/rb-ipod-source.c:1196 ../sources/rb-podcast-source.c:854
+#: ../plugins/ipod/rb-ipod-source.c:1212 ../sources/rb-podcast-source.c:843
 msgid "Podcasts"
 msgstr "Podcasts"
 
-#: ../plugins/ipod/rb-ipod-source.c:1542
+#: ../plugins/ipod/rb-ipod-source.c:1583
 msgid "New playlist"
 msgstr "New playlist"
 
 #. Translators: this is used to display the amount of storage space
 #. * used and the total storage space on an iPod.
 #.
-#: ../plugins/ipod/rb-ipod-source.c:1652
+#: ../plugins/ipod/rb-ipod-source.c:1693
 #, c-format
 msgid "%s of %s"
 msgstr "%s of %s"
@@ -2030,36 +2096,36 @@ msgstr "Internet Radio"
 msgid "Support for broadcasting services transmitted via the Internet"
 msgstr "Support for broadcasting services transmitted via the Internet"
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:1
+#: ../plugins/jamendo/jamendo-prefs.ui.h:1
 msgid "<b>Download</b>"
 msgstr "<b>Download</b>"
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:2
+#: ../plugins/jamendo/jamendo-prefs.ui.h:2
 msgid "Jamendo Preferences"
 msgstr "Jamendo Preferences"
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:3
-msgid ""
-"Ogg Vorbis (300Kbps)\n"
-"MP3 (200Kbps)"
-msgstr ""
-"Ogg Vorbis (300Kbps)\n"
-"MP3 (200Kbps)"
+#: ../plugins/jamendo/jamendo-prefs.ui.h:3
+msgid "MP3 (200Kbps)"
+msgstr "MP3 (200Kbps)"
+
+#: ../plugins/jamendo/jamendo-prefs.ui.h:4
+msgid "Ogg Vorbis (300Kbps)"
+msgstr "Ogg Vorbis (300Kbps)"
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:5
+#: ../plugins/jamendo/jamendo-prefs.ui.h:5
 msgid "Visit Jamendo at "
 msgstr "Visit Jamendo at "
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:6
+#: ../plugins/jamendo/jamendo-prefs.ui.h:6
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:7
+#: ../plugins/jamendo/jamendo-prefs.ui.h:7
 msgid "http://www.jamendo.com/";
 msgstr "http://www.jamendo.com/";
 
 #. This text comes from http://www.jamendo.com/en/static/concept/ and was already translated in many languages. You should take a look on this site and check if you can't reuse it.
-#: ../plugins/jamendo/jamendo-loading.glade.h:2
+#: ../plugins/jamendo/jamendo-loading.ui.h:2
 msgid ""
 "     * A legal framework protecting the artists (thanks to the Creative "
 "Commons licenses)."
@@ -2067,7 +2133,7 @@ msgstr ""
 "     * A legal framework protecting the artists (thanks to the Creative "
 "Commons licences)."
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:3
+#: ../plugins/jamendo/jamendo-loading.ui.h:3
 msgid ""
 "     * An adaptive music recommendation system based on iRATE to help "
 "listeners discover new artists based on their tastes\n"
@@ -2077,78 +2143,78 @@ msgstr ""
 "listeners discover new artists based on their tastes\n"
 "       and on other criteria such as their location."
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:5
+#: ../plugins/jamendo/jamendo-loading.ui.h:5
 msgid "     * Free, simple and quick access to the music, for everyone."
 msgstr "     * Free, simple and quick access to the music, for everyone."
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:6
+#: ../plugins/jamendo/jamendo-loading.ui.h:6
 msgid "     * The possibility of making direct donations to the artists."
 msgstr "     * The possibility of making direct donations to the artists."
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:7
+#: ../plugins/jamendo/jamendo-loading.ui.h:7
 msgid "     * The use of the latest Peer-to-Peer technologies"
 msgstr "     * The use of the latest Peer-to-Peer technologies"
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:8
+#: ../plugins/jamendo/jamendo-loading.ui.h:8
 msgid "<b>Jamendo</b>"
 msgstr "<b>Jamendo</b>"
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:9
+#: ../plugins/jamendo/jamendo-loading.ui.h:9
 msgid ""
-"On jamendo, the artists distribute their music under Creative Commons "
+"Jamendo is a new model for artists to promote, publish, and be paid for "
+"their music."
+msgstr ""
+"Jamendo is a new model for artists to promote, publish, and be paid for "
+"their music."
+
+#: ../plugins/jamendo/jamendo-loading.ui.h:10
+msgid "Jamendo is the only platform that joins together :"
+msgstr "Jamendo is the only platform that joins together :"
+
+#: ../plugins/jamendo/jamendo-loading.ui.h:11
+msgid ""
+"Jamendo users can discover and share albums, but also review them or start a "
+"discussion on the forums.\n"
+"Albums are democratically rated based on the visitors&#x2019; reviews.\n"
+"If they fancy an artist they can support him by making a donation."
+msgstr ""
+"Jamendo users can discover and share albums, but also review them or start a "
+"discussion on the forums.\n"
+"Albums are democratically rated based on the visitors&#x2019; reviews.\n"
+"If they fancy an artist they can support him by making a donation."
+
+#: ../plugins/jamendo/jamendo-loading.ui.h:14
+msgid ""
+"On Jamendo, the artists distribute their music under Creative Commons "
 "licenses.\n"
 "In a nutshell, they allow you to download, remix and share their music "
 "freely.\n"
 "It's a \"Some rights reserved\" agreement, perfectly suited for the new "
 "century."
 msgstr ""
-"On jamendo, the artists distribute their music under Creative Commons "
+"On Jamendo, the artists distribute their music under Creative Commons "
 "licences.\n"
 "In a nutshell, they allow you to download, remix and share their music "
 "freely.\n"
 "It's a \"Some rights reserved\" agreement, perfectly suited for the new "
 "century."
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:12
+#: ../plugins/jamendo/jamendo-loading.ui.h:17
 msgid ""
-"These new rules make jamendo able to use the new powerful means of digital "
+"These new rules make Jamendo able to use the new powerful means of digital "
 "distribution like\n"
 "Peer-to-Peer networks such as BitTorrent or eMule to legally distribute "
 "albums at near-zero cost."
 msgstr ""
-"These new rules make jamendo able to use the new powerful means of digital "
+"These new rules make Jamendo able to use the new powerful means of digital "
 "distribution like\n"
 "Peer-to-Peer networks such as BitTorrent or eMule to legally distribute "
 "albums at near-zero cost."
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:14
+#: ../plugins/jamendo/jamendo-loading.ui.h:19
 msgid "You can find more information at http://www.jamendo.com/";
 msgstr "You can find more information at http://www.jamendo.com/";
 
-#: ../plugins/jamendo/jamendo-loading.glade.h:15
-msgid ""
-"jamendo is a new model for artists to promote, publish, and be paid for "
-"their music."
-msgstr ""
-"jamendo is a new model for artists to promote, publish, and be paid for "
-"their music."
-
-#: ../plugins/jamendo/jamendo-loading.glade.h:16
-msgid "jamendo is the only platform that joins together :"
-msgstr "jamendo is the only platform that joins together:"
-
-#: ../plugins/jamendo/jamendo-loading.glade.h:17
-msgid ""
-"jamendo users can discover and share albums, but also review them or start a "
-"discussion on the forums.\n"
-"Albums are democratically rated based on the visitorsâ?? reviews.\n"
-"If they fancy an artist they can support him by making a donation."
-msgstr ""
-"jamendo users can discover and share albums, but also review them or start a "
-"discussion on the forums.\n"
-"Albums are democratically rated based on the visitorsâ?? reviews.\n"
-"If they fancy an artist they can support him by making a donation."
-
 #: ../plugins/jamendo/jamendo.rb-plugin.in.h:1
 msgid ""
 "Adds support to Rhythmbox for playing and downloading albums from Jamendo"
@@ -2183,85 +2249,85 @@ msgid "Donate Money to this Artist"
 msgstr "Donate Money to this Artist"
 
 #: ../plugins/jamendo/jamendo/JamendoSource.py:120
-msgid "Loading Jamendo catalogue"
+msgid "Loading Jamendo catalog"
 msgstr "Loading Jamendo catalogue"
 
-#: ../plugins/jamendo/jamendo/JamendoSource.py:301
+#: ../plugins/jamendo/jamendo/JamendoSource.py:303
 #, python-format
 msgid "Error looking up p2plink for album %s on jamendo.com"
 msgstr "Error looking up p2plink for album %s on jamendo.com"
 
-#: ../plugins/jamendo/jamendo/JamendoSource.py:325
+#: ../plugins/jamendo/jamendo/JamendoSource.py:327
 #, python-format
 msgid "Error looking up artist %s on jamendo.com"
 msgstr "Error looking up artist %s on jamendo.com"
 
-#: ../plugins/iradio/rb-iradio-source.c:175
+#: ../plugins/iradio/rb-iradio-source.c:173
 msgid "New Internet _Radio Station..."
-msgstr "New Internet _Radio Station..."
+msgstr "New Internet _Radio Stationâ?¦"
 
-#: ../plugins/iradio/rb-iradio-source.c:176
+#: ../plugins/iradio/rb-iradio-source.c:174
 msgid "Create a new Internet Radio station"
 msgstr "Create a new Internet Radio station"
 
 #. Translators: this is the toolbar button label for
-#. New Interner Radio Station action.
-#. Don't include the prefix "radio|" in the translation.
-#: ../plugins/iradio/rb-iradio-source.c:317
-msgid "radio|New"
+#. New Internet Radio Station action.
+#: ../plugins/iradio/rb-iradio-source.c:314
+msgctxt "Radio"
+msgid "New"
 msgstr "New"
 
-#: ../plugins/iradio/rb-iradio-source.c:359 ../widgets/rb-entry-view.c:1455
+#: ../plugins/iradio/rb-iradio-source.c:356 ../widgets/rb-entry-view.c:1506
 #: ../widgets/rb-library-browser.c:142
 #: ../widgets/rb-query-creator-properties.c:78
 #: ../widgets/rb-query-creator-properties.c:104
 msgid "Genre"
 msgstr "Genre"
 
-#: ../plugins/iradio/rb-iradio-source.c:455
+#: ../plugins/iradio/rb-iradio-source.c:452
 msgid "Radio"
 msgstr "Radio"
 
-#: ../plugins/iradio/rb-iradio-source.c:594
+#: ../plugins/iradio/rb-iradio-source.c:591
 #, c-format
 msgid "%d station"
 msgid_plural "%d stations"
 msgstr[0] "%d station"
 msgstr[1] "%d stations"
 
-#: ../plugins/iradio/rb-iradio-source.c:1006
-#: ../plugins/iradio/rb-station-properties-dialog.c:409
+#: ../plugins/iradio/rb-iradio-source.c:1004
+#: ../plugins/iradio/rb-station-properties-dialog.c:405
 msgid "New Internet Radio Station"
 msgstr "New Internet Radio Station"
 
-#: ../plugins/iradio/rb-iradio-source.c:1006
+#: ../plugins/iradio/rb-iradio-source.c:1004
 msgid "URL of internet radio station:"
 msgstr "URL of internet radio station:"
 
-#: ../plugins/iradio/rb-station-properties-dialog.c:405
-#: ../podcast/rb-feed-podcast-properties-dialog.c:216
-#: ../podcast/rb-podcast-properties-dialog.c:372 ../widgets/rb-song-info.c:993
+#: ../plugins/iradio/rb-station-properties-dialog.c:401
+#: ../podcast/rb-feed-podcast-properties-dialog.c:212
+#: ../podcast/rb-podcast-properties-dialog.c:368 ../widgets/rb-song-info.c:986
 #, c-format
 msgid "%s Properties"
 msgstr "%s Properties"
 
-#: ../plugins/iradio/rb-station-properties-dialog.c:497
-#: ../podcast/rb-podcast-properties-dialog.c:485
-#: ../widgets/rb-song-info.c:1052
+#: ../plugins/iradio/rb-station-properties-dialog.c:493
+#: ../podcast/rb-podcast-properties-dialog.c:481
+#: ../widgets/rb-entry-view.c:1070 ../widgets/rb-song-info.c:1050
 #, c-format
 msgid "%lu kbps"
 msgstr "%lu kbps"
 
-#: ../plugins/iradio/rb-station-properties-dialog.c:588
+#: ../plugins/iradio/rb-station-properties-dialog.c:584
 msgid "Unable to change station property"
 msgstr "Unable to change station property"
 
-#: ../plugins/iradio/rb-station-properties-dialog.c:588
+#: ../plugins/iradio/rb-station-properties-dialog.c:584
 #, c-format
 msgid "Unable to change station URI to %s, as that station already exists"
 msgstr "Unable to change station URI to %s, as that station already exists"
 
-#: ../plugins/iradio/station-properties.glade.h:5
+#: ../plugins/iradio/station-properties.ui.h:5
 msgid "L_ocation:"
 msgstr "L_ocation:"
 
@@ -2273,44 +2339,45 @@ msgstr "Control Rhythmbox using an infrared remote control"
 msgid "LIRC "
 msgstr "LIRC "
 
-#: ../plugins/lyrics/lyrics/__init__.py:134
-#: ../plugins/lyrics/lyrics/__init__.py:143
+#: ../plugins/lyrics/lyrics/__init__.py:166
+#: ../plugins/lyrics/lyrics/__init__.py:168
+#: ../plugins/lyrics/lyrics/__init__.py:177
 msgid "No lyrics found"
 msgstr "No lyrics found"
 
-#: ../plugins/lyrics/lyrics/__init__.py:177
+#: ../plugins/lyrics/lyrics/__init__.py:211
 msgid "_Save"
 msgstr "_Save"
 
-#: ../plugins/lyrics/lyrics/__init__.py:182
-#: ../plugins/lyrics/lyrics/__init__.py:195 ../shell/rb-shell.c:420
+#: ../plugins/lyrics/lyrics/__init__.py:216
+#: ../plugins/lyrics/lyrics/__init__.py:229 ../shell/rb-shell.c:390
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../plugins/lyrics/lyrics/__init__.py:197
+#: ../plugins/lyrics/lyrics/__init__.py:231
 msgid "_Search again"
 msgstr "_Search again"
 
-#: ../plugins/lyrics/lyrics/__init__.py:215
-#: ../plugins/lyrics/lyrics/__init__.py:281
+#: ../plugins/lyrics/lyrics/__init__.py:249
+#: ../plugins/lyrics/lyrics/__init__.py:315
 msgid "Lyrics"
 msgstr "Lyrics"
 
-#: ../plugins/lyrics/lyrics/__init__.py:255
+#: ../plugins/lyrics/lyrics/__init__.py:289
 msgid "Searching for lyrics..."
-msgstr "Searching for lyrics..."
+msgstr "Searching for lyricsâ?¦"
 
-#: ../plugins/lyrics/lyrics/__init__.py:291
+#: ../plugins/lyrics/lyrics/__init__.py:325
 msgid "Song L_yrics"
 msgstr "Song L_yrics"
 
-#: ../plugins/lyrics/lyrics/__init__.py:292
+#: ../plugins/lyrics/lyrics/__init__.py:326
 msgid "Display lyrics for the playing song"
 msgstr "Display lyrics for the playing song"
 
-#: ../plugins/lyrics/lyrics/LyricsConfigureDialog.py:104
+#: ../plugins/lyrics/lyrics/LyricsConfigureDialog.py:106
 msgid "Choose lyrics folder..."
-msgstr "Choose lyrics folder..."
+msgstr "Choose lyrics folderâ?¦"
 
 #: ../plugins/lyrics/lyrics.rb-plugin.in.h:1
 msgid "Fetch song lyrics from the Internet"
@@ -2320,27 +2387,27 @@ msgstr "Fetch song lyrics from the Internet"
 msgid "Song Lyrics"
 msgstr "Song Lyrics"
 
-#: ../plugins/lyrics/lyrics-prefs.glade.h:1
+#: ../plugins/lyrics/lyrics-prefs.ui.h:1
 msgid "<b>Lyrics Folder</b>"
 msgstr "<b>Lyrics Folder</b>"
 
-#: ../plugins/lyrics/lyrics-prefs.glade.h:2
+#: ../plugins/lyrics/lyrics-prefs.ui.h:2
 msgid "<b>Search engines</b>"
 msgstr "<b>Search engines</b>"
 
-#: ../plugins/lyrics/lyrics-prefs.glade.h:3
+#: ../plugins/lyrics/lyrics-prefs.ui.h:3
 msgid "Browse..."
-msgstr "Browse..."
+msgstr "Browseâ?¦"
 
-#: ../plugins/lyrics/lyrics-prefs.glade.h:4
+#: ../plugins/lyrics/lyrics-prefs.ui.h:4
 msgid "Lyrics Plugin Preferences"
 msgstr "Lyrics Plugin Preferences"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:1
+#: ../plugins/magnatune/magnatune-loading.ui.h:1
 msgid "     * Founder/owner runs it -- support a small business"
 msgstr "     * Founder/owner runs it -- support a small business"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:3
+#: ../plugins/magnatune/magnatune-loading.ui.h:3
 #, no-c-format
 msgid ""
 "    * 50% of payment goes to artist (makes buyer feel good: they're helping "
@@ -2349,11 +2416,11 @@ msgstr ""
 "    * 50% of payment goes to artist (makes buyer feel good: they're helping "
 "the world)"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:4
+#: ../plugins/magnatune/magnatune-loading.ui.h:4
 msgid "    * All albums and artists hand-picked"
 msgstr "    * All albums and artists hand-picked"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:5
+#: ../plugins/magnatune/magnatune-loading.ui.h:5
 msgid ""
 "    * Downloads and CDs are both available (no other site on the internet "
 "sells both)"
@@ -2361,7 +2428,7 @@ msgstr ""
 "    * Downloads and CDs are both available (no other site on the Internet "
 "sells both)"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:6
+#: ../plugins/magnatune/magnatune-loading.ui.h:6
 msgid ""
 "    * Extensive biographical info about each musician, and artist photo -- "
 "feel a strong connection to the artist"
@@ -2369,11 +2436,11 @@ msgstr ""
 "    * Extensive biographical info about each musician, and artist photo -- "
 "feel a strong connection to the artist"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:7
+#: ../plugins/magnatune/magnatune-loading.ui.h:7
 msgid "    * Free listening of all songs"
 msgstr "    * Free listening of all songs"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:8
+#: ../plugins/magnatune/magnatune-loading.ui.h:8
 msgid ""
 "    * Full color, high quality cover art PDF available for most albums - "
 "easy to print"
@@ -2381,7 +2448,7 @@ msgstr ""
 "    * Full colour, high quality cover art PDF available for most albums - "
 "easy to print"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:9
+#: ../plugins/magnatune/magnatune-loading.ui.h:9
 msgid ""
 "    * Low pressure environment - nothing flashing, no audio ads while "
 "listening to albums"
@@ -2389,7 +2456,7 @@ msgstr ""
 "    * Low-pressure environment - nothing flashing, no audio adverts while "
 "listening to albums"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:10
+#: ../plugins/magnatune/magnatune-loading.ui.h:10
 msgid ""
 "    * Music selection is unique to Magnatune, unlike most on-line stores "
 "that have more-or-less the same (gigantic) selection\n"
@@ -2397,7 +2464,7 @@ msgstr ""
 "    * Music selection is unique to Magnatune, unlike most on-line stores "
 "that have more-or-less the same (gigantic) selection\n"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:12
+#: ../plugins/magnatune/magnatune-loading.ui.h:12
 msgid ""
 "    * No copy protection on the music (DRM) which allows playing music on "
 "any device (unlike iTunes/MSN/etc)"
@@ -2405,11 +2472,11 @@ msgstr ""
 "    * No copy protection on the music (DRM) which allows playing music on "
 "any device (unlike iTunes/MSN/etc)"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:13
+#: ../plugins/magnatune/magnatune-loading.ui.h:13
 msgid "    * No need to \"register\" to listen or buy"
 msgstr "    * No need to \"register\" to listen or buy"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:14
+#: ../plugins/magnatune/magnatune-loading.ui.h:14
 msgid ""
 "    * Not part of the \"evil\" major label machine - for those that hate the "
 "music biz and want to help topple it"
@@ -2417,11 +2484,11 @@ msgstr ""
 "    * Not part of the \"evil\" major label machine - for those that hate the "
 "music business and want to help topple it"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:15
+#: ../plugins/magnatune/magnatune-loading.ui.h:15
 msgid "    * Not venture-capital backed big business"
 msgstr "    * Not venture-capital backed big business"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:16
+#: ../plugins/magnatune/magnatune-loading.ui.h:16
 msgid ""
 "    * Our genres are hard to find in record stores and not on radio (though "
 "do appear on college radio)"
@@ -2429,7 +2496,7 @@ msgstr ""
 "    * Our genres are hard to find in record stores and not on radio (though "
 "do appear on college radio)"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:17
+#: ../plugins/magnatune/magnatune-loading.ui.h:17
 msgid ""
 "    * Perfect quality downloads (CD copy) are available when you download "
 "(not inferior quality sound)"
@@ -2437,7 +2504,7 @@ msgstr ""
 "    * Perfect quality downloads (CD copy) are available when you download "
 "(not inferior quality sound)"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:18
+#: ../plugins/magnatune/magnatune-loading.ui.h:18
 msgid ""
 "    * Radio stations and \"genre mix\" playlists allow background listening "
 "- can do work while listening to our music"
@@ -2445,11 +2512,11 @@ msgstr ""
 "    * Radio stations and \"genre mix\" playlists allow background listening "
 "- can do work while listening to our music"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:19
+#: ../plugins/magnatune/magnatune-loading.ui.h:19
 msgid "    * Smaller selection means easier to find good music"
 msgstr "    * Smaller selection means easier to find good music"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:20
+#: ../plugins/magnatune/magnatune-loading.ui.h:20
 msgid ""
 "    * Variable pricing scheme means you can pay as little as $5 for an album "
 "if you choose"
@@ -2457,19 +2524,19 @@ msgstr ""
 "    * Variable pricing scheme means you can pay as little as $5 for an album "
 "if you choose"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:21
+#: ../plugins/magnatune/magnatune-loading.ui.h:21
 msgid "    * Very simple user interface, quick to play music"
 msgstr "    * Very simple user interface, quick to play music"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:22
+#: ../plugins/magnatune/magnatune-loading.ui.h:22
 msgid "    * Wide variety of genres, can fit any mood"
 msgstr "    * Wide variety of genres, can fit any mood"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:23
+#: ../plugins/magnatune/magnatune-loading.ui.h:23
 msgid "<b>Magnatune online music store</b>"
 msgstr "<b>Magnatune online music store</b>"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:24
+#: ../plugins/magnatune/magnatune-loading.ui.h:24
 msgid ""
 "Magnatune is an online record label that is not evil. Some of their key "
 "attributes are:\n"
@@ -2477,71 +2544,86 @@ msgstr ""
 "Magnatune is an online record label that is not evil. Some of their key "
 "attributes are:\n"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:26
+#: ../plugins/magnatune/magnatune-loading.ui.h:26
 msgid "You can find more information at http://www.magnatune.com/";
 msgstr "You can find more information at http://www.magnatune.com/";
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:1
-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 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)"
-
-#: ../plugins/magnatune/magnatune-prefs.glade.h:15
-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"
-
-#: ../plugins/magnatune/magnatune-prefs.glade.h:27
+#: ../plugins/magnatune/magnatune-prefs.ui.h:1
+#: ../plugins/magnatune/magnatune-purchase.ui.h:1
+msgid "$10 US (better than average)"
+msgstr "$10 US (better than average)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:2
+#: ../plugins/magnatune/magnatune-purchase.ui.h:2
+msgid "$11 US"
+msgstr "$11 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:3
+#: ../plugins/magnatune/magnatune-purchase.ui.h:3
+msgid "$12 US (generous)"
+msgstr "$12 US (generous)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:4
+#: ../plugins/magnatune/magnatune-purchase.ui.h:4
+msgid "$13 US"
+msgstr "$13 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:5
+#: ../plugins/magnatune/magnatune-purchase.ui.h:5
+msgid "$14 US"
+msgstr "$14 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:6
+#: ../plugins/magnatune/magnatune-purchase.ui.h:6
+msgid "$15 US (VERY generous!)"
+msgstr "$15 US (VERY generous!)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:7
+#: ../plugins/magnatune/magnatune-purchase.ui.h:7
+msgid "$16 US"
+msgstr "$16 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:8
+#: ../plugins/magnatune/magnatune-purchase.ui.h:8
+msgid "$17 US"
+msgstr "$17 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:9
+#: ../plugins/magnatune/magnatune-purchase.ui.h:9
+msgid "$18 US (We love you!)"
+msgstr "$18 US (We love you!)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:10
+#: ../plugins/magnatune/magnatune-purchase.ui.h:10
+msgid "$5 US"
+msgstr "$5 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:11
+#: ../plugins/magnatune/magnatune-purchase.ui.h:11
+msgid "$6 US"
+msgstr "$6 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:12
+#: ../plugins/magnatune/magnatune-purchase.ui.h:12
+msgid "$7 US"
+msgstr "$7 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:13
+#: ../plugins/magnatune/magnatune-purchase.ui.h:13
+msgid "$8 US (typical)"
+msgstr "$8 US (typical)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:14
+#: ../plugins/magnatune/magnatune-purchase.ui.h:14
+msgid "$9 US"
+msgstr "$9 US"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:15
+#: ../plugins/magnatune/magnatune-purchase.ui.h:15
+msgid "128K MP3"
+msgstr "128K MP3"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:16
 msgid ""
 "<span weight=\"bold\" foreground=\"red\">Your credit card is past the "
 "expiration date listed.</span>"
@@ -2549,190 +2631,195 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"red\">Your credit card is past the "
 "expiration date listed.</span>"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:28
+#: ../plugins/magnatune/magnatune-prefs.ui.h:17
+#: ../plugins/magnatune/magnatune-purchase.ui.h:16
+msgid "April (04)"
+msgstr "April (04)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:18
+#: ../plugins/magnatune/magnatune-purchase.ui.h:18
+msgid "August (08)"
+msgstr "August (08)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:19
 msgid "C_redit Card:"
 msgstr "C_redit Card:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:29
+#: ../plugins/magnatune/magnatune-prefs.ui.h:20
+#: ../plugins/magnatune/magnatune-purchase.ui.h:21
+msgid "December (12)"
+msgstr "December (12)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:21
 msgid "Default _amount to pay:"
 msgstr "Default _amount to pay:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:30
+#: ../plugins/magnatune/magnatune-prefs.ui.h:22
 msgid "Expiry:"
 msgstr "Expiry:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:31
+#: ../plugins/magnatune/magnatune-prefs.ui.h:23
+#: ../plugins/magnatune/magnatune-purchase.ui.h:24
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:24
+#: ../plugins/magnatune/magnatune-purchase.ui.h:25
+msgid "February (02)"
+msgstr "February (02)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:25
 msgid "Find out about Magnatune at "
 msgstr "Find out about Magnatune at "
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:32
+#: ../plugins/magnatune/magnatune-prefs.ui.h:26
+#: ../plugins/magnatune/magnatune-purchase.ui.h:28
+msgid "January (01)"
+msgstr "January (01)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:27
+#: ../plugins/magnatune/magnatune-purchase.ui.h:29
+msgid "July (07)"
+msgstr "July (07)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:28
+#: ../plugins/magnatune/magnatune-purchase.ui.h:30
+msgid "June (06)"
+msgstr "June (06)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:29
 msgid "Magnatune Information"
 msgstr "Magnatune Information"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:33
+#: ../plugins/magnatune/magnatune-prefs.ui.h:30
 msgid "Magnatune Preferences"
 msgstr "Magnatune Preferences"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:34
-#: ../plugins/magnatune/magnatune-purchase.glade.h:34
-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"
+#: ../plugins/magnatune/magnatune-prefs.ui.h:31
+#: ../plugins/magnatune/magnatune-purchase.ui.h:31
+msgid "March (03)"
+msgstr "March (03)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:32
+#: ../plugins/magnatune/magnatune-purchase.ui.h:32
+msgid "May (05)"
+msgstr "May (05)"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:39
+#: ../plugins/magnatune/magnatune-prefs.ui.h:33
+#: ../plugins/magnatune/magnatune-purchase.ui.h:33
+msgid "November (11)"
+msgstr "November (11)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:34
+#: ../plugins/magnatune/magnatune-purchase.ui.h:34
+msgid "October (10)"
+msgstr "October (10)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:35
+#: ../plugins/magnatune/magnatune-purchase.ui.h:35
+msgid "Ogg Vorbis"
+msgstr "Ogg Vorbis"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:36
 msgid "Preferred audio _format:"
 msgstr "Preferred audio _format:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:40
+#: ../plugins/magnatune/magnatune-prefs.ui.h:37
 msgid "Redownload purchased music at "
 msgstr "Re-download purchased music at "
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:41
+#: ../plugins/magnatune/magnatune-prefs.ui.h:38
 msgid "Remember my credit card details"
 msgstr "Remember my credit card details"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:42
+#: ../plugins/magnatune/magnatune-prefs.ui.h:39
+#: ../plugins/magnatune/magnatune-purchase.ui.h:37
+msgid "September (09)"
+msgstr "September (09)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:40
+#: ../plugins/magnatune/magnatune-purchase.ui.h:38
+msgid "VBR MP3"
+msgstr "VBR MP3"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:41
 msgid "Visit Magnatune at "
 msgstr "Visit Magnatune at "
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:43
+#: ../plugins/magnatune/magnatune-prefs.ui.h:42
+#: ../plugins/magnatune/magnatune-purchase.ui.h:39
+msgid "WAV"
+msgstr "WAV"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:43
 msgid "_Email:"
 msgstr "_E-mail:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:44
+#: ../plugins/magnatune/magnatune-prefs.ui.h:44
 msgid "_Month:"
 msgstr "_Month:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:47
+#: ../plugins/magnatune/magnatune-prefs.ui.h:47
 msgid "http://www.magnatune.com/";
 msgstr "http://www.magnatune.com/";
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:48
+#: ../plugins/magnatune/magnatune-prefs.ui.h:48
 msgid "http://www.magnatune.com/info/";
 msgstr "http://www.magnatune.com/info/";
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:49
+#: ../plugins/magnatune/magnatune-prefs.ui.h:49
 msgid "http://www.magnatune.com/info/redownload";
 msgstr "http://www.magnatune.com/info/redownload";
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:1
-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 (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!)"
-
-#: ../plugins/magnatune/magnatune-purchase.glade.h:15
+#: ../plugins/magnatune/magnatune-purchase.ui.h:17
 msgid "Audio _format:"
 msgstr "Audio _format:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:16
+#: ../plugins/magnatune/magnatune-purchase.ui.h:19
 msgid "C_redit Card number:"
 msgstr "C_redit Card number:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:17
+#: ../plugins/magnatune/magnatune-purchase.ui.h:20
 msgid "Credit Card"
 msgstr "Credit Card"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:18
+#: ../plugins/magnatune/magnatune-purchase.ui.h:22
 msgid "Expiry _month:"
 msgstr "Expiry _month:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:19
+#: ../plugins/magnatune/magnatune-purchase.ui.h:23
 msgid "Expiry _year (last two digits):"
 msgstr "Expiry _year (last two digits):"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:20
+#: ../plugins/magnatune/magnatune-purchase.ui.h:26
 msgid "Gift Card"
 msgstr "Gift Card"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:21
+#: ../plugins/magnatune/magnatune-purchase.ui.h:27
 msgid "Gift card number:"
 msgstr "Gift card number:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:22
-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 ""
-"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)"
-
-#: ../plugins/magnatune/magnatune-purchase.glade.h:39
+#: ../plugins/magnatune/magnatune-purchase.ui.h:36
 msgid "Purchase Magnatune Tracks"
 msgstr "Purchase Magnatune Tracks"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:40
+#: ../plugins/magnatune/magnatune-purchase.ui.h:40
 msgid "_Amount to pay (US Dollars):"
 msgstr "_Amount to pay (US Dollars):"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:41
+#: ../plugins/magnatune/magnatune-purchase.ui.h:41
 msgid "_Email address:"
 msgstr "_E-mail address:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:42
+#: ../plugins/magnatune/magnatune-purchase.ui.h:42
 msgid "_Name (as printed on card):"
 msgstr "_Name (as printed on card):"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:43
+#: ../plugins/magnatune/magnatune-purchase.ui.h:43
 msgid "_Purchase"
 msgstr "_Purchase"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:44
+#: ../plugins/magnatune/magnatune-purchase.ui.h:44
 msgid "_Remember my credit card details"
 msgstr "_Remember my credit card details"
 
@@ -2753,7 +2840,7 @@ msgid "Magnatune"
 msgstr "Magnatune"
 
 #: ../plugins/magnatune/magnatune/MagnatuneSource.py:121
-msgid "Loading Magnatune catalogue"
+msgid "Loading Magnatune catalog"
 msgstr "Loading Magnatune catalogue"
 
 #: ../plugins/magnatune/magnatune/MagnatuneSource.py:124
@@ -2768,34 +2855,34 @@ msgstr "Couldn't purchase album"
 msgid "You must have a library location set to purchase an album."
 msgstr "You must have a library location set to purchase an album."
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:253
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:255
 #, python-format
 msgid "Would you like to purchase the album <i>%(album)s</i> by '%(artist)s'?"
 msgstr "Would you like to purchase the album <i>%(album)s</i> by '%(artist)s'?"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:357
-msgid "Unable to load catalogue"
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:372
+msgid "Unable to load catalog"
 msgstr "Unable to load catalogue"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:358
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:373
 msgid ""
-"Rhythmbox could not understand the Magnatune catalogue, please file a bug."
+"Rhythmbox could not understand the Magnatune catalog, please file a bug."
 msgstr ""
 "Rhythmbox could not understand the Magnatune catalogue, please file a bug."
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:443
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:459
 msgid "Authorizing Purchase"
 msgstr "Authorising Purchase"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:444
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:460
 msgid "Authorizing purchase with the Magnatune server. Please wait..."
-msgstr "Authorising purchase with the Magnatune server. Please wait..."
+msgstr "Authorising purchase with the Magnatune server. Please waitâ?¦"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:490
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:506
 msgid "Purchase Error"
 msgstr "Purchase Error"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:491
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:507
 #, python-format
 msgid ""
 "An error occurred while trying to purchase the album.\n"
@@ -2806,12 +2893,12 @@ msgstr ""
 "The Magnatune server returned:\n"
 "%s"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:494
-#: ../widgets/rb-entry-view.c:1578
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:510
+#: ../widgets/rb-entry-view.c:1630
 msgid "Error"
 msgstr "Error"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:495
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:511
 #, python-format
 msgid ""
 "An error occurred while trying to purchase the album.\n"
@@ -2871,24 +2958,40 @@ msgstr "Portable Players - MTP"
 msgid "Support for MTP devices (show the content, transfer, play from device)"
 msgstr "Support for MTP devices (show the content, transfer, play from device)"
 
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:103
-#: ../shell/rb-removable-media-manager.c:152
+#: ../plugins/mtpdevice/rb-mtp-gst-src.c:174
+#: ../plugins/mtpdevice/rb-mtp-gst-src.c:216
+#, c-format
+msgid "Unable to copy file from MTP device: %s"
+msgstr "Unable to copy file from MTP device: %s"
+
+#: ../plugins/mtpdevice/rb-mtp-gst-src.c:190
+#, c-format
+msgid "Not enough space in %s"
+msgstr "Not enough space in %s"
+
+#: ../plugins/mtpdevice/rb-mtp-gst-src.c:202
+#, c-format
+msgid "Unable to open temporary file: %s"
+msgstr "Unable to open temporary file: %s"
+
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:120
+#: ../shell/rb-removable-media-manager.c:165
 msgid "_Eject"
 msgstr "_Eject"
 
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:104
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:121
 msgid "Eject MTP-device"
 msgstr "Eject MTP-device"
 
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:107
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:124
 msgid "Rename MTP-device"
 msgstr "Rename MTP-device"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:161
+#: ../plugins/mtpdevice/rb-mtp-source.c:145
 msgid "Media player device error"
 msgstr "Media player device error"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:643
+#: ../plugins/mtpdevice/rb-mtp-source.c:733
 msgid "Digital Audio Player"
 msgstr "Digital Audio Player"
 
@@ -2943,23 +3046,6 @@ msgstr "Interactive Python console"
 msgid "Python Console"
 msgstr "Python Console"
 
-#: ../plugins/rb-plugin-manager.c:55
-msgid "Plugin"
-msgstr "Plugin"
-
-#: ../plugins/rb-plugin-manager.c:56
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../plugins/rb-plugins-engine.c:556
-msgid "Plugin Error"
-msgstr "Plugin Error"
-
-#: ../plugins/rb-plugins-engine.c:556
-#, c-format
-msgid "Unable to activate plugin %s"
-msgstr "Unable to activate plugin %s"
-
 #: ../plugins/sample-python/sample-python.py:14
 msgid "Python Source"
 msgstr "Python Source"
@@ -2990,65 +3076,184 @@ msgstr "A sample plugin in Vala with no features"
 msgid "Vala Sample Plugin"
 msgstr "Vala Sample Plugin"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:230
+#: ../plugins/status-icon/eggtrayicon.c:133
+msgid "Orientation"
+msgstr "Orientation"
+
+#: ../plugins/status-icon/eggtrayicon.c:134
+msgid "The orientation of the tray."
+msgstr "The orientation of the tray."
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:142
+msgid "_Close"
+msgstr "_Close"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:143
+msgid "Hide the music player window"
+msgstr "Hide the music player window"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:149
+msgid "_Show Music Player"
+msgstr "_Show Music Player"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:150
+msgid "Choose music to play"
+msgstr "Choose music to play"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:152
+msgid "Show N_otifications"
+msgstr "Show N_otifications"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:153
+msgid "Show notifications of song changes and other events"
+msgstr "Show notifications of song changes and other events"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:427
+msgid "Next"
+msgstr "Next"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:578
+#: ../remote/dbus/rb-client.c:454 ../remote/dbus/rb-client.c:480
+msgid "Not playing"
+msgstr "Not playing"
+
+#. Translators: the %s is the elapsed and total time
+#: ../plugins/status-icon/rb-status-icon-plugin.c:581
+#, c-format
+msgid "Paused, %s"
+msgstr "Paused, %s"
+
+#. Translators: by Artist
+#: ../plugins/status-icon/rb-status-icon-plugin.c:670
+#, c-format
+msgid "by <i>%s</i>"
+msgstr "by <i>%s</i>"
+
+#. Translators: from Album
+#: ../plugins/status-icon/rb-status-icon-plugin.c:691
+#, c-format
+msgid "from <i>%s</i>"
+msgstr "from <i>%s</i>"
+
+#: ../plugins/status-icon/status-icon.rb-plugin.in.h:1
+msgid "Status Icon"
+msgstr "Status Icon"
+
+#: ../plugins/status-icon/status-icon.rb-plugin.in.h:2
+msgid "Status icon and notification popups"
+msgstr "Status icon and notification popups"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:1
+msgid "Always shown"
+msgstr "Always shown"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:2
+msgid "Always visible"
+msgstr "Always visible"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:3
+msgid "Change song"
+msgstr "Change song"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:4
+msgid "Change volume"
+msgstr "Change volume"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:5
+msgid "Never shown"
+msgstr "Never shown"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:6
+msgid "Never visible"
+msgstr "Never visible"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:7
+msgid "Owns the main window"
+msgstr "Owns the main window"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:8
+msgid "Shown when the main window is hidden"
+msgstr "Shown when the main window is hidden"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:9
+msgid "Status icon preferences"
+msgstr "Status icon preferences"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:10
+msgid "Visible with notifications"
+msgstr "Visible with notifications"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:11
+msgid "_Mouse wheel:"
+msgstr "_Mouse wheel:"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:12
+msgid "_Notifications:"
+msgstr "_Notifications:"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:13
+msgid "_Status icon:"
+msgstr "_Status icon:"
+
+#: ../plugins/visualizer/rb-visualizer-plugin.c:229
 msgid "_Visualization"
 msgstr "_Visualisation"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:231
+#: ../plugins/visualizer/rb-visualizer-plugin.c:230
 msgid "Start or stop visualization"
 msgstr "Start or stop visualisation"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:237
+#: ../plugins/visualizer/rb-visualizer-plugin.c:236
 msgid "Small"
 msgstr "Small"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:238
+#: ../plugins/visualizer/rb-visualizer-plugin.c:237
 msgid "Normal"
 msgstr "Normal"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:239
+#: ../plugins/visualizer/rb-visualizer-plugin.c:238
 msgid "Large"
 msgstr "Large"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:240
+#: ../plugins/visualizer/rb-visualizer-plugin.c:239
 msgid "Extra Large"
 msgstr "Extra Large"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:251
+#: ../plugins/visualizer/rb-visualizer-plugin.c:243
 msgid "Embedded"
 msgstr "Embedded"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:252
+#: ../plugins/visualizer/rb-visualizer-plugin.c:244
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:253
+#: ../plugins/visualizer/rb-visualizer-plugin.c:245
 msgid "Desktop"
 msgstr "Desktop"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:254
+#: ../plugins/visualizer/rb-visualizer-plugin.c:246
 msgid "Window"
 msgstr "Window"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:712
+#: ../plugins/visualizer/rb-visualizer-plugin.c:726
 #, c-format
 msgid "Unable to start video output"
 msgstr "Unable to start video output"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:747
+#: ../plugins/visualizer/rb-visualizer-plugin.c:761
 #, c-format
 msgid "Failed to link new visual effect into the GStreamer pipeline"
 msgstr "Failed to link new visual effect into the GStreamer pipeline"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:795
+#: ../plugins/visualizer/rb-visualizer-plugin.c:809
 msgid "Unable to start visualization"
 msgstr "Unable to start visualisation"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1358
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1390
 msgid "Enable visual effects?"
 msgstr "Enable visual effects?"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1360
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1392
 msgid ""
 "It seems you are running Rhythmbox remotely.\n"
 "Are you sure you want to enable the visual effects?"
@@ -3056,27 +3261,27 @@ msgstr ""
 "It seems you are running Rhythmbox remotely.\n"
 "Are you sure you want to enable the visual effects?"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1692
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1722
 msgid "Music Player Visualization"
 msgstr "Music Player Visualisation"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:1
+#: ../plugins/visualizer/visualizer-controls.ui.h:1
 msgid "Disable"
 msgstr "Disable"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:2
+#: ../plugins/visualizer/visualizer-controls.ui.h:2
 msgid "Mode:"
 msgstr "Mode:"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:3
+#: ../plugins/visualizer/visualizer-controls.ui.h:3
 msgid "Quality:"
 msgstr "Quality:"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:4
+#: ../plugins/visualizer/visualizer-controls.ui.h:4
 msgid "Screen:"
 msgstr "Screen:"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:5
+#: ../plugins/visualizer/visualizer-controls.ui.h:5
 msgid "Visualization:"
 msgstr "Visualisation:"
 
@@ -3141,137 +3346,136 @@ msgid "There was a problem adding this podcast: %s.  Please verify the URL: %s"
 msgstr ""
 "There was a problem adding this podcast: %s.  Please verify the URL: %s"
 
-#: ../podcast/rb-podcast-parse.c:168
+#: ../podcast/rb-podcast-parse.c:183
 #, c-format
 msgid "Unable to check file type: %s"
 msgstr "Unable to check file type: %s"
 
-#: ../podcast/rb-podcast-parse.c:187
+#: ../podcast/rb-podcast-parse.c:202
 #, c-format
 msgid "Unexpected file type: %s"
 msgstr "Unexpected file type: %s"
 
-#: ../podcast/rb-podcast-parse.c:210
+#: ../podcast/rb-podcast-parse.c:225
 #, c-format
 msgid "Unable to parse the feed contents"
 msgstr "Unable to parse the feed contents"
 
-#: ../podcast/rb-podcast-parse.c:224
+#: ../podcast/rb-podcast-parse.c:239
 #, c-format
 msgid "The feed does not contain any downloadable items"
 msgstr "The feed does not contain any downloadable items"
 
-#: ../podcast/rb-podcast-properties-dialog.c:435
+#: ../podcast/rb-podcast-properties-dialog.c:431
 msgid "Not Downloaded"
 msgstr "Not Downloaded"
 
-#: ../remote/dbus/rb-client.c:81
+#: ../remote/dbus/rb-client.c:82
 msgid "Don't start a new instance of Rhythmbox"
 msgstr "Don't start a new instance of Rhythmbox"
 
-#: ../remote/dbus/rb-client.c:82 ../shell/main.c:121
+#: ../remote/dbus/rb-client.c:83 ../shell/main.c:118
 msgid "Quit Rhythmbox"
 msgstr "Quit Rhythmbox"
 
-#: ../remote/dbus/rb-client.c:84
+#: ../remote/dbus/rb-client.c:85
 msgid "Don't present an existing Rhythmbox window"
 msgstr "Don't present an existing Rhythmbox window"
 
-#: ../remote/dbus/rb-client.c:85
+#: ../remote/dbus/rb-client.c:86
 msgid "Hide the Rhythmbox window"
 msgstr "Hide the Rhythmbox window"
 
-#: ../remote/dbus/rb-client.c:87
+#: ../remote/dbus/rb-client.c:88
 msgid "Jump to next song"
 msgstr "Jump to next song"
 
-#: ../remote/dbus/rb-client.c:88
+#: ../remote/dbus/rb-client.c:89
 msgid "Jump to previous song"
 msgstr "Jump to previous song"
 
-#: ../remote/dbus/rb-client.c:90
+#: ../remote/dbus/rb-client.c:91
 msgid "Show notification of the playing song"
 msgstr "Show notification of the playing song"
 
-#: ../remote/dbus/rb-client.c:92
+#: ../remote/dbus/rb-client.c:93
 msgid "Resume playback if currently paused"
 msgstr "Resume playback if currently paused"
 
-#: ../remote/dbus/rb-client.c:93
+#: ../remote/dbus/rb-client.c:94
 msgid "Pause playback if currently playing"
 msgstr "Pause playback if currently playing"
 
-#: ../remote/dbus/rb-client.c:94
+#: ../remote/dbus/rb-client.c:95
 msgid "Toggle play/pause mode"
 msgstr "Toggle play/pause mode"
 
 #. { "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL },
-#: ../remote/dbus/rb-client.c:97
+#: ../remote/dbus/rb-client.c:98
 msgid "Play a specified URI, importing it if necessary"
 msgstr "Play a specified URI, importing it if necessary"
 
-#: ../remote/dbus/rb-client.c:97
+#: ../remote/dbus/rb-client.c:98
 msgid "URI to play"
 msgstr "URI to play"
 
-#: ../remote/dbus/rb-client.c:98
+#: ../remote/dbus/rb-client.c:99
 msgid "Add specified tracks to the play queue"
 msgstr "Add specified tracks to the play queue"
 
-#: ../remote/dbus/rb-client.c:99
+#: ../remote/dbus/rb-client.c:100
 msgid "Empty the play queue before adding new tracks"
 msgstr "Empty the play queue before adding new tracks"
 
-#: ../remote/dbus/rb-client.c:101
+#: ../remote/dbus/rb-client.c:102
 msgid "Print the title and artist of the playing song"
 msgstr "Print the title and artist of the playing song"
 
-#: ../remote/dbus/rb-client.c:102
+#: ../remote/dbus/rb-client.c:103
 msgid "Print formatted details of the song"
 msgstr "Print formatted details of the song"
 
-#: ../remote/dbus/rb-client.c:104
+#: ../remote/dbus/rb-client.c:105
 msgid "Set the playback volume"
 msgstr "Set the playback volume"
 
-#: ../remote/dbus/rb-client.c:105
+#: ../remote/dbus/rb-client.c:106
 msgid "Increase the playback volume"
 msgstr "Increase the playback volume"
 
-#: ../remote/dbus/rb-client.c:106
+#: ../remote/dbus/rb-client.c:107
 msgid "Decrease the playback volume"
 msgstr "Decrease the playback volume"
 
-#: ../remote/dbus/rb-client.c:107
+#: ../remote/dbus/rb-client.c:108
 msgid "Print the current playback volume"
 msgstr "Print the current playback volume"
 
-#: ../remote/dbus/rb-client.c:108
+#: ../remote/dbus/rb-client.c:109
 msgid "Mute playback"
 msgstr "Mute playback"
 
-#: ../remote/dbus/rb-client.c:109
+#: ../remote/dbus/rb-client.c:110
 msgid "Unmute playback"
 msgstr "Unmute playback"
 
-#: ../remote/dbus/rb-client.c:452 ../remote/dbus/rb-client.c:478
-#: ../shell/rb-shell.c:2158
-msgid "Not playing"
-msgstr "Not playing"
+#: ../remote/dbus/rb-client.c:111
+msgid "Set the rating of the current song"
+msgstr "Set the rating of the current song"
 
-#: ../remote/dbus/rb-client.c:706
+#: ../remote/dbus/rb-client.c:736
 #, c-format
 msgid "Playback is muted.\n"
 msgstr "Playback is muted.\n"
 
-#: ../remote/dbus/rb-client.c:707
+#: ../remote/dbus/rb-client.c:737
 #, c-format
 msgid "Playback volume is %f.\n"
 msgstr "Playback volume is %f.\n"
 
 #: ../rhythmdb/rhythmdb-property-model.c:473
-#: ../sources/rb-auto-playlist-source.c:105 ../sources/rb-browser-source.c:175
-#: ../sources/rb-podcast-source.c:339
+#: ../sources/rb-auto-playlist-source.c:105 ../sources/rb-browser-source.c:173
+#: ../sources/rb-podcast-source.c:333
 #: ../sources/rb-static-playlist-source.c:110
 msgid "All"
 msgstr "All"
@@ -3279,13 +3483,13 @@ msgstr "All"
 #: ../rhythmdb/rhythmdb-tree.c:407
 #, c-format
 msgid ""
-"The database was created by a later version of rhythmbox.  This version of "
-"rhythmbox cannot read the database."
+"The database was created by a later version of Rhythmbox.  This version of "
+"Rhythmbox cannot read the database."
 msgstr ""
-"The database was created by a later version of rhythmbox.  This version of "
-"rhythmbox cannot read the database."
+"The database was created by a later version of Rhythmbox.  This version of "
+"Rhythmbox cannot read the database."
 
-#: ../rhythmdb/rhythmdb.c:721
+#: ../rhythmdb/rhythmdb.c:751
 #, c-format
 msgid "Couldn't access %s: %s"
 msgstr "Couldn't access %s: %s"
@@ -3295,7 +3499,7 @@ msgstr "Couldn't access %s: %s"
 #. * a local artist name if desired.  Ensure the album name
 #. * and song title are also replaced in this case.
 #.
-#: ../rhythmdb/rhythmdb.c:1652
+#: ../rhythmdb/rhythmdb.c:1698
 msgid "The Beatles"
 msgstr "The Beatles"
 
@@ -3303,7 +3507,7 @@ msgstr "The Beatles"
 #. * example artist name is localised, this should be replaced
 #. * with the name of an album by that artist.
 #.
-#: ../rhythmdb/rhythmdb.c:1658
+#: ../rhythmdb/rhythmdb.c:1704
 msgid "Help!"
 msgstr "Help!"
 
@@ -3311,33 +3515,46 @@ msgstr "Help!"
 #. * artist and album names are localised, this should be replaced
 #. * with the name of the seventh song from the localised album.
 #.
-#: ../rhythmdb/rhythmdb.c:1664
+#: ../rhythmdb/rhythmdb.c:1710
 msgid "Ticket To Ride"
 msgstr "Ticket To Ride"
 
-#: ../rhythmdb/rhythmdb.c:2209
+#: ../rhythmdb/rhythmdb.c:2259
 msgid "invalid unicode in error message"
 msgstr "invalid unicode in error message"
 
-#: ../rhythmdb/rhythmdb.c:3076
+#: ../rhythmdb/rhythmdb.c:2320
+#, c-format
+msgid "Empty file"
+msgstr "Empty file"
+
+#. Translators: the parameter here is a list of GStreamer plugins.
+#. * The plugin names are already translated.
+#.
+#: ../rhythmdb/rhythmdb.c:2431
+#, c-format
+msgid "Additional GStreamer plugins are required to play this file: %s"
+msgstr "Additional GStreamer plugins are required to play this file: %s"
+
+#: ../rhythmdb/rhythmdb.c:3191
 msgid "Could not load the music database:"
 msgstr "Could not load the music database:"
 
-#: ../rhythmdb/rhythmdb.c:4439
+#: ../rhythmdb/rhythmdb.c:4559
 #, c-format
 msgid "%ld minute"
 msgid_plural "%ld minutes"
 msgstr[0] "%ld minute"
 msgstr[1] "%ld minutes"
 
-#: ../rhythmdb/rhythmdb.c:4440
+#: ../rhythmdb/rhythmdb.c:4560
 #, c-format
 msgid "%ld hour"
 msgid_plural "%ld hours"
 msgstr[0] "%ld hour"
 msgstr[1] "%ld hours"
 
-#: ../rhythmdb/rhythmdb.c:4441
+#: ../rhythmdb/rhythmdb.c:4561
 #, c-format
 msgid "%ld day"
 msgid_plural "%ld days"
@@ -3345,7 +3562,7 @@ msgstr[0] "%ld day"
 msgstr[1] "%ld days"
 
 #. Translators: the format is "X days, X hours and X minutes"
-#: ../rhythmdb/rhythmdb.c:4447
+#: ../rhythmdb/rhythmdb.c:4567
 #, c-format
 msgid "%s, %s and %s"
 msgstr "%s, %s and %s"
@@ -3353,47 +3570,52 @@ msgstr "%s, %s and %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:4453 ../rhythmdb/rhythmdb.c:4461
-#: ../rhythmdb/rhythmdb.c:4472
+#: ../rhythmdb/rhythmdb.c:4573 ../rhythmdb/rhythmdb.c:4581
+#: ../rhythmdb/rhythmdb.c:4592
 #, c-format
 msgid "%s and %s"
 msgstr "%s and %s"
 
-#: ../shell/main.c:114
+#: ../shell/main.c:111
 msgid "Enable debug output"
 msgstr "Enable debug output"
 
-#: ../shell/main.c:115
+#: ../shell/main.c:112
 msgid "Enable debug output matching a specified string"
 msgstr "Enable debug output matching a specified string"
 
-#: ../shell/main.c:116
+#: ../shell/main.c:113
 msgid "Do not update the library with file changes"
 msgstr "Do not update the library with file changes"
 
-#: ../shell/main.c:117
+#: ../shell/main.c:114
 msgid "Do not register the shell"
 msgstr "Do not register the shell"
 
-#: ../shell/main.c:118
+#: ../shell/main.c:115
 msgid "Don't save any data permanently (implies --no-registration)"
 msgstr "Don't save any data permanently (implies --no-registration)"
 
-#: ../shell/main.c:119
+#: ../shell/main.c:116
 msgid "Path for database file to use"
 msgstr "Path for database file to use"
 
-#: ../shell/main.c:120
+#: ../shell/main.c:117
 msgid "Path for playlists file to use"
 msgstr "Path for playlists file to use"
 
-#: ../shell/main.c:122
+#: ../shell/main.c:119
 msgid "[URI...]"
-msgstr "[URI...]"
+msgstr "[URIâ?¦]"
 
-#: ../shell/main.c:147 ../shell/main.c:153 ../shell/main.c:162
-msgid "Rhythmbox"
-msgstr "Rhythmbox"
+#: ../shell/main.c:149
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 
 #: ../shell/rb-playlist-manager.c:161
 msgid "MPEG Version 3.0 URL"
@@ -3414,7 +3636,7 @@ msgstr "_Playlist"
 
 #: ../shell/rb-playlist-manager.c:172
 msgid "_New Playlist..."
-msgstr "_New Playlist..."
+msgstr "_New Playlistâ?¦"
 
 #: ../shell/rb-playlist-manager.c:173
 msgid "Create a new playlist"
@@ -3422,7 +3644,7 @@ msgstr "Create a new playlist"
 
 #: ../shell/rb-playlist-manager.c:175
 msgid "New _Automatic Playlist..."
-msgstr "New _Automatic Playlist..."
+msgstr "New _Automatic Playlistâ?¦"
 
 #: ../shell/rb-playlist-manager.c:176
 msgid "Create a new automatically updating playlist"
@@ -3430,7 +3652,7 @@ msgstr "Create a new automatically updating playlist"
 
 #: ../shell/rb-playlist-manager.c:178
 msgid "_Load from File..."
-msgstr "_Load from File..."
+msgstr "_Load from Fileâ?¦"
 
 #: ../shell/rb-playlist-manager.c:179
 msgid "Choose a playlist to be loaded"
@@ -3438,7 +3660,7 @@ msgstr "Choose a playlist to be loaded"
 
 #: ../shell/rb-playlist-manager.c:181 ../shell/rb-playlist-manager.c:199
 msgid "_Save to File..."
-msgstr "_Save to File..."
+msgstr "_Save to Fileâ?¦"
 
 #: ../shell/rb-playlist-manager.c:182
 msgid "Save a playlist to a file"
@@ -3520,41 +3742,58 @@ msgstr "Unknown playlist: %s"
 msgid "Playlist %s is an automatic playlist"
 msgstr "Playlist %s is an automatic playlist"
 
-#: ../shell/rb-removable-media-manager.c:153
+#: ../shell/rb-plugin-manager.c:54
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../shell/rb-plugin-manager.c:55
+msgid "Enabled"
+msgstr "Enabled"
+
+#: ../shell/rb-plugins-engine.c:556
+msgid "Plugin Error"
+msgstr "Plugin Error"
+
+#: ../shell/rb-plugins-engine.c:556
+#, c-format
+msgid "Unable to activate plugin %s"
+msgstr "Unable to activate plugin %s"
+
+#: ../shell/rb-removable-media-manager.c:166
 msgid "Eject this medium"
 msgstr "Eject this medium"
 
-#: ../shell/rb-removable-media-manager.c:155
+#: ../shell/rb-removable-media-manager.c:168
 msgid "_Extract to Library"
 msgstr "_Extract to Library"
 
-#: ../shell/rb-removable-media-manager.c:156
+#: ../shell/rb-removable-media-manager.c:169
 msgid "Copy all tracks to the library"
 msgstr "Copy all tracks to the library"
 
-#: ../shell/rb-removable-media-manager.c:158
+#: ../shell/rb-removable-media-manager.c:171
 msgid "_Scan Removable Media"
 msgstr "_Scan Removable Media"
 
-#: ../shell/rb-removable-media-manager.c:159
+#: ../shell/rb-removable-media-manager.c:172
 msgid "Scan for new Removable Media"
 msgstr "Scan for new Removable Media"
 
 #. Translators: this is the toolbar button label
 #. for Copy to Library action.
-#: ../shell/rb-removable-media-manager.c:725
+#: ../shell/rb-removable-media-manager.c:837
 msgid "Extract"
 msgstr "Extract"
 
-#: ../shell/rb-removable-media-manager.c:756
+#: ../shell/rb-removable-media-manager.c:868
 msgid "Unable to eject"
 msgstr "Unable to eject"
 
-#: ../shell/rb-removable-media-manager.c:777
+#: ../shell/rb-removable-media-manager.c:889
 msgid "Unable to unmount"
 msgstr "Unable to unmount"
 
-#: ../shell/rb-removable-media-manager.c:978
+#: ../shell/rb-removable-media-manager.c:1100
 msgid "Error transferring track"
 msgstr "Error transferring track"
 
@@ -3642,363 +3881,349 @@ msgstr "Pr_operties"
 msgid "Show information on the selected song"
 msgstr "Show information on the selected song"
 
-#: ../shell/rb-shell-player.c:318
+#: ../shell/rb-shell-player.c:309
 msgid "Pre_vious"
 msgstr "Pre_vious"
 
-#: ../shell/rb-shell-player.c:319
+#: ../shell/rb-shell-player.c:310
 msgid "Start playing the previous song"
 msgstr "Start playing the previous song"
 
-#: ../shell/rb-shell-player.c:321
+#: ../shell/rb-shell-player.c:312
 msgid "_Next"
 msgstr "_Next"
 
-#: ../shell/rb-shell-player.c:322
+#: ../shell/rb-shell-player.c:313
 msgid "Start playing the next song"
 msgstr "Start playing the next song"
 
-#: ../shell/rb-shell-player.c:324
+#: ../shell/rb-shell-player.c:315
 msgid "_Increase Volume"
 msgstr "_Increase Volume"
 
-#: ../shell/rb-shell-player.c:325
+#: ../shell/rb-shell-player.c:316
 msgid "Increase playback volume"
 msgstr "Increase playback volume"
 
-#: ../shell/rb-shell-player.c:327
+#: ../shell/rb-shell-player.c:318
 msgid "_Decrease Volume"
 msgstr "_Decrease Volume"
 
-#: ../shell/rb-shell-player.c:328
+#: ../shell/rb-shell-player.c:319
 msgid "Decrease playback volume"
 msgstr "Decrease playback volume"
 
-#: ../shell/rb-shell-player.c:335
+#: ../shell/rb-shell-player.c:326
 msgid "_Play"
 msgstr "_Play"
 
-#: ../shell/rb-shell-player.c:336 ../shell/rb-shell-player.c:3807
+#: ../shell/rb-shell-player.c:327 ../shell/rb-shell-player.c:3732
 msgid "Start playback"
 msgstr "Start playback"
 
-#: ../shell/rb-shell-player.c:338
+#: ../shell/rb-shell-player.c:329
 msgid "Sh_uffle"
 msgstr "Sh_uffle"
 
-#: ../shell/rb-shell-player.c:339
+#: ../shell/rb-shell-player.c:330
 msgid "Play songs in a random order"
 msgstr "Play songs in a random order"
 
-#: ../shell/rb-shell-player.c:341
+#: ../shell/rb-shell-player.c:332
 msgid "_Repeat"
 msgstr "_Repeat"
 
-#: ../shell/rb-shell-player.c:342
+#: ../shell/rb-shell-player.c:333
 msgid "Play first song again after all songs are played"
 msgstr "Play first song again after all songs are played"
 
-#: ../shell/rb-shell-player.c:344
+#: ../shell/rb-shell-player.c:335
 msgid "_Song Position Slider"
 msgstr "_Song Position Slider"
 
-#: ../shell/rb-shell-player.c:345
+#: ../shell/rb-shell-player.c:336
 msgid "Change the visibility of the song position slider"
 msgstr "Change the visibility of the song position slider"
 
-#: ../shell/rb-shell-player.c:814
+#: ../shell/rb-shell-player.c:788
 msgid "Stream error"
 msgstr "Stream error"
 
-#: ../shell/rb-shell-player.c:815
+#: ../shell/rb-shell-player.c:789
 msgid "Unexpected end of stream!"
 msgstr "Unexpected end of stream!"
 
-#: ../shell/rb-shell-player.c:945
+#: ../shell/rb-shell-player.c:921
 msgid "Linear"
 msgstr "Linear"
 
-#: ../shell/rb-shell-player.c:947
+#: ../shell/rb-shell-player.c:923
 msgid "Linear looping"
 msgstr "Linear looping"
 
-#: ../shell/rb-shell-player.c:949
+#: ../shell/rb-shell-player.c:925
 msgid "Shuffle"
 msgstr "Shuffle"
 
-#: ../shell/rb-shell-player.c:951
+#: ../shell/rb-shell-player.c:927
 msgid "Random with equal weights"
 msgstr "Random with equal weights"
 
-#: ../shell/rb-shell-player.c:953
+#: ../shell/rb-shell-player.c:929
 msgid "Random by time since last play"
 msgstr "Random by time since last play"
 
-#: ../shell/rb-shell-player.c:955
+#: ../shell/rb-shell-player.c:931
 msgid "Random by rating"
 msgstr "Random by rating"
 
-#: ../shell/rb-shell-player.c:957
+#: ../shell/rb-shell-player.c:933
 msgid "Random by time since last play and rating"
 msgstr "Random by time since last play and rating"
 
-#: ../shell/rb-shell-player.c:959
+#: ../shell/rb-shell-player.c:935
 msgid "Linear, removing entries once played"
 msgstr "Linear, removing entries once played"
 
-#: ../shell/rb-shell-player.c:969
+#: ../shell/rb-shell-player.c:945
 #, c-format
 msgid "Failed to create the player: %s"
 msgstr "Failed to create the player: %s"
 
-#: ../shell/rb-shell-player.c:1526
+#: ../shell/rb-shell-player.c:1491
 #, c-format
 msgid "Playlist was empty"
 msgstr "Playlist was empty"
 
-#: ../shell/rb-shell-player.c:2033
+#: ../shell/rb-shell-player.c:1980
 #, c-format
 msgid "Not currently playing"
 msgstr "Not currently playing"
 
-#: ../shell/rb-shell-player.c:2091
+#: ../shell/rb-shell-player.c:2038
 #, c-format
 msgid "No previous song"
 msgstr "No previous song"
 
-#: ../shell/rb-shell-player.c:2191
+#: ../shell/rb-shell-player.c:2138
 #, c-format
 msgid "No next song"
 msgstr "No next song"
 
-#: ../shell/rb-shell-player.c:2312 ../shell/rb-shell-player.c:3438
+#: ../shell/rb-shell-player.c:2259 ../shell/rb-shell-player.c:3383
 msgid "Couldn't start playback"
 msgstr "Couldn't start playback"
 
-#: ../shell/rb-shell-player.c:3194
+#: ../shell/rb-shell-player.c:3145
 msgid "Couldn't stop playback"
 msgstr "Couldn't stop playback"
 
-#: ../shell/rb-shell-player.c:3310
+#: ../shell/rb-shell-player.c:3255
 #, c-format
 msgid "Playback position not available"
 msgstr "Playback position not available"
 
-#: ../shell/rb-shell-player.c:3342
+#: ../shell/rb-shell-player.c:3287
 #, c-format
 msgid "Current song is not seekable"
 msgstr "Current song is not seekable"
 
-#: ../shell/rb-shell-player.c:3805
+#: ../shell/rb-shell-player.c:3730
 msgid "Stop playback"
 msgstr "Stop playback"
 
-#: ../shell/rb-shell-preferences.c:171 ../shell/rb-shell.c:2394
+#: ../shell/rb-shell-preferences.c:167 ../shell/rb-shell.c:2193
 msgid "Couldn't display help"
 msgstr "Couldn't display help"
 
-#: ../shell/rb-shell-preferences.c:206
+#: ../shell/rb-shell-preferences.c:202
 msgid "Music Player Preferences"
 msgstr "Music Player Preferences"
 
-#: ../shell/rb-shell-preferences.c:261
+#: ../shell/rb-shell-preferences.c:255
 msgid "General"
 msgstr "General"
 
-#: ../shell/rb-shell-preferences.c:320
+#: ../shell/rb-shell-preferences.c:304
 msgid "Playback"
 msgstr "Playback"
 
-#: ../shell/rb-shell.c:419
+#: ../shell/rb-shell.c:389
 msgid "_Music"
 msgstr "_Music"
 
-#: ../shell/rb-shell.c:421
+#: ../shell/rb-shell.c:391
 msgid "_View"
 msgstr "_View"
 
-#: ../shell/rb-shell.c:422
+#: ../shell/rb-shell.c:392
 msgid "_Control"
 msgstr "_Control"
 
-#: ../shell/rb-shell.c:423
+#: ../shell/rb-shell.c:393
 msgid "_Tools"
 msgstr "_Tools"
 
-#: ../shell/rb-shell.c:424
+#: ../shell/rb-shell.c:394
 msgid "_Help"
 msgstr "_Help"
 
-#: ../shell/rb-shell.c:426
+#: ../shell/rb-shell.c:396
 msgid "_Import Folder..."
-msgstr "_Import Folder..."
+msgstr "_Import Folderâ?¦"
 
-#: ../shell/rb-shell.c:427
+#: ../shell/rb-shell.c:397
 msgid "Choose folder to be added to the Library"
 msgstr "Choose folder to be added to the Library"
 
-#: ../shell/rb-shell.c:429
+#: ../shell/rb-shell.c:399
 msgid "Import _File..."
-msgstr "Import _File..."
+msgstr "Import _Fileâ?¦"
 
-#: ../shell/rb-shell.c:430
+#: ../shell/rb-shell.c:400
 msgid "Choose file to be added to the Library"
 msgstr "Choose file to be added to the Library"
 
-#: ../shell/rb-shell.c:432
+#: ../shell/rb-shell.c:402
 msgid "_About"
 msgstr "_About"
 
-#: ../shell/rb-shell.c:433
+#: ../shell/rb-shell.c:403
 msgid "Show information about the music player"
 msgstr "Show information about the music player"
 
-#: ../shell/rb-shell.c:435
+#: ../shell/rb-shell.c:405
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../shell/rb-shell.c:436
+#: ../shell/rb-shell.c:406
 msgid "Display music player help"
 msgstr "Display music player help"
 
-#: ../shell/rb-shell.c:438
-msgid "_Close"
-msgstr "_Close"
-
-#: ../shell/rb-shell.c:439
-msgid "Hide the music player window"
-msgstr "Hide the music player window"
-
-#: ../shell/rb-shell.c:441
+#: ../shell/rb-shell.c:408
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../shell/rb-shell.c:442
+#: ../shell/rb-shell.c:409
 msgid "Quit the music player"
 msgstr "Quit the music player"
 
-#: ../shell/rb-shell.c:444
+#: ../shell/rb-shell.c:411
 msgid "Prefere_nces"
 msgstr "Prefere_nces"
 
-#: ../shell/rb-shell.c:445
+#: ../shell/rb-shell.c:412
 msgid "Edit music player preferences"
 msgstr "Edit music player preferences"
 
-#: ../shell/rb-shell.c:447
+#: ../shell/rb-shell.c:414
 msgid "Plu_gins"
 msgstr "Plu_gins"
 
-#: ../shell/rb-shell.c:448
+#: ../shell/rb-shell.c:415
 msgid "Change and configure plugins"
 msgstr "Change and configure plugins"
 
-#: ../shell/rb-shell.c:450
+#: ../shell/rb-shell.c:417
 msgid "Show _All Tracks"
 msgstr "Show _All Tracks"
 
-#: ../shell/rb-shell.c:451
+#: ../shell/rb-shell.c:418
 msgid "Show all tracks in this music source"
 msgstr "Show all tracks in this music source"
 
-#: ../shell/rb-shell.c:453
+#: ../shell/rb-shell.c:420
 msgid "_Jump to Playing Song"
 msgstr "_Jump to Playing Song"
 
-#: ../shell/rb-shell.c:454
+#: ../shell/rb-shell.c:421
 msgid "Scroll the view to the currently playing song"
 msgstr "Scroll the view to the currently playing song"
 
-#: ../shell/rb-shell.c:461
+#: ../shell/rb-shell.c:428
 msgid "Side _Pane"
 msgstr "Side _Pane"
 
-#: ../shell/rb-shell.c:462
+#: ../shell/rb-shell.c:429
 msgid "Change the visibility of the side pane"
 msgstr "Change the visibility of the side pane"
 
-#: ../shell/rb-shell.c:464
+#: ../shell/rb-shell.c:431
 msgid "T_oolbar"
 msgstr "T_oolbar"
 
-#: ../shell/rb-shell.c:465
+#: ../shell/rb-shell.c:432
 msgid "Change the visibility of the toolbar"
 msgstr "Change the visibility of the toolbar"
 
-#: ../shell/rb-shell.c:467
+#: ../shell/rb-shell.c:434
 msgid "_Small Display"
 msgstr "_Small Display"
 
-#: ../shell/rb-shell.c:468
+#: ../shell/rb-shell.c:435
 msgid "Make the main window smaller"
 msgstr "Make the main window smaller"
 
-#: ../shell/rb-shell.c:470
+#: ../shell/rb-shell.c:437
 msgid "Party _Mode"
 msgstr "Party _Mode"
 
-#: ../shell/rb-shell.c:471
+#: ../shell/rb-shell.c:438
 msgid "Change the status of the party mode"
 msgstr "Change the status of the party mode"
 
-#: ../shell/rb-shell.c:473
+#: ../shell/rb-shell.c:440
 msgid "Play _Queue as Side Pane"
 msgstr "Play _Queue as Side Pane"
 
-#: ../shell/rb-shell.c:474
+#: ../shell/rb-shell.c:441
 msgid "Change whether the queue is visible as a source or a sidebar"
 msgstr "Change whether the queue is visible as a source or a sidebar"
 
-#: ../shell/rb-shell.c:476
+#: ../shell/rb-shell.c:443
 msgid "S_tatusbar"
 msgstr "S_tatusbar"
 
-#: ../shell/rb-shell.c:477
+#: ../shell/rb-shell.c:444
 msgid "Change the visibility of the statusbar"
 msgstr "Change the visibility of the statusbar"
 
-#: ../shell/rb-shell.c:1008 ../shell/rb-shell.c:1225
+#: ../shell/rb-shell.c:985 ../shell/rb-shell.c:1208
 msgid "Unable to move user data files"
 msgstr "Unable to move user data files"
 
-#: ../shell/rb-shell.c:1311
+#: ../shell/rb-shell.c:1294
 msgid "Change the music volume"
 msgstr "Change the music volume"
 
-#: ../shell/rb-shell.c:1783
+#: ../shell/rb-shell.c:1701
 msgid "Error while saving song information"
 msgstr "Error while saving song information"
 
-#: ../shell/rb-shell.c:1932
+#: ../shell/rb-shell.c:1806
 #, c-format
 msgid "Transferring track %d out of %d (%.0f%%)"
 msgstr "Transferring track %d out of %d (%.0f%%)"
 
-#: ../shell/rb-shell.c:1935
+#: ../shell/rb-shell.c:1809
 #, c-format
 msgid "Transferring track %d out of %d"
 msgstr "Transferring track %d out of %d"
 
-#. Translators: the %s is the elapsed and total time
-#: ../shell/rb-shell.c:2161
-#, c-format
-msgid "Paused, %s"
-msgstr "Paused, %s"
-
 #. Translators: %s is the song name
-#: ../shell/rb-shell.c:2203
+#: ../shell/rb-shell.c:2009
 #, c-format
 msgid "%s (Paused)"
 msgstr "%s (Paused)"
 
-#: ../shell/rb-shell.c:2307
+#: ../shell/rb-shell.c:2113
 msgid "translator-credits"
 msgstr ""
 "David Lodge <dave cirt net>\n"
 "Philip Withnall <philip tecnocode co uk>\n"
 "Bruce Cowan <bcowan fastmail co uk>"
 
-#: ../shell/rb-shell.c:2310
+#: ../shell/rb-shell.c:2116
 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"
@@ -4010,7 +4235,7 @@ msgstr ""
 "the Free Software Foundation; either version 2 of the Licence, or\n"
 "(at your option) any later version.\n"
 
-#: ../shell/rb-shell.c:2314
+#: ../shell/rb-shell.c:2120
 msgid ""
 "Rhythmbox is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -4022,7 +4247,7 @@ msgstr ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "GNU General Public Licence for more details.\n"
 
-#: ../shell/rb-shell.c:2318
+#: ../shell/rb-shell.c:2124
 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"
@@ -4032,66 +4257,54 @@ msgstr ""
 "along with Rhythmbox; if not, write to the Free Software Foundation, Inc.,\n"
 "51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA\n"
 
-#: ../shell/rb-shell.c:2325
+#: ../shell/rb-shell.c:2131
 msgid "Maintainers:"
 msgstr "Maintainers:"
 
-#: ../shell/rb-shell.c:2328
+#: ../shell/rb-shell.c:2134
 msgid "Former Maintainers:"
 msgstr "Former Maintainers:"
 
-#: ../shell/rb-shell.c:2331
+#: ../shell/rb-shell.c:2137
 msgid "Contributors:"
 msgstr "Contributors:"
 
-#: ../shell/rb-shell.c:2333
+#: ../shell/rb-shell.c:2139
 msgid "Music management and playback software for GNOME."
 msgstr "Music management and playback software for GNOME."
 
-#: ../shell/rb-shell.c:2342
+#: ../shell/rb-shell.c:2148
 msgid "Rhythmbox Website"
 msgstr "Rhythmbox Website"
 
-#: ../shell/rb-shell.c:2441
+#: ../shell/rb-shell.c:2240
 msgid "Configure Plugins"
 msgstr "Configure Plugins"
 
-#: ../shell/rb-shell.c:2512
+#: ../shell/rb-shell.c:2311
 msgid "Import Folder into Library"
 msgstr "Import Folder into Library"
 
-#: ../shell/rb-shell.c:2534
+#: ../shell/rb-shell.c:2333
 msgid "Import File into Library"
 msgstr "Import File into Library"
 
-#. Translators: by Artist
-#: ../shell/rb-shell.c:3049
-#, c-format
-msgid "by <i>%s</i>"
-msgstr "by <i>%s</i>"
-
-#. Translators: from Album
-#: ../shell/rb-shell.c:3070
-#, c-format
-msgid "from <i>%s</i>"
-msgstr "from <i>%s</i>"
-
-#: ../shell/rb-shell.c:3278
+#: ../shell/rb-shell.c:2873
 #, c-format
 msgid "No registered source can handle URI %s"
 msgstr "No registered source can handle URI %s"
 
-#: ../shell/rb-shell.c:3547 ../shell/rb-shell.c:3576
+#: ../shell/rb-shell.c:3143 ../shell/rb-shell.c:3172
 #, c-format
 msgid "Unknown song URI: %s"
 msgstr "Unknown song URI: %s"
 
-#: ../shell/rb-shell.c:3585
+#: ../shell/rb-shell.c:3181
 #, c-format
 msgid "Unknown property %s"
 msgstr "Unknown property %s"
 
-#: ../shell/rb-shell.c:3595
+#: ../shell/rb-shell.c:3191
 #, c-format
 msgid "Invalid property type %s for property %s"
 msgstr "Invalid property type %s for property %s"
@@ -4110,81 +4323,65 @@ msgstr "Filter music display by genre, artist, album, or title"
 
 #: ../shell/rb-statusbar.c:198
 msgid "Loading..."
-msgstr "Loading..."
-
-#: ../shell/rb-tray-icon.c:160
-msgid "_Show Music Player"
-msgstr "_Show Music Player"
-
-#: ../shell/rb-tray-icon.c:161
-msgid "Choose music to play"
-msgstr "Choose music to play"
+msgstr "Loadingâ?¦"
 
-#: ../shell/rb-tray-icon.c:163
-msgid "Show N_otifications"
-msgstr "Show N_otifications"
-
-#: ../shell/rb-tray-icon.c:164
-msgid "Show notifications of song changes and other events"
-msgstr "Show notifications of song changes and other events"
-
-#: ../sources/rb-auto-playlist-source.c:105 ../sources/rb-browser-source.c:175
-#: ../sources/rb-podcast-source.c:339
+#: ../sources/rb-auto-playlist-source.c:105 ../sources/rb-browser-source.c:173
+#: ../sources/rb-podcast-source.c:333
 #: ../sources/rb-static-playlist-source.c:110
 msgid "Search all fields"
 msgstr "Search all fields"
 
-#: ../sources/rb-auto-playlist-source.c:106 ../sources/rb-browser-source.c:176
+#: ../sources/rb-auto-playlist-source.c:106 ../sources/rb-browser-source.c:174
 #: ../sources/rb-static-playlist-source.c:111
 msgid "Artists"
 msgstr "Artists"
 
-#: ../sources/rb-auto-playlist-source.c:106 ../sources/rb-browser-source.c:176
+#: ../sources/rb-auto-playlist-source.c:106 ../sources/rb-browser-source.c:174
 #: ../sources/rb-static-playlist-source.c:111
 msgid "Search artists"
 msgstr "Search artists"
 
-#: ../sources/rb-auto-playlist-source.c:107 ../sources/rb-browser-source.c:177
+#: ../sources/rb-auto-playlist-source.c:107 ../sources/rb-browser-source.c:175
 #: ../sources/rb-static-playlist-source.c:112
 msgid "Albums"
 msgstr "Albums"
 
-#: ../sources/rb-auto-playlist-source.c:107 ../sources/rb-browser-source.c:177
+#: ../sources/rb-auto-playlist-source.c:107 ../sources/rb-browser-source.c:175
 #: ../sources/rb-static-playlist-source.c:112
 msgid "Search albums"
 msgstr "Search albums"
 
-#: ../sources/rb-auto-playlist-source.c:108 ../sources/rb-browser-source.c:178
+#: ../sources/rb-auto-playlist-source.c:108 ../sources/rb-browser-source.c:176
 #: ../sources/rb-static-playlist-source.c:113
 msgid "Titles"
 msgstr "Titles"
 
-#: ../sources/rb-auto-playlist-source.c:108 ../sources/rb-browser-source.c:178
+#: ../sources/rb-auto-playlist-source.c:108 ../sources/rb-browser-source.c:176
 #: ../sources/rb-static-playlist-source.c:113
 msgid "Search titles"
 msgstr "Search titles"
 
-#: ../sources/rb-browser-source.c:162
+#: ../sources/rb-browser-source.c:160
 msgid "Browse This _Genre"
 msgstr "Browse This _Genre"
 
-#: ../sources/rb-browser-source.c:163
+#: ../sources/rb-browser-source.c:161
 msgid "Set the browser to view only this genre"
 msgstr "Set the browser to view only this genre"
 
-#: ../sources/rb-browser-source.c:165
+#: ../sources/rb-browser-source.c:163
 msgid "Browse This _Artist"
 msgstr "Browse This _Artist"
 
-#: ../sources/rb-browser-source.c:166
+#: ../sources/rb-browser-source.c:164
 msgid "Set the browser to view only this artist"
 msgstr "Set the browser to view only this artist"
 
-#: ../sources/rb-browser-source.c:168
+#: ../sources/rb-browser-source.c:166
 msgid "Browse This A_lbum"
 msgstr "Browse This A_lbum"
 
-#: ../sources/rb-browser-source.c:169
+#: ../sources/rb-browser-source.c:167
 msgid "Set the browser to view only this album"
 msgstr "Set the browser to view only this album"
 
@@ -4211,7 +4408,7 @@ msgstr "Artist/Album"
 msgid "Artist - Album"
 msgstr "Artist - Album"
 
-#: ../sources/rb-library-source.c:140 ../widgets/rb-entry-view.c:1445
+#: ../sources/rb-library-source.c:140 ../widgets/rb-entry-view.c:1496
 #: ../widgets/rb-library-browser.c:144
 #: ../widgets/rb-query-creator-properties.c:77
 #: ../widgets/rb-query-creator-properties.c:103
@@ -4246,11 +4443,11 @@ msgstr "Music"
 msgid "Choose Library Location"
 msgstr "Choose Library Location"
 
-#: ../sources/rb-library-source.c:601
+#: ../sources/rb-library-source.c:599
 msgid "Multiple locations set"
 msgstr "Multiple locations set"
 
-#: ../sources/rb-library-source.c:996
+#: ../sources/rb-library-source.c:1008
 msgid "Example Path:"
 msgstr "Example Path:"
 
@@ -4299,117 +4496,117 @@ msgstr "from"
 msgid "by"
 msgstr "by"
 
-#: ../sources/rb-podcast-source.c:313
+#: ../sources/rb-podcast-source.c:307
 msgid "_New Podcast Feed..."
-msgstr "_New Podcast Feed..."
+msgstr "_New Podcast Feedâ?¦"
 
-#: ../sources/rb-podcast-source.c:314
+#: ../sources/rb-podcast-source.c:308
 msgid "Subscribe to a new Podcast Feed"
 msgstr "Subscribe to a new Podcast Feed"
 
-#: ../sources/rb-podcast-source.c:317
+#: ../sources/rb-podcast-source.c:311
 msgid "Download _Episode"
 msgstr "Download _Episode"
 
-#: ../sources/rb-podcast-source.c:318
+#: ../sources/rb-podcast-source.c:312
 msgid "Download Podcast Episode"
 msgstr "Download Podcast Episode"
 
-#: ../sources/rb-podcast-source.c:320
+#: ../sources/rb-podcast-source.c:314
 msgid "_Cancel Download"
 msgstr "_Cancel Download"
 
-#: ../sources/rb-podcast-source.c:321
+#: ../sources/rb-podcast-source.c:315
 msgid "Cancel Episode Download"
 msgstr "Cancel Episode Download"
 
-#: ../sources/rb-podcast-source.c:324
+#: ../sources/rb-podcast-source.c:318
 msgid "Episode Properties"
 msgstr "Episode Properties"
 
-#: ../sources/rb-podcast-source.c:326
+#: ../sources/rb-podcast-source.c:320
 msgid "_Update Podcast Feed"
 msgstr "_Update Podcast Feed"
 
-#: ../sources/rb-podcast-source.c:327
+#: ../sources/rb-podcast-source.c:321
 msgid "Update Feed"
 msgstr "Update Feed"
 
-#: ../sources/rb-podcast-source.c:329
+#: ../sources/rb-podcast-source.c:323
 msgid "_Delete Podcast Feed"
 msgstr "_Delete Podcast Feed"
 
-#: ../sources/rb-podcast-source.c:330
+#: ../sources/rb-podcast-source.c:324
 msgid "Delete Feed"
 msgstr "Delete Feed"
 
-#: ../sources/rb-podcast-source.c:332
+#: ../sources/rb-podcast-source.c:326
 msgid "_Update All Feeds"
 msgstr "_Update All Feeds"
 
-#: ../sources/rb-podcast-source.c:333
+#: ../sources/rb-podcast-source.c:327
 msgid "Update all feeds"
 msgstr "Update all feeds"
 
-#: ../sources/rb-podcast-source.c:340
+#: ../sources/rb-podcast-source.c:334
 msgid "Feeds"
 msgstr "Feeds"
 
-#: ../sources/rb-podcast-source.c:340
+#: ../sources/rb-podcast-source.c:334
 msgid "Search podcast feeds"
 msgstr "Search podcast feeds"
 
-#: ../sources/rb-podcast-source.c:341
+#: ../sources/rb-podcast-source.c:335
 msgid "Episodes"
 msgstr "Episodes"
 
-#: ../sources/rb-podcast-source.c:341
+#: ../sources/rb-podcast-source.c:335
 msgid "Search podcast episodes"
 msgstr "Search podcast episodes"
 
 #. Translators: this is the toolbar button label
 #. for New Podcast Feed action.
-#. Don't include the prefix "podcast|" in the translation.
-#: ../sources/rb-podcast-source.c:539
-msgid "podcast|New"
+#: ../sources/rb-podcast-source.c:528
+msgctxt "Podcast"
+msgid "New"
 msgstr "New"
 
 #. Translators: this is the toolbar button label
 #. for Update All Feeds action.
-#: ../sources/rb-podcast-source.c:545
+#: ../sources/rb-podcast-source.c:534
 msgid "Update"
 msgstr "Update"
 
-#: ../sources/rb-podcast-source.c:589 ../sources/rb-podcast-source.c:600
+#: ../sources/rb-podcast-source.c:578 ../sources/rb-podcast-source.c:589
 msgid "Date"
 msgstr "Date"
 
-#: ../sources/rb-podcast-source.c:621 ../sources/rb-podcast-source.c:689
-#: ../sources/rb-podcast-source.c:743
+#: ../sources/rb-podcast-source.c:610 ../sources/rb-podcast-source.c:678
+#: ../sources/rb-podcast-source.c:732
 msgid "Feed"
 msgstr "Feed"
 
-#: ../sources/rb-podcast-source.c:640 ../sources/rb-podcast-source.c:658
+#: ../sources/rb-podcast-source.c:629 ../sources/rb-podcast-source.c:647
 msgid "Status"
 msgstr "Status"
 
-#: ../sources/rb-podcast-source.c:641 ../sources/rb-podcast-source.c:1493
+#: ../sources/rb-podcast-source.c:630 ../sources/rb-podcast-source.c:1482
 msgid "Downloaded"
 msgstr "Downloaded"
 
-#: ../sources/rb-podcast-source.c:642 ../sources/rb-podcast-source.c:1501
+#: ../sources/rb-podcast-source.c:631 ../sources/rb-podcast-source.c:1490
 msgid "Waiting"
 msgstr "Waiting"
 
-#: ../sources/rb-podcast-source.c:643 ../sources/rb-podcast-source.c:1497
+#: ../sources/rb-podcast-source.c:632 ../sources/rb-podcast-source.c:1486
 msgid "Failed"
 msgstr "Failed"
 
-#: ../sources/rb-podcast-source.c:930
+#: ../sources/rb-podcast-source.c:919
 msgid "Delete the podcast episode and downloaded file?"
 msgstr "Delete the podcast episode and downloaded file?"
 
-#: ../sources/rb-podcast-source.c:933
+#: ../sources/rb-podcast-source.c:922
 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 "
@@ -4419,19 +4616,19 @@ msgstr ""
 "lost.  Please note that you can delete the episode but keep the downloaded "
 "file by choosing to delete the episode only."
 
-#: ../sources/rb-podcast-source.c:941
+#: ../sources/rb-podcast-source.c:930
 msgid "Delete _Episode Only"
 msgstr "Delete _Episode Only"
 
-#: ../sources/rb-podcast-source.c:947
+#: ../sources/rb-podcast-source.c:936
 msgid "_Delete Episode And File"
 msgstr "_Delete Episode And File"
 
-#: ../sources/rb-podcast-source.c:1386
+#: ../sources/rb-podcast-source.c:1375
 msgid "Delete the podcast feed and downloaded files?"
 msgstr "Delete the podcast feed and downloaded files?"
 
-#: ../sources/rb-podcast-source.c:1389
+#: ../sources/rb-podcast-source.c:1378
 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 "
@@ -4441,58 +4638,58 @@ msgstr ""
 "Please note that you can delete the feed but keep the downloaded files by "
 "choosing to delete the feed only."
 
-#: ../sources/rb-podcast-source.c:1397
+#: ../sources/rb-podcast-source.c:1386
 msgid "Delete _Feed Only"
 msgstr "Delete _Feed Only"
 
-#: ../sources/rb-podcast-source.c:1404
+#: ../sources/rb-podcast-source.c:1393
 msgid "_Delete Feed And Files"
 msgstr "_Delete Feed And Files"
 
-#: ../sources/rb-podcast-source.c:1612
+#: ../sources/rb-podcast-source.c:1601
 #, c-format
 msgid "%d feed"
 msgid_plural "All %d feeds"
 msgstr[0] "%d feed"
 msgstr[1] "All %d feeds"
 
-#: ../sources/rb-podcast-source.c:1749
+#: ../sources/rb-podcast-source.c:1738
 msgid "Downloading podcast"
 msgstr "Downloading podcast"
 
-#: ../sources/rb-podcast-source.c:1762
+#: ../sources/rb-podcast-source.c:1753
 msgid "Finished downloading podcast"
 msgstr "Finished downloading podcast"
 
-#: ../sources/rb-podcast-source.c:1775
+#: ../sources/rb-podcast-source.c:1768
 msgid "New updates available from"
 msgstr "New updates available from"
 
-#: ../sources/rb-podcast-source.c:1891
+#: ../sources/rb-podcast-source.c:1886
 msgid "Error in podcast"
 msgstr "Error in podcast"
 
-#: ../sources/rb-podcast-source.c:1898
+#: ../sources/rb-podcast-source.c:1893
 #, c-format
 msgid "%s. Would you like to add the podcast feed anyway?"
 msgstr "%s. Would you like to add the podcast feed anyway?"
 
-#: ../sources/rb-podcast-source.c:2025
+#: ../sources/rb-podcast-source.c:2020
 msgid "New Podcast Feed"
 msgstr "New Podcast Feed"
 
-#: ../sources/rb-podcast-source.c:2025
+#: ../sources/rb-podcast-source.c:2020
 msgid "URL of podcast feed:"
 msgstr "URL of podcast feed:"
 
-#: ../sources/rb-podcast-source.c:2041
+#: ../sources/rb-podcast-source.c:2036
 #, c-format
 msgid "%d episode"
 msgid_plural "%d episodes"
 msgstr[0] "%d episode"
 msgstr[1] "%d episodes"
 
-#: ../sources/rb-podcast-source.c:2149
+#: ../sources/rb-podcast-source.c:2144
 msgid "Podcast Error"
 msgstr "Podcast Error"
 
@@ -4527,18 +4724,6 @@ msgstr "Connecting"
 msgid "Buffering"
 msgstr "Buffering"
 
-#: ../widgets/eggtrayicon.c:147
-msgid "Orientation"
-msgstr "Orientation"
-
-#: ../widgets/eggtrayicon.c:148
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
-
-#: ../widgets/eggtrayicon.c:521
-msgid "Notification"
-msgstr "Notification"
-
 #: ../widgets/rb-cell-renderer-pixbuf.c:118
 msgid "Pixbuf Object"
 msgstr "Pixbuf Object"
@@ -4547,69 +4732,69 @@ msgstr "Pixbuf Object"
 msgid "The pixbuf to render."
 msgstr "The pixbuf to render."
 
-#: ../widgets/rb-entry-view.c:1062
-#, c-format
-msgid "%u kbps"
-msgstr "%u kbps"
+#: ../widgets/rb-entry-view.c:1064 ../widgets/rb-entry-view.c:1545
+#: ../widgets/rb-song-info.c:1046
+msgid "Lossless"
+msgstr "Lossless"
 
-#: ../widgets/rb-entry-view.c:1414
+#: ../widgets/rb-entry-view.c:1465
 msgid "Track"
 msgstr "Track"
 
-#: ../widgets/rb-entry-view.c:1465
+#: ../widgets/rb-entry-view.c:1516
 msgid "Time"
 msgstr "Time"
 
-#: ../widgets/rb-entry-view.c:1477 ../widgets/rb-query-creator-properties.c:79
+#: ../widgets/rb-entry-view.c:1528 ../widgets/rb-query-creator-properties.c:79
 #: ../widgets/rb-query-creator-properties.c:108
 msgid "Year"
 msgstr "Year"
 
-#: ../widgets/rb-entry-view.c:1489
+#: ../widgets/rb-entry-view.c:1540
 msgid "Quality"
 msgstr "Quality"
 
-#: ../widgets/rb-entry-view.c:1492
+#: ../widgets/rb-entry-view.c:1543
 msgid "000 kbps"
 msgstr "000 kbps"
 
-#: ../widgets/rb-entry-view.c:1502 ../widgets/rb-query-creator-properties.c:80
+#: ../widgets/rb-entry-view.c:1554 ../widgets/rb-query-creator-properties.c:80
 #: ../widgets/rb-query-creator-properties.c:106
 msgid "Rating"
 msgstr "Rating"
 
-#: ../widgets/rb-entry-view.c:1524 ../widgets/rb-query-creator-properties.c:83
+#: ../widgets/rb-entry-view.c:1576 ../widgets/rb-query-creator-properties.c:83
 #: ../widgets/rb-query-creator-properties.c:107
 msgid "Play Count"
 msgstr "Play Count"
 
-#: ../widgets/rb-entry-view.c:1536
+#: ../widgets/rb-entry-view.c:1588
 #: ../widgets/rb-query-creator-properties.c:111
 msgid "Last Played"
 msgstr "Last Played"
 
-#: ../widgets/rb-entry-view.c:1548
+#: ../widgets/rb-entry-view.c:1600
 #: ../widgets/rb-query-creator-properties.c:112
 msgid "Date Added"
 msgstr "Date Added"
 
-#: ../widgets/rb-entry-view.c:1559
+#: ../widgets/rb-entry-view.c:1611
 msgid "Last Seen"
 msgstr "Last Seen"
 
-#: ../widgets/rb-entry-view.c:1570
+#: ../widgets/rb-entry-view.c:1622
 msgid "Location"
 msgstr "Location"
 
-#: ../widgets/rb-entry-view.c:1824
+#: ../widgets/rb-entry-view.c:1881
 msgid "Now Playing"
 msgstr "Now Playing"
 
-#: ../widgets/rb-entry-view.c:1887
+#: ../widgets/rb-entry-view.c:1944
 msgid "Playback Error"
 msgstr "Playback Error"
 
-#: ../widgets/rb-header.c:537
+#: ../widgets/rb-header.c:511
 msgid "Not Playing"
 msgstr "Not Playing"
 
@@ -4819,26 +5004,264 @@ msgstr "_Search:"
 msgid "Clear the search text"
 msgstr "Clear the search text"
 
-#: ../widgets/rb-song-info.c:371
+#: ../widgets/rb-song-info.c:369
 msgid "Song Properties"
 msgstr "Song Properties"
 
-#: ../widgets/rb-song-info.c:420
+#: ../widgets/rb-song-info.c:417
 msgid "Multiple Song Properties"
 msgstr "Multiple Song Properties"
 
-#: ../widgets/rb-song-info.c:1110
+#: ../widgets/rb-song-info.c:1108
 msgid "Unknown file name"
 msgstr "Unknown file name"
 
-#: ../widgets/rb-song-info.c:1132
+#: ../widgets/rb-song-info.c:1130
 msgid "On the desktop"
 msgstr "On the desktop"
 
-#: ../widgets/rb-song-info.c:1141
+#: ../widgets/rb-song-info.c:1139
 msgid "Unknown location"
 msgstr "Unknown location"
 
+#~ msgid "Unknown playback error"
+#~ msgstr "Unknown playback error"
+
+#~ msgid ""
+#~ "songs\n"
+#~ "MB\n"
+#~ "GB\n"
+#~ "Minutes"
+#~ msgstr ""
+#~ "songs\n"
+#~ "MB\n"
+#~ "GB\n"
+#~ "Minutes"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "-\n"
+#~ "Text below icons\n"
+#~ "Text beside icons\n"
+#~ "Icons only\n"
+#~ "Text only"
+#~ msgstr ""
+#~ "Default\n"
+#~ "-\n"
+#~ "Text below icons\n"
+#~ "Text beside icons\n"
+#~ "Icons only\n"
+#~ "Text only"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "C_rossfade between songs on the same album"
+#~ msgstr "C_rossfade between songs on the same album"
+
+#~ msgid "Crossfade Type"
+#~ msgstr "Crossfade Type"
+
+#~ msgid "Rhythmbox Plugins"
+#~ msgstr "Rhythmbox Plugins"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid ""
+#~ "Every hour\n"
+#~ "Every day\n"
+#~ "Every week\n"
+#~ "Manually"
+#~ msgstr ""
+#~ "Every hour\n"
+#~ "Every day\n"
+#~ "Every week\n"
+#~ "Manually"
+
+#~ msgid "HTTP proxy configuration error"
+#~ msgstr "HTTP proxy configuration error"
+
+#~ msgid "Rhythmbox does not support automatic proxy configuration"
+#~ msgstr "Rhythmbox does not support automatic proxy configuration"
+
+#~ msgid "The GStreamer plugins to decode \"%s\" files cannot be found"
+#~ msgstr "The GStreamer plugins to decode \"%s\" files cannot be found"
+
+#~ msgid "The file contains a stream of type %s, which is not decodable"
+#~ msgstr "The file contains a stream of type %s, which is not decodable"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "Incorrect password"
+#~ msgstr "Incorrect password"
+
+#~ msgid "Handshake failed"
+#~ msgstr "Handshake failed"
+
+#~ msgid "Client update required"
+#~ msgstr "Client update required"
+
+#~ msgid "Track submission failed"
+#~ msgstr "Track submission failed"
+
+#~ msgid "Queue is too long"
+#~ msgstr "Queue is too long"
+
+#~ msgid "Unable to resolve hostname %s"
+#~ msgstr "Unable to resolve hostname %s"
+
+#~ msgid "Minimize to the tray when closing the main window"
+#~ msgstr "Minimise to the tray when closing the main window"
+
+#~ msgid "Minimize to tray"
+#~ msgstr "Minimise to tray"
+
+#~ msgid "Your Name:"
+#~ msgstr "Your Name:"
+
+#~ msgid "radio|New"
+#~ msgstr "New"
+
+#~ 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 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)"
+
+#~ 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 (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!)"
+
+#~ 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 ""
+#~ "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)"
+
+#~ msgid "Rhythmbox"
+#~ msgstr "Rhythmbox"
+
+#~ msgid "podcast|New"
+#~ msgstr "New"
+
+#~ msgid "%u kbps"
+#~ msgstr "%u kbps"
+
 #~ msgid "*"
 #~ msgstr "*"
 
@@ -4848,18 +5271,6 @@ msgstr "Unknown location"
 #~ msgid "Open from URI"
 #~ msgstr "Open from URI"
 
-#~ msgid "GB"
-#~ msgstr "GB"
-
-#~ msgid "MB"
-#~ msgstr "MB"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutes"
-
-#~ msgid "songs"
-#~ msgstr "songs"
-
 #~ msgid "Check Last.fm server status at"
 #~ msgstr "Check Last.fm server status at"
 
@@ -4906,9 +5317,6 @@ msgstr "Unknown location"
 #~ msgid "http://last.fm/forum/21713/_/51596";
 #~ msgstr "http://last.fm/forum/21713/_/51596";
 
-#~ msgid "Next Song"
-#~ msgstr "Next Song"
-
 #~ msgid "Skip the current track"
 #~ msgstr "Skip the current track"
 
@@ -5197,9 +5605,6 @@ msgstr "Unknown location"
 #~ msgid "Art_ist"
 #~ msgstr "Art_ist"
 
-#~ msgid "_Album"
-#~ msgstr "_Album"
-
 #~ msgid "_Play Count"
 #~ msgstr "_Play Count"
 
@@ -5257,9 +5662,6 @@ msgstr "Unknown location"
 #~ msgid "This location is not a valid one"
 #~ msgstr "This location is not a valid one"
 
-#~ msgid "File is not an audio file"
-#~ msgstr "File is not an audio file"
-
 #~ msgid "Song is not handled"
 #~ msgstr "Song is not handled"
 
@@ -5307,15 +5709,9 @@ msgstr "Unknown location"
 #~ msgid "Rhythmbox Nautilus Context Menu Item"
 #~ msgstr "Rhythmbox Nautilus Context Menu Item"
 
-#~ msgid "Whether the main window is visible"
-#~ msgstr "Whether the main window is visible"
-
 #~ msgid "Whether shuffle is enabled"
 #~ msgstr "Whether shuffle is enabled"
 
-#~ msgid "Properties for the current song"
-#~ msgstr "Properties for the current song"
-
 #~ msgid ""
 #~ "Failed to register the shell: %s\n"
 #~ "This probably means that you installed Rhythmbox in a different prefix "
@@ -5457,9 +5853,6 @@ msgstr "Unknown location"
 #~ msgid "Low"
 #~ msgstr "Low"
 
-#~ msgid "Regular"
-#~ msgstr "Regular"
-
 #~ msgid "High"
 #~ msgstr "High"
 
@@ -5472,9 +5865,6 @@ msgstr "Unknown location"
 #~ msgid "Ge_nre"
 #~ msgstr "Ge_nre"
 
-#~ msgid "Listening to "
-#~ msgstr "Listening to "
-
 #~ msgid "Get information on this album from the web"
 #~ msgstr "Get information on this album from the web"
 



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