Updated: message merged r1849

2 files changed, 263 insertions, 480 deletions

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index ef385327..ed53da0b 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 3410ec59..c9eba158 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: 2009-01-06 07:40+0900\n"
+"POT-Creation-Date: 2009-02-02 07:39+0900\n"
 "PO-Revision-Date: 2007-02-05 21:58-0000\n"
 "Last-Translator: Alexey Illarionov <littlesavage@orionet.ru>\n"
 "Language-Team: Russian <translations@ampache.org>\n"
@@ -482,7 +482,7 @@ msgstr "Последний IP"
 #: ../../templates/show_song.inc.php:27
 #: ../../templates/show_admin_tools.inc.php:34
 #: ../../templates/show_admin_tools.inc.php:74
-#: ../../templates/show_access_list.inc.php:52
+#: ../../templates/show_access_list.inc.php:62
 #: ../../templates/show_playlist_songs.inc.php:48
 #: ../../templates/show_playlist_songs.inc.php:69
 #: ../../templates/show_manage_shoutbox.inc.php:39
@@ -496,14 +496,14 @@ msgid "On-line"
 msgstr "Онлайн"
 
 #: ../../templates/show_users.inc.php:53 ../../templates/show_user.inc.php:22
-#: ../../lib/class/user.class.php:662 ../../lib/class/catalog.class.php:152
+#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:152
 #: ../../lib/class/catalog.class.php:153 ../../lib/preferences.php:261
 msgid "Never"
 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:666 ../../lib/general.lib.php:439
+#: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:337
 #: ../../modules/localplay/mpd.controller.php:511
 #: ../../modules/localplay/httpq.controller.php:510
 msgid "Unknown"
@@ -560,15 +560,18 @@ msgstr "Гость"
 
 #: ../../templates/show_edit_user.inc.php:75
 #: ../../templates/show_preference_box.inc.php:59
-#: ../../templates/show_edit_access.inc.php:57
+#: ../../templates/show_add_access_local.inc.php:41
+#: ../../templates/show_add_access_rpc.inc.php:41
+#: ../../templates/show_edit_access.inc.php:60
 #: ../../templates/show_preference_admin.inc.php:42
-#: ../../templates/show_add_access.inc.php:46
+#: ../../templates/show_add_access.inc.php:41
 #: ../../templates/show_add_user.inc.php:75
 #: ../../templates/show_create_democratic.inc.php:41
 #: ../../templates/show_flagged.inc.php:35
 #: ../../templates/show_flagged.inc.php:54
+#: ../../templates/show_add_access_current.inc.php:44
 #: ../../templates/show_mail_users.inc.php:31
-#: ../../templates/show_access_list.inc.php:49
+#: ../../templates/show_access_list.inc.php:59
 #: ../../templates/show_manage_shoutbox.inc.php:35
 #: ../../templates/show_manage_shoutbox.inc.php:59
 #: ../../lib/class/democratic.class.php:105 ../../lib/preferences.php:231
@@ -617,6 +620,8 @@ msgstr "Обновить пользователя"
 #: ../../templates/show_live_streams.inc.php:36
 #: ../../templates/show_live_streams.inc.php:58
 #: ../../templates/show_edit_catalog.inc.php:26
+#: ../../templates/show_add_access_local.inc.php:26
+#: ../../templates/show_add_access_rpc.inc.php:26
 #: ../../templates/show_add_live_stream.inc.php:28
 #: ../../templates/show_edit_artist.inc.php:27
 #: ../../templates/show_edit_access.inc.php:26
@@ -626,12 +631,13 @@ msgstr "Обновить пользователя"
 #: ../../templates/show_create_democratic.inc.php:26
 #: ../../templates/show_account.inc.php:27
 #: ../../templates/show_edit_album.inc.php:27
+#: ../../templates/show_add_access_current.inc.php:26
 #: ../../templates/show_localplay_playlist.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:58
 #: ../../templates/show_add_playlist.inc.php:28
 #: ../../templates/show_admin_tools.inc.php:33
 #: ../../templates/show_admin_tools.inc.php:73
-#: ../../templates/show_access_list.inc.php:45
+#: ../../templates/show_access_list.inc.php:55
 #: ../../templates/show_playlist_edit.inc.php:30
 msgid "Name"
 msgstr "Имя"
@@ -1023,12 +1029,15 @@ msgid "Cooldown"
 msgstr ""
 
 #: ../../templates/show_manage_democratic.inc.php:37
-#: ../../templates/show_edit_access.inc.php:69
+#: ../../templates/show_add_access_local.inc.php:32
+#: ../../templates/show_add_access_rpc.inc.php:32
+#: ../../templates/show_edit_access.inc.php:72
 #: ../../templates/show_preference_admin.inc.php:31
 #: ../../templates/show_preference_admin.inc.php:50
-#: ../../templates/show_add_access.inc.php:52
+#: ../../templates/show_add_access.inc.php:32
 #: ../../templates/show_create_democratic.inc.php:38
