Merge https://github.com/friendica/red into zpull

2 files changed, 475 insertions, 413 deletions

diff --git a/view/ru/messages.po b/view/ru/messages.po
index 375af7439..d4ee432e3 100644
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-06 00:01-0700\n"
-"PO-Revision-Date: 2013-09-13 09:56+0000\n"
+"POT-Creation-Date: 2013-09-13 00:01-0700\n"
+"PO-Revision-Date: 2013-09-16 06:41+0000\n"
 "Last-Translator: alexej <info@pixelbits.de>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/red-matrix/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -247,9 +247,9 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: ../../include/Contact.php:87 ../../include/contact_widgets.php:9
+#: ../../include/Contact.php:87 ../../include/contact_widgets.php:23
 #: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56
-#: ../../boot.php:1687
+#: ../../boot.php:1696
 msgid "Connect"
 msgstr "Подключить"
 
@@ -285,7 +285,7 @@ msgstr "Сообщения сети"
 
 #: ../../include/Contact.php:467 ../../include/conversation.php:918
 msgid "Edit Contact"
-msgstr "Редактировать канал"
+msgstr "Редактировать контакт"
 
 #: ../../include/Contact.php:468 ../../include/conversation.php:919
 msgid "Send PM"
@@ -352,7 +352,7 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:77 ../../mod/admin.php:636
-#: ../../mod/admin.php:645 ../../boot.php:1422
+#: ../../mod/admin.php:645 ../../boot.php:1431
 msgid "Email"
 msgstr "E-mail"
 
@@ -380,88 +380,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/contact_widgets.php:6
-msgid "Add New Connection"
-msgstr "Добавить новый контакт"
-
-#: ../../include/contact_widgets.php:7
-msgid "Enter the channel address"
-msgstr "Введите адрес вашего канала"
-
-#: ../../include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Пример: bob@example.com, http://example.com/barbara"
-
-#: ../../include/contact_widgets.php:23
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "имеется %d  приглашение"
-msgstr[1] "имеются %d  приглашения"
-msgstr[2] "имеется %d  приглашений"
-
-#: ../../include/contact_widgets.php:29
-msgid "Find Channels"
-msgstr "Поиск каналов"
-
-#: ../../include/contact_widgets.php:30
-msgid "Enter name or interest"
-msgstr "Впишите имя или интерес"
-
-#: ../../include/contact_widgets.php:31
-msgid "Connect/Follow"
-msgstr "Подключить/следовать"
-
-#: ../../include/contact_widgets.php:32
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Примеры: Владимир Ильич, Революционер"
-
-#: ../../include/contact_widgets.php:33 ../../mod/directory.php:182
-#: ../../mod/directory.php:187 ../../mod/connections.php:666
-msgid "Find"
-msgstr "Поиск"
-
-#: ../../include/contact_widgets.php:34 ../../mod/suggest.php:64
-msgid "Channel Suggestions"
-msgstr "Рекомендации контактов"
-
-#: ../../include/contact_widgets.php:35
-msgid "Similar Interests"
-msgstr "Похожие интересы"
-
-#: ../../include/contact_widgets.php:36
-msgid "Random Profile"
-msgstr "Случайные"
-
-#: ../../include/contact_widgets.php:37
-msgid "Invite Friends"
-msgstr "Пригласить друзей"
-
-#: ../../include/contact_widgets.php:61 ../../include/features.php:58
-msgid "Saved Folders"
-msgstr "Запомненные папки"
-
-#: ../../include/contact_widgets.php:64 ../../include/contact_widgets.php:91
-msgid "Everything"
-msgstr "Все"
-
-#: ../../include/contact_widgets.php:88
-msgid "Categories"
-msgstr "Категории"
-
-#: ../../include/contact_widgets.php:121
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d совместный канал"
-msgstr[1] "%d совместных канала"
-msgstr[2] "%d совместных каналов"
-
-#: ../../include/contact_widgets.php:126 ../../include/js_strings.php:7
-#: ../../include/ItemObject.php:255
-msgid "show more"
-msgstr "показать все"
-
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr "Прочее"
@@ -553,7 +471,7 @@ msgid "Finishes:"
 msgstr "\t\nКонец:"
 
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1737
+#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1746
 msgid "Location:"
 msgstr "Откуда:"
 
@@ -720,6 +638,10 @@ msgstr "Категории сообщения"
 msgid "Add categories to your posts"
 msgstr "Добавить категории для ваших сообщений"
 
+#: ../../include/features.php:58 ../../include/contact_widgets.php:76
+msgid "Saved Folders"
+msgstr "Запомненные папки"
+
 #: ../../include/features.php:58
 msgid "Ability to file posts under folders"
 msgstr ""
@@ -761,7 +683,7 @@ msgstr ""
 
 #: ../../include/group.php:242
 msgid "All Channels"
-msgstr "Все контакты"
+msgstr "Все каналы"
 
 #: ../../include/group.php:264 ../../include/page_widgets.php:8
 msgid "edit"
@@ -792,10 +714,15 @@ msgid "Delete this item?"
 msgstr "Удалить этот элемент?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:504
-#: ../../mod/photos.php:1073 ../../mod/photos.php:1157
+#: ../../mod/photos.php:1075 ../../mod/photos.php:1159
 msgid "Comment"
 msgstr "Комментарий"
 
+#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:148
+#: ../../include/ItemObject.php:255
+msgid "show more"
+msgstr "показать все"
+
 #: ../../include/js_strings.php:8
 msgid "show fewer"
 msgstr "показать меньше"
@@ -897,12 +824,12 @@ msgstr "Невозможно определить отправителя."
 msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/network.php:1103
+#: ../../include/network.php:1113
 msgid "view full size"
 msgstr "посмотреть в полный размер"
 
 #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51
-#: ../../mod/photos.php:97 ../../mod/photos.php:755 ../../mod/photos.php:777
+#: ../../mod/photos.php:97 ../../mod/photos.php:757 ../../mod/photos.php:779
 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235
 #: ../../mod/profile_photo.php:346
 msgid "Profile Photos"
@@ -918,7 +845,7 @@ msgid "Full Name:"
 msgstr "Полное имя:"
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:140
-#: ../../boot.php:1739
+#: ../../boot.php:1748
 msgid "Gender:"
 msgstr "Пол:"
 
@@ -939,7 +866,7 @@ msgid "Age:"
 msgstr "Возраст:"
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:142
-#: ../../boot.php:1740
+#: ../../boot.php:1749
 msgid "Status:"
 msgstr "Статус:"
 
@@ -953,7 +880,7 @@ msgid "Sexual Preference:"
 msgstr "Сексуальная ориентация:"
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:144
-#: ../../boot.php:1741
+#: ../../boot.php:1750
 msgid "Homepage:"
 msgstr "Домашняя страница:"
 
@@ -991,7 +918,7 @@ msgstr "Что вам не нравится:"
 
 #: ../../include/profile_advanced.php:67
 msgid "Contact information and Social Networks:"
-msgstr "Информация и социальные сети канала:"
+msgstr "Информация и социальные сети контакта:"
 
 #: ../../include/profile_advanced.php:69
 msgid "Musical interests:"
@@ -1021,7 +948,7 @@ msgstr "Работа / Занятость:"
 msgid "School/education:"
 msgstr "Школа / образование:"
 
-#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1419
+#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1428
 msgid "Logout"
 msgstr "Выход"
 
@@ -1050,7 +977,7 @@ msgstr "Редактирование профилей"
 msgid "Manage/Edit Profiles"
 msgstr "Управление / Редактирование профилей"
 
-#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2180
+#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2189
 msgid "Photos"
 msgstr "Фотографии"
 
@@ -1058,7 +985,7 @@ msgstr "Фотографии"
 msgid "Your photos"
 msgstr "Ваши фотографии"
 
