Sync from r1734

2 files changed, 54 insertions, 36 deletions

diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index 9bdc25e5..74301949 100644
--- a/locale/en_GB/LC_MESSAGES/messages.mo
+++ b/locale/en_GB/LC_MESSAGES/messages.mo
diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po
index 7bdff871..723ef459 100644
--- a/locale/en_GB/LC_MESSAGES/messages.po
+++ b/locale/en_GB/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ampache 2.5.0\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-29 16:38+0900\n"
+"POT-Creation-Date: 2008-09-03 08:08+0900\n"
 "PO-Revision-Date: 2005-07-17 21:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -38,9 +38,9 @@ msgstr ""
 #: ../../templates/show_live_stream_row.inc.php:23
 #: ../../templates/show_shoutbox.inc.php:34
 #: ../../templates/show_songs.inc.php:39 ../../templates/show_songs.inc.php:68
-#: ../../templates/show_recently_played.inc.php:35
-#: ../../templates/show_recently_played.inc.php:78
-#: ../../templates/show_recently_played.inc.php:97
+#: ../../templates/show_recently_played.inc.php:37
+#: ../../templates/show_recently_played.inc.php:80
+#: ../../templates/show_recently_played.inc.php:99
 #: ../../templates/show_artist.inc.php:38
 #: ../../templates/show_album.inc.php:51
 #: ../../templates/show_playlist_song_row.inc.php:22
@@ -57,6 +57,8 @@ msgstr "Add"
 #: ../../templates/show_artist.inc.php:41
 #: ../../templates/show_album.inc.php:55
 #: ../../templates/show_playlist_row.inc.php:24
+#: ../../modules/localplay/mpd.controller.php:495
+#: ../../modules/localplay/httpq.controller.php:494
 msgid "Random"
 msgstr "Random"
 
@@ -310,8 +312,8 @@ msgstr "Cover"
 #: ../../templates/show_search.inc.php:50
 #: ../../templates/show_songs.inc.php:42 ../../templates/show_songs.inc.php:71
 #: ../../templates/show_get_albumart.inc.php:36
-#: ../../templates/show_recently_played.inc.php:37
-#: ../../templates/show_recently_played.inc.php:100
+#: ../../templates/show_recently_played.inc.php:39
+#: ../../templates/show_recently_played.inc.php:102
 #: ../../templates/show_disabled_songs.inc.php:35
 #: ../../templates/show_disabled_songs.inc.php:58
 #: ../../templates/show_duplicates.inc.php:39
@@ -335,8 +337,8 @@ msgstr "Album"
 #: ../../templates/show_search.inc.php:44
 #: ../../templates/show_songs.inc.php:41 ../../templates/show_songs.inc.php:70
 #: ../../templates/show_get_albumart.inc.php:28
-#: ../../templates/show_recently_played.inc.php:38
-#: ../../templates/show_recently_played.inc.php:101
+#: ../../templates/show_recently_played.inc.php:40
+#: ../../templates/show_recently_played.inc.php:103
 #: ../../templates/show_disabled_songs.inc.php:36
 #: ../../templates/show_disabled_songs.inc.php:59
 #: ../../templates/show_duplicates.inc.php:38
@@ -404,7 +406,7 @@ msgstr "Action"
 #: ../../templates/show_user_stats.inc.php:47
 #: ../../templates/show_user_stats.inc.php:60
 #: ../../templates/show_songs.inc.php:64
-#: ../../templates/show_recently_played.inc.php:93
+#: ../../templates/show_recently_played.inc.php:95
 msgid "Not Enough Data"
 msgstr ""
 
@@ -418,8 +420,8 @@ msgstr "Fullname"
 #: ../../templates/show_edit_user.inc.php:29
 #: ../../templates/show_add_user.inc.php:29
 #: ../../templates/show_install_account.inc.php:61
-#: ../../templates/show_recently_played.inc.php:39
-#: ../../templates/show_recently_played.inc.php:98
+#: ../../templates/show_recently_played.inc.php:41
+#: ../../templates/show_recently_played.inc.php:100
 #: ../../templates/show_user_registration.inc.php:75
 #: ../../templates/show_now_playing_row.inc.php:29
 msgid "Username"
@@ -493,8 +495,8 @@ msgstr ""
 #: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
 #: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
 #: ../../lib/class/user.class.php:665 ../../lib/general.lib.php:439
-#: ../../modules/localplay/mpd.controller.php:508
-#: ../../modules/localplay/httpq.controller.php:505
+#: ../../modules/localplay/mpd.controller.php:511
+#: ../../modules/localplay/httpq.controller.php:510
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -865,15 +867,14 @@ msgid "All Playlists"
 msgstr ""
 
 #: ../../templates/sidebar_home.inc.php:76
-#: ../../templates/sidebar_modules.inc.php:41
 msgid "Currently Playing"
 msgstr ""
 
 #: ../../templates/sidebar_home.inc.php:78
 #: ../../templates/show_playtype_switch.inc.php:36
-#: ../../templates/sidebar_modules.inc.php:47 ../../lib/preferences.php:179
-#: ../../modules/localplay/mpd.controller.php:492
-#: ../../modules/localplay/httpq.controller.php:489
+#: ../../templates/sidebar_modules.inc.php:46 ../../lib/preferences.php:179
+#: ../../modules/localplay/mpd.controller.php:491
+#: ../../modules/localplay/httpq.controller.php:490
 msgid "Democratic"
 msgstr ""
 