-#: ../../templates/show_access_list.inc.php:48
+#: ../../templates/show_add_access_current.inc.php:35
+#: ../../templates/show_access_list.inc.php:58
 msgid "Level"
 msgstr "Уровень"
 
@@ -1041,6 +1050,136 @@ msgstr "По умолчанию"
 msgid "Create New Playlist"
 msgstr "Создать плейлист"
 
+#: ../../templates/show_add_access_local.inc.php:22
+#: ../../templates/show_access_list.inc.php:40
+#: ../../templates/show_access_list.inc.php:41
+#, fuzzy
+msgid "Add Local Network Definition"
+msgstr "Определение локальный сети"
+
+#: ../../templates/show_add_access_local.inc.php:34
+#: ../../templates/show_add_access_rpc.inc.php:34
+#: ../../templates/show_edit_access.inc.php:75
+#: ../../templates/show_add_access.inc.php:34
+#: ../../templates/show_play_selected.inc.php:49
+#: ../../templates/show_add_access_current.inc.php:37
+#: ../../lib/class/access.class.php:410
+msgid "View"
+msgstr "Просмотр"
+
+#: ../../templates/show_add_access_local.inc.php:35
+#: ../../templates/show_add_access_rpc.inc.php:35
+#: ../../templates/show_edit_access.inc.php:76
+#: ../../templates/show_add_access.inc.php:35
+#: ../../templates/show_add_access_current.inc.php:38
+#: ../../lib/class/access.class.php:413
+msgid "Read"
+msgstr "Чтение"
+
+#: ../../templates/show_add_access_local.inc.php:36
+#: ../../templates/show_add_access_rpc.inc.php:36
+#: ../../templates/show_edit_access.inc.php:77
+#: ../../templates/show_add_access.inc.php:36
+#: ../../templates/show_add_access_current.inc.php:39
+#: ../../lib/class/access.class.php:416
+msgid "Read/Write"
+msgstr "Чтение/Запись"
+
+#: ../../templates/show_add_access_local.inc.php:37
+#: ../../templates/show_add_access_local.inc.php:52
+#: ../../templates/show_add_access_rpc.inc.php:37
+#: ../../templates/show_add_access_rpc.inc.php:52
+#: ../../templates/show_edit_access.inc.php:78
+#: ../../templates/show_add_access.inc.php:37
+#: ../../templates/show_export.inc.php:35
+#: ../../templates/show_add_access_current.inc.php:40
+#: ../../templates/show_mail_users.inc.php:30
+#: ../../templates/show_random.inc.php:38
+#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:141
+#: ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
+#: ../../lib/class/access.class.php:407 ../../lib/class/access.class.php:427
+msgid "All"
+msgstr "Все"
+
+#: ../../templates/show_add_access_local.inc.php:48
+#: ../../templates/show_add_access_rpc.inc.php:48
+#: ../../templates/show_add_playlist.inc.php:32
+#: ../../templates/show_random.inc.php:61
+#: ../../templates/show_access_list.inc.php:61
+#: ../../templates/show_playlist_edit.inc.php:36
+msgid "Type"
+msgstr "Тип"
+
+#: ../../templates/show_add_access_local.inc.php:50
+#: ../../templates/show_add_access_local.inc.php:51
+#: ../../templates/show_add_access_local.inc.php:52
+#: ../../templates/show_edit_access.inc.php:36
+#: ../../templates/show_add_access.inc.php:53
+#: ../../lib/class/access.class.php:446
+msgid "Local Network Definition"
+msgstr "Определение локальный сети"
+
+#: ../../templates/show_add_access_local.inc.php:51
+#: ../../templates/show_add_access_rpc.inc.php:51
+#: ../../templates/show_edit_access.inc.php:34
+#: ../../templates/show_add_access.inc.php:51
+#: ../../lib/class/access.class.php:453
+msgid "Stream Access"
+msgstr "Потоковый доступ"
+
+#: ../../templates/show_add_access_local.inc.php:51
+#: ../../templates/show_edit_access.inc.php:35
+#: ../../templates/show_add_access.inc.php:52
+#: ../../lib/class/access.class.php:449
+msgid "Web Interface"
+msgstr "Веб интерфейс"
+
+#: ../../templates/show_add_access_local.inc.php:56
+#: ../../templates/show_add_access_rpc.inc.php:56
+#: ../../templates/show_add_access.inc.php:59
+#: ../../templates/show_add_access_current.inc.php:50
+msgid "RPC Options"
+msgstr "Опции XML-RPC"
+
+#: ../../templates/show_add_access_local.inc.php:59
+#: ../../templates/show_add_access_rpc.inc.php:59
+#: ../../templates/show_edit_access.inc.php:66
+#: ../../templates/show_add_access.inc.php:62
+#: ../../templates/show_add_access_current.inc.php:53
+msgid "Remote Key"
+msgstr "Удаленный ключ"
+
+#: ../../templates/show_add_access_local.inc.php:66
+#: ../../templates/show_add_access_rpc.inc.php:66
+#: ../../templates/show_edit_access.inc.php:43
+#: ../../templates/show_add_access.inc.php:69
+#: ../../templates/show_add_access_current.inc.php:32
+#, fuzzy
+msgid "IPv4 or IPv6 Addresses"
+msgstr "Начальный IP адрес"
+
+#: ../../templates/show_add_access_local.inc.php:71
+#: ../../templates/show_add_access_rpc.inc.php:71
+#: ../../templates/show_edit_access.inc.php:48
+#: ../../templates/show_add_access.inc.php:74
+#, fuzzy
+msgid "Start"
+msgstr "Статус"
+
+#: ../../templates/show_add_access_local.inc.php:76
+#: ../../templates/show_add_access_rpc.inc.php:76
+#: ../../templates/show_edit_access.inc.php:53
+#: ../../templates/show_add_access.inc.php:79
+msgid "End"
+msgstr ""
+
+#: ../../templates/show_add_access_local.inc.php:85
+#: ../../templates/show_add_access_rpc.inc.php:85
+#: ../../templates/show_add_access.inc.php:88
+#: ../../templates/show_add_access_current.inc.php:61
+msgid "Create ACL"
+msgstr "Создать ACL"
+
 #: ../../templates/show_playlist.inc.php:26
 #, fuzzy, php-format
 msgid "%s %s Playlist"