-#: ../../include/nav.php:84 ../../boot.php:1420
+#: ../../include/nav.php:84 ../../boot.php:1429
 msgid "Login"
 msgstr "Войти"
 
@@ -1079,7 +1006,7 @@ msgstr ""
 msgid "Home Page"
 msgstr "Моя страница"
 
-#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1395
+#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1404
 msgid "Register"
 msgstr "Регистрация"
 
@@ -1138,7 +1065,7 @@ msgstr "Пометить все оповещения матрицы как пр�
 
 #: ../../include/nav.php:149
 msgid "See all channel notifications"
-msgstr "Просмотреть все оповещения канала"
+msgstr "Просмотреть все уведомления канала"
 
 #: ../../include/nav.php:150
 msgid "Mark all channel notifications seen"
@@ -1174,11 +1101,11 @@ msgstr "Пометить все оповещения как прочитанно
 
 #: ../../include/nav.php:161
 msgid "Mail"
-msgstr "Сообщения"
+msgstr "Переписка"
 
 #: ../../include/nav.php:161
 msgid "Private mail"
-msgstr "Ваши личные сообщения"
+msgstr "Ваша личная переписка"
 
 #: ../../include/nav.php:162
 msgid "See all private messages"
@@ -1200,7 +1127,7 @@ msgstr "Исходящие"
 msgid "New Message"
 msgstr "Новое личное сообщение"
 
-#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2191
+#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2200
 msgid "Events"
 msgstr "Мероприятия"
 
@@ -1257,6 +1184,40 @@ msgstr "Ничего нового здесь"
 msgid "Please wait..."
 msgstr "Подождите пожалуйста ..."
 
+#: ../../include/identity.php:14 ../../mod/item.php:1148
+msgid "Unable to obtain identity information from database"
+msgstr "Невозможно получить идентификационную информацию из базы данных"
+
+#: ../../include/identity.php:36
+msgid "Empty name"
+msgstr "Пустое имя"
+
+#: ../../include/identity.php:38
+msgid "Name too long"
+msgstr "Слишком длинное имя"
+
+#: ../../include/identity.php:80
+msgid "No account identifier"
+msgstr "идентификатор аккаунта отсутствует"
+
+#: ../../include/identity.php:98
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте."
+
+#: ../../include/identity.php:157
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/identity.php:214
+msgid "Default Profile"
+msgstr "Профиль по умолчанию"
+
+#: ../../include/identity.php:239 ../../include/profile_selectors.php:42
+#: ../../mod/network.php:364 ../../mod/connections.php:377
+msgid "Friends"
+msgstr "Друзья"
+
 #: ../../include/notify.php:23
 msgid "created a new post"
 msgstr "создал новое сообщение"
@@ -1278,7 +1239,7 @@ msgstr ""
 #: ../../include/attach.php:133 ../../include/attach.php:189
 #: ../../include/attach.php:204 ../../include/attach.php:237
 #: ../../include/attach.php:251 ../../include/attach.php:272
-#: ../../include/attach.php:464 ../../include/items.php:3336
+#: ../../include/attach.php:464 ../../include/items.php:3359
 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13
 #: ../../mod/invite.php:102 ../../mod/allfriends.php:10
 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31
@@ -1286,9 +1247,9 @@ msgstr ""
 #: ../../mod/settings.php:598 ../../mod/viewconnections.php:33
 #: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6
 #: ../../mod/mitem.php:92 ../../mod/group.php:15 ../../mod/photos.php:74
-#: ../../mod/photos.php:645 ../../mod/viewsrc.php:12 ../../mod/menu.php:40
+#: ../../mod/photos.php:647 ../../mod/viewsrc.php:12 ../../mod/menu.php:40
 #: ../../mod/message.php:204 ../../mod/layouts.php:27 ../../mod/layouts.php:42
-#: ../../mod/item.php:152 ../../mod/network.php:7 ../../mod/intro.php:50
+#: ../../mod/network.php:7 ../../mod/intro.php:50
 #: ../../mod/connections.php:174 ../../mod/profiles.php:163
 #: ../../mod/profiles.php:476 ../../mod/new_channel.php:66
 #: ../../mod/new_channel.php:97 ../../mod/manage.php:6
@@ -1297,9 +1258,9 @@ msgstr ""
 #: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:43
 #: ../../mod/editwebpage.php:65 ../../mod/notifications.php:66
 #: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13
-#: ../../mod/poke.php:128 ../../mod/channel.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:49 ../../mod/suggest.php:32
-#: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:112
+#: ../../mod/poke.php:128 ../../mod/channel.php:117 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:49 ../../mod/item.php:163 ../../mod/suggest.php:32
+#: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:114
 #: ../../index.php:178 ../../index.php:340
 msgid "Permission denied."
 msgstr "Доступ запрещен."
@@ -1321,12 +1282,12 @@ msgstr ""
 msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/photos.php:287 ../../boot.php:2183
+#: ../../include/photos.php:288 ../../boot.php:2192
 msgid "Photo Albums"
 msgstr "Фотоальбомы"
 
-#: ../../include/photos.php:291 ../../mod/photos.php:793
-#: ../../mod/photos.php:1267
+#: ../../include/photos.php:292 ../../mod/photos.php:795
+#: ../../mod/photos.php:1269
 msgid "Upload New Photos"
 msgstr "Загрузить новые фотографии"
 
@@ -1474,11 +1435,6 @@ msgstr "Неверный"
 msgid "Sex Addict"
 msgstr "Секс наркоман"
 
-#: ../../include/profile_selectors.php:42 ../../include/identity.php:236
-#: ../../mod/network.php:364 ../../mod/connections.php:377
-msgid "Friends"
-msgstr "Друзья"
-
 #: ../../include/profile_selectors.php:42
 msgid "Friends/Benefits"
 msgstr ""
@@ -1563,59 +1519,43 @@ msgstr "Не заботьтесь"
 msgid "Ask me"
 msgstr "Спроси меня"
 
-#: ../../include/identity.php:14
-msgid "Unable to obtain identity information from database"
-msgstr "Невозможно получить идентификационную информацию из базы данных"
-
-#: ../../include/identity.php:36
-msgid "Empty name"
-msgstr "Пустое имя"
-
-#: ../../include/identity.php:38
-msgid "Name too long"
-msgstr "Слишком длинное имя"
-
-#: ../../include/identity.php:80
-msgid "No account identifier"
-msgstr "идентификатор аккаунта отсутствует"
+#: ../../include/attach.php:184 ../../include/attach.php:232
+msgid "Item was not found."
+msgstr "Элемент не найден."
 
-#: ../../include/identity.php:95
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте."
+#: ../../include/attach.php:285
+msgid "No source file."
+msgstr "Нет исходного файла."
 
-#: ../../include/identity.php:154
-msgid "Unable to retrieve created identity"
-msgstr ""
+#: ../../include/attach.php:302
+msgid "Cannot locate file to replace"
+msgstr "Не удается найти файл, чтобы заменить"
 
-#: ../../include/identity.php:211
-msgid "Default Profile"
-msgstr "Профиль по умолчанию"
+#: ../../include/attach.php:320
+msgid "Cannot locate file to revise/update"
+msgstr "Не удается найти файл для пересмотра / обновления"
 
-#: ../../include/plugin.php:435 ../../include/plugin.php:437
-msgid "Click here to upgrade."
-msgstr "Нажмите здесь, чтобы обновить."
+#: ../../include/attach.php:331
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Файл превышает предельный размер %d"
 
-#: ../../include/plugin.php:443
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/attach.php:342
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/plugin.php:448
-msgid "This action is not available under your subscription plan."
-msgstr ""
+#: ../../include/attach.php:424
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена."
 
