[rhythmbox] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit b31903698c578add3748d8c38140e31c05e8c2c7
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Thu Jul 9 11:25:46 2009 +0700

    Updated Thai translation.

 po/th.po | 2852 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1611 insertions(+), 1241 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index c800e9b..4feb437 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,503 +8,466 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rhythmbox 0.8.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-17 11:24+0700\n"
-"PO-Revision-Date: 2009-03-19 17:22+0700\n"
+"POT-Creation-Date: 2009-07-09 09:17+0700\n"
+"PO-Revision-Date: 2009-07-09 11:25+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
-"Language-Team: Thai <l10n opentle org>\n"
+"Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../backends/gstreamer/rb-encoder-gst.c:584
+#: ../backends/gstreamer/rb-encoder-gst.c:573
 #, c-format
 msgid "Do you want to overwrite the file \"%s\"?"
 msgstr "�ุ���อ��าร��ีย��ั����ม \"%s\" หรือ�ม�?"
 
-#: ../backends/gstreamer/rb-encoder-gst.c:655
+#: ../backends/gstreamer/rb-encoder-gst.c:644
 #, c-format
 msgid "Could not create a GStreamer sink element to write to %s"
 msgstr "�ม�สามาร�สร�า�อิลิ�ม����สีย�ออ���ื�อ��ีย�ออ�ยั� %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:369
 #, c-format
-msgid "Failed to create %s element; check your installation"
-msgstr "�ม�สามาร�สร�า� %s �รุ�า�รว�สอ��าร�ิ��ั��"
+msgid "Failed to create playbin2 element; check your GStreamer installation"
+msgstr "�ม�สามาร�สร�า�อ����ระ�อ� playbin2 �รุ�า�รว�สอ��าร�ิ��ั�� GStreamer"
 
-#: ../backends/gstreamer/rb-player-gst.c:763
+#. ?
+#: ../backends/gstreamer/rb-player-gst.c:583
+#: ../backends/gstreamer/rb-player-gst-xfade.c:2754
 #, c-format
-msgid "Unknown playback error"
-msgstr "�าร�ล����ล��ิ��ลา�"
+msgid "Failed to open output device: %s"
+msgstr "�ม�สามาร���ิ�อุ��ร���าออ�: %s"
+
+#: ../backends/gstreamer/rb-player-gst.c:628
+#, c-format
+msgid "Unable to start playback pipeline"
+msgstr "�ม�สามาร���ิ������ล��สำหรั��ล��"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:1136
-#: ../backends/gstreamer/rb-player-gst-xfade.c:1150
+#: ../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 "�ม�สามาร���ื�อม��อส�รีม�หม����า�ั������ล���อ� GStreamer ���"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:1178
+#: ../backends/gstreamer/rb-player-gst-xfade.c:1193
 #, c-format
 msgid "Failed to start new stream"
 msgstr "�ม�สามาร��ริ�มส�รีมสาย�หม����"
 
 #. ?
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2717
+#: ../backends/gstreamer/rb-player-gst-xfade.c:2679
 #, c-format
 msgid "Failed to open output device"
 msgstr "�ม�สามาร���ิ�อุ��ร���าออ�"
 
-#. ?
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2796
-#, c-format
-msgid "Failed to open output device: %s"
-msgstr "�ม�สามาร���ิ�อุ��ร���าออ�: %s"
-
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3033
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3115
+#: ../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 "�ม�สามาร�สร�า�อิลิ�ม����อ� GStreamer �รุ�า�รว�สอ��าร�ิ��ั��"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3044
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3031
 #, c-format
 msgid "Failed to create audio output element; check your installation"
 msgstr "�ม�สามาร�สร�า�อิลิ�ม����สีย�ออ� �รุ�า�รว�สอ��าร�ิ��ั��"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3089
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3131
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3157
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3166
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3175
+#: ../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 "�ม�สามาร���ื�อม��อ�����ล���อ� GStreamer �รุ�า�รว�สอ��าร�ิ��ั��"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3270
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3257
 #, c-format
 msgid "Failed to create GStreamer pipeline to play %s"
 msgstr "�ม�สามาร�สร�า������ล���อ� GStreamer ��ื�อ�ล�� %s"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3286
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3273
 #, c-format
 msgid "Failed to start playback of %s"
 msgstr "�ม�สามาร��ริ�ม�ล�� %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 "�_�ิ�ม��ราย�าร �มื�อ��ื�อ����ร���ีย���อ��ียว"
 
-#: ../data/glade/create-playlist.glade.h:3
+#: ../data/ui/create-playlist.ui.h:3
 msgid "Create automatically updating playlist where:"
 msgstr "สร�า�ราย�าร��ล�อั���มั�ิ�ึ��"
 
-#: ../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 "�า�ี"
+
+#: ../data/ui/create-playlist.ui.h:7
 msgid "_Limit to: "
 msgstr "_�ำ�ั��ี�:"
 
-#: ../data/glade/create-playlist.glade.h:5
+#: ../data/ui/create-playlist.ui.h:8
 msgid "_When sorted by:"
 msgstr "�_รีย�ลำ�ั��าม:"
 
-#: ../data/glade/create-playlist.glade.h:6
-msgid ""
-"songs\n"
-"MB\n"
-"GB\n"
-"Minutes"
-msgstr ""
-"��ล�\n"
-"MB\n"
-"GB\n"
-"�า�ี"
+#: ../data/ui/create-playlist.ui.h:9
+msgid "songs"
+msgstr "��ล�"
 
-#: ../data/glade/general-prefs.glade.h:1
+#: ../data/ui/general-prefs.ui.h:1
 msgid "A_lbum"
 msgstr "_อัล�ั�ม"
 
-#: ../data/glade/general-prefs.glade.h:2
+#: ../data/ui/general-prefs.ui.h:2
 msgid "Browser Views"
 msgstr "มุมมอ���ราว���อร�"
 
-#: ../data/glade/general-prefs.glade.h:3
+#: ../data/ui/general-prefs.ui.h:3
 msgid "Da_te added"
 msgstr "วั��ี���ิ�_ม"
 
-#: ../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 ""
-"�ริยาย\n"
-"-\n"
-"��อ�วาม����อ�อ�\n"
-"��อ�วาม��า��อ�อ�\n"
-"�อ�อ����า�ั��\n"
-"��อ�วาม���า�ั��"
-
-#: ../data/glade/general-prefs.glade.h:10
+#: ../data/ui/general-prefs.ui.h:4
+msgid "Default"
+msgstr "�ริยาย"
+
+#: ../data/ui/general-prefs.ui.h:5
 msgid "G_enres, artists and albums"
 msgstr "�_�ว��ล� ศิล�ิ��ละอัล�ั�ม"
 
-#: ../data/glade/general-prefs.glade.h:11
+#: ../data/ui/general-prefs.ui.h:6
+msgid "Icons only"
+msgstr "�อ�อ����า�ั��"
+
+#: ../data/ui/general-prefs.ui.h:7
 msgid "Lo_cation"
 msgstr "_�ำ�ห����ี��ั��:"
 
-#: ../data/glade/general-prefs.glade.h:12
+#: ../data/ui/general-prefs.ui.h:8
+msgid "Text below icons"
+msgstr "��อ�วาม����อ�อ�"
+
+#: ../data/ui/general-prefs.ui.h:9
+msgid "Text beside icons"
+msgstr "��อ�วาม��า��อ�อ�"
+
+#: ../data/ui/general-prefs.ui.h:10
+msgid "Text only"
+msgstr "��อ�วาม���า�ั��"
+
+#: ../data/ui/general-prefs.ui.h:11
 msgid "Ti_me"
 msgstr "�_วลา"
 
-#: ../data/glade/general-prefs.glade.h:13
+#: ../data/ui/general-prefs.ui.h:12
 msgid "Toolbar Button Labels"
 msgstr "รู�����อ��ุ�ม�ี������รื�อ�มือ"
 
-#: ../data/glade/general-prefs.glade.h:14
+#: ../data/ui/general-prefs.ui.h:13
 msgid "Track _number"
 msgstr "_ลำ�ั���ล�"
 
-#: ../data/glade/general-prefs.glade.h:15
+#: ../data/ui/general-prefs.ui.h:14
 msgid "Visible Columns"
 msgstr "�อลัม���ี��ส��"
 
-#: ../data/glade/general-prefs.glade.h:16
+#: ../data/ui/general-prefs.ui.h:15
 msgid "_Artist"
 msgstr "ศิล�ิ_�"
 
-#: ../data/glade/general-prefs.glade.h:17
+#: ../data/ui/general-prefs.ui.h:16
 msgid "_Artists and albums"
 msgstr "_ศิล�ิ��ละอัล�ั�ม"
 
-#: ../data/glade/general-prefs.glade.h:18
+#: ../data/ui/general-prefs.ui.h:17
 msgid "_Genre"
 msgstr "��ว��ล_�"
 
-#: ../data/glade/general-prefs.glade.h:19
+#: ../data/ui/general-prefs.ui.h:18
 msgid "_Genres and artists"
 msgstr "_��ว��ล��ละศิล�ิ�"
 
-#: ../data/glade/general-prefs.glade.h:20
+#: ../data/ui/general-prefs.ui.h:19
 msgid "_Last played"
 msgstr "�ล���รั��สุ�_��าย"
 
-#: ../data/glade/general-prefs.glade.h:21
+#: ../data/ui/general-prefs.ui.h:20
 msgid "_Play count"
 msgstr "_�ำ�ว��รั���ี��ล��"
 
-#: ../data/glade/general-prefs.glade.h:22
+#: ../data/ui/general-prefs.ui.h:21
 msgid "_Quality"
 msgstr "�ุ�ภา_�"
 
-#: ../data/glade/general-prefs.glade.h:23
+#: ../data/ui/general-prefs.ui.h:22
 msgid "_Rating"
 msgstr "_�ะ���"
 
-#: ../data/glade/general-prefs.glade.h:24
+#: ../data/ui/general-prefs.ui.h:23
 msgid "_Year"
 msgstr "_�ี:"
 
-#: ../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 "ศิล�ิ�/ศิล�ิ� - อัล�ั�ม/ศิล�ิ� (อัล�ั�ม) - 01 - �ื�อ��ล�.ogg"
 
-#: ../data/glade/library-prefs.glade.h:3
+#: ../data/ui/library-prefs.ui.h:2
 msgid "F_older hierarchy:"
 msgstr "��ร�สร�า��_�ล��อร�:"
 
-#: ../data/glade/library-prefs.glade.h:4
+#: ../data/ui/library-prefs.ui.h:3
 msgid "Library Location"
 msgstr "�ำ�ห����ลั���ล�"
 
-#: ../data/glade/library-prefs.glade.h:5
+#: ../data/ui/library-prefs.ui.h:4
 msgid "Library Structure"
 msgstr "��ร�สร�า��ลั���ล�"
 
-#: ../data/glade/library-prefs.glade.h:6
+#: ../data/ui/library-prefs.ui.h:5
 msgid "_Browse..."
 msgstr "�_รีย��ู..."
 
-#: ../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 "�_����..."
 
-#: ../data/glade/library-prefs.glade.h:8
+#: ../data/ui/library-prefs.ui.h:7
 msgid "_File name:"
 msgstr "_�ื�อ���ม:"
 
-#: ../data/glade/library-prefs.glade.h:9
+#: ../data/ui/library-prefs.ui.h:8
 msgid "_Music files are placed in:"
 msgstr "�����_��ม��ล���:"
 
-#: ../data/glade/library-prefs.glade.h:10
+#: ../data/ui/library-prefs.ui.h:9
 msgid "_Preferred format:"
 msgstr "_รู�����ี��ะ���:"
 
-#: ../data/glade/library-prefs.glade.h:11
+#: ../data/ui/library-prefs.ui.h:10
 msgid "_Watch my library for new files"
 msgstr "_�ิ��าม���ม�หม����ลั���ล�"
 
-#: ../data/glade/playback-prefs.glade.h:2
-msgid "C_rossfade between songs on the same album"
-msgstr "ห_รี��สีย����า-ออ�ระหว�า���ล���อัล�ั�ม��ียว�ั�"
-
-#: ../data/glade/playback-prefs.glade.h:3
+#: ../data/ui/playback-prefs.ui.h:1
 msgid "Crossfade Duration (Seconds)"
 msgstr "��ว��วลาหรี��สีย����า-ออ�"
 
-#: ../data/glade/playback-prefs.glade.h:4
-msgid "Crossfade Type"
-msgstr "��ิ��อ��ารหรี��สีย����า-ออ�"
-
-#: ../data/glade/playback-prefs.glade.h:5
+#: ../data/ui/playback-prefs.ui.h:2
 msgid "Network Buffer Size (kB)"
 msgstr "��า��ั���อร���รือ��าย (kB)"
 
-#: ../data/glade/playback-prefs.glade.h:6
+#: ../data/ui/playback-prefs.ui.h:3
 msgid "Player Backend"
 msgstr "�����อ���สำหรั���ร��รม�ล����ล�"
 
-#: ../data/glade/playback-prefs.glade.h:7
+#: ../data/ui/playback-prefs.ui.h:4
 msgid "_Use crossfading backend (requires restart)"
 msgstr "�_�������อ���หรี��สีย����า-ออ� (��อ���ิ���ร��รม�หม�)"
 
-#: ../data/glade/playlist-save.glade.h:1
+#: ../data/ui/playlist-save.ui.h:1
 msgid "<b>Playlist format</b>"
 msgstr "<b>รู����ราย�าร��ล�</b>"
 
-#: ../data/glade/playlist-save.glade.h:2
+#: ../data/ui/playlist-save.ui.h:2
 msgid "By extension"
 msgstr "�าม�ามส�ุล"
 
-#: ../data/glade/playlist-save.glade.h:3
+#: ../data/ui/playlist-save.ui.h:3
 msgid "Save Playlist"
 msgstr "�ั��ึ�ราย�าร��ล�"
 
-#: ../data/glade/playlist-save.glade.h:4
+#: ../data/ui/playlist-save.ui.h:4
 msgid "Select playlist format:"
 msgstr "�ลือ�รู����ราย�าร��ล�"
 
-#: ../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 "�ู���ีย�:"
 
-#: ../data/glade/plugins.glade.h:2
+#: ../data/ui/plugins.ui.h:2
 msgid "C_onfigure..."
 msgstr "�รั��_���..."
 
-#: ../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 "ลิ�สิ��ิ�:"
 
-#: ../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 "�ำอ�ิ�าย:"
 
-#: ../data/glade/plugins.glade.h:5
-msgid "Rhythmbox Plugins"
-msgstr "�ลั��อิ�สำหรั� Rhythmbox"
-
-#: ../data/glade/plugins.glade.h:6
+#: ../data/ui/plugins.ui.h:5
 msgid "Site:"
 msgstr "����:"
 
-#: ../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 "�ั�ว��"
 
-#: ../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 "รายละ�อีย�"
 
-#: ../data/glade/podcast-feed-properties.glade.h:7
+#: ../data/ui/podcast-feed-properties.ui.h:6
 msgid "Language:"
 msgstr "ภาษา:"
 
-#: ../data/glade/podcast-feed-properties.glade.h:8
+#: ../data/ui/podcast-feed-properties.ui.h:7
 msgid "Last episode:"
 msgstr "�อ�ล�าสุ�:"
 
-#: ../data/glade/podcast-feed-properties.glade.h:9
+#: ../data/ui/podcast-feed-properties.ui.h:8
 msgid "Last updated:"
 msgstr "�ล���รั��สุ���าย�มื�อ:"
 
-#: ../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 "�หล���ี�มา:"
 
-#: ../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 "�ื�อ:"
 
-#: ../data/glade/podcast-prefs.glade.h:1
+#: ../data/ui/podcast-prefs.ui.h:1
 msgid "<b>Download Manager</b>"
 msgstr "<b>��รื�อ�มือ��วย�าว���หล�</b>"
 
-#: ../data/glade/podcast-prefs.glade.h:2
+#: ../data/ui/podcast-prefs.ui.h:2
 msgid "Check for _new episodes:"
 msgstr "�_รว�สอ�ว�ามี�อ��หม�:"
 
-#: ../data/glade/podcast-prefs.glade.h:3
-msgid ""
-"Every hour\n"
-"Every day\n"
-"Every week\n"
-"Manually"
-msgstr ""
-"�ุ��ั�ว�ม�\n"
-"�ุ�วั�\n"
-"�ุ�สั��าห�\n"
-"�รว�สอ��อ�"
+#: ../data/ui/podcast-prefs.ui.h:3
+msgid "Every day"
+msgstr "�ุ�วั�"
+
+#: ../data/ui/podcast-prefs.ui.h:4
+msgid "Every hour"
+msgstr "�ุ��ั�ว�ม�"
+
+#: ../data/ui/podcast-prefs.ui.h:5
+msgid "Every week"
+msgstr "�ุ�สั��าห�"
+
+#: ../data/ui/podcast-prefs.ui.h:6
+msgid "Manually"
+msgstr "�รว�สอ��อ�"
 
-#: ../data/glade/podcast-prefs.glade.h:7
+#: ../data/ui/podcast-prefs.ui.h:7
 msgid "Select Folder For Podcasts"
 msgstr "�ลือ���ล��อร�สำหรั������อ���ส��"
 
-#: ../data/glade/podcast-prefs.glade.h:8
+#: ../data/ui/podcast-prefs.ui.h:8
 msgid "_Download location:"
 msgstr "_�ำ�ห����������ม�าว���หล�"
 
-#: ../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 "อั�รา�ิ�:"
 
-#: ../data/glade/podcast-properties.glade.h:4
+#: ../data/ui/podcast-properties.ui.h:3
 msgid "Date:"
 msgstr "วั��ี�:"
 
-#: ../data/glade/podcast-properties.glade.h:7
+#: ../data/ui/podcast-properties.ui.h:6
 msgid "Download location:"
 msgstr "�ำ�ห����าว���หล�:"
 
-#: ../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 "�วามยาว:"
 
-#: ../data/glade/podcast-properties.glade.h:9
+#: ../data/ui/podcast-properties.ui.h:8
 msgid "Feed:"
 msgstr "�หล����อ�:"
 
-#: ../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 "�ล���รั��ล�าสุ�:"
 
-#: ../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 "�ำ�ว��รั���ี��ล��:"
 
-#: ../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 "_�ะ���:"
 
-#: ../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 "_อัล�ั�ม:"
 
-#: ../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 "ศิล�ิ_�:"
 
-#: ../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 "�_����ี�:"
 
-#: ../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 "��ว��ล_�:"
 
-#: ../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 "_�ี:"
 
-#: ../data/glade/song-info.glade.h:3
+#: ../data/ui/song-info.ui.h:3
 msgid "Date added:"
 msgstr "วั��ี���ิ�ม:"
 
-#: ../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 "��อ�วาม�ส����อ�ิ��ลา�"
 
-#: ../data/glade/song-info.glade.h:7
+#: ../data/ui/song-info.ui.h:7
 msgid "File name:"
 msgstr "�ื�อ���ม:"
 
-#: ../data/glade/song-info.glade.h:8
+#: ../data/ui/song-info.ui.h:8
 msgid "File size:"
 msgstr "��า����ม:"
 
-#: ../data/glade/song-info.glade.h:10
+#: ../data/ui/song-info.ui.h:10
 msgid "Location:"
 msgstr "�ำ�ห����ี��ั��:"
 
-#: ../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 "_�ื�อ:"
 
-#: ../data/glade/song-info.glade.h:18
+#: ../data/ui/song-info.ui.h:18
 msgid "_Track number:"
 msgstr "_ลำ�ั���ล�:"
 
-#: ../data/glade/uri.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../data/glade/uri.glade.h:2
-msgid "Enter the _location (URI) of the file you would like to add:"
-msgstr "��อ�_�ำ�ห��� (URI) �อ����ม�ี���อ��าร��ิ�ม:"
-
-#: ../data/glade/uri.glade.h:3
-msgid "Open from URI"
-msgstr "��ิ��า� URI"
-
 #: ../data/playlists.xml.in.h:1
 msgid "My Top Rated"
 msgstr "�ะ���สู�สุ�"
@@ -519,8 +482,9 @@ msgstr "�ล��ล�าสุ�"
 
 #: ../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 "��ร��รม�ล����ล�"
 
@@ -532,6 +496,69 @@ msgstr "�ล���ละ�ั��าร�ั���ล��อ��
 msgid "Rhythmbox Music Player"
 msgstr "��ร��รม�ล����ล� Rhythmbox"
 
