Sync from r1734

2 files changed, 57 insertions, 37 deletions

diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 337b54c9..d65cf2a6 100644
--- a/locale/de_DE/LC_MESSAGES/messages.mo
+++ b/locale/de_DE/LC_MESSAGES/messages.mo
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 6435d7a8..49a6952d 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-08-29 16:42+0900\n"
+"POT-Creation-Date: 2008-09-03 08:08+0900\n"
 "PO-Revision-Date: 2008-08-24 09:26+0200\n"
 "Last-Translator: Nikolai Försterling <devel@fosternet.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -42,9 +42,9 @@ msgstr "Fehler: Kein Schlüsselwort eingegeben"
 #: ../../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
@@ -61,6 +61,8 @@ msgstr "Hinzufügen"
 #: ../../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 "Zufällig"
 
@@ -318,8 +320,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
@@ -343,8 +345,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
@@ -410,7 +412,7 @@ msgstr "Aktionen"
 #: ../../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 "zu wenig statistische Daten"
 
@@ -424,8 +426,8 @@ msgstr "Kompletter Name"
 #: ../../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"
@@ -497,8 +499,8 @@ msgstr "Nie"
 #: ../../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 "Unbekannt"
 
@@ -866,15 +868,14 @@ msgid "All Playlists"
 msgstr "Alle Wiedergabelisten"
 
 #: ../../templates/sidebar_home.inc.php:76
-#: ../../templates/sidebar_modules.inc.php:41
 msgid "Currently Playing"
 msgstr "gerade gespielt"
 
 #: ../../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 "demokratisch"
 
@@ -1064,7 +1065,7 @@ msgid "Show instances"
 msgstr "Sitzungen anzeigen"
 
 #: ../../templates/sidebar_localplay.inc.php:38
-#: ../../templates/sidebar_modules.inc.php:49
+#: ../../templates/sidebar_modules.inc.php:48
 msgid "Show Playlist"
 msgstr "Wiedergabeliste anzeigen"
 
@@ -1109,7 +1110,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 "Radiosender hinzufügen"
 
@@ -1127,11 +1128,6 @@ msgstr "Empfehlenswerte Alben"
 msgid "Loading..."
 msgstr "Laden..."
 
-#: ../../templates/show_index.inc.php:45 ../../templates/show_user.inc.php:68
-#: ../../server/index.ajax.php:44
-msgid "Recently Played"
-msgstr "kürzlich gespielt"
-
 #: ../../templates/show_edit_artist.inc.php:23
 msgid "Edit Artist"
 msgstr "Bearbeite Interpret"
@@ -1495,6 +1491,11 @@ msgstr "Benutzer ist abgemeldet"
 msgid "Active Playlist"
 msgstr "Aktive Wiedergabeliste"
 
+#: ../../templates/show_user.inc.php:68
+#: ../../templates/show_recently_played.inc.php:25
+msgid "Recently Played"
+msgstr "kürzlich gespielt"
+
 #: ../../templates/show_add_access.inc.php:22
 msgid "Add Access for a Host"
 msgstr "Zugang für einen Rechner einrichten"
@@ -1690,9 +1691,10 @@ msgstr "Ähnliche Interpreten"
 msgid "Related Album"
 msgstr "Ähnliche Alben"
 
-#: ../../templates/rightbar.inc.php:68 ../../lib/class/random.class.php:426
-msgid "Related Genre"
-msgstr "Ähnliche Musikstile"
+#: ../../templates/rightbar.inc.php:68
+#, fuzzy
+msgid "Related Tag"
+msgstr "Ähnliche Alben"
 
 #: ../../templates/rightbar.inc.php:104
 msgid "More"
@@ -1896,8 +1898,8 @@ msgstr "Bewertungen"
 
 #: ../../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
@@ -2276,7 +2278,12 @@ msgstr "Ampache Datenbank Passwort"
 msgid "Overwrite Existing"
 msgstr "Überschreibe bestehende"
 
-#: ../../templates/show_install.inc.php:99
+#: ../../templates/show_install.inc.php:98
+#, fuzzy
+msgid "Use Existing Database"
+msgstr "Datenbank einfügen"
+
+#: ../../templates/show_install.inc.php:103
 msgid "Insert Database"
 msgstr "Datenbank einfügen"
 
@@ -2508,8 +2515,8 @@ msgstr "Monaten"
 msgid "years ago"
 msgstr "Jahren"
 
-#: ../../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 "zuletzt gespielt vor"
 
@@ -2946,11 +2953,11 @@ msgstr "Lieder gesperrt"
 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
 msgid "Statistics"
 msgstr "Statistik"
 
-#: ../../templates/sidebar_modules.inc.php:50
+#: ../../templates/sidebar_modules.inc.php:49
 msgid "Manage Playlist"
 msgstr "Verwalte Wiedergabeliste"
 
@@ -2964,7 +2971,7 @@ msgstr "Beständig"
 msgid "Date Added"
 msgstr "Hinzugefügt am"
 
-#: ../../templates/show_now_playing.inc.php:32
+#: ../../templates/show_now_playing.inc.php:33
 #: ../../lib/class/localplay.class.php:639
 msgid "Now Playing"
 msgstr "Aktuell wird gespielt"
@@ -3133,6 +3140,10 @@ msgstr "Shoutbox Aufzeichnungen"
 msgid "Flagged Records"
 msgstr "Markierte Datensätze"
 
+#: ../../lib/class/rss.class.php:59
+msgid "RSS Feed"
+msgstr ""
+
 #: ../../lib/class/flag.class.php:257
 msgid "Approved"
 msgstr "Erlaubt"
@@ -3307,6 +3318,10 @@ msgstr "Geprüft"
 msgid "songs updated."
 msgstr "Lieder aktualisiert."
 
+#: ../../lib/class/random.class.php:426
+msgid "Related Genre"
+msgstr "Ähnliche Musikstile"
+
 #: ../../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"
@@ -3368,11 +3383,11 @@ msgstr "Während dem hinzufügen löschen"
 msgid "Always"
 msgstr "Immer"
 
-#: ../../lib/install.php:253
+#: ../../lib/install.php:250
 msgid "No Username/Password specified"
 msgstr "Kein Benutzer/Passwort angegeben"
 
-#: ../../lib/install.php:258
+#: ../../lib/install.php:255
 msgid "Passwords do not match"
 msgstr "Passwörter nicht identisch"
 
@@ -3401,6 +3416,11 @@ msgstr "Sitzung abgelaufen: Bitte erneut einloggen"
 msgid "Radio Station Added"
 msgstr "Radiosender hinzugefügt"
 
+#: ../../install.php:168
+#, fuzzy
+msgid "Error: Config file not found or Unreadable"
+msgstr "Fehler Konfigurationsdatei abgelaufen"
+
 #: ../../update.php:47 ../../update.php:51
 msgid "Ampache Update"
 msgstr "Ampache Update"