-#: ../../include/zot.php:423
-msgid "Invalid data packet"
+#: ../../include/attach.php:436
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/zot.php:433
-msgid "Unable to verify channel signature"
-msgstr "Невозможно проверить сигнатуру канала"
-
-#: ../../include/zot.php:572
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
+#: ../../include/attach.php:480 ../../include/attach.php:497
+msgid "Path not available."
+msgstr "Путь недоступен."
 
 #: ../../include/account.php:23
 msgid "Not a valid email address"
@@ -1651,7 +1591,7 @@ msgid "Registration request at %s"
 msgstr "Требуется регистрация на %s"
 
 #: ../../include/account.php:274 ../../include/account.php:301
-#: ../../include/account.php:358 ../../boot.php:1240
+#: ../../include/account.php:358
 msgid "Administrator"
 msgstr "Администратор"
 
@@ -1673,25 +1613,25 @@ msgstr "Аккаунт утвержден."
 msgid "Registration revoked for %s"
 msgstr "Регистрация отозвана для %s"
 
-#: ../../include/bbcode.php:94 ../../include/bbcode.php:443
-#: ../../include/bbcode.php:446
+#: ../../include/bbcode.php:94 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:426
 msgid "Image/photo"
 msgstr "Изображение / фото"
 
-#: ../../include/bbcode.php:161
+#: ../../include/bbcode.php:141
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s написал следующее %2$s %3$s"
 
-#: ../../include/bbcode.php:163
+#: ../../include/bbcode.php:143
 msgid "post"
 msgstr "сообщение"
 
-#: ../../include/bbcode.php:403 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:383 ../../include/bbcode.php:403
 msgid "$1 wrote:"
 msgstr "$1 писал:"
 
-#: ../../include/bbcode.php:450 ../../include/bbcode.php:451
+#: ../../include/bbcode.php:430 ../../include/bbcode.php:431
 msgid "Encrypted content"
 msgstr "Зашифрованное содержание"
 
@@ -2052,6 +1992,84 @@ msgstr "Ошибка аутентификации"
 msgid "Login failed."
 msgstr "Не удалось войти."
 
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr ""
+
+#: ../../include/contact_widgets.php:20
+msgid "Add New Connection"
+msgstr "Добавить новый контакт"
+
+#: ../../include/contact_widgets.php:21
+msgid "Enter the channel address"
+msgstr "Введите адрес канала"
+
+#: ../../include/contact_widgets.php:22
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Пример: bob@example.com, http://example.com/barbara"
+
+#: ../../include/contact_widgets.php:38
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "имеется %d  приглашение"
+msgstr[1] "имеются %d  приглашения"
+msgstr[2] "имеется %d  приглашений"
+
+#: ../../include/contact_widgets.php:44
+msgid "Find Channels"
+msgstr "Поиск контактов"
+
+#: ../../include/contact_widgets.php:45
+msgid "Enter name or interest"
+msgstr "Впишите имя или интерес"
+
+#: ../../include/contact_widgets.php:46
+msgid "Connect/Follow"
+msgstr "Подключить/следовать"
+
+#: ../../include/contact_widgets.php:47
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Примеры: Владимир Ильич, Революционер"
+
+#: ../../include/contact_widgets.php:48 ../../mod/directory.php:182
+#: ../../mod/directory.php:187 ../../mod/connections.php:666
+msgid "Find"
+msgstr "Поиск"
+
+#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64
+msgid "Channel Suggestions"
+msgstr "Рекомендации каналов"
+
+#: ../../include/contact_widgets.php:50
+msgid "Similar Interests"
+msgstr "Похожие интересы"
+
+#: ../../include/contact_widgets.php:51
+msgid "Random Profile"
+msgstr "Случайные"
+
+#: ../../include/contact_widgets.php:52
+msgid "Invite Friends"
+msgstr "Пригласить друзей"
+
+#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113
+msgid "Everything"
+msgstr "Все"
+
+#: ../../include/contact_widgets.php:110
+msgid "Categories"
+msgstr "Категории"
+
+#: ../../include/contact_widgets.php:143
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d совместный контакт"
+msgstr[1] "%d совместных контакта"
+msgstr[2] "%d совместных контактов"
+
 #: ../../include/follow.php:21
 msgid "Channel is blocked on this site."
 msgstr "Канал блокируется на этом сайте."
@@ -2193,55 +2211,34 @@ msgstr "мне не-нравиться"
 msgid "dislikes"
 msgstr "мне не-нравиться"
 
-#: ../../include/attach.php:184 ../../include/attach.php:232
-msgid "Item was not found."
-msgstr "Элемент не найден."
-
-#: ../../include/attach.php:285
-msgid "No source file."
-msgstr "Нет исходного файла."
-
-#: ../../include/attach.php:302
-msgid "Cannot locate file to replace"
-msgstr "Не удается найти файл, чтобы заменить"
-
-#: ../../include/attach.php:320
-msgid "Cannot locate file to revise/update"
-msgstr "Не удается найти файл для пересмотра / обновления"
-
-#: ../../include/attach.php:331
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Файл превышает предельный размер %d"
-
-#: ../../include/attach.php:424
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена."
+#: ../../include/plugin.php:440 ../../include/plugin.php:442
+msgid "Click here to upgrade."
+msgstr "Нажмите здесь, чтобы обновить."
 
-#: ../../include/attach.php:436
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/plugin.php:448
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/attach.php:480 ../../include/attach.php:497
-msgid "Path not available."
-msgstr "Путь недоступен."
+#: ../../include/plugin.php:453
+msgid "This action is not available under your subscription plan."
+msgstr ""
 
-#: ../../include/ItemObject.php:87 ../../mod/photos.php:943
+#: ../../include/ItemObject.php:87 ../../mod/photos.php:945
 msgid "Private Message"
 msgstr "Личное сообщение"
 
 #: ../../include/ItemObject.php:92 ../../mod/webpages.php:98
 #: ../../mod/settings.php:683 ../../mod/menu.php:55 ../../mod/layouts.php:89
-#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:117
+#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:120
 #: ../../mod/blocks.php:92 ../../mod/editpost.php:94
-#: ../../mod/editblock.php:101
+#: ../../mod/editblock.php:115
 msgid "Edit"
 msgstr "Редактировать"
 
 #: ../../include/ItemObject.php:104 ../../include/conversation.php:631
 #: ../../mod/settings.php:684 ../../mod/group.php:182
-#: ../../mod/photos.php:1123 ../../mod/connections.php:344
-#: ../../mod/admin.php:640
+#: ../../mod/photos.php:1125 ../../mod/connections.php:344
+#: ../../mod/admin.php:640 ../../mod/filestorage.php:62
 msgid "Delete"
 msgstr "Удалить"
 
@@ -2273,11 +2270,11 @@ msgstr "помеченные"
 msgid "add tag"
 msgstr "добавить тег"
 
-#: ../../include/ItemObject.php:165 ../../mod/photos.php:1053
+#: ../../include/ItemObject.php:165 ../../mod/photos.php:1055
 msgid "I like this (toggle)"
 msgstr "мне это нравится (переключение)"
 
-#: ../../include/ItemObject.php:166 ../../mod/photos.php:1054
+#: ../../include/ItemObject.php:166 ../../mod/photos.php:1056
 msgid "I don't like this (toggle)"
 msgstr "мне это не нравится (переключение)"
 
@@ -2312,10 +2309,10 @@ msgid " from %s"
 msgstr " от %s"
 
 #: ../../include/ItemObject.php:233 ../../include/conversation.php:696
-#: ../../include/conversation.php:1092 ../../mod/photos.php:1056
+#: ../../include/conversation.php:1092 ../../mod/photos.php:1058
 #: ../../mod/message.php:298 ../../mod/message.php:461
-#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:126
-#: ../../mod/editpost.php:103 ../../mod/editblock.php:110
+#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:129
+#: ../../mod/editpost.php:103 ../../mod/editblock.php:124
 msgid "Please wait"
 msgstr "Подождите пожалуйста"
 