+#: ../lib/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "���ม�ี��ม�������ม .desktop �ี�������"
+
+#: ../lib/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "�ม�รู��ั����ม��ส����อ�รุ�� '%s'"
+
+#: ../lib/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "�ำลั��ริ�ม %s"
+
+#: ../lib/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "��ร��รม�ม�รั��อ�สาร���รร�ั��ำสั��"
+
+#: ../lib/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "�ม�รู��ั��ัว�ลือ��อ��าร�รีย���ร��รม: %d"
+
+#: ../lib/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "�ม�สามาร�ส�� URI �อ��อ�สาร��ยั�ราย�าร��ส����อ��ี�มี 'Type=Link'"
+
+#: ../lib/eggdesktopfile.c:1392
+#, c-format
+msgid "Not a launchable item"
+msgstr "�ม����ราย�าร�ี��รีย��ำ�า����"
+
+#: ../lib/eggsmclient.c:225
+msgid "Disable connection to session manager"
+msgstr "�ิ�����าร��ื�อม��อ��ยั���ร��รม�ั��ารวาระ"
+
+#: ../lib/eggsmclient.c:228
+msgid "Specify file containing saved configuration"
+msgstr "ระ�ุ���ม�ี��ั��ึ���า�ั���ว�"
+
+#: ../lib/eggsmclient.c:228
+msgid "FILE"
+msgstr "FILE"
+
+#: ../lib/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr "ระ�ุหมาย�ล��าร�ั��ารวาระ"
+
+#: ../lib/eggsmclient.c:231
+msgid "ID"
+msgstr "ID"
+
+#: ../lib/eggsmclient.c:252
+msgid "Session management options:"
+msgstr "�ัว�ลือ���ี�ยว�ั��าร�ั��ารวาระ:"
+
+#: ../lib/eggsmclient.c:253
+msgid "Show session management options"
+msgstr "�ส���ัว�ลือ���ี�ยว�ั��าร�ั��ารวาระ"
+
 #. 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"
@@ -566,171 +593,145 @@ msgid "%b %d %Y"
 msgstr "%d %b %Ey"
 
 #. 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:159
-#: ../plugins/artdisplay/artdisplay/CoverArtDatabase.py:160
-#: ../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
+#: ../lib/rb-cut-and-paste-code.c:326 ../lib/rb-util.c:581
+#: ../lib/rb-util.c:821
+#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:93
+#: ../plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py:95
+#: ../plugins/artdisplay/artdisplay/CoverArtDatabase.py:180
+#: ../plugins/artdisplay/artdisplay/CoverArtDatabase.py:181
+#: ../plugins/audiocd/rb-audiocd-source.c:373
+#: ../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/generic-player/rb-generic-player-source.c:1401
 #: ../plugins/ipod/rb-ipod-source.c:305
-#: ../plugins/jamendo/jamendo/JamendoSource.py:298
-#: ../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/jamendo/jamendo/JamendoSaxHandler.py:67
+#: ../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:79
+#: ../plugins/lyrics/lyrics/__init__.py:81
+#: ../plugins/mtpdevice/rb-mtp-source.c:552
+#: ../plugins/mtpdevice/rb-mtp-source.c:924
+#: ../plugins/mtpdevice/rb-mtp-source.c:1015
+#: ../plugins/status-icon/rb-status-icon-plugin.c:706
+#: ../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:1768
-#: ../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:1813
+#: ../shell/rb-shell-player.c:1670 ../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 "�ม��รา�"
 
-#: ../lib/rb-file-helpers.c:217
+#: ../lib/rb-file-helpers.c:211
 #, c-format
 msgid "Unable to move %s to %s: %s"
 msgstr "�ม�สามาร�ย�าย %s ��ยั� %s: %s"
 
-#: ../lib/rb-file-helpers.c:386
+#: ../lib/rb-file-helpers.c:380
 #, c-format
 msgid "Too many symlinks"
 msgstr "symlink �ยอะ��ิ���"
 
-#: ../lib/rb-file-helpers.c:994
+#: ../lib/rb-file-helpers.c:988
 #, c-format
 msgid "Cannot get free space at %s: %s"
 msgstr "�ม�สามาร��อ��ื�อ�ี�ว�า��ี� %s: %s"
 
-#: ../lib/rb-proxy-config.c:218
-msgid "HTTP proxy configuration error"
-msgstr "��ิ���อ�ิ��ลา����าร�ั����า�ร�อ��ี HTTP"
-
-#: ../lib/rb-proxy-config.c:219
-msgid "Rhythmbox does not support automatic proxy configuration"
-msgstr "Rhythmbox �ม�รอ�รั��าร�ั����า�ร�อ��ี���อั���มั�ิ"
-
-#: ../lib/rb-util.c:578 ../remote/dbus/rb-client.c:142
+#: ../lib/rb-util.c:583 ../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:585 ../remote/dbus/rb-client.c:146
 #, c-format
 msgid "%d:%02d:%02d"
 msgstr "%d:%02d:%02d"
 
-#: ../lib/rb-util.c:615
+#: ../lib/rb-util.c:620
 #, c-format
 msgid "%d:%02d of %d:%02d remaining"
 msgstr "�หลืออี� %d:%02d �า� %d:%02d"
 
-#: ../lib/rb-util.c:619
+#: ../lib/rb-util.c:624
 #, c-format
 msgid "%d:%02d:%02d of %d:%02d:%02d remaining"
 msgstr "�หลืออี� %d:%02d:%02d �า� %d:%02d:%02d"
 
-#: ../lib/rb-util.c:624
+#: ../lib/rb-util.c:629
 #, c-format
 msgid "%d:%02d of %d:%02d"
 msgstr "%d:%02d �า� %d:%02d"
 
-#: ../lib/rb-util.c:628
+#: ../lib/rb-util.c:633
 #, c-format
 msgid "%d:%02d:%02d of %d:%02d:%02d"
 msgstr "%d:%02d:%02d �า� %d:%02d:%02d"
 
-#: ../metadata/rb-metadata-dbus-client.c:324
+#: ../metadata/rb-metadata-dbus-client.c:377
 #, c-format
 msgid "Internal GStreamer problem; file a bug"
 msgstr "��ิ��ั�หาภาย��ระ�� GStreamer; �รุ�าราย�า���อ�ิ��ลา�"
 
-#: ../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:395
+#: ../metadata/rb-metadata-dbus-client.c:431
+#: ../metadata/rb-metadata-dbus-client.c:767
+#: ../metadata/rb-metadata-dbus-client.c:777
 #, c-format
 msgid "D-BUS communication error"
 msgstr "��ิ���อ�ิ��ลา����ารสื�อสาร��า� D-BUS"
 
-#: ../metadata/rb-metadata-gst.c:645
-#, c-format
-msgid "The GStreamer plugins to decode \"%s\" files cannot be found"
-msgstr "�ม����ลั��อิ��อ� GStreamer สำหรั�อ�า�รหัส���ม \"%s\""
-
-#: ../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 "���ม�ี�มีรู�����สีย���ิ� %s �ึ���ม�สามาร�อ�า�รหัส���"
+msgid "Failed to create %s element; check your installation"
+msgstr "�ม�สามาร�สร�า�อ����ระ�อ� %s �รุ�า�รว�สอ��าร�ิ��ั��"
 
-#: ../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 "�ม�สามาร�สร�า��หล���ี�มา �รุ�า�รว�สอ��าร�ิ��ั��"
 
-#: ../metadata/rb-metadata-gst.c:1103
+#: ../metadata/rb-metadata-gst.c:797
 #, c-format
 msgid "GStreamer error: failed to change state"
 msgstr "��อ�ิ��ลา��อ� GStreamer: �ม�สามาร���ลี�ย�ส�า�ะ���"
 
-#: ../metadata/rb-metadata-gst.c:1199
-#, c-format
-msgid "Empty file"
-msgstr "���มว�า���ล�า"
-
-#: ../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 "�ม�สามาร�ระ�ุ��ิ� MIME �อ����ม���"
 
-#: ../metadata/rb-metadata-gst.c:1341
+#: ../metadata/rb-metadata-gst.c:991
 #, c-format
 msgid "Unsupported file type: %s"
 msgstr "�ม�รอ�รั����ม��ิ�: %s"
 
-#: ../metadata/rb-metadata-gst.c:1350
+#: ../metadata/rb-metadata-gst.c:1000
 #, c-format
 msgid "Unable to create tag-writing elements"
 msgstr "�ม�สามาร�สร�า�อิลิ�ม���สำหรั���ีย�����"
 
-#: ../metadata/rb-metadata-gst.c:1365
+#: ../metadata/rb-metadata-gst.c:1015
 #, c-format
 msgid "Timeout while setting pipeline to NULL"
 msgstr "หม��วลา��อ��ี��ะ�ำห�������ล������ NULL ���"
 
-#: ../metadata/rb-metadata-gst.c:1389
+#: ../metadata/rb-metadata-gst.c:1039
 #, c-format
 msgid "File corrupted during write"
 msgstr "���ม�สียหาย��ะ��ีย�"
@@ -743,11 +744,11 @@ msgstr "ภา���"
 msgid "Fetch album covers from the Internet"
 msgstr "�ึ�ภา���อัล�ั�ม�า�อิ���อร�����"
 
-#: ../plugins/artdisplay/artdisplay/__init__.py:288
+#: ../plugins/artdisplay/artdisplay/__init__.py:308
 msgid "Searching... drop artwork here"
 msgstr "�ำลั����หา... วา�รู�ภา��ี��ี�"
 
-#: ../plugins/artdisplay/artdisplay/__init__.py:290
+#: ../plugins/artdisplay/artdisplay/__init__.py:310
 msgid "Drop artwork here"
 msgstr "วา�รู�ภา��ี��ี�"
 
@@ -759,59 +760,71 @@ msgstr "��รื�อ��ล���ี�ี��ล�"
 msgid "Support for playing of audio CDs as music source"
 msgstr "�ารรอ�รั��าร�ล���ี�ี��ล����า�ะ�หล����ล�"
 
-#: ../plugins/audiocd/multiple-album.glade.h:1
+#: ../plugins/audiocd/album-info.ui.h:1
+msgid "A_lbum:"
+msgstr "_อัล�ั�ม:"
+
+#: ../plugins/audiocd/album-info.ui.h:2
+msgid "Artist s_ort order:"
+msgstr "ลำ�ั��าร�_รีย��ื�อศิล�ิ�:"
+
+#: ../plugins/audiocd/album-info.ui.h:4
+msgid "_Disc:"
+msgstr "�_���:"
+
+#: ../plugins/audiocd/multiple-album.ui.h:1
 msgid "Multiple Albums Found"
 msgstr "��หลายอัล�ั�ม"
 
-#: ../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>."
 msgstr "�ี�ี�ี�อา�มา�า�อัล�ั�ม���หลายอัล�ั�ม �รุ�า�ลือ�อัล�ั�ม�ี�����า���า�ล�า��ี� �ล�ว�� <i>��อ��</i>"
 
-#: ../plugins/audiocd/multiple-album.glade.h:3
+#: ../plugins/audiocd/multiple-album.ui.h:3
 msgid "_Continue"
 msgstr "_��อ��"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:221
+#: ../plugins/audiocd/rb-audiocd-source.c:377
 msgid "<Invalid unicode>"
 msgstr "<รหัสยู�ิ�����ม��ู���อ�>"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:267
+#: ../plugins/audiocd/rb-audiocd-source.c:423
 #, c-format
 msgid "Track %u"
 msgstr "��ล��ี� %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:483
+#: ../plugins/audiocd/rb-audiocd-source.c:491
+#: ../plugins/audiocd/rb-audiocd-source.c:859
 msgid "Couldn't load Audio CD"
 msgstr "�ม�สามาร��รีย��ี�ี��ล�"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:328
+#: ../plugins/audiocd/rb-audiocd-source.c:484
 msgid "Rhythmbox couldn't access the CD."
 msgstr "Rhythmbox �ม�สามาร����า����ี�ี"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:336
+#: ../plugins/audiocd/rb-audiocd-source.c:492
 msgid "Rhythmbox couldn't read the CD information."
 msgstr "Rhythmbox �ม�สามาร�อ�า���อมูล�อ��ี�ี"
 
-#: ../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:581
+#: ../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 "�ื�อ"
 
-#: ../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:588
+#: ../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 "ศิล�ิ�"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:669
+#: ../plugins/audiocd/rb-audiocd-source.c:860
 msgid "Rhythmbox could not get access to the CD device."
 msgstr "Rhythmbox �ม�มีสามาร����า���อุ��ร���ี�ี"
 
@@ -825,23 +838,23 @@ msgstr "�ม�สามาร�สร�า���ร�สำหรั�
 msgid "Cannot access CD"
 msgstr "�ม�สามาร����า����ี�ี"
 
-#: ../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 "�ม��รา��ื�อ���ม"
 
-#: ../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 "�ม��รา�ศิล�ิ�"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:130
+#: ../plugins/audiocd/sj-metadata-gvfs.c:129
 #, c-format
 msgid "Track %d"
 msgstr "��ล��ี� %d"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:147
+#: ../plugins/audiocd/sj-metadata-gvfs.c:150
 #, c-format
 msgid "Cannot access CD: %s"
 msgstr "�ม�สามาร����า����ี�ี: %s"
@@ -865,337 +878,327 @@ msgstr "metadata �อ��ี�ี�ี��ม�สม�ูร��"
 msgid "[Untitled]"
 msgstr "[�ม�มี�ื�อ]"
 
-#: ../plugins/audiocd/sj-metadata.c:187
+#: ../plugins/audiocd/sj-metadata.c:190
 #, c-format
 msgid "Device '%s' does not contain any media"
 msgstr "อุ��ร�� '%s' �ม�มีสื�อ��� อยู��ลย"
 
-#: ../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 "�ม�สามาร���ิ�อุ��ร�� '%s' ��� �รุ�า�รว�สอ�สิ��ิ��าร����า��อ�อุ��ร���ั��ล�าว"
 
-#: ../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 "�ม�สามาร�อ�า��ี�ี: %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 "ส����อมูล��ล���ยั� last.fm �ละ�ล��ส�รีมวิ�ยุ last.fm"
+msgid "Submits song information to Last.fm and plays Last.fm radio streams"
+msgstr "ส����อมูล��ล���ยั� Last.fm �ละ�ล��ส�รีมวิ�ยุ Last.fm"
 
-#: ../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 "���าระ��"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:3
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:2
 msgid "Disabled"
 msgstr "�ิ�����า�"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:4
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:3
 msgid "Join the Rhythmbox group"
 msgstr "���าร�วม�ลุ�ม Rhythmbox"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:5
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:4
 msgid "Last submission time:"
 msgstr "�วลา�ี�ส����อมูลล�าสุ�:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:6
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1083
-#: ../plugins/iradio/rb-station-properties-dialog.c:506
-#: ../rhythmdb/rhythmdb.c:3583 ../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:3702 ../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 "�ม���ย"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:7
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:6
 msgid "New to Last.fm?"
 msgstr "ยั��ม���ย��� Last.fm หรือ?"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:8
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:7
 msgid "Queued tracks:"
 msgstr "��ล����ิว:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:9
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:8
 msgid "Sign up for an account"
 msgstr "ล��ะ��ีย���ื�อ��ิ��ั��ี"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:10
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:9
 msgid "Statistics"
 msgstr "ส�ิ�ิ"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:11
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:10
 msgid "Status:"
 msgstr "ส�า�ะ:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:12
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:11
 msgid "Tracks submitted:"
 msgstr "��ล��ี�ส����:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:13
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:12
 msgid "_Password:"
 msgstr "_รหัส��า�:"
 
-#: ../plugins/audioscrobbler/audioscrobbler-prefs.glade.h:14
+#: ../plugins/audioscrobbler/audioscrobbler-prefs.ui.h:13
 msgid "_Username:"
 msgstr "_�ื�อ�ู����:"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-plugin.c:216
+#: ../plugins/audioscrobbler/rb-audioscrobbler-plugin.c:211
 msgid "Last.fm Preferences"
 msgstr "�รั����� Last.fm"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1106
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1003
 msgid "OK"
 msgstr "�รีย�ร�อย"
 
-#: ../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 "�ำลั����าระ��"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1112
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1009
 msgid "Request failed"
 msgstr "�ารร�อ��อ�ิ��ลา�"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1115
-msgid "Incorrect username"
-msgstr "�ื�อ�ู�����ม��ู���อ�"
-
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1118
-msgid "Incorrect password"
-msgstr "รหัส��า��ม��ู���อ�"
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1012
+msgid "Incorrect username or password"
+msgstr "�ื�อ�ู����หรือรหัส��า��ม��ู���อ�"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1121
-msgid "Handshake failed"
-msgstr "��ื�อม��อ�ม�สำ�ร��"
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1015
+msgid "Clock is not set correctly"
+msgstr "�าฬิ�า�ั���วลา�ม��ู���อ�"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1124
-msgid "Client update required"
-msgstr "�ำ������อ��รั�รุ���อ���ล�อ���"
-
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1127
-msgid "Track submission failed"
-msgstr "ส����ล��ม�สำ�ร��"
-
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1130
-msgid "Queue is too long"
-msgstr "�ิวยาว��ิ���"
+#: ../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 "Rhythmbox รุ���ี��ู�ห�าม�ม��ห����า Last.fm"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1133
+#: ../plugins/audioscrobbler/rb-audioscrobbler.c:1021
 msgid "Track submission failed too many times"
 msgstr "ส����ล��ม�สำ�ร�������ำ�ว��รั��มา���ิ���"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:192
 msgid "Similar Artists radio"
 msgstr "วิ�ยุ�อ�ศิล�ิ��ี��ล�าย�ั�"
 
-#: ../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 "ศิล�ิ��ี��ล�าย�ั� %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:193
 msgid "Tag radio"
 msgstr "วิ�ยุ�ี�มี����"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:193
 #, c-format
 msgid "Tracks tagged with %s"
 msgstr "��ล��ี�มี���� %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:194
 msgid "Artist Fan radio"
 msgstr "วิ�ยุ�อ����ศิล�ิ�"
 
-#: ../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 "ศิล�ิ��ี�����อ� %s �อ�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
 msgid "Group radio"
 msgstr "วิ�ยุ�ลุ�ม"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:195
 #, c-format
 msgid "Tracks liked by the %s group"
 msgstr "��ล��ี��ลุ�ม %s �อ�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:196
 msgid "Neighbour radio"
 msgstr "วิ�ยุ��ื�อ���า�"
 
-#: ../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"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:197
 msgid "Personal radio"
 msgstr "วิ�ยุส�ว��ัว"
 
-#: ../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"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:200
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:198
 msgid "Loved tracks"
 msgstr "��ล���ร�"
 
-#: ../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"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:201
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
 msgid "Recommended tracks"
 msgstr "��ล���ะ�ำ"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:201
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:199
 #, c-format
 msgid "Tracks recommended to %s"
 msgstr "��ล���ะ�ำสำหรั� %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:287
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:200
+msgid "Playlist"
+msgstr "ราย�าร��ล�"
+
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:200
+#, c-format
+msgid "%s's playlist"
+msgstr "ราย�าร��ล��อ� %s"
+
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:284
 msgid "Love"
 msgstr "��ร�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:288
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:285
 msgid "Mark this song as loved"
 msgstr "�ำ��รื�อ�หมาย��ล��ี�������ล���ร�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:290
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:287
 msgid "Ban"
 msgstr "ห�าม"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:291
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:288
 msgid "Ban the current track from being played again"
 msgstr "ห�าม�ล����ล��ี�อี�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:293
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:290
 msgid "Delete Station"
 msgstr "ล�ส�า�ี"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:294
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:291
 msgid "Delete the selected station"
 msgstr "ล�ส�า�ี�ี��ลือ�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:296
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:293
 msgid "Download song"
 msgstr "�าว���หล���ล�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:297
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:294
 msgid "Download this song"
 msgstr "�าว���หล���ล��ี�"
 
 #. 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 "��อ�ราย�าร�ี��ะ���สร�า�����ส�า�ี Last.fm:"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:520
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:504
 msgid "Add"
 msgstr "��ิ�ม"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:876
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:851
 msgid "Account Settings"
 msgstr "�าร�ั����า�ั��ี"
 
-#: ../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 "��อ�มีรายละ�อีย��ั��ี��อ��ี��ุ��ะ��ื�อม��อ��� �รุ�า�รว�สอ��าร�ั����า�อ��ุ�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:905
-msgid "This version of Rhythmbox has been banned from Last.fm."
-msgstr "Rhythmbox รุ���ี��ู�ห�าม�ม��ห����า Last.fm"
-
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:909
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:884
 msgid "Unable to connect"
 msgstr "�ม�สามาร���ื�อม��อ"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1283
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1258
 #, c-format
 msgid "Global Tag %s"
 msgstr "����ส�ว��ลา� %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 ��อร�������"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1310
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1285
 #, c-format
 msgid "%s's Playlist"
 msgstr "ราย�าร��ล��อ� %s"
 
 #. 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 "วิ�ยุ %2$s �อ� %1$s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1320
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1295
 #, c-format
 msgid "%s Group Radio"
 msgstr "วิ�ยุ�อ��ลุ�ม %s"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1786
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1738
 msgid "Neighbour Radio"
 msgstr "วิ�ยุ��ื�อ���า�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1794
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1746
 msgid "Personal Radio"
 msgstr "วิ�ยุส�ว��ัว"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1884
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1836
 msgid "Server did not respond"
 msgstr "��ิร���วอร��ม��อ�ส�อ�"
 
-#: ../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 "มี��ื�อหา�ม���ีย��อ�ี��ะ�ล����ล��า�ส�า�ี�ี�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:1957
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1909
 msgid "This station is available to subscribers only."
 msgstr "ส�า�ี�ี��ั�������าะสมา�ิ����า�ั��"
 
-#: ../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 "ระ��ส�รีม�ิ��าร��ื�อม��อ��ื�อ�รั��รุ� �รุ�าลอ��หม�ภายหลั�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:2003
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:1955
 msgid "Changing station"
 msgstr "�ำลั���ลี�ย�ส�า�ี"
 