@@ -1114,6 +1253,21 @@ msgstr ""
 msgid "Cache Hits:"
 msgstr ""
 
+#: ../../templates/show_add_access_rpc.inc.php:22
+#: ../../templates/show_access_list.inc.php:36
+#: ../../templates/show_access_list.inc.php:37
+#, fuzzy
+msgid "Add API / RPC Host"
+msgstr "Добавить доступ для хоста"
+
+#: ../../templates/show_add_access_rpc.inc.php:50
+#: ../../templates/show_add_access_rpc.inc.php:51
+#: ../../templates/show_add_access_rpc.inc.php:52
+#: ../../templates/show_edit_access.inc.php:37
+#: ../../templates/show_add_access.inc.php:54
+msgid "RPC"
+msgstr "RPC"
+
 #: ../../templates/show_add_live_stream.inc.php:24
 #: ../../templates/sidebar_modules.inc.php:42
 msgid "Add Radio Station"
@@ -1148,80 +1302,16 @@ msgid "Update Artist"
 msgstr "Обновить исполнителя"
 
 #: ../../templates/show_edit_access.inc.php:22
-msgid "Edit ACL"
-msgstr "Редактировать ACL"
+#, fuzzy
+msgid "Edit Access Control List"
+msgstr "Списки доступа"
 
 #: ../../templates/show_edit_access.inc.php:30
-#: ../../templates/show_add_access.inc.php:63
+#: ../../templates/show_add_access.inc.php:48
 msgid "ACL Type"
 msgstr "Тип ACL"
 
-#: ../../templates/show_edit_access.inc.php:34
-#: ../../templates/show_add_access.inc.php:66
-msgid "Stream Access"
-msgstr "Потоковый доступ"
-
-#: ../../templates/show_edit_access.inc.php:35
-#: ../../templates/show_add_access.inc.php:67
-msgid "Web Interface"
-msgstr "Веб интерфейс"
-
-#: ../../templates/show_edit_access.inc.php:36
-#: ../../templates/show_add_access.inc.php:68
-msgid "Local Network Definition"
-msgstr "Определение локальный сети"
-
-#: ../../templates/show_edit_access.inc.php:37
-#: ../../templates/show_add_access.inc.php:69
-msgid "RPC"
-msgstr "RPC"
-
-#: ../../templates/show_edit_access.inc.php:43
-#: ../../templates/show_add_access.inc.php:32
-msgid "Start IP Address"
-msgstr "Начальный IP адрес"
-
-#: ../../templates/show_edit_access.inc.php:50
-#: ../../templates/show_add_access.inc.php:39
-msgid "End IP Address"
-msgstr "Конечный IP адрес"
-
-#: ../../templates/show_edit_access.inc.php:63
-#: ../../templates/show_add_access.inc.php:77
-msgid "Remote Key"
-msgstr "Удаленный ключ"
-
-#: ../../templates/show_edit_access.inc.php:73
-#: ../../templates/show_add_access.inc.php:55
-#: ../../templates/show_play_selected.inc.php:49
-#: ../../lib/class/access.class.php:328
-msgid "View"
-msgstr "Просмотр"
-
-#: ../../templates/show_edit_access.inc.php:74
-#: ../../templates/show_add_access.inc.php:56
-#: ../../lib/class/access.class.php:331
-msgid "Read"
-msgstr "Чтение"
-
-#: ../../templates/show_edit_access.inc.php:75
-#: ../../templates/show_add_access.inc.php:57
-#: ../../lib/class/access.class.php:334
-msgid "Read/Write"
-msgstr "Чтение/Запись"
-
-#: ../../templates/show_edit_access.inc.php:76
-#: ../../templates/show_add_access.inc.php:58
-#: ../../templates/show_export.inc.php:35
-#: ../../templates/show_mail_users.inc.php:30
-#: ../../templates/show_random.inc.php:38
-#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:141
-#: ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
-#: ../../lib/class/access.class.php:325 ../../lib/class/access.class.php:350
-msgid "All"
-msgstr "Все"
-
-#: ../../templates/show_edit_access.inc.php:82
+#: ../../templates/show_edit_access.inc.php:84
 #: ../../templates/show_preference_admin.inc.php:55
 #: ../../templates/show_catalog_row.inc.php:31
 #: ../../templates/show_play_selected.inc.php:64