@@ -2327,8 +2324,8 @@ msgstr[0] "%d комментарий"
 msgstr[1] "%d комментария"
 msgstr[2] "%d комментариев"
 
-#: ../../include/ItemObject.php:502 ../../mod/photos.php:1071
-#: ../../mod/photos.php:1155
+#: ../../include/ItemObject.php:502 ../../mod/photos.php:1073
+#: ../../mod/photos.php:1157
 msgid "This is you"
 msgstr "Это вы"
 
@@ -2338,14 +2335,14 @@ msgstr "Это вы"
 #: ../../mod/settings.php:733 ../../mod/settings.php:761
 #: ../../mod/settings.php:785 ../../mod/settings.php:856
 #: ../../mod/settings.php:1023 ../../mod/connect.php:96 ../../mod/group.php:87
-#: ../../mod/photos.php:676 ../../mod/photos.php:770 ../../mod/photos.php:1035
-#: ../../mod/photos.php:1074 ../../mod/photos.php:1158
+#: ../../mod/photos.php:678 ../../mod/photos.php:772 ../../mod/photos.php:1037
+#: ../../mod/photos.php:1076 ../../mod/photos.php:1160
 #: ../../mod/message.php:299 ../../mod/message.php:460
 #: ../../mod/connections.php:421 ../../mod/profiles.php:529
 #: ../../mod/admin.php:409 ../../mod/admin.php:633 ../../mod/admin.php:769
-#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:381
+#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:385
 #: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
-#: ../../mod/mood.php:135 ../../view/theme/redbasic/php/config.php:136
+#: ../../mod/mood.php:137 ../../view/theme/redbasic/php/config.php:136
 #: ../../view/theme/redbasic/php/config.php:154
 #: ../../view/theme/redstrap/php/config.php:131
 msgid "Submit"
@@ -2384,9 +2381,9 @@ msgid "Video"
 msgstr "Видео"
 
 #: ../../include/ItemObject.php:514 ../../include/conversation.php:1112
-#: ../../mod/photos.php:1075 ../../mod/editlayout.php:130
-#: ../../mod/editwebpage.php:148 ../../mod/editpost.php:123
-#: ../../mod/editblock.php:130
+#: ../../mod/photos.php:1077 ../../mod/editlayout.php:130
+#: ../../mod/editwebpage.php:151 ../../mod/editpost.php:123
+#: ../../mod/editblock.php:145
 msgid "Preview"
 msgstr "Предварительный просмотр"
 
@@ -2508,7 +2505,7 @@ msgstr "Сохранить в папку:"
 msgid "Where are you right now?"
 msgstr "Где вы сейчас?"
 
-#: ../../include/conversation.php:1069 ../../mod/photos.php:1055
+#: ../../include/conversation.php:1069 ../../mod/photos.php:1057
 msgid "Share"
 msgstr "Поделиться"
 
@@ -2518,8 +2515,8 @@ msgstr "Ссылка заголовока страницы"
 
 #: ../../include/conversation.php:1073 ../../mod/message.php:295
 #: ../../mod/message.php:457 ../../mod/editlayout.php:102
-#: ../../mod/editwebpage.php:118 ../../mod/editpost.php:95
-#: ../../mod/editblock.php:102
+#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:95
+#: ../../mod/editblock.php:116
 msgid "Upload photo"
 msgstr "Загрузить фотографию"
 
@@ -2529,8 +2526,8 @@ msgstr "загрузить фотографию"
 
 #: ../../include/conversation.php:1075 ../../mod/message.php:296
 #: ../../mod/message.php:458 ../../mod/editlayout.php:103
-#: ../../mod/editwebpage.php:119 ../../mod/editpost.php:96
-#: ../../mod/editblock.php:103
+#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:96
+#: ../../mod/editblock.php:117
 msgid "Attach file"
 msgstr "Прикрепить файл"
 
@@ -2540,8 +2537,8 @@ msgstr "прикрепить файл"
 
 #: ../../include/conversation.php:1077 ../../mod/message.php:297
 #: ../../mod/message.php:459 ../../mod/editlayout.php:104
-#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:97
-#: ../../mod/editblock.php:104
+#: ../../mod/editwebpage.php:123 ../../mod/editpost.php:97
+#: ../../mod/editblock.php:118
 msgid "Insert web link"
 msgstr "Вставить веб-ссылку"
 
@@ -2566,8 +2563,8 @@ msgid "audio link"
 msgstr "аудио-ссылка"
 
 #: ../../include/conversation.php:1083 ../../mod/editlayout.php:108
-#: ../../mod/editwebpage.php:124 ../../mod/editpost.php:101
-#: ../../mod/editblock.php:108
+#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:101
+#: ../../mod/editblock.php:122
 msgid "Set your location"
 msgstr "Указание своего расположения"
 
@@ -2576,8 +2573,8 @@ msgid "set location"
 msgstr "указание расположения"
 
 #: ../../include/conversation.php:1085 ../../mod/editlayout.php:109
-#: ../../mod/editwebpage.php:125 ../../mod/editpost.php:102
-#: ../../mod/editblock.php:109
+#: ../../mod/editwebpage.php:128 ../../mod/editpost.php:102
+#: ../../mod/editblock.php:123
 msgid "Clear browser location"
 msgstr "Стереть указание расположения"
 
@@ -2586,20 +2583,20 @@ msgid "clear location"
 msgstr "стереть указание расположения"
 
 #: ../../include/conversation.php:1088 ../../mod/editlayout.php:122
-#: ../../mod/editwebpage.php:140 ../../mod/editpost.php:115
-#: ../../mod/editblock.php:122
+#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:115
+#: ../../mod/editblock.php:137
 msgid "Set title"
 msgstr "Заголовок"
 
 #: ../../include/conversation.php:1091 ../../mod/editlayout.php:124
-#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:117
-#: ../../mod/editblock.php:124
+#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:117
+#: ../../mod/editblock.php:139
 msgid "Categories (comma-separated list)"
 msgstr "Категории (список через запятую)"
 
 #: ../../include/conversation.php:1093 ../../mod/editlayout.php:111
-#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:104
-#: ../../mod/editblock.php:111
+#: ../../mod/editwebpage.php:130 ../../mod/editpost.php:104
+#: ../../mod/editblock.php:125
 msgid "Permission settings"
 msgstr "Настройки разрешений"
 
@@ -2608,14 +2605,14 @@ msgid "permissions"
 msgstr "разрешения"
 
 #: ../../include/conversation.php:1102 ../../mod/editlayout.php:119
-#: ../../mod/editwebpage.php:135 ../../mod/editpost.php:112
-#: ../../mod/editblock.php:119
+#: ../../mod/editwebpage.php:138 ../../mod/editpost.php:112
+#: ../../mod/editblock.php:134
 msgid "Public post"
 msgstr "Публичное сообщение"
 
 #: ../../include/conversation.php:1104 ../../mod/editlayout.php:125
-#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:118
-#: ../../mod/editblock.php:125
+#: ../../mod/editwebpage.php:146 ../../mod/editpost.php:118
+#: ../../mod/editblock.php:140
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Пример: bob@example.com, mary@example.com"
 
@@ -2624,27 +2621,27 @@ msgstr "Пример: bob@example.com, mary@example.com"
 msgid "Permission denied"
 msgstr "Доступ запрещен"
 
-#: ../../include/items.php:3285 ../../mod/page.php:60 ../../mod/viewsrc.php:18
+#: ../../include/items.php:3308 ../../mod/page.php:66 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:677
-#: ../../mod/admin.php:876 ../../mod/display.php:33
+#: ../../mod/admin.php:876 ../../mod/display.php:32
 msgid "Item not found."
 msgstr "Элемент не найден."
 
-#: ../../include/items.php:3457
+#: ../../include/items.php:3480
 msgid "Archives"
 msgstr "Архивы"
 