-#: ../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 "�ำลั��ึ�ราย�าร��ล�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:2327
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:2280
 msgid "Banning song"
 msgstr "�ำลั�ห�าม�ล����ล�"
 
-#: ../plugins/audioscrobbler/rb-lastfm-source.c:2345
+#: ../plugins/audioscrobbler/rb-lastfm-source.c:2298
 msgid "Adding song to your Loved tracks"
 msgstr "�ำลั���ิ�ม��ล����า��ราย�าร��ล���ร��อ��ุ�"
 
@@ -1289,67 +1292,67 @@ msgstr "�ม�สามาร��ำสำ��า����"
 msgid "Reason"
 msgstr "�ห�ุ�ล"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:420
+#: ../plugins/cd-recorder/rb-recorder-gst.c:419
 #, c-format
 msgid "Failed to create pipeline"
 msgstr "�ม�สามาร�สร�า������ล�����"
 
-#: ../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 "�ม�สามาร�ล����ม '%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 "�ม�สามาร�อ�า�ส�า�ะ�า������ล���ี��ำลั��ำ��ิ��ารอยู����"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:602
+#: ../plugins/cd-recorder/rb-recorder-gst.c:601
 msgid "Could not get current track position"
 msgstr "�ม�สามาร�อ�า��ำ�ห�����ล��ั��ุ�ั�"
 
-#: ../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 "�ม�สามาร��ริ�ม�ล�������ล�����"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:661
+#: ../plugins/cd-recorder/rb-recorder-gst.c:660
 #, c-format
 msgid "Could not pause playback"
 msgstr "�ม�สามาร��ั��าร�ล�����"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:842
+#: ../plugins/cd-recorder/rb-recorder-gst.c:841
 #, c-format
 msgid "Cannot find drive"
 msgstr "หา��รว��ม���"
 
-#: ../plugins/cd-recorder/rb-recorder-gst.c:882
+#: ../plugins/cd-recorder/rb-recorder-gst.c:881
 #, c-format
 msgid "Cannot find drive %s"
 msgstr "หา��รว� %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 "��รว� %s �ม����อุ��ร����ีย�"
 
-#: ../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."
+msgid "No writable drives found"
 msgstr "�ม�����รว��ี�สามาร���ีย����"
 
-#: ../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 "�ม�สามาร�อ�า���อมูล�วามยาว��ล��อ����ม: %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."
+msgid "Could not determine audio track durations"
 msgstr "�ม�สามาร�หา�วามยาว�อ���ล����"
 
-#: ../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"
@@ -1358,74 +1361,74 @@ msgstr ""
 "��ิ���อ�ิ��ลา���ะ��ีย��ี�ี:\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 "��ิ���อ�ิ��ลา���ะ��ีย��ี�ี"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:304
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:279
 msgid "Maximum possible"
 msgstr "สู��ี�สุ����า�ี����������"
 
-#: ../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 "อุ��ร����ีย�����าร�ม����: %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 �ั�ว�ม�"
 
-#: ../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 �า�ี"
 
-#: ../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"
 msgstr[0] "%d วิ�า�ี"
 
 #. 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 วิ�า�ี"
 
-#: ../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 "�หลืออี��ระมา� %s"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:538
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:513
 msgid "Writing audio to CD"
 msgstr "�ำลั���ีย���ล�ล��ี�ี"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:554
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:529
 msgid "Finished creating audio CD."
 msgstr "�สร���ารสร�า��ี�ี��ล�"
 
-#: ../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?"
@@ -1433,207 +1436,207 @@ msgstr ""
 "สร�า��ี�ี��ล��สร���ล�ว\n"
 "��อ��าร�ำสำ��าอี��ุ�หรือ�ม�?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:580
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:549
 msgid "Writing failed.  Try again?"
 msgstr "�าร��ีย��ี�ี�ิ��ลา� ��อ��ารลอ��หม�หรือ�ม�?"
 
-#: ../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 "�าร��ีย��ี�ี�ู�ย��ลิ� ��อ��ารลอ��หม�หรือ�ม�?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:650
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:619
 msgid "Audio recording error"
 msgstr "�าร��ีย��ี�ี��ล��ิ��ลา�"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:679
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:648
 msgid "Audio Conversion Error"
 msgstr "�าร��ล���ล��ิ��ลา�"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:709
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:678
 msgid "Recording error"
 msgstr "�าร�ั��ึ��ิ��ลา�"
 
-#: ../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 "�ุ���อ��าร�ั��ั�หวะ�าร��ีย�����หรือ�ม�"
 
-#: ../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 "อา��ำ�ห������ี�����ม����"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:839
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:808
 msgid "_Cancel"
 msgstr "_ย��ลิ�"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:840
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:809
 msgid "_Interrupt"
 msgstr "_�ั��ั�หวะ"
 
-#: ../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 "�ม�สามาร�สร�า��ี�ี��ล�"
 
-#: ../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 "�รุ�า�รว�สอ�ว�า��ร��รมอื���ม�����ำลั�����า���รว��ี�"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:885
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:854
 msgid "Drive is busy"
 msgstr "��รว��ู�����า�อยู�"
 
-#: ../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 "�รุ�า�ส�������ล�าหรือ���������ีย���ำ���ล�����รว�"
 
-#: ../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 "�ส������ี�ี��ล�าหรือ�����ี�ี�����ีย���ำ"
 
-#: ../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 "�รุ�า�ส������ี�ี��ล�าล�����รว�"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:891
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:860
 msgid "Insert a blank CD"
 msgstr "�ส������ี�ี��ล�า"
 
-#: ../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 "�รุ�า��ลี�ย���������รว����������ี�ี��ล�าหรือ�����ี�ี�����ีย���ำ���"
 
-#: ../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 "��ลี�ย����������ี�ี��ล�าหรือ�����ี�ี�����ีย���ำ���"
 
-#: ../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 "�รุ�า��ลี�ย���������รว����������ี�ี��ล�า"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:897
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:866
 msgid "Reload a blank CD"
 msgstr "��ลี�ย����������ี�ี��ล�า"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:948
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:917
 msgid "Converting audio tracks"
 msgstr "�ำลั���ล���ล��า��ี�ี"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:951
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:920
 msgid "Preparing to write CD"
 msgstr "�ำลั���รียม��ีย������ี�ี"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:954
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:923
 msgid "Writing CD"
 msgstr "�ำลั���ีย��ี�ี"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:957
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:926
 msgid "Finishing write"
 msgstr "�ำลั����าร��ีย�"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:960
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:929
 msgid "Erasing CD"
 msgstr "�ำลั�ล���อมูล���ี�ี"
 
-#: ../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 "���าร�ระ�ำ�ี��ม�มี�าร�ั��าร�� 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 "%s �ี� �ู�ะมี��อมูล�ั��ึ��ว�อยู��ล�ว"
 
-#: ../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 "�ะล���อมูล�������ี�หรือ�ม�?"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1003
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:972
 msgid "_Try Another"
 msgstr "_ลอ�����อื��"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1010
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:979
 msgid "_Erase Disc"
 msgstr "_ล���อมูล������"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1169
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1144
 msgid "C_reate"
 msgstr "_สร�า�"
 
-#: ../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 "สร�า��ัว�ั��ึ��ม�สำ�ร��: %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 "�ม�สามาร�ล����ร��อรี�ั�ว�ราว '%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 "สร�า��ี�ี��ล�"
 
-#: ../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 "��อ��ารสร�า��ี�ี��ล��า� '%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 "�ม�สามาร�สร�า�ราย�ื�อร�อ��สีย����"
 
-#: ../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 "ราย�าร��ล�ยาว��ิ��ว�า�ะ��ีย�ล��ี�ี��ล����"
 
-#: ../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 ""
 "ราย�าร��ล��ี�ยาว %s �า�ี �ึ��ยาว��ิ�มา�ร�า��ี�ี��ล� ��า�����ี�ี�ี����สามาร��ั��ึ����ยาว�ว�า���ิ "
-"�รุ�า�ส���������รว��ล�วลอ�อี��รั��"
+"���รุ�า�ส���������รว��ล�วลอ�อี��รั��"
 
-#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1619
+#: ../plugins/cd-recorder/rb-playlist-source-recorder.c:1604
 msgid "Playlist too long"
 msgstr "ราย�าร��ล�ยาว��ิ���"
 
-#: ../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 "�ม�สามาร�หา��ื�อ�ี�ว�า��ั�ว�ราว���!"
 
-#: ../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 "�ม�สามาร�หา��ื�อ�ี�ว�า��ั�ว�ราวสำหรั���ล���อมูล��ล���� ��อ��าร��ื�อ�ี� %s MiB"
+msgstr "�ม�สามาร�หา��ื�อ�ี�ว�า��ั�ว�ราวสำหรั���ล���อมูล��ล���� ��อ��าร��ื�อ�ี� %s MB"
 
-#: ../plugins/cd-recorder/recorder.glade.h:1
+#: ../plugins/cd-recorder/recorder.ui.h:1
 msgid "Create audio CD from playlist?"
 msgstr "สร�า��ี�ี��ล��า�ราย�าร��ล�หรือ�ม�?"
 
-#: ../plugins/cd-recorder/recorder.glade.h:2
+#: ../plugins/cd-recorder/recorder.ui.h:2
 msgid "Options"
 msgstr "�ัว�ลือ�"
 
-#: ../plugins/cd-recorder/recorder.glade.h:3
+#: ../plugins/cd-recorder/recorder.ui.h:3
 msgid "Progress"
 msgstr "�วาม�ื�ห��า"
 
-#: ../plugins/cd-recorder/recorder.glade.h:4
+#: ../plugins/cd-recorder/recorder.ui.h:4
 msgid "Write _speed:"
 msgstr "_�วาม�ร�ว�าร��ีย�:"
 
-#: ../plugins/cd-recorder/recorder.glade.h:5
+#: ../plugins/cd-recorder/recorder.ui.h:5
 msgid "Write disc _to:"
 msgstr "��ีย��ี�ี_�ี�:"
 
-#: ../plugins/cd-recorder/recorder.glade.h:6
+#: ../plugins/cd-recorder/recorder.ui.h:6
 msgid "_Make multiple copies"
 msgstr "�_�ีย�หลาย�ุ�"
 
@@ -1657,19 +1660,19 @@ msgstr "�าร�����ั���ล���า� DAAP"
 msgid "Share music and play shared music on your local network"
 msgstr "�����ั���ล��ละ�ล����ล��ี������ั�����รือ��าย���าะ�ี��อ��ุ�"
 
-#: ../plugins/daap/daap-prefs.glade.h:1
+#: ../plugins/daap/daap-prefs.ui.h:1
 msgid "<b>Sharing</b>"
 msgstr "<b>�าร�ห����ร�วม</b>"
 
-#: ../plugins/daap/daap-prefs.glade.h:2
+#: ../plugins/daap/daap-prefs.ui.h:2
 msgid "Require _password:"
 msgstr "���_รหัส��า�:"
 
-#: ../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 "_�ื�อ�หล����ล����ร�วม:"
 
-#: ../plugins/daap/daap-prefs.glade.h:4
+#: ../plugins/daap/daap-prefs.ui.h:4
 msgid "_Share my music"
 msgstr "�_�ิ��ห������ล�ร�วม"
 
@@ -1688,8 +1691,8 @@ msgstr "�ื�อ�หล����ล����ร�วม '%s' �ู
 
 #: ../plugins/daap/rb-daap-mdns-browser-avahi.c:237
 #: ../plugins/daap/rb-daap-mdns-browser-avahi.c:280
-msgid "MDNS service is not running"
-msgstr "�ริ�าร MDNS �ม�����ำ�า�อยู�"
+msgid "mDNS service is not running"
+msgstr "�ริ�าร mDNS �ม�����ำ�า�อยู�"
 
 #: ../plugins/daap/rb-daap-mdns-browser-avahi.c:245
 msgid "Browser already active"
@@ -1717,12 +1720,12 @@ msgstr "�ม�สามาร� commit �ริ�าร���"
 
 #: ../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 "�ริ�าร MDNS �อ� avahi �ม�����ำ�า�อยู�"
+msgid "The avahi mDNS service is not running"
+msgstr "�ริ�าร mDNS �อ� avahi �ม�����ำ�า�อยู�"
 
 #: ../plugins/daap/rb-daap-mdns-publisher-avahi.c:310
-msgid "The MDNS service is not published"
-msgstr "�ริ�าร MDNS �ม�����ระ�าศ"
+msgid "The mDNS service is not published"
+msgstr "�ริ�าร mDNS �ม�����ระ�าศ"
 
 #: ../plugins/daap/rb-daap-plugin.c:125
 msgid "_Disconnect"
@@ -1740,24 +1743,15 @@ msgstr "��ื�อม��อ��ยั��หล�����ร�
 msgid "Connect to a new DAAP share"
 msgstr "��ื�อม��อ��ยั��หล�����ร�วม DAAP �หล���หม�"
 
-#: ../plugins/daap/rb-daap-plugin.c:647 ../plugins/daap/rb-daap-source.c:525
-msgid "Could not connect to shared music"
-msgstr "�ม�สามาร���ื�อม��อ��ยั��หล����ล����ร�วม"
-
-#: ../plugins/daap/rb-daap-plugin.c:648
-#, c-format
-msgid "Unable to resolve hostname %s"
-msgstr "�ม�สามาร���ิ�หา�ี�อยู��า��ื�อ�ฮส�� '%s'"
-
-#: ../plugins/daap/rb-daap-plugin.c:699
+#: ../plugins/daap/rb-daap-plugin.c:660
 msgid "New DAAP share"
 msgstr "�หล�����ร�วม DAAP �หล���หม�"
 
-#: ../plugins/daap/rb-daap-plugin.c:699
+#: ../plugins/daap/rb-daap-plugin.c:660
 msgid "Host:port of DAAP share:"
 msgstr "�ฮส��:�อร�� �อ��หล�����ร�วม DAAP"
 
-#: ../plugins/daap/rb-daap-plugin.c:924
+#: ../plugins/daap/rb-daap-plugin.c:882
 msgid "DAAP Music Sharing Preferences"
 msgstr "�รั������าร�����ั���ล���า� DAAP"
 
@@ -1766,36 +1760,32 @@ msgstr "�รั������าร�����ั���ล���
 msgid "%s's Music"
 msgstr "��ล��อ� %s"
 
-#: ../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 "�หล����ล����ร�วม '%s' ��อ��ารรหัส��า����าร��ื�อม��อ"
 
-#: ../plugins/daap/rb-daap-source.c:359
+#: ../plugins/daap/rb-daap-source.c:416
 msgid "Password Required"
 msgstr "��อ��ารรหัส��า�"
 
-#: ../plugins/daap/rb-daap-source.c:431
+#: ../plugins/daap/rb-daap-source.c:528
 msgid "Connecting to music share"
 msgstr "�ำลั���ื�อม��อ��ยั��หล����ล����ร�วม"
 
-#: ../plugins/daap/rb-daap-source.c:438
+#: ../plugins/daap/rb-daap-source.c:535
 msgid "Retrieving songs from music share"
 msgstr "�ำลั�อ�า���ล��า��หล����ล����ร�วม"
 
-#: ../plugins/daap/rb-daap-src.c:480
+#: ../plugins/daap/rb-daap-source.c:622
+msgid "Could not connect to shared music"
+msgstr "�ม�สามาร���ื�อม��อ��ยั��หล����ล����ร�วม"
+
+#: ../plugins/daap/rb-daap-src.c:495
 #, c-format
 msgid "Connection to %s:%d refused."
 msgstr "�าร��ื�อม��อ��ยั� %s:%d �ู���ิ�ส�"
 
-#: ../plugins/dontreallyclose/dontreallyclose.rb-plugin.in.h:1
-msgid "Minimize to the tray when closing the main window"
-msgstr "ย�อ����ล����า��า��มื�อ�ิ�ห��า��า�หลั�"
-
-#: ../plugins/dontreallyclose/dontreallyclose.rb-plugin.in.h:2
-msgid "Minimize to tray"
-msgstr "ย�อ����ล��า�"
-
 #: ../plugins/fmradio/fmradio.rb-plugin.in.h:1
 #: ../plugins/fmradio/rb-fm-radio-source.c:203
 msgid "FM Radio"
@@ -1846,11 +1836,54 @@ msgstr "ล�ราย�าร��ล�"
 msgid "Delete this playlist"
 msgstr "ล�ราย�าร��ล��ี�"
 
-#: ../plugins/generic-player/rb-generic-player-source.c:964
+#: ../plugins/generic-player/rb-generic-player-source.c:982
 #, c-format
 msgid "Importing (%d/%d)"
 msgstr "�ำลั��ำ���า (%d/%d)"
 
+#: ../plugins/im-status/im-status.rb-plugin.in.h:1
+msgid "IM Status"
+msgstr "ส�า�ะ IM"
+
+#: ../plugins/im-status/im-status.rb-plugin.in.h:2
+msgid ""
+"Updates IM status according to the current song (works with Empathy & Gossip)"
+msgstr "�รั���อมูลส�า�ะ IM �าม��ล��ี��ล��อยู� (�������ั� 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 "� �ำลั��ั���ล�... �"
+
 #: ../plugins/ipod/ipod.rb-plugin.in.h:1
 msgid "Portable Players - iPod"
 msgstr "��รื�อ��ล�����า - �อ�อ�"
@@ -1859,86 +1892,82 @@ msgstr "��รื�อ��ล�����า - �อ�อ�"
 msgid "Support for Apple iPod devices (show the content, play from device)"
 msgstr "�ารรอ�รั�อุ��ร���อ�อ��อ��อ���ิล (�ส����ื�อหา, �ล����ล�����รื�อ�)"
 
-#: ../plugins/ipod/ipod-info.glade.h:1
+#: ../plugins/ipod/ipod-info.ui.h:1
 msgid "<b>Content</b>"
 msgstr "<b>��ื�อหา</b>"
 
-#: ../plugins/ipod/ipod-info.glade.h:2
+#: ../plugins/ipod/ipod-info.ui.h:2
 msgid "<b>Information</b>"
 msgstr "<b>��อมูล</b>"
 
-#: ../plugins/ipod/ipod-info.glade.h:3
+#: ../plugins/ipod/ipod-info.ui.h:3
 msgid "<b>System</b>"
 msgstr "<b>ระ��</b>"
 
-#: ../plugins/ipod/ipod-info.glade.h:4
+#: ../plugins/ipod/ipod-info.ui.h:4
 msgid "Advanced"
 msgstr "�ั��สู�"
 
-#: ../plugins/ipod/ipod-info.glade.h:6
+#: ../plugins/ipod/ipod-info.ui.h:6
 msgid "Database Version:"
 msgstr "รุ���อ��า���อมูล:"
 
-#: ../plugins/ipod/ipod-info.glade.h:7
+#: ../plugins/ipod/ipod-info.ui.h:7
 msgid "Device Node:"
 msgstr "�ห���อ�อุ��ร��:"
 
-#: ../plugins/ipod/ipod-info.glade.h:8
+#: ../plugins/ipod/ipod-info.ui.h:8
 msgid "Firmware Version:"
 msgstr "รุ���อ���ิร�ม�วร�:"
 
-#: ../plugins/ipod/ipod-info.glade.h:9
+#: ../plugins/ipod/ipod-info.ui.h:9
 msgid "Model:"
 msgstr "รุ��:"
 
-#: ../plugins/ipod/ipod-info.glade.h:10
+#: ../plugins/ipod/ipod-info.ui.h:10
 msgid "Mount Point:"
 msgstr "�ุ��มา���:"
 
-#: ../plugins/ipod/ipod-info.glade.h:11
+#: ../plugins/ipod/ipod-info.ui.h:11
 msgid "Number of Playlists:"
 msgstr "�ำ�ว�ราย�าร��ล�:"
 
-#: ../plugins/ipod/ipod-info.glade.h:12
+#: ../plugins/ipod/ipod-info.ui.h:12
 msgid "Number of Tracks:"
 msgstr "�ำ�ว���ล�:"
 
-#: ../plugins/ipod/ipod-info.glade.h:13
+#: ../plugins/ipod/ipod-info.ui.h:13
 msgid "Serial Number:"
 msgstr "หมาย�ล�ลำ�ั��ลิ�ภั���:"
 
 #. 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 "�าร�����ื�อ�ี�:"
 
-#: ../plugins/ipod/ipod-info.glade.h:16
-msgid "Your Name:"
-msgstr "�ื�อ�อ��ุ�:"
-
-#: ../plugins/ipod/ipod-info.glade.h:17
+#: ../plugins/ipod/ipod-info.ui.h:16
 msgid "iPod Name:"
 msgstr "�ื�อ�อ�อ�:"
 
-#: ../plugins/ipod/ipod-info.glade.h:18
+#: ../plugins/ipod/ipod-info.ui.h:17
 msgid "iPod Properties"
 msgstr "�ุ�สม�ั�ิ�อ��อ�อ�"
 
-#: ../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>"
 msgstr ""
-"<span size=\"x-large\" "
-"weight=\"bold\">�ุ���อ��าร�ั���อมูล�ั������าร����อ�อ��อ��ุ�หรือ�ม�?</span>"
+"<span size=\"x-large\" weight=\"bold"
+"\">�ุ���อ��าร�ั���อมูล�ั������าร����อ�อ��อ��ุ�หรือ�ม�?</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 �รว���อุ��ร���ึ��อา������อ�อ��ี�ยั��ม�����ั���อมูล�ั����� หรืออา��ะ��อมูล�สียหาย "
 "�ะ��อ��ั���อมูล�ั������ห��ั�อุ��ร���ั��ล�าว ��อ��ี� Rhythmbox �ะสามาร�����า���� "