@@ -1498,16 +1588,11 @@ msgid "Recently Played"
 msgstr "Последние проигранные"
 
 #: ../../templates/show_add_access.inc.php:22
-msgid "Add Access for a Host"
-msgstr "Добавить доступ для хоста"
-
-#: ../../templates/show_add_access.inc.php:74
-msgid "RPC Options"
-msgstr "Опции XML-RPC"
-
-#: ../../templates/show_add_access.inc.php:84
-msgid "Create ACL"
-msgstr "Создать ACL"
+#: ../../templates/show_access_list.inc.php:43
+#: ../../templates/show_access_list.inc.php:44
+#, fuzzy
+msgid "Advanced Add"
+msgstr "Расширенный"
 
 #: ../../templates/sidebar_admin.inc.php:24
 #: ../../templates/show_admin_tools.inc.php:26
@@ -1540,6 +1625,7 @@ msgid "Browse Users"
 msgstr "Список пользователей"
 
 #: ../../templates/sidebar_admin.inc.php:37
+#: ../../templates/show_access_list.inc.php:28
 msgid "Access Control"
 msgstr "Списки доступа"
 
@@ -1726,7 +1812,7 @@ msgstr "Общее"
 
 #: ../../templates/show_edit_playlist_row.inc.php:33
 #: ../../templates/show_playlist_edit.inc.php:40
-#: ../../lib/class/playlist.class.php:81
+#: ../../lib/class/playlist.class.php:83
 msgid "Private"
 msgstr "Частное"
 
@@ -2092,6 +2178,13 @@ msgstr "Последние десять отмеченных записей"
 msgid "Disabled Songs"
 msgstr "Отключенные песни"
 
+#: ../../templates/show_add_access_current.inc.php:22
+#: ../../templates/show_access_list.inc.php:32
+#: ../../templates/show_access_list.inc.php:33
+#, fuzzy
+msgid "Add Current Host"
+msgstr "Текущий плейлист"
+
 #: ../../templates/show_localplay_instances.inc.php:23
 msgid "Show Localplay Instances"
 msgstr "Показать сущности локального воспроизведения"
@@ -2203,13 +2296,6 @@ msgstr "Неограниченно"
 msgid "Create a new playlist"
 msgstr "Создать новый плейлист"
 
-#: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random.inc.php:61
-#: ../../templates/show_access_list.inc.php:51
-#: ../../templates/show_playlist_edit.inc.php:36
-msgid "Type"
-msgstr "Тип"
-
 #: ../../templates/show_run_add_catalog.inc.php:24
 #: ../../templates/show_adds_catalog.inc.php:25
 msgid "Found"
@@ -2575,8 +2661,8 @@ msgid "Disk"
 msgstr "Диск"
 
 #: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1922
-#: ../../lib/class/catalog.class.php:1993
+#: ../../lib/class/catalog.class.php:1931
+#: ../../lib/class/catalog.class.php:2002
 msgid "Unknown (Orphaned)"
 msgstr "Неизвестный (сирота)"
 
@@ -2735,49 +2821,20 @@ msgstr "Показывать неактивных пользователей"
 msgid "Check for New Version"
 msgstr "Проверить новую версию"
 
-#: ../../templates/show_access_list.inc.php:29
-msgid "Ampache Access Control"
-msgstr "Ampache Контроль доступа"
-
-#: ../../templates/show_access_list.inc.php:32
-msgid ""
-"Since your catalog can be accessed remotely you may want to limit the access "
-"from remote sources so you are not in violation of copyright laws."
-msgstr ""
-
-#: ../../templates/show_access_list.inc.php:33
-msgid ""
-"By default your server will allow anyone with an account to stream music."
-msgstr ""
-
-#: ../../templates/show_access_list.inc.php:34
-msgid ""
-"It will not allow any other Ampache servers to connect to it to share "
-"catalog information."
-msgstr ""
-
-#: ../../templates/show_access_list.inc.php:35
+#: ../../templates/show_access_list.inc.php:50
 #, fuzzy