-#: ../../include/items.php:3618 ../../mod/group.php:44 ../../mod/group.php:146
+#: ../../include/items.php:3641 ../../mod/group.php:44 ../../mod/group.php:146
 msgid "Collection not found."
 msgstr "Коллекция не найдена."
 
-#: ../../include/items.php:3628
+#: ../../include/items.php:3651
 msgid "Collection has no members."
 msgstr "В коллекции нет ни одного пользователя."
 
-#: ../../include/items.php:3644
+#: ../../include/items.php:3667
 msgid "Connection not found."
-msgstr "Канал не найден."
+msgstr "Контакт не найден."
 
 #: ../../include/security.php:49
 msgid "Welcome "
@@ -2664,6 +2661,19 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
+#: ../../include/zot.php:423
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:433
+msgid "Unable to verify channel signature"
+msgstr "Невозможно проверить сигнатуру канала"
+
+#: ../../include/zot.php:571
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
 #: ../../mod/common.php:10
 msgid "No channel."
 msgstr "Не канал."
@@ -2674,7 +2684,7 @@ msgstr "Общие контакты"
 
 #: ../../mod/common.php:52
 msgid "No connections in common."
-msgstr "Общих каналов нет."
+msgstr "Общих контактов нет."
 
 #: ../../mod/events.php:66
 msgid "Event title and start time are required."
@@ -2869,7 +2879,8 @@ msgid "No friends to display."
 msgstr "Нет друзей для показа."
 
 #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8
-#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../boot.php:1593
+#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../mod/filestorage.php:8
+#: ../../boot.php:1602
 msgid "Requested profile is not available."
 msgstr "Запрашиваемый профиль не доступен."
 
@@ -3714,14 +3725,14 @@ msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
 #: ../../mod/viewconnections.php:28 ../../mod/directory.php:23
-#: ../../mod/photos.php:559 ../../mod/display.php:9 ../../mod/search.php:80
+#: ../../mod/photos.php:561 ../../mod/display.php:9 ../../mod/search.php:80
 #: ../../mod/community.php:18
 msgid "Public access denied."
 msgstr "Общественный доступ запрещен."
 
 #: ../../mod/viewconnections.php:57
 msgid "No connections."
-msgstr "Никаких каналов."
+msgstr "Никаких связей."
 
 #: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40
 #, php-format
@@ -3730,7 +3741,7 @@ msgstr "Посетить %s's ​​профиль [%s]"
 
 #: ../../mod/viewconnections.php:84
 msgid "View Connnections"
-msgstr "Просмотр каналов"
+msgstr "Просмотр контактов"
 
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
@@ -3918,55 +3929,55 @@ msgstr ""
 msgid "Edit this menu item"
 msgstr ""
 
-#: ../../mod/mitem.php:142
+#: ../../mod/mitem.php:141
 msgid "New Menu Element"
 msgstr ""
 
-#: ../../mod/mitem.php:144 ../../mod/mitem.php:185
+#: ../../mod/mitem.php:143 ../../mod/mitem.php:184
 msgid "Link text"
 msgstr ""
 
-#: ../../mod/mitem.php:145 ../../mod/mitem.php:186
+#: ../../mod/mitem.php:144 ../../mod/mitem.php:185
 msgid "URL of link"
 msgstr ""
 
-#: ../../mod/mitem.php:146 ../../mod/mitem.php:187
+#: ../../mod/mitem.php:145 ../../mod/mitem.php:186
 msgid "Use Red magic-auth if available"
 msgstr ""
 
-#: ../../mod/mitem.php:147 ../../mod/mitem.php:188
+#: ../../mod/mitem.php:146 ../../mod/mitem.php:187
 msgid "Open link in new window"
 msgstr ""
 
-#: ../../mod/mitem.php:149 ../../mod/mitem.php:190
+#: ../../mod/mitem.php:148 ../../mod/mitem.php:189
 msgid "Order in list"
 msgstr ""
 
-#: ../../mod/mitem.php:149 ../../mod/mitem.php:190
+#: ../../mod/mitem.php:148 ../../mod/mitem.php:189
 msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../mod/mitem.php:150 ../../mod/menu.php:79 ../../mod/new_channel.php:117
+#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117
 msgid "Create"
 msgstr "Создать"
 
-#: ../../mod/mitem.php:162
+#: ../../mod/mitem.php:161
 msgid "Menu item not found."
 msgstr ""
 
-#: ../../mod/mitem.php:171
+#: ../../mod/mitem.php:170
 msgid "Menu item deleted."
 msgstr ""
 
-#: ../../mod/mitem.php:173
+#: ../../mod/mitem.php:172
 msgid "Menu item could not be deleted."
 msgstr ""
 
-#: ../../mod/mitem.php:182
+#: ../../mod/mitem.php:181
 msgid "Edit Menu Element"
 msgstr ""
 
-#: ../../mod/mitem.php:191 ../../mod/menu.php:107
+#: ../../mod/mitem.php:190 ../../mod/menu.php:107
 msgid "Modify"
 msgstr ""
 
@@ -3984,7 +3995,7 @@ msgstr "Имя коллекции изменено."
 
 #: ../../mod/group.php:92
 msgid "Create a collection of channels."
-msgstr "Создать коллекцию каналов"
+msgstr "Создать коллекцию контактов"
 
 #: ../../mod/group.php:93 ../../mod/group.php:189
 msgid "Collection Name: "
@@ -4026,11 +4037,11 @@ msgstr ""
 msgid "Album not found."
 msgstr "Альбом не найден."
 
-#: ../../mod/photos.php:125 ../../mod/photos.php:771
+#: ../../mod/photos.php:125 ../../mod/photos.php:773
 msgid "Delete Album"
 msgstr "Удалить альбом"
 
-#: ../../mod/photos.php:165 ../../mod/photos.php:1036
+#: ../../mod/photos.php:165 ../../mod/photos.php:1038
 msgid "Delete Photo"
 msgstr "Удалить фотографию"
 
@@ -4043,115 +4054,115 @@ msgstr "%1$s добавил тег в %2$s на %3$s"
 msgid "a photo"
 msgstr "фотография"
 
-#: ../../mod/photos.php:569
+#: ../../mod/photos.php:571
 msgid "No photos selected"
 msgstr "Никакие фотографии не выбраны"
 
-#: ../../mod/photos.php:623
+#: ../../mod/photos.php:625
 msgid "Access to this item is restricted."
 msgstr "Доступ к этому элементу ограничен."
 
-#: ../../mod/photos.php:687
+#: ../../mod/photos.php:689
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:690
+#: ../../mod/photos.php:692
 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:698
+#: ../../mod/photos.php:700
 msgid "Upload Photos"
 msgstr "Загрузить фотографии"
 
-#: ../../mod/photos.php:702 ../../mod/photos.php:766
+#: ../../mod/photos.php:704 ../../mod/photos.php:768
 msgid "New album name: "
 msgstr "Название нового альбома:"
 
-#: ../../mod/photos.php:703
+#: ../../mod/photos.php:705
 msgid "or existing album name: "
 msgstr "или существующий альбом:"
 
-#: ../../mod/photos.php:704
+#: ../../mod/photos.php:706
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:706 ../../mod/photos.php:1031
+#: ../../mod/photos.php:708 ../../mod/photos.php:1033
 msgid "Permissions"
 msgstr "Разрешения"
 
-#: ../../mod/photos.php:755 ../../mod/photos.php:777 ../../mod/photos.php:1203
-#: ../../mod/photos.php:1218
+#: ../../mod/photos.php:757 ../../mod/photos.php:779 ../../mod/photos.php:1205
+#: ../../mod/photos.php:1220
 msgid "Contact Photos"
-msgstr "Фотографии канала"
+msgstr "Фотографии контакта"
 
-#: ../../mod/photos.php:781
+#: ../../mod/photos.php:783
 msgid "Edit Album"
 msgstr "Редактировать Фотоальбом"
 