@@ -1946,29 +1975,29 @@ msgstr ""
 "Rhythmbox �ั���อมูล�ั������ห��ั��อ�อ��ี� ���รุ�า��อ���อมูล��า�ล�า��ี� �����าอุ��ร���ี��ม�����อ�อ� "
 "หรือ��า�ุ��ม������อ��าร�ั���อมูล�ั������ห��ั�อุ��ร�� ���รุ�า��ย��ลิ�"
 
-#: ../plugins/ipod/ipod-init.glade.h:3
-msgid "_Initialise"
+#: ../plugins/ipod/ipod-init.ui.h:3
+msgid "_Initialize"
 msgstr "_�ั���อมูล�ั�����"
 
-#: ../plugins/ipod/ipod-init.glade.h:4
+#: ../plugins/ipod/ipod-init.ui.h:4
 msgid "_Model:"
 msgstr "รุ�_�:"
 
-#: ../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 "_�ื�อ:"
 
-#: ../plugins/ipod/ipod-init.glade.h:6
+#: ../plugins/ipod/ipod-init.ui.h:6
 msgid "iPod detected"
 msgstr "�รว����อ�อ�"
 
-#: ../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 "�ม�สามาร��ั���อมูล�ั������ห��ั��อ�อ�"
 
 #: ../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/mtpdevice/rb-mtp-plugin.c:109 ../shell/rb-playlist-manager.c:184
 msgid "_Rename"
 msgstr "��ลี�ย�_�ื�อ"
 
@@ -1977,7 +2006,7 @@ msgid "Rename iPod"
 msgstr "��ลี�ย��ื�อ�อ�อ�"
 
 #: ../plugins/ipod/rb-ipod-plugin.c:107 ../shell/rb-shell-clipboard.c:188
-#: ../sources/rb-podcast-source.c:323
+#: ../sources/rb-podcast-source.c:317
 msgid "_Properties"
 msgstr "�ุ�_สม�ั�ิ"
 
@@ -2005,18 +2034,18 @@ msgstr "_ล�"
 msgid "Delete playlist"
 msgstr "ล�ราย�าร��ล�"
 
-#: ../plugins/ipod/rb-ipod-source.c:1196 ../sources/rb-podcast-source.c:854
+#: ../plugins/ipod/rb-ipod-source.c:1210 ../sources/rb-podcast-source.c:843
 msgid "Podcasts"
 msgstr "�อ���ส��"
 
-#: ../plugins/ipod/rb-ipod-source.c:1542
+#: ../plugins/ipod/rb-ipod-source.c:1563
 msgid "New playlist"
 msgstr "��ิ�มราย�าร��ล��หม�"
 
 #. 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:1673
 #, c-format
 msgid "%s of %s"
 msgstr "%s �า� %s"
@@ -2029,42 +2058,42 @@ msgstr "วิ�ยุอิ���อร�����"
 msgid "Support for broadcasting services transmitted via the Internet"
 msgstr "�ารรอ�รั�ส�า�ี�ระ�าย�สีย��ี���ร�สั��า���า�อิ���อร�����"
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:1
+#: ../plugins/jamendo/jamendo-prefs.ui.h:1
 msgid "<b>Download</b>"
 msgstr "<b>�าว���หล�</b>"
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:2
+#: ../plugins/jamendo/jamendo-prefs.ui.h:2
 msgid "Jamendo Preferences"
 msgstr "�รั����� Jamendo"
 
-#: ../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.glade.h:5
+#: ../plugins/jamendo/jamendo-prefs.ui.h:4
+msgid "Ogg Vorbis (300Kbps)"
+msgstr "Ogg Vorbis (300Kbps)"
+
+#: ../plugins/jamendo/jamendo-prefs.ui.h:5
 msgid "Visit Jamendo at "
-msgstr "���า�ม Jamendo �ี�"
+msgstr "���า�ม Jamendo �ี� "
 
-#: ../plugins/jamendo/jamendo-prefs.glade.h:6
+#: ../plugins/jamendo/jamendo-prefs.ui.h:6
 msgid "_Format:"
 msgstr "รู��_��:"
 
-#: ../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)."
 msgstr "     * �รอ���หมาย�ี���วย����อ�ศิล�ิ� (��วยสั��าอ�ุ�า�����รี�อ�ี��อมมอ�ส�)"
 
-#: ../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"
@@ -2073,79 +2102,80 @@ msgstr ""
 "     * ระ����ะ�ำ��ล��ี��รั��ัว�����ยอาศัย iRATE �ึ����วย�ู��ั����หาศิล�ิ��หม�� �ามรส�ิยม\n"
 "       �ละ�าม��ื�อ���อื��� ���� �าม�หล���ี�อยู�"
 
-#: ../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 "     * �าร���า�ึ���ล��ี��รี �รีย���าย �ละรว��ร�ว สำหรั��ุ���"
 
-#: ../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 "     * ��อ��า�สำหรั��ริ�า��ห��ั�ศิล�ิ���ย�ร�"
 
-#: ../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 "     * �าร���������ลยี��� Peer-to-Peer ����หม�ล�าสุ�"
 
-#: ../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 ����รู�����หม�สำหรั��ห�ศิล�ิ���ร�ม� ��ย��ร� �ละรั���า�อ����สำหรั��ล�า���ล�"
+
+#: ../plugins/jamendo/jamendo-loading.ui.h:10
+msgid "Jamendo is the only platform that joins together :"
+msgstr "Jamendo �����ว�ี��ียว�ี�รวมสิ����า�� ��อ���ี����า��วย�ั� :"
+
+#: ../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 สามาร����หา�ละ�����ั�อัล�ั�ม��ล���า�� ��� �ละยั�สามาร���ีย���วิ�าร�� "
+"หรือ�ั�����ส���า���ระ�า�ส���า���\n"
+"อัล�ั�ม��า�� �ะ�ู��ห��ะ�������ระ�า�ิ���ย ��ยอาศัย�ารวิ�าร���อ��ู����า�ม\n"
+"�ละ��า�ู��ม�ื���อ�ศิล�ิ����ห� ��สามาร��ห��ารส�ั�ส�ุ���วย�าร�ริ�า����"
+
+#: ../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 ""
-"�ี� jamendo ศิล�ิ��ะ��ย��ร��ล�า���ล�ภาย���สั��าอ�ุ�า�����รี�อ�ี��อมมอ�ส�\n"
+"�ี� Jamendo ศิล�ิ��ะ��ย��ร��ล�า���ล�ภาย���สั��าอ�ุ�า�����รี�อ�ี��อมมอ�ส�\n"
 "��ยสรุ����ือ ��ล�สามาร��าว���หล���� �รีย��รีย��หม���� �ละ�����ั���อ���อย�า��สรี\n"
 "ภาย�����อ��ล���� \"ส�ว�สิ��ิ��า�ส�ว�\" �ึ���หมาะ�ั�ยุ�ศ�วรรษ�หม��ี�อย�า�มา�"
 
-#: ../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 ""
-"������หม��ี� �ำ�ห� jamendo สามาร����วิ�ี�าร��ย��ร�����ิ�ิ�ัล����หม��ี��ร��ลั�อย�า�\n"
+"������หม��ี� �ำ�ห� Jamendo สามาร����วิ�ี�าร��ย��ร�����ิ�ิ�ัล����หม��ี��ร��ลั�อย�า�\n"
 "��รือ��าย Peer-to-Peer ���� BitTorrent หรือ eMule ���าร��ย��ร�อัล�ั�ม��ล���า�� "
 "อย�า��ู���หมาย�ี�รา�า��ือ�ศู�ย����"
 
-#: ../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 "�ุ�สามาร��ู��อมูล��ิ�ม��ิม����ี� 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 ����รู�����หม�สำหรั��ห�ศิล�ิ���ร�ม� ��ย��ร� �ละรั���า�อ����สำหรั��ล�า���ล�"
-
-#: ../plugins/jamendo/jamendo-loading.glade.h:16
-msgid "jamendo is the only platform that joins together :"
-msgstr "jamendo �����ว�ี��ียว�ี�รวมสิ����า�� ��อ���ี����า��วย�ั� :"
-
-#: ../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 สามาร����หา�ละ�����ั�อัล�ั�ม��ล���า�� ��� �ละยั�สามาร���ีย���วิ�าร�� "
-"หรือ�ั�����ส���า���ระ�า�ส���า���\n"
-"อัล�ั�ม��า�� �ะ�ู��ห��ะ�������ระ�า�ิ���ย ��ยอาศัย�ารวิ�าร���อ��ู����า�ม\n"
-"�ละ��า�ู��ม�ื���อ�ศิล�ิ����ห� ��สามาร��ห��ารส�ั�ส�ุ���วย�าร�ริ�า����"
-
 #: ../plugins/jamendo/jamendo.rb-plugin.in.h:1
 msgid ""
 "Adds support to Rhythmbox for playing and downloading albums from Jamendo"
 msgstr "��ิ�ม�ารรอ�รั��าร�ล���ละ�าว���หล�อัล�ั�ม��ล��า� Jamendo �ห��ั� Rhythmbox"
 
 #: ../plugins/jamendo/jamendo.rb-plugin.in.h:2
-#: ../plugins/jamendo/jamendo/JamendoSource.py:65
+#: ../plugins/jamendo/jamendo/JamendoSource.py:62
 msgid "Jamendo"
 msgstr "Jamendo"
 
@@ -2171,85 +2201,85 @@ msgstr "_�ริ�า��ห��ั�ศิล�ิ�"
 msgid "Donate Money to this Artist"
 msgstr "�ริ�า���ิ��ห��ั�ศิล�ิ��ี�"
 
-#: ../plugins/jamendo/jamendo/JamendoSource.py:121
-msgid "Loading Jamendo catalogue"
+#: ../plugins/jamendo/jamendo/JamendoSource.py:120
+msgid "Loading Jamendo catalog"
 msgstr "�ำลั�อ�า�สาร�ั���ล��อ� Jamendo"
 
-#: ../plugins/jamendo/jamendo/JamendoSource.py:359
+#: ../plugins/jamendo/jamendo/JamendoSource.py:303
 #, python-format
 msgid "Error looking up p2plink for album %s on jamendo.com"
 msgstr "��ิ���อ�ิ��ลา���ะหา p2plink สำหรั�อัล�ั�ม %s �ี� jamendo.com"
 
-#: ../plugins/jamendo/jamendo/JamendoSource.py:383
+#: ../plugins/jamendo/jamendo/JamendoSource.py:327
 #, python-format
 msgid "Error looking up artist %s on jamendo.com"
 msgstr "��ิ���อ�ิ��ลา���ะหาศิล�ิ�สำหรั�อัล�ั�ม %s �ี� jamendo.com"
 
-#: ../plugins/iradio/rb-iradio-source.c:175
+#: ../plugins/iradio/rb-iradio-source.c:173
 msgid "New Internet _Radio Station..."
 msgstr "��ิ�มส�า�ี_วิ�ยุอิ���อร�����..."
 
-#: ../plugins/iradio/rb-iradio-source.c:176
+#: ../plugins/iradio/rb-iradio-source.c:174
 msgid "Create a new Internet Radio station"
 msgstr "สร�า�ส�า�ีวิ�ยุอิ���อร������ห���หม�"
 
 #. 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 "�หม�"
 
-#: ../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 "��ว��ล�"
 
-#: ../plugins/iradio/rb-iradio-source.c:455
+#: ../plugins/iradio/rb-iradio-source.c:452
 msgid "Radio"
 msgstr "วิ�ยุ"
 
-#: ../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 ส�า�ี"
 
-#: ../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 "��ิ�มส�า�ีวิ�ยุอิ���อร�����"
 
-#: ../plugins/iradio/rb-iradio-source.c:1006
+#: ../plugins/iradio/rb-iradio-source.c:1004
 msgid "URL of internet radio station:"
 msgstr "URL �อ�ส�า�ีวิ�ยุอิ���อร�����:"
 
-#: ../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"
 
-#: ../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 "�ม�สามาร���ลี�ย��ุ�สม�ั�ิ�อ�ส�า�ี"
 
-#: ../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 "�ม�สามาร���ลี�ย� URI �อ�ส�า�ี���� %s ��ื�อ��า�มีส�า�ี�ั��ล�าวอยู���อ��ล�ว"
 
-#: ../plugins/iradio/station-properties.glade.h:5
+#: ../plugins/iradio/station-properties.ui.h:5
 msgid "L_ocation:"
 msgstr "_�ี�อยู�:"
 
@@ -2261,42 +2291,43 @@ msgstr "�ว��ุม Rhythmbox ��ย���รี�ม��อ�
 msgid "LIRC "
 msgstr "LIRC"
 
-#: ../plugins/lyrics/lyrics/__init__.py:134
 #: ../plugins/lyrics/lyrics/__init__.py:143
+#: ../plugins/lyrics/lyrics/__init__.py:145
+#: ../plugins/lyrics/lyrics/__init__.py:154
 msgid "No lyrics found"
 msgstr "�ม�����ื�อ��ล�"
 
-#: ../plugins/lyrics/lyrics/__init__.py:177
+#: ../plugins/lyrics/lyrics/__init__.py:188
 msgid "_Save"
 msgstr "_�ั��ึ�"
 
-#: ../plugins/lyrics/lyrics/__init__.py:182
-#: ../plugins/lyrics/lyrics/__init__.py:195 ../shell/rb-shell.c:420
+#: ../plugins/lyrics/lyrics/__init__.py:193
+#: ../plugins/lyrics/lyrics/__init__.py:206 ../shell/rb-shell.c:390
 msgid "_Edit"
 msgstr "�_����"
 
-#: ../plugins/lyrics/lyrics/__init__.py:197
+#: ../plugins/lyrics/lyrics/__init__.py:208
 msgid "_Search again"
 msgstr "_���หาอี��รั��"
 
-#: ../plugins/lyrics/lyrics/__init__.py:215
-#: ../plugins/lyrics/lyrics/__init__.py:281
+#: ../plugins/lyrics/lyrics/__init__.py:226
+#: ../plugins/lyrics/lyrics/__init__.py:295
 msgid "Lyrics"
 msgstr "��ื�อ��ล�"
 
-#: ../plugins/lyrics/lyrics/__init__.py:255
+#: ../plugins/lyrics/lyrics/__init__.py:269
 msgid "Searching for lyrics..."
 msgstr "�ำลั����หา��ื�อ��ล�..."
 
-#: ../plugins/lyrics/lyrics/__init__.py:291
+#: ../plugins/lyrics/lyrics/__init__.py:305
 msgid "Song L_yrics"
 msgstr "�_�ื�อ��ล�"
 
-#: ../plugins/lyrics/lyrics/__init__.py:292
+#: ../plugins/lyrics/lyrics/__init__.py:306
 msgid "Display lyrics for the playing song"
 msgstr "�ส����ื�อ��ล��อ���ล��ี��ำลั��ล��"
 
-#: ../plugins/lyrics/lyrics/LyricsConfigureDialog.py:104
+#: ../plugins/lyrics/lyrics/LyricsConfigureDialog.py:106
 msgid "Choose lyrics folder..."
 msgstr "�ลือ���ล��อร���ื�อ��ล�..."
 
@@ -2308,44 +2339,44 @@ msgstr "�ึ���ื�อ��ล��า�อิ���อร��
 msgid "Song Lyrics"
 msgstr "��ื�อ��ล�"
 
-#: ../plugins/lyrics/lyrics-prefs.glade.h:1
+#: ../plugins/lyrics/lyrics-prefs.ui.h:1
 msgid "<b>Lyrics Folder</b>"
 msgstr "<b>��ล��อร���ื�อ��ล�</b>"
 
-#: ../plugins/lyrics/lyrics-prefs.glade.h:2
+#: ../plugins/lyrics/lyrics-prefs.ui.h:2
 msgid "<b>Search engines</b>"
 msgstr "<b>��รื�อ�มือ���หา</b>"
 
-#: ../plugins/lyrics/lyrics-prefs.glade.h:3
+#: ../plugins/lyrics/lyrics-prefs.ui.h:3
 msgid "Browse..."
 msgstr "�_รีย��ู..."
 
-#: ../plugins/lyrics/lyrics-prefs.glade.h:4
+#: ../plugins/lyrics/lyrics-prefs.ui.h:4
 msgid "Lyrics Plugin Preferences"
 msgstr "�รั������ลั��อิ���ื�อ��ล�"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:1
+#: ../plugins/magnatune/magnatune-loading.ui.h:1
 msgid "     * Founder/owner runs it -- support a small business"
 msgstr "    * �ู���อ�ั��/���า�อ��ำ��ิ��าร�อ� -- ��ื�อส�ั�ส�ุ��ุร�ิ��ล���"
 
-#: ../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 "
 "the world)"
 msgstr "    * 50% �อ���ิ��ี���าย�ะ���ึ�ศิล�ิ� (�ำ�ห��ู��ื�อรู�สึ��ี ��ราะ��า�ำลั���วย�หลือ�ล�)"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:4
+#: ../plugins/magnatune/magnatune-loading.ui.h:4
 msgid "    * All albums and artists hand-picked"
 msgstr "    * �ุ�อัล�ั�ม�ละ�ุ�ศิล�ิ����รั��าร�ั�สรร��วยม�ุษย�"
 
-#: ../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)"
 msgstr "    * มี�ห��ั���าร�าว���หล��ละ�ี�ี (�ม�มี�หล��อื������อิ���อร������ี��าย�ั��สอ�อย�า�)"
 
-#: ../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"
@@ -2353,23 +2384,23 @@ msgstr ""
 "    * ��อมูล�ีว�ระวั�ิอย�า�ละ�อีย��อ��ั����รี���ละ�� รวม�ั��รู���าย�อ�ศิล�ิ� -- "
 "�ห��วามรู�สึ���ล��ิ��ั�ศิล�ิ�"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:7
+#: ../plugins/magnatune/magnatune-loading.ui.h:7
 msgid "    * Free listening of all songs"
 msgstr "    * �ั���ล��ุ���ล�����รี"
 
-#: ../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"
 msgstr "    * มีภา���สี�ริ� �ุ�ภา�สู� ��รู� PDF สำหรั���ือ��ุ�อัล�ั�ม - �ั��ิม�������าย"
 
-#: ../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"
 msgstr "    * สภา��ว�ล�อม�ี��ม����ั� - �ม�มีอะ�รวู�วา� �ม�มี�สีย���ษ�า��ะ�ั���ล�"
 
-#: ../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"
@@ -2377,7 +2408,7 @@ msgstr ""
 "    * �ุ���ล��ี��ลือ�สรร �����อ�ลั�ษ�����าะ�อ� Magnatune "
 "��า��า�ร�า�ออ��ล���ั�ว���ึ��มั��ะมี�ุ���ล���ำ� �ั� (�ำ�ว�มหึมา)\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)"
@@ -2385,11 +2416,11 @@ msgstr ""
 "    * �ม�มี�าร��อ��ั��าร�ำสำ��า��ล� (DRM) �ำ�ห�สามาร��ล����ล���อุ��ร����� ����� "
 "(�ม��หมือ� iTunes, MSN ฯลฯ)"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:13
+#: ../plugins/magnatune/magnatune-loading.ui.h:13
 msgid "    * No need to \"register\" to listen or buy"
 msgstr "    * �ม��ำ������อ� \"ล��ะ��ีย�\" ��ื�อ�ะ�ั�หรือ�ื�อ"
 
-#: ../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"
@@ -2397,11 +2428,11 @@ msgstr ""
 "    * �ม��������ส�ว�ห�ึ���อ���รื�อ��ั�ร�ี�ลา��ี� \"�ั�วร�าย\" - "
 "�หมาะสำหรั��ู��ี��ม��อ��ุร�ิ���ล���ว�ั�� �ละ��อ��าร��วย�ำลาย�สีย"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:15
+#: ../plugins/magnatune/magnatune-loading.ui.h:15
 msgid "    * Not venture-capital backed big business"
 msgstr "    * �ม�����ุร�ิ���า��ห���ี�มี�าย�ุ�ห�ุ�หลั�"
 
-#: ../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)"
@@ -2409,14 +2440,14 @@ msgstr ""
 "    * ��ว��ล��อ��ราหา�ั��ามร�า�������ล����ยา� �ละ�ม���ิ��ามส�า�ีวิ�ยุ "
 "(�ม��ะ��ิ���า��ามวิ�ยุ�อ�มหาวิ�ยาลัย)"
 
-#: ../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)"
 msgstr ""
 "    * มี��อมูล�สีย��ุ�ภา�สู� (�หมือ��ี�ี) �ห��มื�อ�ุ��าว���หล� (�ม����มี����สีย��ี�ล��ุ�ภา�ล�)"
 
-#: ../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"
@@ -2424,291 +2455,311 @@ msgstr ""
 "    * ส�า�ีวิ�ยุ�ละราย�าร��ล���� \"�สม��ว\" สามาร���ิ��ั�����ลอ��� - "
 "สามาร��ำ�า����ร�อม�ั��ั���ล��อ��รา���"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:19