-msgid ""
-"Use tool below to add any server's IP address that you want to access your "
-"Ampache catalog or be able to stream from this server."
-msgstr ""
-"Используйте форму для добавления узла, которому вы хотите предоставитьдоступ "
-"к Ampcahe"
-
-#: ../../templates/show_access_list.inc.php:40
-msgid "Add Entry"
-msgstr "Добавить запись"
+msgid "Access Control Entries"
+msgstr "Списки доступа"
 
-#: ../../templates/show_access_list.inc.php:46
+#: ../../templates/show_access_list.inc.php:56
 msgid "Start Address"
 msgstr "Начальный адрес"
 
-#: ../../templates/show_access_list.inc.php:47
+#: ../../templates/show_access_list.inc.php:57
 msgid "End Address"
 msgstr "Конечный адрес"
 
-#: ../../templates/show_access_list.inc.php:50
+#: ../../templates/show_access_list.inc.php:60
 msgid "Key"
 msgstr "Ключ"
 
@@ -3131,6 +3188,21 @@ msgstr "Записи кричалки"
 msgid "Flagged Records"
 msgstr "Отмеченные записи"
 
+#: ../../lib/class/access.class.php:102 ../../lib/class/access.class.php:106
+#: ../../lib/class/access.class.php:146 ../../lib/class/access.class.php:150
+msgid "Invalid IPv4 / IPv6 Address Entered"
+msgstr ""
+
+#: ../../lib/class/access.class.php:111 ../../lib/class/access.class.php:112
+#: ../../lib/class/access.class.php:155 ../../lib/class/access.class.php:156
+msgid "IP Address Version Mismatch"
+msgstr ""
+
+#: ../../lib/class/access.class.php:443
+#, fuzzy
+msgid "API/RPC"
+msgstr "RPC"
+
 #: ../../lib/class/flag.class.php:257
 msgid "Approved"
 msgstr "Одобрено"
@@ -3166,7 +3238,7 @@ msgid "Error Passwords don't match"
 msgstr "Ошибка: Пароль не совпадает"
 
 #: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:433
-#: ../../lib/class/catalog.class.php:774
+#: ../../lib/class/catalog.class.php:783
 msgid "Error: Unable to open"
 msgstr "Ошибка: не удалось открыть "
 
@@ -3196,131 +3268,131 @@ msgstr "Запущено удаленное обновление"
 msgid "Error: Unable to change to directory"
 msgstr "Ошибка: не удалось изменить директорию"
 
-#: ../../lib/class/catalog.class.php:511
+#: ../../lib/class/catalog.class.php:519
 #, fuzzy, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr "Ошибка: не удалось определить размер файла "
 
-#: ../../lib/class/catalog.class.php:517
+#: ../../lib/class/catalog.class.php:525
 #, fuzzy, php-format
 msgid "%s is not readable by ampache"
 msgstr "не читаем программой ampache"
 
-#: ../../lib/class/catalog.class.php:525
+#: ../../lib/class/catalog.class.php:533
 #, php-format
 msgid "%s does not match site charset"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1063 ../../preferences.php:111
-#: ../../admin/access.php:45
+#: ../../lib/class/catalog.class.php:1072 ../../preferences.php:111
+#: ../../admin/access.php:109
 msgid "Updated"
 msgstr "Обновлено"
 
-#: ../../lib/class/catalog.class.php:1070
+#: ../../lib/class/catalog.class.php:1079
 msgid "No Update Needed"
 msgstr "Обновление не требуется"
 
-#: ../../lib/class/catalog.class.php:1170
+#: ../../lib/class/catalog.class.php:1179
 msgid "Running Remote Update"
 msgstr "Запущено удаленное обновление"
 
-#: ../../lib/class/catalog.class.php:1197
+#: ../../lib/class/catalog.class.php:1206
 msgid "Added Playlist From"
 msgstr "Добавлен плейлист из"
 
-#: ../../lib/class/catalog.class.php:1226
+#: ../../lib/class/catalog.class.php:1235
 msgid "Catalog Update Finished"
 msgstr "Обновление каталога завершено"
 
-#: ../../lib/class/catalog.class.php:1226
+#: ../../lib/class/catalog.class.php:1235
 msgid "Total Time"
 msgstr "Общее время"
 
-#: ../../lib/class/catalog.class.php:1227
+#: ../../lib/class/catalog.class.php:1236
 msgid "Total Songs"
 msgstr "Всего песен"
 
-#: ../../lib/class/catalog.class.php:1227
+#: ../../lib/class/catalog.class.php:1236
 msgid "Songs Per Seconds"
 msgstr "Песен в секунду"
 
-#: ../../lib/class/catalog.class.php:1241 ../../admin/users.php:142
+#: ../../lib/class/catalog.class.php:1250 ../../admin/users.php:142
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../../lib/class/catalog.class.php:1241
+#: ../../lib/class/catalog.class.php:1250
 #, fuzzy
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr "Невозможно загрузить библиотеку XMLRPC, убедитесь что XML-RPC включено"
 