-#: ../../mod/photos.php:787
+#: ../../mod/photos.php:789
 msgid "Show Newest First"
 msgstr "Показать новые первыми"
 
-#: ../../mod/photos.php:789
+#: ../../mod/photos.php:791
 msgid "Show Oldest First"
 msgstr "Показать старые первыми"
 
-#: ../../mod/photos.php:833 ../../mod/photos.php:1250
+#: ../../mod/photos.php:835 ../../mod/photos.php:1252
 msgid "View Photo"
 msgstr "Посмотреть фотографию"
 
-#: ../../mod/photos.php:877
+#: ../../mod/photos.php:879
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:879
+#: ../../mod/photos.php:881
 msgid "Photo not available"
 msgstr "Фотография не доступна"
 
-#: ../../mod/photos.php:937
+#: ../../mod/photos.php:939
 msgid "Use as profile photo"
 msgstr "Использовать в качестве фотографии профиля"
 
-#: ../../mod/photos.php:965
+#: ../../mod/photos.php:967
 msgid "View Full Size"
 msgstr "Посмотреть в полный размер"
 
-#: ../../mod/photos.php:1019
+#: ../../mod/photos.php:1021
 msgid "Edit photo"
 msgstr "Редактировать фотографию"
 
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1023
 msgid "Rotate CW (right)"
 msgstr "Повернуть CW (направо)"
 
-#: ../../mod/photos.php:1022
+#: ../../mod/photos.php:1024
 msgid "Rotate CCW (left)"
 msgstr "Повернуть CCW (налево)"
 
-#: ../../mod/photos.php:1024
+#: ../../mod/photos.php:1026
 msgid "New album name"
 msgstr "Новое название альбома:"
 
-#: ../../mod/photos.php:1027
+#: ../../mod/photos.php:1029
 msgid "Caption"
 msgstr "Подпись"
 
-#: ../../mod/photos.php:1029
+#: ../../mod/photos.php:1031
 msgid "Add a Tag"
 msgstr "Добавить тег"
 
-#: ../../mod/photos.php:1033
+#: ../../mod/photos.php:1035
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Например: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1256
+#: ../../mod/photos.php:1258
 msgid "View Album"
 msgstr "Посмотреть фотоальбом"
 
-#: ../../mod/photos.php:1265
+#: ../../mod/photos.php:1267
 msgid "Recent Photos"
 msgstr "Последние фотографии"
 
@@ -4163,11 +4174,11 @@ msgstr "отправил вам личное сообщение"
 msgid "added your channel"
 msgstr "добавил ваш канал"
 
-#: ../../mod/ping.php:230 ../../boot.php:1799 ../../boot.php:1879
+#: ../../mod/ping.php:230 ../../boot.php:1808 ../../boot.php:1888
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../mod/ping.php:252 ../../boot.php:1845 ../../boot.php:1920
+#: ../../mod/ping.php:252 ../../boot.php:1854 ../../boot.php:1929
 msgid "[today]"
 msgstr "[сегодня]"
 
@@ -4367,26 +4378,6 @@ msgstr "Введите адрес вашего канала (например: c
 msgid "Authenticate"
 msgstr "Проверка подлинности"
 
-#: ../../mod/item.php:122
-msgid "Unable to locate original post."
-msgstr "Не удалось найти оригинал."
-
-#: ../../mod/item.php:290
-msgid "Empty post discarded."
-msgstr "Отказаться от пустой почты."
-
-#: ../../mod/item.php:334
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../mod/item.php:779
-msgid "System error. Post not saved."
-msgstr "Системная ошибка. Сообщение не сохранено."
-
-#: ../../mod/item.php:1064 ../../mod/wall_upload.php:41
-msgid "Wall Photos"
-msgstr "Стена фотографий"
-
 #: ../../mod/network.php:141 ../../mod/search.php:20
 msgid "Remove term"
 msgstr "Удалить термин"
@@ -4666,7 +4657,7 @@ msgstr "Скрыть или показывать этот канал"
 
 #: ../../mod/connections.php:347
 msgid "Delete this connection"
-msgstr "Удалить этот канал"
+msgstr "Удалить этот контакт"
 
 #: ../../mod/connections.php:380
 msgid "Unknown"
@@ -4674,7 +4665,7 @@ msgstr "Неизвестный"
 
 #: ../../mod/connections.php:390 ../../mod/connections.php:418
 msgid "Approve this connection"
-msgstr "Утвердить этот канал"
+msgstr "Утвердить этот контакт"
 
 #: ../../mod/connections.php:390
 msgid "Accept connection to allow communication"
@@ -4783,11 +4774,11 @@ msgstr "Посетить %s's ​​профиль - %s"
 
 #: ../../mod/connections.php:443
 msgid "Block/Unblock contact"
-msgstr "Запретить/разрешить канал"
+msgstr "Запретить/разрешить контакт"
 
 #: ../../mod/connections.php:444
 msgid "Ignore contact"
-msgstr "Игнорировать канал"
+msgstr "Игнорировать контакт"
 
 #: ../../mod/connections.php:445
 msgid "Repair URL settings"
@@ -4799,7 +4790,7 @@ msgstr "Просмотр разговоров"
 
 #: ../../mod/connections.php:448
 msgid "Delete contact"
-msgstr "Удалить канал"
+msgstr "Удалить контакт"
 
 #: ../../mod/connections.php:451
 msgid "Last update:"
@@ -4864,7 +4855,7 @@ msgstr "Предлагать новые контакты"
 
 #: ../../mod/connections.php:557
 msgid "Show pending (new) connections"
-msgstr "Просмотр (новых) ждущих каналов"
+msgstr "Просмотр (новых) ждущих контактов"
 
 #: ../../mod/connections.php:560
 msgid "All Connections"
@@ -4872,7 +4863,7 @@ msgstr "Все контакты"
 
 #: ../../mod/connections.php:563
 msgid "Show all connections"
-msgstr "Просмотр всех каналов"
+msgstr "Просмотр всех контактов"
 
 #: ../../mod/connections.php:566
 msgid "Unblocked"
@@ -4905,11 +4896,11 @@ msgstr "%1$s [%2$s]"
 
 #: ../../mod/connections.php:640 ../../mod/nogroup.php:41
 msgid "Edit contact"
-msgstr "Редактировать канал"
+msgstr "Редактировать контакт"
 
 #: ../../mod/connections.php:664
 msgid "Search your connections"
-msgstr "Поиск каналов"
+msgstr "Поиск ваших связей"
 
 #: ../../mod/connections.php:665
 msgid "Finding: "
@@ -4927,17 +4918,6 @@ msgstr ""
 msgid "Visible to:"
 msgstr "Кому видно:"
 
-#: ../../mod/post.php:114
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr ""
-
-#: ../../mod/post.php:127
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr ""
-
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:138
 #: ../../mod/profiles.php:179 ../../mod/profiles.php:486
 msgid "Profile not found."
@@ -5134,7 +5114,7 @@ msgstr "Хобби / интересы"
 
 #: ../../mod/profiles.php:561
 msgid "Contact information and Social Networks"
-msgstr "Информация и социальные сети канала"
+msgstr "Информация и социальные сети контакта"
 
 #: ../../mod/profiles.php:562
 msgid "My other channels"
@@ -5178,29 +5158,29 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr "Редактирование  / Управление профилей"
 
-#: ../../mod/profiles.php:624 ../../boot.php:1701
+#: ../../mod/profiles.php:624 ../../boot.php:1710
 msgid "Change profile photo"
 msgstr "Изменить фотографию профиля"
 
-#: ../../mod/profiles.php:625 ../../boot.php:1708
+#: ../../mod/profiles.php:625 ../../boot.php:1717
 msgid "Create New Profile"
 msgstr "Создать новый профиль"
 