+#: ../plugins/magnatune/magnatune-loading.ui.h:19
 msgid "    * Smaller selection means easier to find good music"
 msgstr "    * �ำ�ว���ล��ี���อย หมาย�ึ�สามาร�หา��ล��ี� �����าย�ว�า"
 
-#: ../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"
 msgstr ""
 "    * วิ�ี�ั��รา�า�����ร��ลี�ย� หมาย�วามว�า�ุ�สามาร���าย��ีย�อัล�ั�มละ 5 �อลลาร������า�ุ��ลือ�"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:21
+#: ../plugins/magnatune/magnatune-loading.ui.h:21
 msgid "    * Very simple user interface, quick to play music"
 msgstr "    * ส�ว��ิ���อ�ู�����ี��รีย���าย �ล����ล��ี���อ��าร����ร�ว"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:22
+#: ../plugins/magnatune/magnatune-loading.ui.h:22
 msgid "    * Wide variety of genres, can fit any mood"
 msgstr "    * มี��ว��ล�หลา�หลาย สามาร��อ�����ุ�อารม��"
 
-#: ../plugins/magnatune/magnatune-loading.glade.h:23
+#: ../plugins/magnatune/magnatune-loading.ui.h:23
 msgid "<b>Magnatune online music store</b>"
 msgstr "<b>ร�า���ล�ออ��ล�� Magnatune</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"
 msgstr "Magnatune ����ร�า���ล�ออ��ล���ี��ม��ั�วร�าย �ุ�ลั�ษ�ะหลั�� �า�ส�ว��อ�ร�า��ือ:\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 "�ุ�สามาร��ู��อมูล��ิ�ม��ิม����ี� 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 (�รรม�า)\n"
-"$9 US\n"
-"$10 US (�ี�ว�า�รรม�า)\n"
-"$11 US\n"
-"$12 US (�อื�อ��ื�อ)\n"
-"$13 US\n"
-"$14 US\n"
-"$15 US (�อื�อ��ื�อมา�)\n"
-"$16 US\n"
-"$17 US\n"
-"$18 US (�รารั��ุ�)"
-
-#: ../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 (�ี�ว�า�รรม�า)"
+
+#: ../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 (�อื�อ��ื�อ)"
+
+#: ../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 (�อื�อ��ื�อมา�)"
+
+#: ../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 (�รารั��ุ�)"
+
+#: ../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 (�รรม�า)"
+
+#: ../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 "MP3 ��� 128K"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:16
 msgid ""
 "<span weight=\"bold\" foreground=\"red\">Your credit card is past the "
 "expiration date listed.</span>"
 msgstr ""
-"<span weight=\"bold\" foreground=\"red\">�ั�ร��ร�ิ��อ��ุ����า��ิ�วั�หม�อายุ�ี��ส���ล�ว</"
-"span>"
+"<span weight=\"bold\" foreground=\"red"
+"\">�ั�ร��ร�ิ��อ��ุ����า��ิ�วั�หม�อายุ�ี��ส���ล�ว</span>"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:17
+#: ../plugins/magnatune/magnatune-purchase.ui.h:16
+msgid "April (04)"
+msgstr "�มษาย� (04)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:18
+#: ../plugins/magnatune/magnatune-purchase.ui.h:18
+msgid "August (08)"
+msgstr "สิ�หา�ม (08)"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:28
+#: ../plugins/magnatune/magnatune-prefs.ui.h:19
 msgid "C_redit Card:"
 msgstr "�ั�ร�_�ร�ิ�:"
 
-#: ../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 "�ั�วา�ม (12)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:21
 msgid "Default _amount to pay:"
 msgstr "_�ำ�ว���ิ����ิ�ี��ะ��าย:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:30
+#: ../plugins/magnatune/magnatune-prefs.ui.h:22
 msgid "Expiry:"
 msgstr "วั�หม�อายุ:"
 
-#: ../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 "�ุมภา�ั��� (02)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:25
 msgid "Find out about Magnatune at "
 msgstr "�ูรายละ�อีย���ิ�ม��ิม�อ� Magnatune �ี� "
 
-#: ../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 "ม�รา�ม (01)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:27
+#: ../plugins/magnatune/magnatune-purchase.ui.h:29
+msgid "July (07)"
+msgstr "�ร��า�ม (07)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:28
+#: ../plugins/magnatune/magnatune-purchase.ui.h:30
+msgid "June (06)"
+msgstr "มิ�ุ�าย� (06)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:29
 msgid "Magnatune Information"
 msgstr "��อมูลสำหรั� Magnatune"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:33
+#: ../plugins/magnatune/magnatune-prefs.ui.h:30
 msgid "Magnatune Preferences"
 msgstr "�รั����� Magnatune"
 
-#: ../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"
-"MP3 ��� VBR\n"
-"MP3 ��� 128K"
+#: ../plugins/magnatune/magnatune-prefs.ui.h:31
+#: ../plugins/magnatune/magnatune-purchase.ui.h:31
+msgid "March (03)"
+msgstr "มี�า�ม (03)"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:39
+#: ../plugins/magnatune/magnatune-prefs.ui.h:32
+#: ../plugins/magnatune/magnatune-purchase.ui.h:32
+msgid "May (05)"
+msgstr "�ฤษภา�ม (05)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:33
+#: ../plugins/magnatune/magnatune-purchase.ui.h:33
+msgid "November (11)"
+msgstr "�ฤศ�ิ�าย� (11)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:34
+#: ../plugins/magnatune/magnatune-purchase.ui.h:34
+msgid "October (10)"
+msgstr "�ุลา�ม (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 "รู��_���สีย��ี��ลือ����:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:40
+#: ../plugins/magnatune/magnatune-prefs.ui.h:37
 msgid "Redownload purchased music at "
 msgstr "�าว���หล���ล��ี��ื�อ�ล�ว��ำอี��ี�"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:41
+#: ../plugins/magnatune/magnatune-prefs.ui.h:38
 msgid "Remember my credit card details"
 msgstr "�ำรายละ�อีย��ั�ร��ร�ิ�"
 
-#: ../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 "�ั�ยาย� (09)"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:40
+#: ../plugins/magnatune/magnatune-purchase.ui.h:38
+msgid "VBR MP3"
+msgstr "MP3 ��� VBR"
+
+#: ../plugins/magnatune/magnatune-prefs.ui.h:41
 msgid "Visit Magnatune at "
 msgstr "�ยี�ยม�ม Magnatune �ี�"
 
-#: ../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 "_อี�มล:"
 
-#: ../plugins/magnatune/magnatune-prefs.glade.h:44
+#: ../plugins/magnatune/magnatune-prefs.ui.h:44
 msgid "_Month:"
 msgstr "��ือ_�:"
 
-#: ../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 (�รรม�า)\n"
-"$9\n"
-"$10 (�ี�ว�า�รรม�า)\n"
-"$11\n"
-"$12 (�อื�อ��ื�อ)\n"
-"$13\n"
-"$14\n"
-"$15 (�อื�อ��ื�อมา�!)\n"
-"$16\n"
-"$17\n"
-"$18 (�รารั��ุ�!)"
-
-#: ../plugins/magnatune/magnatune-purchase.glade.h:15
+#: ../plugins/magnatune/magnatune-purchase.ui.h:17
 msgid "Audio _format:"
 msgstr "รู��_�����ม�สีย�:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:16
+#: ../plugins/magnatune/magnatune-purchase.ui.h:19
 msgid "C_redit Card number:"
 msgstr "หมาย�ล��ั�ร�_�ร�ิ�:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:17
+#: ../plugins/magnatune/magnatune-purchase.ui.h:20
 msgid "Credit Card"
 msgstr "�ั�ร��ร�ิ�"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:18
+#: ../plugins/magnatune/magnatune-purchase.ui.h:22
 msgid "Expiry _month:"
 msgstr "��ือ_�หม�อายุ:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:19
+#: ../plugins/magnatune/magnatune-purchase.ui.h:23
 msgid "Expiry _year (last two digits):"
 msgstr "_�ีหม�อายุ (�ล�สอ�หลั�สุ���าย):"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:20
+#: ../plugins/magnatune/magnatune-purchase.ui.h:26
 msgid "Gift Card"
 msgstr "�ั�ร�ำ�ัล"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:21
+#: ../plugins/magnatune/magnatune-purchase.ui.h:27
 msgid "Gift card number:"
 msgstr "หมาย�ล��ั�ร�ำ�ัล:"
 
-#: ../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 ""
-"ม�รา�ม (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-purchase.glade.h:39
+#: ../plugins/magnatune/magnatune-purchase.ui.h:36
 msgid "Purchase Magnatune Tracks"
 msgstr "�ื�อ��ล��ี� Magnatune"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:40
+#: ../plugins/magnatune/magnatune-purchase.ui.h:40
 msgid "_Amount to pay (US Dollars):"
 msgstr "_�ำ�ว��ี��ะ��าย (�อลลาร�สหรั�):"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:41
+#: ../plugins/magnatune/magnatune-purchase.ui.h:41
 msgid "_Email address:"
 msgstr "�ี�อยู�อี�_มล:"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:42
+#: ../plugins/magnatune/magnatune-purchase.ui.h:42
 msgid "_Name (as printed on card):"
 msgstr "_�ื�อ (�าม�ั�ร��ร�ิ�):"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:43
+#: ../plugins/magnatune/magnatune-purchase.ui.h:43
 msgid "_Purchase"
 msgstr "�ื�_อ"
 
-#: ../plugins/magnatune/magnatune-purchase.glade.h:44
+#: ../plugins/magnatune/magnatune-purchase.ui.h:44
 msgid "_Remember my credit card details"
 msgstr "�ำ_รายละ�อีย��ั�ร��ร�ิ�"
 
@@ -2727,7 +2778,7 @@ msgid "Magnatune"
 msgstr "Magnatune"
 
 #: ../plugins/magnatune/magnatune/MagnatuneSource.py:121
-msgid "Loading Magnatune catalogue"
+msgid "Loading Magnatune catalog"
 msgstr "�ำลั�อ�า�สาร�ั���ล��อ� Magnatune"
 
 #: ../plugins/magnatune/magnatune/MagnatuneSource.py:124
@@ -2742,33 +2793,33 @@ msgstr "�ม�สามาร��ื�ออัล�ั�ม��ล�
 msgid "You must have a library location set to purchase an album."
 msgstr "�ุ���อ��ำห���ำ�ห����อ��ลั���ล��ว� �ึ��ะ�ื�ออัล�ั�ม��ล����"
 
-#: ../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 "�ุ���อ��าร�ะ�ื�ออัล�ั�ม <i>%(album)s</i> ��ย '%(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 "�ม�สามาร�อ�า�สาร�ั���ล�"
 
-#: ../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 อ�า�สาร�ั���ล��อ� Magnatune �ม����า�� �รุ�าราย�า���อ�ิ��ลา��ี�"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:443
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:459
 msgid "Authorizing Purchase"
 msgstr "�ำลั��รว�สอ�สิ��ิ��าร�ื�อ"
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:444
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:460
 msgid "Authorizing purchase with the Magnatune server. Please wait..."
 msgstr "�ำลั��รว�สอ�สิ��ิ��าร�ื�อ�ั���ิร���วอร��อ� Magnatune �รุ�ารอสั��รู�..."
 
-#: ../plugins/magnatune/magnatune/MagnatuneSource.py:490
+#: ../plugins/magnatune/magnatune/MagnatuneSource.py:506
 msgid "Purchase Error"
 msgstr "��ิ���อ�ิ��ลา��อ��าร�ื�อ"
 
-#: ../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"
@@ -2779,12 +2830,12 @@ msgstr ""
 "��ิร���วอร��อ� Magnatune �อ��ลั�มาว�า:\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 "�ิ��ลา�"
 
-#: ../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"
@@ -2844,24 +2895,40 @@ msgstr "��รื�อ��ล�����า - MTP"
 msgid "Support for MTP devices (show the content, transfer, play from device)"
 msgstr "�ารรอ�รั�อุ��ร�� MTP (�ส����ื�อหา ��าย�อ� �ละ�ล����ล��า�อุ��ร��)"
 
-#: ../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 "�ม�สามาร��ั�ลอ����ม�า�อุ��ร�� MTP: %s"
+
+#: ../plugins/mtpdevice/rb-mtp-gst-src.c:190
+#, c-format
+msgid "Not enough space in %s"
+msgstr "�ี�ว�า�มี�ม��อ�� %s"
+
+#: ../plugins/mtpdevice/rb-mtp-gst-src.c:202
+#, c-format
+msgid "Unable to open temporary file: %s"
+msgstr "�ม�สามาร���ิ����ม�ั�ว�ราว���: %s"
+
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:106
+#: ../shell/rb-removable-media-manager.c:150
 msgid "_Eject"
 msgstr "_�อ�สื�อออ�"
 
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:104
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:107
 msgid "Eject MTP-device"
 msgstr "�อ�อุ��ร�� MTP ออ�"
 
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:107
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:110
 msgid "Rename MTP-device"
 msgstr "��ลี�ย��ื�ออุ��ร�� MTP"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:161
+#: ../plugins/mtpdevice/rb-mtp-source.c:177
 msgid "Media player device error"
 msgstr "��ิ���อ�ิ��ลา���ี�ยว�ั�อุ��ร���ล��สื�อ"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:643
+#: ../plugins/mtpdevice/rb-mtp-source.c:750
 msgid "Digital Audio Player"
 msgstr "��รื�อ��ล����ล��ิ�ิ�ัล"
 
@@ -2903,8 +2970,9 @@ msgid ""
 "or rpdb2. If you have not set a debugger password in GConf, it will use the "
 "default password ('rhythmbox')."
 msgstr ""
-"หลั��า��ี��ุ��� \"��ล�\" Rhythmbox �ะรอ���ว�า�ุ��ะ��ื�อม��อ���ามา��ย��� winpdb หรือ rpdb2 "
-"��า�ุ�ยั��ม�����ั��รหัส��า�สำหรั���ร��รม�ี�ั���� GConf ���ะ���รหัส��า��ริยาย ('rhythmbox')"
+"หลั��า��ี��ุ��� \"��ล�\" Rhythmbox �ะรอ���ว�า�ุ��ะ��ื�อม��อ���ามา��ย��� winpdb หรือ "
+"rpdb2 ��า�ุ�ยั��ม�����ั��รหัส��า�สำหรั���ร��รม�ี�ั���� GConf ���ะ���รหัส��า��ริยาย "
+"('rhythmbox')"
 
 #. ex:noet:ts=8:
 #: ../plugins/pythonconsole/pythonconsole.rb-plugin.in.h:1
@@ -2915,11 +2983,11 @@ msgstr "�อ���ล���อ�����อ�"
 msgid "Python Console"
 msgstr "�อ���ล���อ�"
 
-#: ../plugins/rb-plugin-manager.c:55
+#: ../plugins/rb-plugin-manager.c:54
 msgid "Plugin"
 msgstr "�ลั��อิ�"
 
-#: ../plugins/rb-plugin-manager.c:56
+#: ../plugins/rb-plugin-manager.c:55
 msgid "Enabled"
 msgstr "��ิ����"
 
@@ -2962,65 +3030,172 @@ msgstr "�ลั��อิ��ัวอย�า���ภาษา Vala
 msgid "Vala Sample Plugin"
 msgstr "�ลั��อิ� Vala �ัวอย�า�"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:230
+#: ../plugins/status-icon/eggtrayicon.c:133
+msgid "Orientation"
+msgstr "��ววา�"
+
+#: ../plugins/status-icon/eggtrayicon.c:134
+msgid "The orientation of the tray."
+msgstr "��ววา��อ��า�"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:136
+msgid "_Close"
+msgstr "�ิ_�"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:137
+msgid "Hide the music player window"
+msgstr "��อ�ห��า��า���ร��รม�ล����ล�"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:143
+msgid "_Show Music Player"
+msgstr "�_ส����ร��รม�ล����ล�"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:144
+msgid "Choose music to play"
+msgstr "�ลือ���ล��ี���อ��าร�ล��"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:146
+msgid "Show N_otifications"
+msgstr "�ส���รอ��_����ห�ุ"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:147
+msgid "Show notifications of song changes and other events"
+msgstr "�ส���รอ������าร��ลี�ย���ล��ละ�ห�ุ�าร��อื���"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:406
+msgid "Next"
+msgstr "�ั���"
+
+#: ../plugins/status-icon/rb-status-icon-plugin.c:557
+#: ../remote/dbus/rb-client.c:454 ../remote/dbus/rb-client.c:480
+msgid "Not playing"
+msgstr "�ม�����ล��"
+
+#. Translators: the %s is the elapsed and total time
+#: ../plugins/status-icon/rb-status-icon-plugin.c:560
+#, c-format
+msgid "Paused, %s"
+msgstr "หยุ��ั� %s"
+
+#. Translators: by Artist
+#: ../plugins/status-icon/rb-status-icon-plugin.c:649
+#, c-format
+msgid "by <i>%s</i>"
+msgstr "��ย <i>%s</i>"
+
+#. Translators: from Album
+#: ../plugins/status-icon/rb-status-icon-plugin.c:670
+#, c-format
+msgid "from <i>%s</i>"
+msgstr "�า� <i>%s</i>"
+
+#: ../plugins/status-icon/status-icon.rb-plugin.in.h:1
+msgid "Status Icon"
+msgstr "�อ�อ�ส�า�ะ"
+
+#: ../plugins/status-icon/status-icon.rb-plugin.in.h:2
+msgid "Status icon and notification popups"
+msgstr "�อ�อ�ส�า�ะ�ละ�รอ������ห�ุ"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:1
+msgid "Always shown"
+msgstr "�ส���สมอ"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:2
+msgid "Always visible"
+msgstr "�ส���สมอ"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:3
+msgid "Never shown"
+msgstr "�ม��ส��"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:4
+msgid "Never visible"
+msgstr "�ม��ส��"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:5
+msgid "Owns the main window"
+msgstr "�������า�อ�ห��า��า�หลั�"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:6
+msgid "Shown when the main window is hidden"
+msgstr "�ส���มื�อห��า��า�หลั��ู���อ��ว�"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:7
+msgid "Status icon preferences"
+msgstr "�รั������อ�อ�ส�า�ะ"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:8
+msgid "Visible with notifications"
+msgstr "�ส���ร�อม�รอ������ห�ุ"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:9
+msgid "_Notifications"
+msgstr "�าร�_����ห�ุ"
+
+#: ../plugins/status-icon/status-icon-preferences.ui.h:10
+msgid "_Status Icon:"
+msgstr "�อ�อ�_ส�า�ะ:"
+
+#: ../plugins/visualizer/rb-visualizer-plugin.c:229
 msgid "_Visualization"
 msgstr "_ภา��อ���������สีย�"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:231
+#: ../plugins/visualizer/rb-visualizer-plugin.c:230
 msgid "Start or stop visualization"
 msgstr "��ิ�หรือ�ิ�ภา��อ���������สีย�"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:237
+#: ../plugins/visualizer/rb-visualizer-plugin.c:236
 msgid "Small"
 msgstr "�ล��"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:238
+#: ../plugins/visualizer/rb-visualizer-plugin.c:237
 msgid "Normal"
 msgstr "�รรม�า"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:239
+#: ../plugins/visualizer/rb-visualizer-plugin.c:238
 msgid "Large"
 msgstr "�ห��"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:240
+#: ../plugins/visualizer/rb-visualizer-plugin.c:239
 msgid "Extra Large"
 msgstr "�ห��มา�"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:251
+#: ../plugins/visualizer/rb-visualizer-plugin.c:243
 msgid "Embedded"
 msgstr "�ั��ัว"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:252
+#: ../plugins/visualizer/rb-visualizer-plugin.c:244
 msgid "Fullscreen"
 msgstr "���ม�อ"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:253
+#: ../plugins/visualizer/rb-visualizer-plugin.c:245
 msgid "Desktop"
 msgstr "�ื�����ะ"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:254
+#: ../plugins/visualizer/rb-visualizer-plugin.c:246
 msgid "Window"
 msgstr "ห��า��า�"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:712
+#: ../plugins/visualizer/rb-visualizer-plugin.c:726
 #, c-format
 msgid "Unable to start video output"
 msgstr "�ม�สามาร���ิ��าร�ส��ภา�วี�ิ�ัศ��"
 
-#: ../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 "�ม�สามาร���ื�อม��อภา��อ���������สีย��หม����า�ั������ล���อ� GStreamer ���"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:795
+#: ../plugins/visualizer/rb-visualizer-plugin.c:809
 msgid "Unable to start visualization"
 msgstr "�ม�สามาร��ริ�ม�ส��ภา��อ���������สีย����"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1358
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1390
 msgid "Enable visual effects?"
 msgstr "��ิ����ภา��อ���������สีย�หรือ�ม�?"
 
-#: ../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?"
@@ -3028,27 +3203,27 @@ msgstr ""
 "�ู�หมือ��ุ��ำลั��รีย� Rhythmbox �า�ระยะ��ล\n"
 "�����หรือ�ม�ว�า�ุ���อ��าร��ิ����ภา��อ���������สีย�?"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:1692
+#: ../plugins/visualizer/rb-visualizer-plugin.c:1722
 msgid "Music Player Visualization"
 msgstr "ภา��อ���������สีย��อ���ร��รม�ล����ล�"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:1