-#: ../../lib/class/catalog.class.php:1273
-#: ../../lib/class/catalog.class.php:1347
-#: ../../lib/class/catalog.class.php:1380
+#: ../../lib/class/catalog.class.php:1282
+#: ../../lib/class/catalog.class.php:1356
+#: ../../lib/class/catalog.class.php:1389
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Error connecting to"
 msgstr "Ошибка при соединении с"
 
-#: ../../lib/class/catalog.class.php:1273
-#: ../../lib/class/catalog.class.php:1347
-#: ../../lib/class/catalog.class.php:1380
+#: ../../lib/class/catalog.class.php:1282
+#: ../../lib/class/catalog.class.php:1356
+#: ../../lib/class/catalog.class.php:1389
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Code"
 msgstr "Код"
 
-#: ../../lib/class/catalog.class.php:1273
-#: ../../lib/class/catalog.class.php:1347
-#: ../../lib/class/catalog.class.php:1380
+#: ../../lib/class/catalog.class.php:1282
+#: ../../lib/class/catalog.class.php:1356
+#: ../../lib/class/catalog.class.php:1389
 #: ../../lib/class/xmlrpcclient.class.php:64
 msgid "Reason"
 msgstr "Причина"
 
-#: ../../lib/class/catalog.class.php:1302
+#: ../../lib/class/catalog.class.php:1311
 msgid "Completed updating remote catalog(s)"
 msgstr "Закончено обновление удаленных каталогов"
 
-#: ../../lib/class/catalog.class.php:1306
+#: ../../lib/class/catalog.class.php:1315
 msgid "Starting synchronisation of album images"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1308
+#: ../../lib/class/catalog.class.php:1317
 msgid "Completed synchronisation of album images"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1343 ../../admin/access.php:40
+#: ../../lib/class/catalog.class.php:1352 ../../admin/access.php:93
 msgid "Added"
 msgstr "Добавлено"
 
-#: ../../lib/class/catalog.class.php:1376
+#: ../../lib/class/catalog.class.php:1385
 msgid "images synchronized: "
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1505
+#: ../../lib/class/catalog.class.php:1514
 msgid "Catalog Root unreadable, stopping clean"
 msgstr "Корневой каталог не читаем, остановка очистки"
 
-#: ../../lib/class/catalog.class.php:1562
+#: ../../lib/class/catalog.class.php:1571
 msgid "Catalog Clean Done"
 msgstr "Очистка каталога завершена"
 
-#: ../../lib/class/catalog.class.php:1562
+#: ../../lib/class/catalog.class.php:1571
 msgid "files removed"
 msgstr "файлы удалены"
 
-#: ../../lib/class/catalog.class.php:1563
+#: ../../lib/class/catalog.class.php:1572
 msgid "Optimizing Tables"
 msgstr "Оптимизация таблиц"
 
-#: ../../lib/class/catalog.class.php:1863
+#: ../../lib/class/catalog.class.php:1872
 msgid "Update Finished."
 msgstr "Обновление завершено"
 
-#: ../../lib/class/catalog.class.php:1863
+#: ../../lib/class/catalog.class.php:1872
 msgid "Checked"
 msgstr "Отмечен"
 
-#: ../../lib/class/catalog.class.php:1863
+#: ../../lib/class/catalog.class.php:1872
 msgid "songs updated."
 msgstr "песен обновлено."
 
@@ -3382,11 +3454,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../lib/general.lib.php:498
+#: ../../lib/general.lib.php:396
 msgid "On"
 msgstr "Вкл"
 
-#: ../../lib/general.lib.php:501
+#: ../../lib/general.lib.php:399
 msgid "Off"
 msgstr "Выкл"
 
@@ -3457,11 +3529,11 @@ msgstr ""
 msgid "Error: Unable to make Database Connection"
 msgstr "Ошибка: не удалось изменить директорию"
 
-#: ../../lib/install.php:270
+#: ../../lib/install.php:276
 msgid "No Username/Password specified"
 msgstr "Не указаны пользователь или пароль"
 
-#: ../../lib/install.php:275
+#: ../../lib/install.php:281
 msgid "Passwords do not match"
 msgstr "Пароль не совпадает"
 
@@ -3717,11 +3789,12 @@ msgstr "Удален"
 msgid "Your Access List Entry has been removed"
 msgstr "Запись списка доступа была удалена"
 
-#: ../../admin/access.php:40
-msgid "Your new Access List Entry has been created"
+#: ../../admin/access.php:93
+#, fuzzy
+msgid "Your new Access Control List(s) have been created"
 msgstr "Новая запись списка доступа создана"
 
-#: ../../admin/access.php:45
+#: ../../admin/access.php:109
 msgid "Access List Entry updated"
 msgstr "Запись списка доступа обновлена"
 
@@ -3993,312 +4066,22 @@ msgstr "Интерфейс"
 msgid "System"
 msgstr "Система"
 