-#: ../../mod/profiles.php:636 ../../boot.php:1722
+#: ../../mod/profiles.php:636 ../../boot.php:1731
 msgid "Profile Image"
 msgstr "Изображение профиля"
 
-#: ../../mod/profiles.php:639 ../../boot.php:1725
+#: ../../mod/profiles.php:639 ../../boot.php:1734
 msgid "visible to everybody"
 msgstr "видно всем"
 
-#: ../../mod/profiles.php:640 ../../boot.php:1726
+#: ../../mod/profiles.php:640 ../../boot.php:1735
 msgid "Edit visibility"
 msgstr "Редактировать видимость"
 
 #: ../../mod/new_channel.php:107
 msgid "Add a Channel"
-msgstr "Добавить канал"
+msgstr "Добавить контакт"
 
 #: ../../mod/new_channel.php:108
 msgid ""
@@ -5270,7 +5250,7 @@ msgstr "Регистрации пользователей, которые жду
 
 #: ../../mod/admin.php:180
 msgid "Message queues"
-msgstr "Непрочитанный сообщений"
+msgstr "Очередь недоставленных сообщений"
 
 #: ../../mod/admin.php:185 ../../mod/admin.php:407 ../../mod/admin.php:631
 #: ../../mod/admin.php:725 ../../mod/admin.php:767 ../../mod/admin.php:930
@@ -5745,7 +5725,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1430
+#: ../../mod/lostpass.php:85 ../../boot.php:1439
 msgid "Password Reset"
 msgstr "Сбросить пароль"
 
@@ -5819,19 +5799,19 @@ msgstr ""
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../mod/import.php:352
+#: ../../mod/import.php:356
 msgid "Import completed."
 msgstr "Импорт завершен."
 
-#: ../../mod/import.php:365
+#: ../../mod/import.php:369
 msgid "You must be logged in to use this feature."
 msgstr "Вы должны войти в систему, чтобы использовать эту функцию."
 
-#: ../../mod/import.php:370
+#: ../../mod/import.php:374
 msgid "Import Channel"
 msgstr "Импорт канала"
 
-#: ../../mod/import.php:371
+#: ../../mod/import.php:375
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
@@ -5839,27 +5819,27 @@ msgid ""
 "be imported. Importation of content is not yet available."
 msgstr ""
 
-#: ../../mod/import.php:372
+#: ../../mod/import.php:376
 msgid "File to Upload"
 msgstr "Файл для загрузки"
 
-#: ../../mod/import.php:373
+#: ../../mod/import.php:377
 msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../mod/import.php:374
+#: ../../mod/import.php:378
 msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../mod/import.php:375
+#: ../../mod/import.php:379
 msgid "Your old login email address"
 msgstr "Ваш старый адрес электронной почты"
 
-#: ../../mod/import.php:376
+#: ../../mod/import.php:380
 msgid "Your old login password"
 msgstr "Ваш старый пароль"
 
-#: ../../mod/import.php:377
+#: ../../mod/import.php:381
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -5867,31 +5847,36 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr ""
 
-#: ../../mod/import.php:378
+#: ../../mod/import.php:382
 msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../mod/manage.php:59
+#: ../../mod/manage.php:62
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr ""
+
+#: ../../mod/manage.php:70
 msgid "Create a new channel"
 msgstr "Создать новый канал"
 
-#: ../../mod/manage.php:64
+#: ../../mod/manage.php:75
 msgid "Channel Manager"
 msgstr "Настройки канала"
 
-#: ../../mod/manage.php:65
+#: ../../mod/manage.php:76
 msgid "Current Channel"
 msgstr "Текущий канал"
 
-#: ../../mod/manage.php:67
+#: ../../mod/manage.php:78
 msgid "Attach to one of your channels by selecting it."
 msgstr ""
 
-#: ../../mod/manage.php:68
+#: ../../mod/manage.php:79
 msgid "Default Channel"
 msgstr "Канал по умолчанию"
 
-#: ../../mod/manage.php:69
+#: ../../mod/manage.php:80
 msgid "Make Default"
 msgstr "Сделать стандартным"
 
@@ -5921,16 +5906,16 @@ msgstr ""
 
 #: ../../mod/crepair.php:104
 msgid "Contact update failed."
-msgstr "Ошибка обновления канала."
+msgstr "Ошибка обновления контакта."
 
 #: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
 #: ../../mod/fsuggest.php:92
 msgid "Contact not found."
-msgstr "Канал не найден."
+msgstr "Контакт не найден."
 
 #: ../../mod/crepair.php:135
 msgid "Repair Contact Settings"
-msgstr "Починить настройки канала"
+msgstr "Починить настройки контакта"
 
 #: ../../mod/crepair.php:137
 msgid ""
@@ -5946,7 +5931,7 @@ msgstr ""
 
 #: ../../mod/crepair.php:144
 msgid "Return to contact editor"
-msgstr "Вернуться к редактору канала"
+msgstr "Вернуться к редактору контакта"
 
 #: ../../mod/crepair.php:149
 msgid "Account Nickname"
@@ -5986,32 +5971,36 @@ msgstr ""
 
 #: ../../mod/follow.php:25
 msgid "Channel added."
-msgstr "Канал добавлен."
+msgstr "Контакт добавлен."
 
 #: ../../mod/editlayout.php:37 ../../mod/editwebpage.php:31
 #: ../../mod/editpost.php:20 ../../mod/editblock.php:37
 msgid "Item not found"
 msgstr "Элемент не найден"
 
-#: ../../mod/editlayout.php:69 ../../mod/editblock.php:69
-msgid "Edit block"
+#: ../../mod/editlayout.php:69
+msgid "Edit Layout"
 msgstr ""
 
-#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:121
-#: ../../mod/editpost.php:98 ../../mod/editblock.php:105
+#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124
+#: ../../mod/editpost.php:98 ../../mod/editblock.php:119
 msgid "Insert YouTube video"
 msgstr "Вставить YouTube видео"
 
-#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:122
-#: ../../mod/editpost.php:99 ../../mod/editblock.php:106
+#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125
+#: ../../mod/editpost.php:99 ../../mod/editblock.php:120
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Вставить Vorbis [.ogg] видео"
 
-#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:123
-#: ../../mod/editpost.php:100 ../../mod/editblock.php:107
+#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:126
+#: ../../mod/editpost.php:100 ../../mod/editblock.php:121
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Вставить Vorbis [.ogg] музыку"
 
+#: ../../mod/editlayout.php:138
+msgid "Delete Layout"
+msgstr ""
+
 #: ../../mod/nogroup.php:58
 msgid "Contacts who are not members of a group"
 msgstr ""
@@ -6092,9 +6081,13 @@ msgstr "Загрузка изображениея прошла безуспеш�
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/editwebpage.php:85 ../../mod/editpost.php:40
-msgid "Edit post"
-msgstr "Редактировать сообщение"
+#: ../../mod/editwebpage.php:88
+msgid "Edit Webpage"
+msgstr ""
+
+#: ../../mod/editwebpage.php:159
+msgid "Delete Webpage"
+msgstr ""
 
 #: ../../mod/notifications.php:26
 msgid "Invalid request identifier."
@@ -6238,6 +6231,10 @@ msgstr "Публикация прошла успешно."
 msgid "Item is not editable"
 msgstr "Элемент нельзя редактировать"
 
+#: ../../mod/editpost.php:40
+msgid "Edit post"
+msgstr "Редактировать сообщение"
+
 #: ../../mod/profile.php:111
 msgid "Access to this profile has been restricted."
 msgstr "Доступ к этому профилю ограничен."
@@ -6262,6 +6259,10 @@ msgstr ""
 msgid "Make this post private"
 msgstr "Сделать это сообщение личным"
 
+#: ../../mod/wall_upload.php:41 ../../mod/item.php:1077
+msgid "Wall Photos"
+msgstr "Стена фотографий"
+
 #: ../../mod/community.php:23
 msgid "Not available."
 msgstr "Недоступно."