+#: ../plugins/visualizer/visualizer-controls.ui.h:1
 msgid "Disable"
 msgstr "�ิ�����า�"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:2
+#: ../plugins/visualizer/visualizer-controls.ui.h:2
 msgid "Mode:"
 msgstr "รู����:"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:3
+#: ../plugins/visualizer/visualizer-controls.ui.h:3
 msgid "Quality:"
 msgstr "�ุ�ภา�:"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:4
+#: ../plugins/visualizer/visualizer-controls.ui.h:4
 msgid "Screen:"
 msgstr "ห��า�อ:"
 
-#: ../plugins/visualizer/visualizer-controls.glade.h:5
+#: ../plugins/visualizer/visualizer-controls.ui.h:5
 msgid "Visualization:"
 msgstr "ภา��อ��������:"
 
@@ -3111,137 +3286,136 @@ msgstr "�อ���ส��"
 msgid "There was a problem adding this podcast: %s.  Please verify the URL: %s"
 msgstr "��ิ��ั�หา��ะ��ิ�ม�อ���ส���ี�: %s �รุ�า�รว�สอ� URL: %s"
 
-#: ../podcast/rb-podcast-parse.c:168
+#: ../podcast/rb-podcast-parse.c:183
 #, c-format
 msgid "Unable to check file type: %s"
 msgstr "�ม�สามาร��รว�สอ���ิ��อ����ม: %s"
 
-#: ../podcast/rb-podcast-parse.c:187
+#: ../podcast/rb-podcast-parse.c:202
 #, c-format
 msgid "Unexpected file type: %s"
 msgstr "�����ม��ิ��ี��ม��า�หมาย: %s"
 
-#: ../podcast/rb-podcast-parse.c:210
+#: ../podcast/rb-podcast-parse.c:225
 #, c-format
 msgid "Unable to parse the feed contents"
 msgstr "�ม�สามาร������ื�อหา�อ��าร��อ�"
 
-#: ../podcast/rb-podcast-parse.c:224
+#: ../podcast/rb-podcast-parse.c:239
 #, c-format
 msgid "The feed does not contain any downloadable items"
 msgstr "�าร��อ��ม�มีราย�าร���ี��าว���หล����"
 
-#: ../podcast/rb-podcast-properties-dialog.c:435
+#: ../podcast/rb-podcast-properties-dialog.c:431
 msgid "Not Downloaded"
 msgstr "�ม�����าว���หล�"
 
-#: ../remote/dbus/rb-client.c:81
+#: ../remote/dbus/rb-client.c:82
 msgid "Don't start a new instance of Rhythmbox"
 msgstr "�ม���อ���ิ� 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 "ออ��า� Rhythmbox"
 
-#: ../remote/dbus/rb-client.c:84
+#: ../remote/dbus/rb-client.c:85
 msgid "Don't present an existing Rhythmbox window"
 msgstr "�ม���อ��ส��ห��า��า� Rhythmbox �ี���ิ�อยู�"
 
-#: ../remote/dbus/rb-client.c:85
+#: ../remote/dbus/rb-client.c:86
 msgid "Hide the Rhythmbox window"
 msgstr "��อ�ห��า��า� Rhythmbox"
 
-#: ../remote/dbus/rb-client.c:87
+#: ../remote/dbus/rb-client.c:88
 msgid "Jump to next song"
 msgstr "�ระ������ี���ล��ั���"
 
-#: ../remote/dbus/rb-client.c:88
+#: ../remote/dbus/rb-client.c:89
 msgid "Jump to previous song"
 msgstr "�ระ������ี���ล���อ�ห��า"
 
-#: ../remote/dbus/rb-client.c:90
+#: ../remote/dbus/rb-client.c:91
 msgid "Show notification of the playing song"
 msgstr "�ส���รอ������ห�ุ��ี�ยว�ั���ล��ี��ล��อยู�"
 
-#: ../remote/dbus/rb-client.c:92
+#: ../remote/dbus/rb-client.c:93
 msgid "Resume playback if currently paused"
 msgstr "�ล����ล���อ��า�ั�อยู�"
 
-#: ../remote/dbus/rb-client.c:93
+#: ../remote/dbus/rb-client.c:94
 msgid "Pause playback if currently playing"
 msgstr "�ั���ล���า�ำลั��ล��อยู�"
 
-#: ../remote/dbus/rb-client.c:94
+#: ../remote/dbus/rb-client.c:95
 msgid "Toggle play/pause mode"
 msgstr "สลั�ส�า�ะ�าร�ล��/�ั�"
 
 #. { "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 "�ล�� URI �ี��ำห�� ��ย�ำ���า��า�ำ����"
 
-#: ../remote/dbus/rb-client.c:97
+#: ../remote/dbus/rb-client.c:98
 msgid "URI to play"
 msgstr "URI �ี��ะ�ล��"
 
-#: ../remote/dbus/rb-client.c:98
+#: ../remote/dbus/rb-client.c:99
 msgid "Add specified tracks to the play queue"
 msgstr "��ิ�ม��ล��ี��ำห��ล����ิว�ล����ล�"
 
-#: ../remote/dbus/rb-client.c:99
+#: ../remote/dbus/rb-client.c:100
 msgid "Empty the play queue before adding new tracks"
 msgstr "ล�า��ิว�ล����ล���อ��ี��ะ��ิ�ม��ล��หม�"
 
-#: ../remote/dbus/rb-client.c:101
+#: ../remote/dbus/rb-client.c:102
 msgid "Print the title and artist of the playing song"
 msgstr "�ิม���ื�อ��ล��ละศิล�ิ��อ���ล��ี��ล��อยู�"
 
-#: ../remote/dbus/rb-client.c:102
+#: ../remote/dbus/rb-client.c:103
 msgid "Print formatted details of the song"
 msgstr "�ิม��รายละ�อีย��อ���ล���ย�ั�รู������วย"
 
-#: ../remote/dbus/rb-client.c:104
+#: ../remote/dbus/rb-client.c:105
 msgid "Set the playback volume"
 msgstr "�ั���วาม�ั��สีย�"
 
-#: ../remote/dbus/rb-client.c:105
+#: ../remote/dbus/rb-client.c:106
 msgid "Increase the playback volume"
 msgstr "��ิ�ม�วาม�ั��สีย�"
 
-#: ../remote/dbus/rb-client.c:106
+#: ../remote/dbus/rb-client.c:107
 msgid "Decrease the playback volume"
 msgstr "ล��วาม�ั��สีย�"
 
-#: ../remote/dbus/rb-client.c:107
+#: ../remote/dbus/rb-client.c:108
 msgid "Print the current playback volume"
 msgstr "�ิม���วาม�ั��สีย��ั��ุ�ั�"
 
-#: ../remote/dbus/rb-client.c:108
+#: ../remote/dbus/rb-client.c:109
 msgid "Mute playback"
 msgstr "�ิ��สีย�"
 
-#: ../remote/dbus/rb-client.c:109
+#: ../remote/dbus/rb-client.c:110
 msgid "Unmute playback"
 msgstr "��ิ��สีย�"
 
-#: ../remote/dbus/rb-client.c:452 ../remote/dbus/rb-client.c:478
-#: ../shell/rb-shell.c:2158
-msgid "Not playing"
-msgstr "�ม�����ล��"
+#: ../remote/dbus/rb-client.c:111
+msgid "Set the rating of the current song"
+msgstr "�ห��ะ�����ล��ี��ำลั��ล��"
 
-#: ../remote/dbus/rb-client.c:706
+#: ../remote/dbus/rb-client.c:736
 #, c-format
 msgid "Playback is muted.\n"
 msgstr "�ิ��สีย�อยู�\n"
 
-#: ../remote/dbus/rb-client.c:707
+#: ../remote/dbus/rb-client.c:737
 #, c-format
 msgid "Playback volume is %f.\n"
 msgstr "�วาม�ั��สีย��ือ %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 "�ั��หม�"
@@ -3249,12 +3423,12 @@ msgstr "�ั��หม�"
 #: ../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 ""
 "�า���อมูล�ี��ู�สร�า���ย Rhythmbox รุ���ี��หม��ว�า �ละ Rhythmbox รุ���ี��ม�สามาร�อ�า��า���อมูล�ี����"
 
-#: ../rhythmdb/rhythmdb.c:721
+#: ../rhythmdb/rhythmdb.c:751
 #, c-format
 msgid "Couldn't access %s: %s"
 msgstr "�ม�สามาร����า��� %s: %s"
@@ -3264,7 +3438,7 @@ msgstr "�ม�สามาร����า��� %s: %s"
 #. * a local artist name if desired.  Ensure the album name
 #. * and song title are also replaced in this case.
 #.
-#: ../rhythmdb/rhythmdb.c:1650
+#: ../rhythmdb/rhythmdb.c:1694
 msgid "The Beatles"
 msgstr "����ย �ม�อิ���ย�"
 
@@ -3272,7 +3446,7 @@ msgstr "����ย �ม�อิ���ย�"
 #. * example artist name is localised, this should be replaced
 #. * with the name of an album by that artist.
 #.
-#: ../rhythmdb/rhythmdb.c:1656
+#: ../rhythmdb/rhythmdb.c:1700
 msgid "Help!"
 msgstr "รั����"
 
@@ -3280,38 +3454,51 @@ msgstr "รั����"
 #. * artist and album names are localised, this should be replaced
 #. * with the name of the seventh song from the localised album.
 #.
-#: ../rhythmdb/rhythmdb.c:1662
+#: ../rhythmdb/rhythmdb.c:1706
 msgid "Ticket To Ride"
 msgstr "�����า"
 
-#: ../rhythmdb/rhythmdb.c:2207
+#: ../rhythmdb/rhythmdb.c:2255
 msgid "invalid unicode in error message"
 msgstr "รหัสยู�ิ�����ม��ู���อ�����อ�วาม������อ�ิ��ลา�"
 
-#: ../rhythmdb/rhythmdb.c:3072
+#: ../rhythmdb/rhythmdb.c:2316
+#, c-format
+msgid "Empty file"
+msgstr "���มว�า���ล�า"
+
+#. Translators: the parameter here is a list of GStreamer plugins.
+#. * The plugin names are already translated.
+#.
+#: ../rhythmdb/rhythmdb.c:2427
+#, c-format
+msgid "Additional GStreamer plugins are required to play this file: %s"
+msgstr "��อ��าร�ลั��อิ��อ� GStreamer ��ิ�ม��ิม��ื�อ�ล�����ม�ี�: %s"
+
+#: ../rhythmdb/rhythmdb.c:3187
 msgid "Could not load the music database:"
 msgstr "�ม�สามาร�อ�า��า���อมูล��ล�:"
 
-#: ../rhythmdb/rhythmdb.c:4435
+#: ../rhythmdb/rhythmdb.c:4555
 #, c-format
 msgid "%ld minute"
 msgid_plural "%ld minutes"
 msgstr[0] "%ld �า�ี"
 
-#: ../rhythmdb/rhythmdb.c:4436
+#: ../rhythmdb/rhythmdb.c:4556
 #, c-format
 msgid "%ld hour"
 msgid_plural "%ld hours"
 msgstr[0] "%ld �ั�ว�ม�"
 
-#: ../rhythmdb/rhythmdb.c:4437
+#: ../rhythmdb/rhythmdb.c:4557
 #, c-format
 msgid "%ld day"
 msgid_plural "%ld days"
 msgstr[0] "%ld วั�"
 
 #. Translators: the format is "X days, X hours and X minutes"
-#: ../rhythmdb/rhythmdb.c:4443
+#: ../rhythmdb/rhythmdb.c:4563
 #, c-format
 msgid "%s, %s and %s"
 msgstr "%s %s %s"
@@ -3319,47 +3506,52 @@ msgstr "%s %s %s"
 #. Translators: the format is "X days and X hours"
 #. Translators: the format is "X days and X minutes"
 #. Translators: the format is "X hours and X minutes"
-#: ../rhythmdb/rhythmdb.c:4449 ../rhythmdb/rhythmdb.c:4457
-#: ../rhythmdb/rhythmdb.c:4468
+#: ../rhythmdb/rhythmdb.c:4569 ../rhythmdb/rhythmdb.c:4577
+#: ../rhythmdb/rhythmdb.c:4588
 #, c-format
 msgid "%s and %s"
 msgstr "%s %s"
 
-#: ../shell/main.c:114
+#: ../shell/main.c:111
 msgid "Enable debug output"
 msgstr "��ิ���อ�วาม�ี�ั��"
 
-#: ../shell/main.c:115
+#: ../shell/main.c:112
 msgid "Enable debug output matching a specified string"
 msgstr "��ิ���อ�วาม�ี�ั���ี�มีรู�����ร��ั��ี��ำห��"
 
-#: ../shell/main.c:116
+#: ../shell/main.c:113
 msgid "Do not update the library with file changes"
 msgstr "�ม���อ��รั���อมูล�ลั���ล��าม�าร��ลี�ย���ล��อ����ม"
 
-#: ../shell/main.c:117
+#: ../shell/main.c:114
 msgid "Do not register the shell"
 msgstr "�ม���อ�ล��ะ��ีย���ลล�"
 
-#: ../shell/main.c:118
+#: ../shell/main.c:115
 msgid "Don't save any data permanently (implies --no-registration)"
 msgstr "�ม���อ��ั��ึ���อมูล��� ������าวร (��ิ���� --no-registration ��ยอั���มั�ิ)"
 
-#: ../shell/main.c:119
+#: ../shell/main.c:116
 msgid "Path for database file to use"
 msgstr "�า��อ����ม�า���อมูล�ี����"
 
-#: ../shell/main.c:120
+#: ../shell/main.c:117
 msgid "Path for playlists file to use"
 msgstr "�า��อ����มราย�าร��ล��ี����"
 
-#: ../shell/main.c:122
+#: ../shell/main.c:119
 msgid "[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"
+"�รีย� '%s --help' ��ื�อ�ู�ัว�ลือ��รร�ั��ำสั���ั��หม�\n"
 
 #: ../shell/rb-playlist-manager.c:161
 msgid "MPEG Version 3.0 URL"
@@ -3486,41 +3678,41 @@ msgstr "ราย�าร��ล��ม�รู��ั�: %s"
 msgid "Playlist %s is an automatic playlist"
 msgstr "ราย�าร��ล� %s ����ราย�าร��ล�อั���มั�ิ"
 
-#: ../shell/rb-removable-media-manager.c:153
+#: ../shell/rb-removable-media-manager.c:151
 msgid "Eject this medium"
 msgstr "�อ�สื�อ�ี�ออ�"
 
-#: ../shell/rb-removable-media-manager.c:155
+#: ../shell/rb-removable-media-manager.c:153
 msgid "_Extract to Library"
 msgstr "_�ั�ลอ����า�ลั���ล�"
 
-#: ../shell/rb-removable-media-manager.c:156
+#: ../shell/rb-removable-media-manager.c:154
 msgid "Copy all tracks to the library"
 msgstr "�ั�ลอ��ุ���ล����า�ลั���ล�"
 
-#: ../shell/rb-removable-media-manager.c:158
+#: ../shell/rb-removable-media-manager.c:156
 msgid "_Scan Removable Media"
 msgstr "_�รว�หาสื�อ�อ��สีย�"
 
-#: ../shell/rb-removable-media-manager.c:159
+#: ../shell/rb-removable-media-manager.c:157
 msgid "Scan for new Removable Media"
 msgstr "�รว�หาสื�อ�อ��สีย��ิ���หม�"
 
 #. 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:710
 msgid "Extract"
 msgstr "�ั�ลอ�"
 
-#: ../shell/rb-removable-media-manager.c:756
+#: ../shell/rb-removable-media-manager.c:741
 msgid "Unable to eject"
 msgstr "�ม�สามาร��อ�สื�อออ�"
 
-#: ../shell/rb-removable-media-manager.c:777
+#: ../shell/rb-removable-media-manager.c:762
 msgid "Unable to unmount"
 msgstr "�ม�สามาร��ลิ��มา���"
 
-#: ../shell/rb-removable-media-manager.c:978
+#: ../shell/rb-removable-media-manager.c:963
 msgid "Error transferring track"
 msgstr "��ิ���อ�ิ��ลา���ะ��าย�อ���ล�"
 
@@ -3566,7 +3758,7 @@ msgstr "��ะสิ���ี��ลือ�"
 
 #: ../shell/rb-shell-clipboard.c:167
 msgid "_Remove"
-msgstr "_ล�"
+msgstr "�อาออ_�"
 
 #: ../shell/rb-shell-clipboard.c:168 ../shell/rb-shell-clipboard.c:182
 msgid "Remove selection"
@@ -3608,362 +3800,348 @@ msgstr "�ุ�_สม�ั�ิ"
 msgid "Show information on the selected song"
 msgstr "�ส����อมูล�อ���ล��ี��ลือ�"
 
-#: ../shell/rb-shell-player.c:318
+#: ../shell/rb-shell-player.c:309
 msgid "Pre_vious"
 msgstr "_��อ�ห��า"
 
-#: ../shell/rb-shell-player.c:319
+#: ../shell/rb-shell-player.c:310
 msgid "Start playing the previous song"
 msgstr "�ล����ล���อ�ห��า"
 
-#: ../shell/rb-shell-player.c:321
+#: ../shell/rb-shell-player.c:312
 msgid "_Next"
 msgstr "_�ั���"
 
-#: ../shell/rb-shell-player.c:322
+#: ../shell/rb-shell-player.c:313
 msgid "Start playing the next song"
 msgstr "�ล����ล��ั���"
 
-#: ../shell/rb-shell-player.c:324
+#: ../shell/rb-shell-player.c:315
 msgid "_Increase Volume"
 msgstr "�_�ิ�ม�วาม�ั�"
 
-#: ../shell/rb-shell-player.c:325
+#: ../shell/rb-shell-player.c:316
 msgid "Increase playback volume"
 msgstr "��ิ�ม�วาม�ั��สีย�"
 
-#: ../shell/rb-shell-player.c:327
+#: ../shell/rb-shell-player.c:318
 msgid "_Decrease Volume"
 msgstr "_ล��วาม�ั�"
 
-#: ../shell/rb-shell-player.c:328
+#: ../shell/rb-shell-player.c:319
 msgid "Decrease playback volume"
 msgstr "ล��วาม�ั��สีย�"
 
-#: ../shell/rb-shell-player.c:335
+#: ../shell/rb-shell-player.c:326
 msgid "_Play"
 msgstr "_�ล��"
 
-#: ../shell/rb-shell-player.c:336 ../shell/rb-shell-player.c:3807
+#: ../shell/rb-shell-player.c:327 ../shell/rb-shell-player.c:3738
 msgid "Start playback"
 msgstr "�ริ�ม�าร�ล��"
 
-#: ../shell/rb-shell-player.c:338
+#: ../shell/rb-shell-player.c:329
 msgid "Sh_uffle"
 msgstr "สุ�_ม"
 
-#: ../shell/rb-shell-player.c:339
+#: ../shell/rb-shell-player.c:330
 msgid "Play songs in a random order"
 msgstr "�ล����ล����สุ�มลำ�ั�"
 
-#: ../shell/rb-shell-player.c:341
+#: ../shell/rb-shell-player.c:332
 msgid "_Repeat"
 msgstr "�ล�_���ำ"
 
-#: ../shell/rb-shell-player.c:342
+#: ../shell/rb-shell-player.c:333
 msgid "Play first song again after all songs are played"
 msgstr "�ล����ล��ร�อี��รั���มื�อ�ล���ร��ล�ว"
 
-#: ../shell/rb-shell-player.c:344
+#: ../shell/rb-shell-player.c:335
 msgid "_Song Position Slider"
 msgstr "�ุ�มรา��ลื�อ��ำ�ห������_�ล�"
 
-#: ../shell/rb-shell-player.c:345
+#: ../shell/rb-shell-player.c:336
 msgid "Change the visibility of the song position slider"
 msgstr "�ส��หรือ��อ��ุ�มรา��ลื�อ��ำ�ห����าร�ล����ล�"
 
-#: ../shell/rb-shell-player.c:814
+#: ../shell/rb-shell-player.c:788
 msgid "Stream error"
 msgstr "ส�รีม�ิ��ลา�"
 
-#: ../shell/rb-shell-player.c:815
+#: ../shell/rb-shell-player.c:789
 msgid "Unexpected end of stream!"
 msgstr "���ุ����อ�ส�รีม��อ��ำห��!"
 
-#: ../shell/rb-shell-player.c:945
+#: ../shell/rb-shell-player.c:919
 msgid "Linear"
 msgstr "�ามลำ�ั�"
 
-#: ../shell/rb-shell-player.c:947
+#: ../shell/rb-shell-player.c:921
 msgid "Linear looping"
 msgstr "ว���ำ����รีย�ลำ�ั�"
 
-#: ../shell/rb-shell-player.c:949
+#: ../shell/rb-shell-player.c:923
 msgid "Shuffle"
 msgstr "สุ�ม"
 
-#: ../shell/rb-shell-player.c:951
+#: ../shell/rb-shell-player.c:925
 msgid "Random with equal weights"
 msgstr "สุ�ม�ล��������า��ียม�ั�หม�"
 
-#: ../shell/rb-shell-player.c:953
+#: ../shell/rb-shell-player.c:927
 msgid "Random by time since last play"
 msgstr "สุ�ม�ล���าม�วลา�ั������ล���รั��ล�าสุ�"
 
