Sync from r1734

2 files changed, 57 insertions, 37 deletions

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index b36af6f5..680aad44 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 8a88d6e5..44a07bba 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ampache\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: 2007-02-05 21:58-0000\n"
 "Last-Translator: Alexey Illarionov <littlesavage@orionet.ru>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -39,9 +39,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
@@ -58,6 +58,8 @@ msgstr "Добавить"
 #: ../../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 "Случайно"
 
@@ -309,8 +311,8 @@ msgstr "Обложка"
 #: ../../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
@@ -334,8 +336,8 @@ msgstr "Альбом"
 #: ../../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
@@ -401,7 +403,7 @@ msgstr "Действия"
 #: ../../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 "Недостаточно данных"
 
@@ -415,8 +417,8 @@ msgstr "Полное имя"
 #: ../../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"
@@ -488,8 +490,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 "Неизвестно"
 
@@ -857,15 +859,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 "Демократичный"
 
@@ -1055,7 +1056,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 "Показать плейлист"
 
@@ -1100,7 +1101,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 "Добавить радио станцию"
 
@@ -1118,11 +1119,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
 msgid "Edit Artist"
 msgstr "Редактировать исполнителя"
@@ -1480,6 +1476,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 "Добавить доступ для хоста"
@@ -1673,9 +1674,10 @@ msgstr "Похожего исполнителя"
 msgid "Related Album"
 msgstr "Похожий альбом"
 
-#: ../../templates/rightbar.inc.php:68 ../../lib/class/random.class.php:426
-msgid "Related Genre"
-msgstr "Похожий жанр"
+#: ../../templates/rightbar.inc.php:68
+#, fuzzy
+msgid "Related Tag"
+msgstr "Похожий альбом"
 
 #: ../../templates/rightbar.inc.php:104
 msgid "More"
@@ -1879,8 +1881,8 @@ msgstr "Голосов"
 
 #: ../../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
@@ -2258,7 +2260,12 @@ msgstr "Ampache пароль пользователя БД"
 msgid "Overwrite Existing"
 msgstr "Заменить существующие"
 
-#: ../../templates/show_install.inc.php:99
+#: ../../templates/show_install.inc.php:98
+#, fuzzy
+msgid "Use Existing Database"
+msgstr "Добавить базу"
+
+#: ../../templates/show_install.inc.php:103
 msgid "Insert Database"
 msgstr "Добавить базу"
 
@@ -2493,8 +2500,8 @@ msgstr "месяцев назад"
 msgid "years ago"
 msgstr "лет назад"
 
-#: ../../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 "Последние проигранные"
 
@@ -2930,11 +2937,11 @@ msgstr "Песен отключено"
 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 "Статистика"
 
-#: ../../templates/sidebar_modules.inc.php:50
+#: ../../templates/sidebar_modules.inc.php:49
 msgid "Manage Playlist"
 msgstr "Работа с плейлистом"
 
@@ -2948,7 +2955,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 "Сейчас играет"
@@ -3117,6 +3124,10 @@ msgstr "Записи кричалки"
 msgid "Flagged Records"
 msgstr "Отмеченные записи"
 
+#: ../../lib/class/rss.class.php:59
+msgid "RSS Feed"
+msgstr ""
+
 #: ../../lib/class/flag.class.php:257
 msgid "Approved"
 msgstr "Одобрено"
@@ -3290,6 +3301,10 @@ msgstr "Отмечен"
 msgid "songs updated."
 msgstr "песен обновлено."
 
+#: ../../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"
@@ -3351,11 +3366,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 "Пароль не совпадает"
 
@@ -3384,6 +3399,11 @@ msgstr "Время сессии исчерпано: пожалуйста, зайдите еще раз"
 msgid "Radio Station Added"
 msgstr "Радио станция добавленя"
 
+#: ../../install.php:168
+#, fuzzy
+msgid "Error: Config file not found or Unreadable"
+msgstr "Ошибка: конфигурационный файл устарел"
+
 #: ../../update.php:47 ../../update.php:51
 msgid "Ampache Update"
 msgstr "Обновление Ampache"