@@ -6291,6 +6292,14 @@ msgstr "Пригласить друзей"
 msgid "Suggest a friend for %s"
 msgstr ""
 
+#: ../../mod/editblock.php:83
+msgid "Edit Block"
+msgstr ""
+
+#: ../../mod/editblock.php:154
+msgid "Delete Block"
+msgstr ""
+
 #: ../../mod/profperm.php:34 ../../mod/profperm.php:64
 msgid "Invalid profile identifier."
 msgstr ""
@@ -6311,6 +6320,32 @@ msgstr "Видно"
 msgid "All Contacts (with secure profile access)"
 msgstr "Все контакты (с доступом защищенному профилю)"
 
+#: ../../mod/item.php:133
+msgid "Unable to locate original post."
+msgstr "Не удалось найти оригинал."
+
+#: ../../mod/item.php:301
+msgid "Empty post discarded."
+msgstr "Отказаться от пустой почты."
+
+#: ../../mod/item.php:345
+msgid "Executable content type not permitted to this channel."
+msgstr ""
+
+#: ../../mod/item.php:792
+msgid "System error. Post not saved."
+msgstr "Системная ошибка. Сообщение не сохранено."
+
+#: ../../mod/item.php:1153
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../mod/item.php:1159
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr ""
+
 #: ../../mod/siteinfo.php:51
 #, php-format
 msgid "Version %s"
@@ -6451,6 +6486,17 @@ msgstr ""
 msgid "Please login."
 msgstr "Войдите пожалуйста."
 
+#: ../../mod/post.php:114
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr ""
+
+#: ../../mod/post.php:127
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr ""
+
 #: ../../mod/removeme.php:45 ../../mod/removeme.php:48
 msgid "Remove My Account"
 msgstr "Удалить мой аккаунт"
@@ -6465,11 +6511,27 @@ msgstr ""
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/mood.php:131
+#: ../../mod/filestorage.php:22
+msgid "Permission Denied."
+msgstr ""
+
+#: ../../mod/filestorage.php:59
+msgid "Download"
+msgstr ""
+
+#: ../../mod/filestorage.php:64
+msgid "Used: "
+msgstr ""
+
+#: ../../mod/filestorage.php:66
+msgid "Limit: "
+msgstr ""
+
+#: ../../mod/mood.php:133
 msgid "Mood"
 msgstr ""
 
-#: ../../mod/mood.php:132
+#: ../../mod/mood.php:134
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
@@ -6535,104 +6597,104 @@ msgstr "Угловой радиус"
 msgid "0-99 default: 5"
 msgstr "0-99 по умолчанию: 5"
 
-#: ../../boot.php:1234
+#: ../../boot.php:1242
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1237
+#: ../../boot.php:1245
 #, php-format
 msgid "Update Error at %s"
 msgstr "Ошибка обновления на %s"
 
-#: ../../boot.php:1394
+#: ../../boot.php:1403
 msgid "Create a New Account"
 msgstr "Создать новый аккаунт"
 
-#: ../../boot.php:1423
+#: ../../boot.php:1432
 msgid "Password"
 msgstr "Пароль"
 
-#: ../../boot.php:1424
+#: ../../boot.php:1433
 msgid "Remember me"
 msgstr "Запомнить"
 
-#: ../../boot.php:1429
+#: ../../boot.php:1438
 msgid "Forgot your password?"
 msgstr "Забыли пароль или логин?"
 
-#: ../../boot.php:1548
+#: ../../boot.php:1557
 msgid "Requested channel is not available."
 msgstr "Запрашиваемый канал не доступен."
 
-#: ../../boot.php:1560
+#: ../../boot.php:1569
 msgid " Sorry, you don't have the permission to view this profile. "
 msgstr ""
 
-#: ../../boot.php:1707
+#: ../../boot.php:1716
 msgid "Profiles"
 msgstr "Профили"
 
-#: ../../boot.php:1707
+#: ../../boot.php:1716
 msgid "Manage/edit profiles"
 msgstr "Управление / Редактирование профилей"
 
-#: ../../boot.php:1711
+#: ../../boot.php:1720
 msgid "Edit Profile"
 msgstr "Редактировать профиль"
 
-#: ../../boot.php:1800 ../../boot.php:1880
+#: ../../boot.php:1809 ../../boot.php:1889
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1857
+#: ../../boot.php:1866
 msgid "Birthday Reminders"
 msgstr "Напоминания о Днях Рождения"
 
-#: ../../boot.php:1858
+#: ../../boot.php:1867
 msgid "Birthdays this week:"
 msgstr "Дни Рождения на этой неделе:"
 
-#: ../../boot.php:1913
+#: ../../boot.php:1922
 msgid "[No description]"
 msgstr "[без описания]"
 
-#: ../../boot.php:1931
+#: ../../boot.php:1940
 msgid "Event Reminders"
 msgstr "Напоминания мероприятий"
 
-#: ../../boot.php:1932
+#: ../../boot.php:1941
 msgid "Events this week:"
 msgstr "Мероприятия на этой неделе:"
 
-#: ../../boot.php:2166
+#: ../../boot.php:2175
 msgid "Channel"
 msgstr "Канал"
 
-#: ../../boot.php:2169
+#: ../../boot.php:2178
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:2173
+#: ../../boot.php:2182
 msgid "About"
 msgstr "О себе"
 
-#: ../../boot.php:2176
+#: ../../boot.php:2185
 msgid "Profile Details"
 msgstr "Сведения о профиле"
 
-#: ../../boot.php:2194
+#: ../../boot.php:2203
 msgid "Events and Calendar"
 msgstr "Мероприятия и календарь"
 
-#: ../../boot.php:2199
+#: ../../boot.php:2208
 msgid "Webpages"
 msgstr "Веб-страницы"
 
-#: ../../boot.php:2202
+#: ../../boot.php:2211
 msgid "Manage Webpages"
 msgstr "Управление веб-страниц"
 
-#: ../../boot.php:2484
+#: ../../boot.php:2493
 msgid "toggle mobile"
 msgstr "мобильное подключение"
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c1e5b76d1..d57fac71b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -204,7 +204,7 @@ nav .nav-link {
 	background-color: transparent !important;
 }
 
-.nav-commlink.selected {
+.nav-commlink.active {
 	background-color: #ffffff;
 	border-bottom: 1px solid #ffffff;
 	color: #000000 !important;
@@ -350,7 +350,7 @@ footer {
 	margin-bottom: 10px;
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .active {
 	color: #444444 !important;
 }
 
@@ -2925,7 +2925,7 @@ nav .nav-menu-icon {
   -webkit-border-radius: $radiuspx;
   border-radius: $radiuspx;
 }
-nav .nav-menu-icon.selected {
+nav .nav-menu-icon.active {
   background-color: #FF0000;
 }
 nav .nav-menu-icon img {
@@ -2948,7 +2948,7 @@ nav:hover .nav-menu {
 /*  border-bottom: 3px solid #f00; */
 }
 
-nav .nav-menu.selected a {
+nav .nav-menu.active a {
 	color: #444444;
 }
 
@@ -2962,7 +2962,7 @@ nav .nav-notify {
   filter:alpha(opacity=60);
 
 }
-.nav-notify:hover, nav .nav-notify.selected span {
+.nav-notify:hover, nav .nav-notify.active span {
 	color: #ffffff;
 }
 
@@ -2985,10 +2985,10 @@ nav #nav-site-linkmenu .menu-popup {
   left: auto;
 }
 nav #nav-notifications-linkmenu.on .icon.s22.notify,
-nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+nav #nav-notifications-linkmenu.active .icon.s22.notify {
   background-image: url("../../../../images/icons/22/notify_on.png");
 }
-nav #nav-apps-link.selected {
+nav #nav-apps-link.active {
   background-color: #364e59;
 }
 ul.menu-popup {