-#: ../shell/rb-shell-player.c:955
+#: ../shell/rb-shell-player.c:929
 msgid "Random by rating"
 msgstr "สุ�ม�ล���าม�ะ���"
 
-#: ../shell/rb-shell-player.c:957
+#: ../shell/rb-shell-player.c:931
 msgid "Random by time since last play and rating"
 msgstr "สุ�ม�ล���าม�วลา�ั������ล���รั��ล�าสุ� �ละ�าม�ะ���"
 
-#: ../shell/rb-shell-player.c:959
+#: ../shell/rb-shell-player.c:933
 msgid "Linear, removing entries once played"
 msgstr "�ามลำ�ั� ��ยล�ราย�าร�ี��ล���ล�วออ�"
 
-#: ../shell/rb-shell-player.c:969
+#: ../shell/rb-shell-player.c:943
 #, c-format
 msgid "Failed to create the player: %s"
 msgstr "�ม�สามาร�สร�า��ัว�ล��: %s"
 
-#: ../shell/rb-shell-player.c:1526
+#: ../shell/rb-shell-player.c:1489
 #, c-format
 msgid "Playlist was empty"
 msgstr "ราย�าร��ล�ว�า���ล�า"
 
-#: ../shell/rb-shell-player.c:2033
+#: ../shell/rb-shell-player.c:1978
 #, c-format
 msgid "Not currently playing"
 msgstr "�ม�����ล����ล�อยู�"
 
-#: ../shell/rb-shell-player.c:2091
+#: ../shell/rb-shell-player.c:2036
 #, c-format
 msgid "No previous song"
 msgstr "�ม�มี��ล���อ�ห��า"
 
-#: ../shell/rb-shell-player.c:2191
+#: ../shell/rb-shell-player.c:2136
 #, c-format
 msgid "No next song"
 msgstr "�ม�มี��ล��ั���"
 
-#: ../shell/rb-shell-player.c:2312 ../shell/rb-shell-player.c:3438
+#: ../shell/rb-shell-player.c:2257 ../shell/rb-shell-player.c:3389
 msgid "Couldn't start playback"
 msgstr "�ม�สามาร��ริ�ม�ล�����"
 
-#: ../shell/rb-shell-player.c:3194
+#: ../shell/rb-shell-player.c:3151
 msgid "Couldn't stop playback"
 msgstr "�ม�สามาร�หยุ��ล�����"
 
-#: ../shell/rb-shell-player.c:3310
+#: ../shell/rb-shell-player.c:3261
 #, c-format
 msgid "Playback position not available"
 msgstr "�ม�มี��อมูล�ำ�ห����าร�ล����ล�"
 
-#: ../shell/rb-shell-player.c:3342
+#: ../shell/rb-shell-player.c:3293
 #, c-format
 msgid "Current song is not seekable"
 msgstr "��ล��ั��ุ�ั��ม�สามาร���ลี�ย��ำ�ห������"
 
-#: ../shell/rb-shell-player.c:3805
+#: ../shell/rb-shell-player.c:3736
 msgid "Stop playback"
 msgstr "หยุ��ล��"
 
-#: ../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 "�ม�สามาร��ส��วิ�ี���"
 
-#: ../shell/rb-shell-preferences.c:206
+#: ../shell/rb-shell-preferences.c:202
 msgid "Music Player Preferences"
 msgstr "�รั�������ร��รม�ล����ล�"
 
-#: ../shell/rb-shell-preferences.c:261
+#: ../shell/rb-shell-preferences.c:255
 msgid "General"
 msgstr "�ั�ว��"
 
-#: ../shell/rb-shell-preferences.c:320
+#: ../shell/rb-shell-preferences.c:304
 msgid "Playback"
 msgstr "�าร�ล��"
 
-#: ../shell/rb-shell.c:419
+#: ../shell/rb-shell.c:389
 msgid "_Music"
 msgstr "�_�ล�"
 
-#: ../shell/rb-shell.c:421
+#: ../shell/rb-shell.c:391
 msgid "_View"
 msgstr "มุ_มมอ�"
 
-#: ../shell/rb-shell.c:422
+#: ../shell/rb-shell.c:392
 msgid "_Control"
 msgstr "_�ว��ุม"
 
-#: ../shell/rb-shell.c:423
+#: ../shell/rb-shell.c:393
 msgid "_Tools"
 msgstr "��รื�อ_�มือ"
 
-#: ../shell/rb-shell.c:424
+#: ../shell/rb-shell.c:394
 msgid "_Help"
 msgstr "_วิ�ี���"
 
-#: ../shell/rb-shell.c:426
+#: ../shell/rb-shell.c:396
 msgid "_Import Folder..."
 msgstr "_�ำ���า��ล��อร�..."
 
-#: ../shell/rb-shell.c:427
+#: ../shell/rb-shell.c:397
 msgid "Choose folder to be added to the Library"
 msgstr "�ลือ���ล��อร��ี���อ��าร��ิ�ม���า�ลั���ล�"
 
-#: ../shell/rb-shell.c:429
+#: ../shell/rb-shell.c:399
 msgid "Import _File..."
 msgstr "�ำ���า�_��ม..."
 
-#: ../shell/rb-shell.c:430
+#: ../shell/rb-shell.c:400
 msgid "Choose file to be added to the Library"
 msgstr "�ลือ����ม�ี���อ��าร��ิ�ม���า�ลั���ล�"
 
-#: ../shell/rb-shell.c:432
+#: ../shell/rb-shell.c:402
 msgid "_About"
 msgstr "�_�ี�ยว�ั�"
 
-#: ../shell/rb-shell.c:433
+#: ../shell/rb-shell.c:403
 msgid "Show information about the music player"
 msgstr "�ส����อมูล�อ���ร��รม�ล����ล�"
 
-#: ../shell/rb-shell.c:435
+#: ../shell/rb-shell.c:405
 msgid "_Contents"
 msgstr "��ื�อ_หา"
 
-#: ../shell/rb-shell.c:436
+#: ../shell/rb-shell.c:406
 msgid "Display music player help"
 msgstr "�ส��วิ�ี�าร����า���ร��รม�ล����ล�"
 
-#: ../shell/rb-shell.c:438
-msgid "_Close"
-msgstr "�ิ_�"
-
-#: ../shell/rb-shell.c:439
-msgid "Hide the music player window"
-msgstr "��อ�ห��า��า���ร��รม�ล����ล�"
-
-#: ../shell/rb-shell.c:441
+#: ../shell/rb-shell.c:408
 msgid "_Quit"
 msgstr "_ออ�"
 
-#: ../shell/rb-shell.c:442
+#: ../shell/rb-shell.c:409
 msgid "Quit the music player"
 msgstr "ออ��า���ร��รม�ล����ล�"
 
-#: ../shell/rb-shell.c:444
+#: ../shell/rb-shell.c:411
 msgid "Prefere_nces"
 msgstr "_�รั�����..."
 
-#: ../shell/rb-shell.c:445
+#: ../shell/rb-shell.c:412
 msgid "Edit music player preferences"
 msgstr "�������า�รั������อ���ร��รม�ล����ล�"
 
-#: ../shell/rb-shell.c:447
+#: ../shell/rb-shell.c:414
 msgid "Plu_gins"
 msgstr "�ลั�_�อิ�"
 
-#: ../shell/rb-shell.c:448
+#: ../shell/rb-shell.c:415
 msgid "Change and configure plugins"
 msgstr "��ลี�ย��ละ�ั����า�ลั��อิ�"
 
-#: ../shell/rb-shell.c:450
+#: ../shell/rb-shell.c:417
 msgid "Show _All Tracks"
 msgstr "�ส����ล�_�ั��หม�"
 
-#: ../shell/rb-shell.c:451
+#: ../shell/rb-shell.c:418
 msgid "Show all tracks in this music source"
 msgstr "�ส����ล��ั��หม����หล����ล��ี�"
 
-#: ../shell/rb-shell.c:453
+#: ../shell/rb-shell.c:420
 msgid "_Jump to Playing Song"
 msgstr "��_ยั���ล��ี��ำลั��ล��"
 
-#: ../shell/rb-shell.c:454
+#: ../shell/rb-shell.c:421
 msgid "Scroll the view to the currently playing song"
 msgstr "�ลื�อ����ส����ล��ี��ำลั��ล��"
 
-#: ../shell/rb-shell.c:461
+#: ../shell/rb-shell.c:428
 msgid "Side _Pane"
 msgstr "��อ���า�_��า�"
 
-#: ../shell/rb-shell.c:462
+#: ../shell/rb-shell.c:429
 msgid "Change the visibility of the side pane"
 msgstr "��อ�หรือ�ส����อ���า���า�"
 
-#: ../shell/rb-shell.c:464
+#: ../shell/rb-shell.c:431
 msgid "T_oolbar"
 msgstr "�_����รื�อ�มือ"
 
-#: ../shell/rb-shell.c:465
+#: ../shell/rb-shell.c:432
 msgid "Change the visibility of the toolbar"
 msgstr "��อ�หรือ�ส�������รื�อ�มือ"
 
-#: ../shell/rb-shell.c:467
+#: ../shell/rb-shell.c:434
 msgid "_Small Display"
 msgstr "�_�า��ล��"
 
-#: ../shell/rb-shell.c:468
+#: ../shell/rb-shell.c:435
 msgid "Make the main window smaller"
 msgstr "�รั�ห��า��า��ห�������า��ล��"
 
-#: ../shell/rb-shell.c:470
+#: ../shell/rb-shell.c:437
 msgid "Party _Mode"
 msgstr "�หม��า��_ลี�ย�"
 
-#: ../shell/rb-shell.c:471
+#: ../shell/rb-shell.c:438
 msgid "Change the status of the party mode"
 msgstr "��ลี�ย�ส�า�ะ�����หม��า��ลี�ย�"
 
-#: ../shell/rb-shell.c:473
+#: ../shell/rb-shell.c:440
 msgid "Play _Queue as Side Pane"
 msgstr "_�ิว��ล�����อ���า���า�"
 
-#: ../shell/rb-shell.c:474
+#: ../shell/rb-shell.c:441
 msgid "Change whether the queue is visible as a source or a sidebar"
 msgstr "�ลือ�ว�า�ะ�ส���ิว��ล�����อ���า���า�หรือ�ส�������หล����ล�"
 
-#: ../shell/rb-shell.c:476
+#: ../shell/rb-shell.c:443
 msgid "S_tatusbar"
 msgstr "���ส_�า�ะ"
 
-#: ../shell/rb-shell.c:477
+#: ../shell/rb-shell.c:444
 msgid "Change the visibility of the statusbar"
 msgstr "��อ�หรือ�ส�����ส�า�ะ"
 
-#: ../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 "�ม�สามาร�ย�าย���ม��อมูล�อ��ู����"
 
-#: ../shell/rb-shell.c:1311
+#: ../shell/rb-shell.c:1294
 msgid "Change the music volume"
 msgstr "�รั��วาม�ั��สีย�"
 
-#: ../shell/rb-shell.c:1783
+#: ../shell/rb-shell.c:1701
 msgid "Error while saving song information"
 msgstr "��ิ���อ�ิ��ลา����าร�ั��ึ���อมูล��ล�"
 
-#: ../shell/rb-shell.c:1932
+#: ../shell/rb-shell.c:1806
 #, c-format
 msgid "Transferring track %d out of %d (%.0f%%)"
 msgstr "�ำลั���าย�อ���ล��ี� %d �า� %d (%.0f%%)"
 
-#: ../shell/rb-shell.c:1935
+#: ../shell/rb-shell.c:1809
 #, c-format
 msgid "Transferring track %d out of %d"
 msgstr "�ำลั���าย�อ���ล��ี� %d �า� %d"
 
-#. Translators: the %s is the elapsed and total time
-#: ../shell/rb-shell.c:2161
-#, c-format
-msgid "Paused, %s"
-msgstr "หยุ��ั� %s"
-
 #. Translators: %s is the song name
-#: ../shell/rb-shell.c:2203
+#: ../shell/rb-shell.c:2009
 #, c-format
 msgid "%s (Paused)"
 msgstr "%s (หยุ��ั�)"
 
-#: ../shell/rb-shell.c:2307
+#: ../shell/rb-shell.c:2113
 msgid "translator-credits"
 msgstr ""
 "Isriya Paireepairit <markpeak gmail com>\n"
 "Theppitak Karoonboonyanan <thep linux thai net>"
 
-#: ../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"
@@ -3974,7 +4152,7 @@ msgstr ""
 "ภาย�����ื�อ����อ� GNU General Public License �ี���ย��ร���ยมูล�ิ�ิ�อ����วร��สรี\n"
 "�ม�ว�า�ะ����สั��าอ�ุ�า�รุ���ี� 2 หรือรุ���ั�มา (�าม����ุ��ะ�ลือ�)\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"
@@ -3986,7 +4164,7 @@ msgstr ""
 "หรือ *�วาม�หมาะสมสำหรั�วั��ุ�ระส������าะ�ิ����*\n"
 "�รุ�าอ�า� GNU General Public License ��ื�อ�ูรายละ�อีย���ิ�ม��ิม\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"
@@ -3996,66 +4174,54 @@ msgstr ""
 "��า�ุ��ม����รั� �รุ�า�ิ���อ���ี� Free Software Foundation, Inc., 59 Temple Place,\n"
 "Suite 330, Boston, MA  02111-1307  USA\n"
 
-#: ../shell/rb-shell.c:2325
+#: ../shell/rb-shell.c:2131
 msgid "Maintainers:"
 msgstr "�ู��ู�ล:"
 
-#: ../shell/rb-shell.c:2328
+#: ../shell/rb-shell.c:2134
 msgid "Former Maintainers:"
 msgstr "�ู��ู�ล��อ�ี�:"
 
-#: ../shell/rb-shell.c:2331
+#: ../shell/rb-shell.c:2137
 msgid "Contributors:"
 msgstr "�ู�ร�วมสม��:"
 
-#: ../shell/rb-shell.c:2333
+#: ../shell/rb-shell.c:2139
 msgid "Music management and playback software for GNOME."
 msgstr "��ร��รม�ั��าร�ละ�ล����ล��อ� GNOME"
 
-#: ../shell/rb-shell.c:2342
+#: ../shell/rb-shell.c:2148
 msgid "Rhythmbox Website"
 msgstr "�ว������ Rhythmbox"
 
-#: ../shell/rb-shell.c:2441
+#: ../shell/rb-shell.c:2240
 msgid "Configure Plugins"
 msgstr "�ั����า�ลั��อิ�"
 
-#: ../shell/rb-shell.c:2512
+#: ../shell/rb-shell.c:2311
 msgid "Import Folder into Library"
 msgstr "��ิ�ม��ล�����ล��อร����า���ลั���ล�"
 
-#: ../shell/rb-shell.c:2534
+#: ../shell/rb-shell.c:2333
 msgid "Import File into Library"
 msgstr "��ิ�ม���ม���า���ลั���ล�"
 
-#. Translators: by Artist
-#: ../shell/rb-shell.c:3049
-#, c-format
-msgid "by <i>%s</i>"
-msgstr "��ย <i>%s</i>"
-
-#. Translators: from Album
-#: ../shell/rb-shell.c:3070
-#, c-format
-msgid "from <i>%s</i>"
-msgstr "�า� <i>%s</i>"
-
-#: ../shell/rb-shell.c:3278
+#: ../shell/rb-shell.c:2873
 #, c-format
 msgid "No registered source can handle URI %s"
 msgstr "�ม�มี�ัว�ั��าร�หล���ี�ล��ะ��ีย��ว��ี�สามาร��ั��าร URI %s"
 
-#: ../shell/rb-shell.c:3547 ../shell/rb-shell.c:3576
+#: ../shell/rb-shell.c:3142 ../shell/rb-shell.c:3171
 #, c-format
 msgid "Unknown song URI: %s"
 msgstr "�ม�รู��ั� URI �อ���ล�: %s"
 
-#: ../shell/rb-shell.c:3585
+#: ../shell/rb-shell.c:3180
 #, c-format
 msgid "Unknown property %s"
 msgstr "�ม�รู��ั��ุ�สม�ั�ิ %s"
 
-#: ../shell/rb-shell.c:3595
+#: ../shell/rb-shell.c:3190
 #, c-format
 msgid "Invalid property type %s for property %s"
 msgstr "��ิ��ุ�สม�ั�ิ %s �ม��ู���อ�สำหรั��ุ�สม�ั�ิ %s"
@@ -4076,79 +4242,63 @@ msgstr "�ลือ���ล��าม��ว��ล�, ศิล�
 msgid "Loading..."
 msgstr "�ำลั�อ�า�..."
 
-#: ../shell/rb-tray-icon.c:160
-msgid "_Show Music Player"
-msgstr "�_ส����ร��รม�ล����ล�"
-
-#: ../shell/rb-tray-icon.c:161
-msgid "Choose music to play"
-msgstr "�ลือ���ล��ี���อ��าร�ล��"
-
-#: ../shell/rb-tray-icon.c:163
-msgid "Show N_otifications"
-msgstr "�ส���รอ��_����ห�ุ"
-
-#: ../shell/rb-tray-icon.c:164
-msgid "Show notifications of song changes and other events"
-msgstr "�ส���รอ������าร��ลี�ย���ล��ละ�ห�ุ�าร��อื���"
-
-#: ../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 "���หา�ุ������อมูล"
 
-#: ../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 "ศิล�ิ�"
 
-#: ../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 "���หาศิล�ิ�"
 
-#: ../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 "อัล�ั�ม"
 
-#: ../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 "���หาอัล�ั�ม"
 
-#: ../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 "�ื�อ"
 
-#: ../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 "���หา�ื�อ"
 
-#: ../sources/rb-browser-source.c:162
+#: ../sources/rb-browser-source.c:160
 msgid "Browse This _Genre"
 msgstr "�ส�����าะ��ล��_�ว�ี�"
 
-#: ../sources/rb-browser-source.c:163
+#: ../sources/rb-browser-source.c:161
 msgid "Set the browser to view only this genre"
 msgstr "�ั���ห���ราว���อร��ส�����าะ��ล���ว�ี�"
 
-#: ../sources/rb-browser-source.c:165
+#: ../sources/rb-browser-source.c:163
 msgid "Browse This _Artist"
 msgstr "�ส�����าะ_ศิล�ิ��ี�"
 
-#: ../sources/rb-browser-source.c:166
+#: ../sources/rb-browser-source.c:164
 msgid "Set the browser to view only this artist"
 msgstr "�ั���ห���ราว���อร��ส�����าะศิล�ิ��ี�"
 
-#: ../sources/rb-browser-source.c:168
+#: ../sources/rb-browser-source.c:166
 msgid "Browse This A_lbum"
 msgstr "�ส�����าะ_อัล�ั�ม�ี�"
 
-#: ../sources/rb-browser-source.c:169
+#: ../sources/rb-browser-source.c:167
 msgid "Set the browser to view only this album"
 msgstr "�ั���ห���ราว���อร��ส�����าะอัล�ั�ม�ี�"
 
@@ -4174,7 +4324,7 @@ msgstr "ศิล�ิ�/อัล�ั�ม"
 msgid "Artist - Album"
 msgstr "ศิล�ิ� - อัล�ั�ม"
 
-#: ../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
@@ -4209,11 +4359,11 @@ msgstr "��ล�"
 msgid "Choose Library Location"
 msgstr "�ลือ��ำ�ห����ลั���ล�"
 
-#: ../sources/rb-library-source.c:601
+#: ../sources/rb-library-source.c:599
 msgid "Multiple locations set"
 msgstr "�ุ��ำ�ห�����ล�หลาย��ล�"
 
-#: ../sources/rb-library-source.c:996
+#: ../sources/rb-library-source.c:1008
 msgid "Example Path:"
 msgstr "�ัวอย�า��า�:"
 
@@ -4253,125 +4403,125 @@ msgstr "ล�า�"
 msgid "Play Queue"
 msgstr "�ิว��ล�"
 
-#: ../sources/rb-play-queue-source.c:428 ../widgets/rb-header.c:124
+#: ../sources/rb-play-queue-source.c:428 ../widgets/rb-header.c:125
 msgid "from"
 msgstr "�า�"
 
-#: ../sources/rb-play-queue-source.c:428 ../widgets/rb-header.c:125
+#: ../sources/rb-play-queue-source.c:428 ../widgets/rb-header.c:126
 msgid "by"
 msgstr "��ย"
 
-#: ../sources/rb-podcast-source.c:313
+#: ../sources/rb-podcast-source.c:307
 msgid "_New Podcast Feed..."
 msgstr "��ิ�ม�าร��อ��า�_�อ���ส��..."
 
-#: ../sources/rb-podcast-source.c:314
+#: ../sources/rb-podcast-source.c:308
 msgid "Subscribe to a new Podcast Feed"
 msgstr "สมั�รรั��าร��อ��อ��อ���ส��"
 
-#: ../sources/rb-podcast-source.c:317
+#: ../sources/rb-podcast-source.c:311
 msgid "Download _Episode"
 msgstr "�าว���หล�_�อ�"
 
-#: ../sources/rb-podcast-source.c:318
+#: ../sources/rb-podcast-source.c:312
 msgid "Download Podcast Episode"
 msgstr "�าว���หล��อ��อ��อ���ส��"
 