@@ -1069,7 +1070,7 @@ msgid "Show instances"
 msgstr ""
 
 #: ../../templates/sidebar_localplay.inc.php:38
-#: ../../templates/sidebar_modules.inc.php:49
+#: ../../templates/sidebar_modules.inc.php:48
 msgid "Show Playlist"
 msgstr ""
 
@@ -1115,7 +1116,7 @@ msgid "Cache Hits:"
 msgstr ""
 
 #: ../../templates/show_add_live_stream.inc.php:24
-#: ../../templates/sidebar_modules.inc.php:43
+#: ../../templates/sidebar_modules.inc.php:42
 msgid "Add Radio Station"
 msgstr ""
 
@@ -1133,11 +1134,6 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: ../../templates/show_index.inc.php:45 ../../templates/show_user.inc.php:68
-#: ../../server/index.ajax.php:44
-msgid "Recently Played"
-msgstr ""
-
 #: ../../templates/show_edit_artist.inc.php:23
 #, fuzzy
 msgid "Edit Artist"
@@ -1509,6 +1505,11 @@ msgstr ""
 msgid "Active Playlist"
 msgstr ""
 
+#: ../../templates/show_user.inc.php:68
+#: ../../templates/show_recently_played.inc.php:25
+msgid "Recently Played"
+msgstr ""
+
 #: ../../templates/show_add_access.inc.php:22
 msgid "Add Access for a Host"
 msgstr "Add Access for a Host"
@@ -1706,8 +1707,8 @@ msgstr ""
 msgid "Related Album"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:68 ../../lib/class/random.class.php:426
-msgid "Related Genre"
+#: ../../templates/rightbar.inc.php:68
+msgid "Related Tag"
 msgstr ""
 
 #: ../../templates/rightbar.inc.php:104
@@ -1922,8 +1923,8 @@ msgstr "other"
 
 #: ../../templates/show_democratic_playlist.inc.php:52
 #: ../../templates/show_democratic_playlist.inc.php:87
-#: ../../templates/show_recently_played.inc.php:36
-#: ../../templates/show_recently_played.inc.php:99
+#: ../../templates/show_recently_played.inc.php:38
+#: ../../templates/show_recently_played.inc.php:101
 #: ../../templates/show_duplicates.inc.php:37
 #: ../../templates/show_duplicates.inc.php:75
 #: ../../templates/show_now_playing_row.inc.php:45
@@ -2319,7 +2320,12 @@ msgstr ""
 msgid "Overwrite Existing"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:99
+#: ../../templates/show_install.inc.php:98
+#, fuzzy
+msgid "Use Existing Database"
+msgstr "Insert Database"
+
+#: ../../templates/show_install.inc.php:103
 msgid "Insert Database"
 msgstr "Insert Database"
 
@@ -2563,8 +2569,8 @@ msgstr ""
 msgid "years ago"
 msgstr "year"
 
-#: ../../templates/show_recently_played.inc.php:40
-#: ../../templates/show_recently_played.inc.php:102
+#: ../../templates/show_recently_played.inc.php:42
+#: ../../templates/show_recently_played.inc.php:104
 msgid "Last Played"
 msgstr ""
 
@@ -3013,12 +3019,12 @@ msgstr "Songs Disabled"
 msgid "Information"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:42 ../../lib/ui.lib.php:420
+#: ../../templates/sidebar_modules.inc.php:41 ../../lib/ui.lib.php:420
 #, fuzzy
 msgid "Statistics"
 msgstr "Catalogue Statistics"
 
-#: ../../templates/sidebar_modules.inc.php:50
+#: ../../templates/sidebar_modules.inc.php:49
 msgid "Manage Playlist"
 msgstr ""
 
@@ -3032,7 +3038,7 @@ msgstr ""
 msgid "Date Added"
 msgstr ""
 
-#: ../../templates/show_now_playing.inc.php:32
+#: ../../templates/show_now_playing.inc.php:33
 #: ../../lib/class/localplay.class.php:639
 msgid "Now Playing"
 msgstr "Now Playing"
@@ -3217,6 +3223,10 @@ msgstr ""
 msgid "Flagged Records"
 msgstr "Flagged by"
 
+#: ../../lib/class/rss.class.php:59
+msgid "RSS Feed"
+msgstr ""
+
 #: ../../lib/class/flag.class.php:257
 msgid "Approved"
 msgstr ""
@@ -3395,6 +3405,10 @@ msgstr "Checking"
 msgid "songs updated."
 msgstr "Playlist updated."
 
+#: ../../lib/class/random.class.php:426
+msgid "Related Genre"
+msgstr ""
+
 #: ../../lib/class/vauth.class.php:476 ../../lib/class/vauth.class.php:500
 #: ../../lib/class/vauth.class.php:539
 msgid "Error Username or Password incorrect, please try again"
@@ -3457,11 +3471,11 @@ msgstr ""
 msgid "Always"
 msgstr ""
 
-#: ../../lib/install.php:259
+#: ../../lib/install.php:250
 msgid "No Username/Password specified"
 msgstr ""
 
-#: ../../lib/install.php:264
+#: ../../lib/install.php:255
 msgid "Passwords do not match"
 msgstr ""
 
@@ -3490,6 +3504,10 @@ msgstr "Session Expired: please log in again at"
 msgid "Radio Station Added"
 msgstr ""
 
+#: ../../install.php:168
+msgid "Error: Config file not found or Unreadable"
+msgstr ""
+
 #: ../../update.php:47 ../../update.php:51
 #, fuzzy
 msgid "Ampache Update"