-#~ msgid "genre"
-#~ msgstr "стиль"
-
-#, fuzzy
-#~ msgid "Catalan"
-#~ msgstr "Каталог"
-
-#, fuzzy
-#~ msgid "Danish"
-#~ msgstr "Детали"
+#~ msgid "Edit ACL"
+#~ msgstr "Редактировать ACL"
 
-#, fuzzy
-#~ msgid "Greek"
-#~ msgstr "Стиль"
-
-#, fuzzy
-#~ msgid "British English"
-#~ msgstr "English"
-
-#~ msgid "English"
-#~ msgstr "English"
-
-#, fuzzy
-#~ msgid "Persian"
-#~ msgstr "Версия"
-
-#, fuzzy
-#~ msgid "French"
-#~ msgstr "Частота"
-
-#, fuzzy
-#~ msgid "Korean"
-#~ msgstr "Еще"
-
-#, fuzzy
-#~ msgid "Latvian"
-#~ msgstr "Рейтинг"
-
-#, fuzzy
-#~ msgid "Polish"
-#~ msgstr "Плагины"
-
-#, fuzzy
-#~ msgid "Turkish"
-#~ msgstr "Песни"
-
-#, fuzzy
-#~ msgid "Vietnamese"
-#~ msgstr "Файл"
-
-#~ msgid "Playlist Updated"
-#~ msgstr "Плейлист обновлен"
-
-#~ msgid "has been updated and is now"
-#~ msgstr "обновлен"
-
-#, fuzzy
-#~ msgid "Add Tag"
-#~ msgstr "Добавить каталог"
-
-#~ msgid "Editing"
-#~ msgstr "Редактирование"
-
-#~ msgid "preferences"
-#~ msgstr "предпочтения"
-
-#, fuzzy
-#~ msgid "Playlist %s"
-#~ msgstr "Плейлисты"
-
-#~ msgid "Newest Genres"
-#~ msgstr "Последние жанры"
-
-#, fuzzy
-#~ msgid "Ampache Latest Artists Additions"
-#~ msgstr "Последние исполнители"
-
-#, fuzzy
-#~ msgid "Ampache Latest Albums Additions"
-#~ msgstr "Последние альбомы"
-
-#, fuzzy
-#~ msgid "Ampache Most Popular Albums"
-#~ msgstr "Самые популярные альбомы"
-
-#, fuzzy
-#~ msgid "Ampache Most Popular Artists"
-#~ msgstr "Самые популярные исполнители"
+#~ msgid "End IP Address"
+#~ msgstr "Конечный IP адрес"
 
-#, fuzzy
-#~ msgid "Ampache Most Popular Songs"
-#~ msgstr "Самые популярные песни"
+#~ msgid "Ampache Access Control"
+#~ msgstr "Ampache Контроль доступа"
 
 #, fuzzy
-#~ msgid "Ampache Recently Played"
-#~ msgstr "Последние проигранные"
-
-#~ msgid "From genre"
-#~ msgstr "Жанр"
-
-#~ msgid "Favorites"
-#~ msgstr "Любимые"
-
-#~ msgid "Recommendations"
-#~ msgstr "Рекомендации"
-
-#~ msgid "Viewing"
-#~ msgstr "Просмотр"
-
-#~ msgid "Browse By"
-#~ msgstr "Просмотреть"
-
-#~ msgid "Recommend Similar"
-#~ msgstr "Рекомендовать сходного"
-
-#~ msgid "Sections"
-#~ msgstr "Профили"
-
-#~ msgid "catalog"
-#~ msgstr "каталог"
-
-#~ msgid "Find Missing Tracks"
-#~ msgstr "Найти отсутствующие треки"
-
-#~ msgid "Links"
-#~ msgstr "Ссылки"
-
-#~ msgid "Buy Track from MyStrands"
-#~ msgstr "Купить трек на MyStrands"
-
-#~ msgid "Return"
-#~ msgstr "Возврат"
-
-#~ msgid " FOUND"
-#~ msgstr " НАЙДЕНО"
-
-#~ msgid "Searching for new Album Art"
-#~ msgstr "Поиск новой обложки альбома"
-
-#~ msgid "Export Failed"
-#~ msgstr "Экспорт не удался"
-
-#~ msgid "description"
-#~ msgstr "описание"
-
-#~ msgid "Label"
-#~ msgstr "Метка"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Номер каталога"
-
-#~ msgid "Last Updated"
-#~ msgstr "Последнее обновление"
-
 #~ msgid ""
-#~ "This test checks to make sure you have Iconv support installed. Iconv "
-#~ "support is not required for Ampache, but it is highly recommended"
+#~ "Use tool below to add any server's IP address that you want to access "
+#~ "your Ampache catalog or be able to stream from this server."
 #~ msgstr ""