-#: ../sources/rb-podcast-source.c:320
+#: ../sources/rb-podcast-source.c:314
 msgid "_Cancel Download"
 msgstr "_ย��ลิ��าร�าว���หล�"
 
-#: ../sources/rb-podcast-source.c:321
+#: ../sources/rb-podcast-source.c:315
 msgid "Cancel Episode Download"
 msgstr "ย��ลิ��าร�าว���หล��อ�"
 
-#: ../sources/rb-podcast-source.c:324
+#: ../sources/rb-podcast-source.c:318
 msgid "Episode Properties"
 msgstr "�ุ�สม�ั�ิ�อ��อ�"
 
-#: ../sources/rb-podcast-source.c:326
+#: ../sources/rb-podcast-source.c:320
 msgid "_Update Podcast Feed"
 msgstr "_�รั���อมูล�าร��อ��อ��อ���ส��"
 
-#: ../sources/rb-podcast-source.c:327
+#: ../sources/rb-podcast-source.c:321
 msgid "Update Feed"
 msgstr "�รั���อมูล�าร��อ�"
 
-#: ../sources/rb-podcast-source.c:329
+#: ../sources/rb-podcast-source.c:323
 msgid "_Delete Podcast Feed"
 msgstr "_ล��าร��อ��อ��อ���ส��"
 
-#: ../sources/rb-podcast-source.c:330
+#: ../sources/rb-podcast-source.c:324
 msgid "Delete Feed"
 msgstr "ล��าร��อ�"
 
-#: ../sources/rb-podcast-source.c:332
+#: ../sources/rb-podcast-source.c:326
 msgid "_Update All Feeds"
 msgstr "_�รั���อมูล�าร��อ��ั��หม�"
 
-#: ../sources/rb-podcast-source.c:333
+#: ../sources/rb-podcast-source.c:327
 msgid "Update all feeds"
 msgstr "�รั���อมูล�าร��อ��ั��หม�"
 
-#: ../sources/rb-podcast-source.c:340
+#: ../sources/rb-podcast-source.c:334
 msgid "Feeds"
 msgstr "�าร��อ�"
 
-#: ../sources/rb-podcast-source.c:340
+#: ../sources/rb-podcast-source.c:334
 msgid "Search podcast feeds"
 msgstr "���หา�าร��อ��อ��อ���ส��"
 
-#: ../sources/rb-podcast-source.c:341
+#: ../sources/rb-podcast-source.c:335
 msgid "Episodes"
 msgstr "�อ�"
 
-#: ../sources/rb-podcast-source.c:341
+#: ../sources/rb-podcast-source.c:335
 msgid "Search podcast episodes"
 msgstr "���หา�อ��อ��อ���ส��"
 
 #. 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 "�หม�"
 
 #. 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 "�รั���อมูล"
 
-#: ../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 "วั��ี�"
 
-#: ../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 "�าร��อ�"
 
-#: ../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 "ส�า�ะ"
 
-#: ../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 "�าว���หล��ล�ว"
 
-#: ../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 "�ำลั�รอ"
 
-#: ../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 "ล�ม�หลว"
 
-#: ../sources/rb-podcast-source.c:930
+#: ../sources/rb-podcast-source.c:919
 msgid "Delete the podcast episode and downloaded file?"
 msgstr "ล��อ��อ��อ���ส���ละ���ม�ี��าว���หล�มา�ล�วหรือ�ม�?"
 
-#: ../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 "
@@ -4380,19 +4530,19 @@ msgstr ""
 "��า�ุ��ลือ��ี��ะล�ราย�าร�อ��ละ���ม�ั��ล�าว ��อมูล�ั��ล�าว�ะสู�หายอย�า��าวร ��ร�สั����ว�า "
 "�ุ�สามาร�ล�ราย�าร�อ���ย�����ม�ี��าว���หล�มา�ว���� ��ย�ลือ�ล����าะ�อ����า�ั��"
 
-#: ../sources/rb-podcast-source.c:941
+#: ../sources/rb-podcast-source.c:930
 msgid "Delete _Episode Only"
 msgstr "ล����าะ_ราย�าร�อ�"
 
-#: ../sources/rb-podcast-source.c:947
+#: ../sources/rb-podcast-source.c:936
 msgid "_Delete Episode And File"
 msgstr "ล�_�ั��ราย�าร�ละ���ม"
 
-#: ../sources/rb-podcast-source.c:1386
+#: ../sources/rb-podcast-source.c:1375
 msgid "Delete the podcast feed and downloaded files?"
 msgstr "�ุ���อ��ารล��าร��อ��อ��อ���ส���ละ���ม�ี��าว���หล�มาหรือ�ม�?"
 
-#: ../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 "
@@ -4401,56 +4551,56 @@ msgstr ""
 "��า�ุ��ลือ��ี��ะล��าร��อ��ละ���ม�ั��ล�าว ��อมูล�ั��ล�าว�ะสู�หายอย�า��าวร ��ร�สั����ว�า "
 "�ุ�สามาร�ล��าร��อ���ย�����ม�ี��าว���หล�มา�ว���� ��ย�ลือ�ล����าะ�าร��อ����า�ั��"
 
-#: ../sources/rb-podcast-source.c:1397
+#: ../sources/rb-podcast-source.c:1386
 msgid "Delete _Feed Only"
 msgstr "ล����าะ�าร_��อ�"
 
-#: ../sources/rb-podcast-source.c:1404
+#: ../sources/rb-podcast-source.c:1393
 msgid "_Delete Feed And Files"
 msgstr "ล�_�ั���าร��อ��ละ���ม"
 
-#: ../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 ราย�าร"
 
-#: ../sources/rb-podcast-source.c:1749
+#: ../sources/rb-podcast-source.c:1738
 msgid "Downloading podcast"
 msgstr "�ำลั��าว���หล��อ���ส��"
 
-#: ../sources/rb-podcast-source.c:1762
+#: ../sources/rb-podcast-source.c:1753
 msgid "Finished downloading podcast"
 msgstr "�าว���หล��อ���ส���สร���ล�ว"
 
-#: ../sources/rb-podcast-source.c:1775
+#: ../sources/rb-podcast-source.c:1768
 msgid "New updates available from"
 msgstr "มี��อมูล�หม��า�"
 
-#: ../sources/rb-podcast-source.c:1891
+#: ../sources/rb-podcast-source.c:1886
 msgid "Error in podcast"
 msgstr "��ิ���อ�ิ��ลา����อ���ส��"
 
-#: ../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 �ุ�ยั�����อ��าร��ิ�ม�าร��อ��อ��อ���ส��อยู�หรือ�ม�?"
 
-#: ../sources/rb-podcast-source.c:2025
+#: ../sources/rb-podcast-source.c:2020
 msgid "New Podcast Feed"
 msgstr "��ิ�ม�าร��อ��อ��อ���ส��"
 
-#: ../sources/rb-podcast-source.c:2025
+#: ../sources/rb-podcast-source.c:2020
 msgid "URL of podcast feed:"
 msgstr "URL �อ��าร��อ��อ��อ���ส��:"
 
-#: ../sources/rb-podcast-source.c:2041
+#: ../sources/rb-podcast-source.c:2036
 #, c-format
 msgid "%d episode"
 msgid_plural "%d episodes"
 msgstr[0] "%d �อ�"
 
-#: ../sources/rb-podcast-source.c:2149
+#: ../sources/rb-podcast-source.c:2144
 msgid "Podcast Error"
 msgstr "��ิ���อ�ิ��ลา���ี�ยว�ั��อ���ส��"
 
@@ -4484,18 +4634,6 @@ msgstr "�ำลั���ื�อม��อ"
 msgid "Buffering"
 msgstr "�ำลั��ำ�ั���อร�"
 
-#: ../widgets/eggtrayicon.c:147
-msgid "Orientation"
-msgstr "��ววา�"
-
-#: ../widgets/eggtrayicon.c:148
-msgid "The orientation of the tray."
-msgstr "��ววา��อ��า�"
-
-#: ../widgets/eggtrayicon.c:521
-msgid "Notification"
-msgstr "�าร�����ห�ุ"
-
 #: ../widgets/rb-cell-renderer-pixbuf.c:118
 msgid "Pixbuf Object"
 msgstr "อ�อ������ Pixbuf"
@@ -4504,69 +4642,69 @@ msgstr "อ�อ������ Pixbuf"
 msgid "The pixbuf to render."
 msgstr "Pixbuf �ี��ะวา�"
 
-#: ../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 "�ม��สียรายละ�อีย�"
 
-#: ../widgets/rb-entry-view.c:1414
+#: ../widgets/rb-entry-view.c:1465
 msgid "Track"
 msgstr "ลำ�ั�"
 
-#: ../widgets/rb-entry-view.c:1465
+#: ../widgets/rb-entry-view.c:1516
 msgid "Time"
 msgstr "�วลา"
 
-#: ../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 "�ี"
 
-#: ../widgets/rb-entry-view.c:1489
+#: ../widgets/rb-entry-view.c:1540
 msgid "Quality"
 msgstr "�ุ�ภา�"
 
-#: ../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 "�ะ���"
 
-#: ../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 "�ำ�ว��รั���ี��ล��"
 
-#: ../widgets/rb-entry-view.c:1536
+#: ../widgets/rb-entry-view.c:1588
 #: ../widgets/rb-query-creator-properties.c:111
 msgid "Last Played"
 msgstr "�ล��ล�าสุ�"
 
-#: ../widgets/rb-entry-view.c:1548
+#: ../widgets/rb-entry-view.c:1600
 #: ../widgets/rb-query-creator-properties.c:112
 msgid "Date Added"
 msgstr "วั��ี���ิ�ม"
 
-#: ../widgets/rb-entry-view.c:1559
+#: ../widgets/rb-entry-view.c:1611
 msgid "Last Seen"
 msgstr "�ห���รั��ล�าสุ�"
 
-#: ../widgets/rb-entry-view.c:1570
+#: ../widgets/rb-entry-view.c:1622
 msgid "Location"
 msgstr "�ี�อยู�"
 
-#: ../widgets/rb-entry-view.c:1824
+#: ../widgets/rb-entry-view.c:1881
 msgid "Now Playing"
 msgstr "�ำลั��ล��"
 
-#: ../widgets/rb-entry-view.c:1887
+#: ../widgets/rb-entry-view.c:1944
 msgid "Playback Error"
 msgstr "�าร�ล����ล��ิ��ลา�"
 
-#: ../widgets/rb-header.c:537
+#: ../widgets/rb-header.c:538
 msgid "Not Playing"
 msgstr "�ม�����ล��"
 
@@ -4763,30 +4901,281 @@ msgid_plural "%d Stars"
 msgstr[0] "%d �าว"
 
 #. this string can only be so long, or there wont be a search entry :)
-#: ../widgets/rb-search-entry.c:156
+#: ../widgets/rb-search-entry.c:165
 msgid "_Search:"
 msgstr "_���หา:"
 
-#: ../widgets/rb-song-info.c:371
+#: ../widgets/rb-search-entry.c:176
+msgid "Clear the search text"
+msgstr "ล�า��ำ���"
+
+#: ../widgets/rb-song-info.c:369
 msgid "Song Properties"
 msgstr "�ุ�สม�ั�ิ��ล�"
 
-#: ../widgets/rb-song-info.c:420
+#: ../widgets/rb-song-info.c:417
 msgid "Multiple Song Properties"
 msgstr "�ุ�สม�ั�ิ��ล����หลาย��ล�"
 
-#: ../widgets/rb-song-info.c:1110
+#: ../widgets/rb-song-info.c:1108
 msgid "Unknown file name"
 msgstr "�ม��รา��ื�อ���ม"
 
-#: ../widgets/rb-song-info.c:1132
+#: ../widgets/rb-song-info.c:1130
 msgid "On the desktop"
 msgstr "���ื�����ะ"
 
-#: ../widgets/rb-song-info.c:1141
+#: ../widgets/rb-song-info.c:1139
 msgid "Unknown location"
 msgstr "�ม��รา��ำ�ห���"
 
+#~ msgid "Unknown playback error"
+#~ msgstr "�าร�ล����ล��ิ��ลา�"
+
+#~ msgid ""
+#~ "songs\n"
+#~ "MB\n"
+#~ "GB\n"
+#~ "Minutes"
+#~ msgstr ""
+#~ "��ล�\n"
+#~ "MB\n"
+#~ "GB\n"
+#~ "�า�ี"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "-\n"
+#~ "Text below icons\n"
+#~ "Text beside icons\n"
+#~ "Icons only\n"
+#~ "Text only"
+#~ msgstr ""
+#~ "�ริยาย\n"
+#~ "-\n"
+#~ "��อ�วาม����อ�อ�\n"
+#~ "��อ�วาม��า��อ�อ�\n"
+#~ "�อ�อ����า�ั��\n"
+#~ "��อ�วาม���า�ั��"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "C_rossfade between songs on the same album"
+#~ msgstr "ห_รี��สีย����า-ออ�ระหว�า���ล���อัล�ั�ม��ียว�ั�"
+
+#~ msgid "Crossfade Type"
+#~ msgstr "��ิ��อ��ารหรี��สีย����า-ออ�"
+
+#~ msgid "Rhythmbox Plugins"
+#~ msgstr "�ลั��อิ�สำหรั� Rhythmbox"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid ""
+#~ "Every hour\n"
+#~ "Every day\n"
+#~ "Every week\n"
+#~ "Manually"
+#~ msgstr ""
+#~ "�ุ��ั�ว�ม�\n"
+#~ "�ุ�วั�\n"
+#~ "�ุ�สั��าห�\n"
+#~ "�รว�สอ��อ�"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Enter the _location (URI) of the file you would like to add:"
+#~ msgstr "��อ�_�ำ�ห��� (URI) �อ����ม�ี���อ��าร��ิ�ม:"
+
+#~ msgid "Open from URI"
+#~ msgstr "��ิ��า� URI"
+
+#~ msgid "HTTP proxy configuration error"
+#~ msgstr "��ิ���อ�ิ��ลา����าร�ั����า�ร�อ��ี HTTP"
+
+#~ msgid "Rhythmbox does not support automatic proxy configuration"
+#~ msgstr "Rhythmbox �ม�รอ�รั��าร�ั����า�ร�อ��ี���อั���มั�ิ"
+
+#~ msgid "The GStreamer plugins to decode \"%s\" files cannot be found"
+#~ msgstr "�ม����ลั��อิ��อ� GStreamer สำหรั�อ�า�รหัส���ม \"%s\""
+
+#~ msgid "The file contains a stream of type %s, which is not decodable"
+#~ msgstr "���ม�ี�มีรู�����สีย���ิ� %s �ึ���ม�สามาร�อ�า�รหัส���"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "Incorrect password"
+#~ msgstr "รหัส��า��ม��ู���อ�"
+
+#~ msgid "Handshake failed"
+#~ msgstr "��ื�อม��อ�ม�สำ�ร��"
+
+#~ msgid "Client update required"
+#~ msgstr "�ำ������อ��รั�รุ���อ���ล�อ���"
+
+#~ msgid "Track submission failed"
+#~ msgstr "ส����ล��ม�สำ�ร��"
+
+#~ msgid "Queue is too long"
+#~ msgstr "�ิวยาว��ิ���"
+
+#~ msgid "Unable to resolve hostname %s"
+#~ msgstr "�ม�สามาร���ิ�หา�ี�อยู��า��ื�อ�ฮส�� '%s'"
+
+#~ msgid "Minimize to the tray when closing the main window"
+#~ msgstr "ย�อ����ล����า��า��มื�อ�ิ�ห��า��า�หลั�"
+
+#~ msgid "Minimize to tray"
+#~ msgstr "ย�อ����ล��า�"
+
+#~ msgid "Your Name:"
+#~ msgstr "�ื�อ�อ��ุ�:"
+
+#~ msgid "radio|New"
+#~ msgstr "�หม�"
+
+#~ msgid ""
+#~ "$5 US\n"
+#~ "$6 US\n"
+#~ "$7 US\n"
+#~ "$8 US (typical)\n"
+#~ "$9 US\n"
+#~ "$10 US (better than average)\n"
+#~ "$11 US\n"
+#~ "$12 US (generous)\n"
+#~ "$13 US\n"
+#~ "$14 US\n"
+#~ "$15 US (very generous)\n"
+#~ "$16 US\n"
+#~ "$17 US\n"
+#~ "$18 US (we love you)"
+#~ msgstr ""
+#~ "$5 US\n"
+#~ "$6 US\n"
+#~ "$7 US\n"
+#~ "$8 US (�รรม�า)\n"
+#~ "$9 US\n"
+#~ "$10 US (�ี�ว�า�รรม�า)\n"
+#~ "$11 US\n"
+#~ "$12 US (�อื�อ��ื�อ)\n"
+#~ "$13 US\n"
+#~ "$14 US\n"
+#~ "$15 US (�อื�อ��ื�อมา�)\n"
+#~ "$16 US\n"
+#~ "$17 US\n"
+#~ "$18 US (�รารั��ุ�)"
+
+#~ 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"
+#~ "MP3 ��� VBR\n"
+#~ "MP3 ��� 128K"
+
+#~ msgid ""
+#~ "$5\n"
+#~ "$6\n"
+#~ "$7\n"
+#~ "$8 (typical)\n"
+#~ "$9\n"
+#~ "$10 (better than average)\n"
+#~ "$11\n"
+#~ "$12 (generous)\n"
+#~ "$13\n"
+#~ "$14\n"
+#~ "$15 (VERY generous!)\n"
+#~ "$16\n"
+#~ "$17\n"
+#~ "$18 (We love you!)"
+#~ msgstr ""
+#~ "$5\n"
+#~ "$6\n"
+#~ "$7\n"
+#~ "$8 (�รรม�า)\n"
+#~ "$9\n"
+#~ "$10 (�ี�ว�า�รรม�า)\n"
+#~ "$11\n"
+#~ "$12 (�อื�อ��ื�อ)\n"
+#~ "$13\n"
+#~ "$14\n"
+#~ "$15 (�อื�อ��ื�อมา�!)\n"
+#~ "$16\n"
+#~ "$17\n"
+#~ "$18 (�รารั��ุ�!)"
+
+#~ msgid ""
+#~ "January (01)\n"
+#~ "February (02)\n"
+#~ "March (03)\n"
+#~ "April (04)\n"
+#~ "May (05)\n"
+#~ "June (06)\n"
+#~ "July (07)\n"
+#~ "August (08)\n"
+#~ "September (09)\n"
+#~ "October (10)\n"
+#~ "November (11)\n"
+#~ "December (12)"
+#~ msgstr ""
+#~ "ม�รา�ม (01)\n"
+#~ "�ุมภา�ั��� (02)\n"
+#~ "มี�า�ม (03)\n"
+#~ "�มษาย� (04)\n"
+#~ "�ฤษภา�ม (05)\n"
+#~ "มิ�ุ�าย� (06)\n"
+#~ "�ร��า�ม (07)\n"
+#~ "สิ�หา�ม (08)\n"
+#~ "�ั�ยาย� (09)\n"
+#~ "�ุลา�ม (10)\n"
+#~ "�ฤศ�ิ�าย� (11)\n"
+#~ "�ั�วา�ม (12)"
+
+#~ msgid "Rhythmbox"
+#~ msgstr "Rhythmbox"
+
+#~ msgid "podcast|New"
+#~ msgstr "�หม�"
+
+#~ msgid "%u kbps"
+#~ msgstr "%u kbps"
+
 #~ msgid "Error initializing Howl for publishing"
 #~ msgstr "��ิ���อ�ิ��ลา���ะ�ั����� Howl ��ื�อ�ระ�าศ"
 
@@ -4805,18 +5194,6 @@ msgstr "�ม��รา��ำ�ห���"
 #~ msgid "http://last.fm/group/Rhythmbox";
 #~ msgstr "http://last.fm/group/Rhythmbox";
 
-#~ msgid "GB"
-#~ msgstr "�ิ�ะ����"
-
-#~ msgid "MB"
-#~ msgstr "�ม�ะ����"
-
-#~ msgid "Minutes"
-#~ msgstr "�า�ี"
-
-#~ msgid "songs"
-#~ msgstr "��ล�"
-
 #~ msgid ""
 #~ "Rhythmbox manages all of your music in a central music \"library\", so "
 #~ "you can easily view, search, and organize it.\n"
@@ -5101,10 +5478,6 @@ msgstr "�ม��รา��ำ�ห���"
 #~ msgid "Seek by the specified amount if possible and exit"
 #~ msgstr "���หา�วลา�ี�ระ�ุ�อ���ล��ี��ล�� (��า�ำ���) �ล�วออ�"
 
-#, fuzzy
-#~ msgid "Set the rating of the currently playing song and exit"
-#~ msgstr "�ลื�อ����ส����ล��ี��ำลั��ล��"
-
 #~ msgid "Change visibility of the main Rhythmbox window"
 #~ msgstr "�ส��หรือ��อ�ห��า��า�หลั�"
 
@@ -5149,9 +5522,6 @@ msgstr "�ม��รา��ำ�ห���"
 #~ msgid "Perfect"
 #~ msgstr "ยอ��ยี�ยม"
 
-#~ msgid "Listening to "
-#~ msgstr "�ำลั��ั�"
-
 #~ msgid "Error loading files into library"
 #~ msgstr "��ิ���อ�ิ��ลา����ารอ�า���ล���ยั� library"