-#~ "Тест на поддержку Iconv.Поддержка Iconv не требуется для Ampache, но она "
-#~ "строго рекомендуется."
-
-#~ msgid ""
-#~ "This steps takes the basic config values, and first attempts to write "
-#~ "them out directly to your webserver. If access is denied it will prompt "
-#~ "you to download the config file. Please put the downloaded config file "
-#~ "in /config"
-#~ msgstr ""
-#~ "На этих шагах будут запрошены основные конфигурационные значения и будет "
-#~ "произведена попытка записать их напрямую на веб сервер. Если доступ будет "
-#~ "запрещен, будет запрос на скачивание конфигурационного файла. Пожалуйста, "
-#~ "положите скачанный конфигурационный файл в /config"
-
-#~ msgid "Rating Updated"
-#~ msgstr "Рейтинг обновлен"
-
-#~ msgid "Your rating for this object has been updated"
-#~ msgstr "Ваш рейтинг для данного объекта обновлен"
-
-#~ msgid "Playlist Cleared"
-#~ msgstr "Плейлист очищен"
-
-#~ msgid "No songs in this playlist."
-#~ msgstr "В этом плейлисте нет песен"
-
-#~ msgid "New Playlist"
-#~ msgstr "Новый плейлист"
-
-#~ msgid "Controls"
-#~ msgstr "Управление"
-
-#~ msgid "Module Name"
-#~ msgstr "Имя модуля"
-
-#~ msgid "Disable Songs"
-#~ msgstr "Отключить песни"
-
-#~ msgid "Admin Controls"
-#~ msgstr "Управление администратора"
-
-#~ msgid "Downsample"
-#~ msgstr "Понижать качество"
-
-#~ msgid "Newest Artist Additions"
-#~ msgstr "Последние исполнители"
-
-#~ msgid "Newest Album Additions"
-#~ msgstr "Последние альбомы"
-
-#~ msgid "Newest Live Stream Additions"
-#~ msgstr "Последние потоки"
-
-#~ msgid "Playlist Actions"
-#~ msgstr "Действия"
-
-#~ msgid "Edit Playlist"
-#~ msgstr "Редактировать плейлист"
-
-#~ msgid "Play This Playlist"
-#~ msgstr "Играть плейлист"
-
-#~ msgid "Play Random"
-#~ msgstr "Играть случайные"
-
-#~ msgid "Delete This Playlist"
-#~ msgstr "Удалить плейлист"
-
-#~ msgid "Import From File"
-#~ msgstr "Импортировать файл"
-
-#~ msgid "Delete Empty Playlists"
-#~ msgstr "Удалить пустые плейлисты"
-
-#~ msgid "Site"
-#~ msgstr "Страница"
-
-#~ msgid "No user with this name registered"
-#~ msgstr "Пользователь с таким именем не зарегистрирован"
-
-#~ msgid "The validation key used isn't correct."
-#~ msgstr "Ключ валидации не верен"
-
-#~ msgid "User activated"
-#~ msgstr "Пользователь активирован"
-
-#~ msgid "Error: Unable to write to"
-#~ msgstr "Ошибка: не могу записать в "
-
-#~ msgid "Adding"
-#~ msgstr "Добавление"
-
-#~ msgid "to database"
-#~ msgstr "в базу данных"
-
-#~ msgid "Continue?  (Y/N):"
-#~ msgstr "Продолжить? (Y/N):"
-
-#~ msgid "Error:  "
-#~ msgstr "Ошибка: "
-
-#~ msgid "!\n"
-#~ msgstr "!\n"
-
-#~ msgid "You are currently logged in as"
-#~ msgstr "Вы зашли как"
-
-#~ msgid "Song title"
-#~ msgstr "Название"
-
-#~ msgid "Total"
-#~ msgstr "Всего"
-
-#~ msgid "Rebuild Preferences"
-#~ msgstr "Перестроить настройки"
-
-#~ msgid "Play Random from Album"
-#~ msgstr "Играть случайные с альбома"
-
-#~ msgid "Minutes"
-#~ msgstr "Минут"
-
-#~ msgid "Host Access to Your Catalog"
-#~ msgstr "Доступ узла к каталогу"
-
-#~ msgid "Revoke"
-#~ msgstr "Отозвать"
-
-#~ msgid "Album Name"
-#~ msgstr "Альбом"
-
-#~ msgid "Album Year"
-#~ msgstr "Год"
-
-#~ msgid "Edit Access List"
-#~ msgstr "Редактировать списки доступа"
-
-#~ msgid "Ampache.cfg.php Up to Date?"
-#~ msgstr "Ampache.cfg.php обновлен?"
-
-#~ msgid "Ampache.cfg.php is missing the following:"
-#~ msgstr "ampache.cfg.php не нашел следующее:"
-
-#~ msgid "Reset Form"
-#~ msgstr "Сбросить"
-
-#~ msgid "Save Search As Track on"
-#~ msgstr "Сохранить найденное как трек"
+#~ "Используйте форму для добавления узла, которому вы хотите "
+#~ "предоставитьдоступ к Ampcahe"
 
-#~ msgid "Save"
-#~ msgstr "Сохранить"
+#~ msgid "Add Entry"
+#~ msgstr "Добавить запись"