Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 14 insertions, 14 deletions

diff --git a/view/ru/strings.php b/view/ru/strings.php
index 3a8d9920c..c9d569cbb 100644
--- a/view/ru/strings.php
+++ b/view/ru/strings.php
@@ -347,8 +347,8 @@ $a->strings["Newest to Oldest"] = "От новых к старым";
 $a->strings["Enable Safe Search"] = "";
 $a->strings["Disable Safe Search"] = "";
 $a->strings["Safe Mode"] = "Безопасный режим";
-$a->strings["Red Matrix Notification"] = "Оповещения Red матрицы";
-$a->strings["redmatrix"] = "redmatrix";
+$a->strings["Hubzilla Notification"] = "Оповещения Red матрицы";
+$a->strings["hubzilla"] = "hubzilla";
 $a->strings["Thank You,"] = "Спасибо,";
 $a->strings["%s Administrator"] = "%s администратор";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
@@ -1070,7 +1070,7 @@ $a->strings["Click on a contact to add or remove."] = "Нажмите на ка�
 $a->strings["Visible To"] = "Видно";
 $a->strings["All Connections"] = "Все контакты";
 $a->strings["Public Sites"] = "Публичные сайты";
-$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "";
+$a->strings["The listed sites allow public registration into the Hubzilla. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "";
 $a->strings["Site URL"] = "URL веб-сайта";
 $a->strings["Access Type"] = "Тип доступа";
 $a->strings["Registration Policy"] = "Правила регистрации";
@@ -1111,7 +1111,7 @@ $a->strings["Please re-enter your password"] = "Пожалуйста, введи
 $a->strings["Away"] = "Нет на месте";
 $a->strings["Online"] = "Сейчас в сети";
 $a->strings["Please login."] = "Войдите пожалуйста.";
-$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "";
+$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "";
 $a->strings["Remove This Channel"] = "Удалить этот канал";
 $a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "";
 $a->strings["Please enter your password for verification:"] = "Пожалуйста, введите пароль для проверки:";
@@ -1262,9 +1262,9 @@ $a->strings["Hometown: "] = "Город проживания:";
 $a->strings["About: "] = "О себе:";
 $a->strings["Keywords: "] = "Ключевые слова:";
 $a->strings["This site is not a directory server"] = "Этот сайт не является сервером каталога";
-$a->strings["Red Matrix - &quot;The Network&quot;"] = "";
+$a->strings["Hubzilla - &quot;The Network&quot;"] = "";
 $a->strings["Welcome to %s"] = "Добро пожаловать в %s";
-$a->strings["Red Matrix Server - Setup"] = "Red Matrix Сервер - Установка";
+$a->strings["Hubzilla Server - Setup"] = "Hubzilla Сервер - Установка";
 $a->strings["Could not connect to database."] = "Не удалось подключиться к серверу баз данных.";
 $a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "";
 $a->strings["Could not create table."] = "Не удалось создать таблицу.";
@@ -1275,7 +1275,7 @@ $a->strings["System check"] = "Проверка системы";
 $a->strings["Next"] = "Следующая";
 $a->strings["Check again"] = "Проверить снова";
 $a->strings["Database connection"] = "Подключение к базе данных";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "";
+$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = "";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "";
 $a->strings["Database Server Name"] = "Имя сервера базы данных";
@@ -1367,11 +1367,11 @@ $a->strings["Version %s"] = "Версия %s";
 $a->strings["Installed plugins/addons/apps:"] = "";
 $a->strings["No installed plugins/addons/apps"] = "";
 $a->strings["Red"] = "Red";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "";
+$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralised privacy enhanced websites."] = "";
 $a->strings["Running at web location"] = "";
-$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Пожалуйста посетите <a href=\"http://getzot.com\">GetZot.com</a> чтобы узнать больше о Red Matrix.";
+$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Hubzilla."] = "Пожалуйста посетите <a href=\"http://getzot.com\">GetZot.com</a> чтобы узнать больше о Hubzilla.";
 $a->strings["Bug reports and issues: please visit"] = "";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "";
+$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "";
 $a->strings["Site Administrators"] = "Администратор сайта";
 $a->strings["Page owner information could not be retrieved."] = "";
 $a->strings["Album not found."] = "Альбом не найден.";
@@ -1661,12 +1661,12 @@ $a->strings["You have no more invitations available"] = "У вас больше
 $a->strings["Send invitations"] = "Послать приглашения";
 $a->strings["Enter email addresses, one per line:"] = "Введите адреса электронной почты, по одному на строку:";
 $a->strings["Your message:"] = "Сообщение:";
-$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "";
+$a->strings["You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralised communication and information tool."] = "";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "";
 $a->strings["Please visit my channel at"] = "Пожалуйста, посетите мой канал на";
-$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "";
+$a->strings["Once you have registered (on ANY Hubzilla site - they are all inter-connected), please connect with my Hubzilla channel address:"] = "";
 $a->strings["Click the [Register] link on the following page to join."] = "";
-$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Чтобы узнать больше о проекте Red Matrix, и чтобы узнать почему он имеет потенциал для изменения привычного нам Интернета, пожалуйста, посетите http://getzot.com";
+$a->strings["For more information about the Hubzilla Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Чтобы узнать больше о проекте Hubzilla, и чтобы узнать почему он имеет потенциал для изменения привычного нам Интернета, пожалуйста, посетите http://getzot.com";
 $a->strings["Unable to locate original post."] = "Не удалось найти оригинал.";
 $a->strings["Empty post discarded."] = "Отказаться от пустой почты.";
 $a->strings["Executable content type not permitted to this channel."] = "";
@@ -1856,7 +1856,7 @@ $a->strings["Are you sure you want to delete this item?"] = "Вы уверены
 $a->strings["Total"] = "Всего";
 $a->strings["Update %s failed. See error logs."] = "";
 $a->strings["Update Error at %s"] = "Ошибка обновления на %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "";
 $a->strings["Password"] = "Пароль";
 $a->strings["Remember me"] = "Запомнить";
 $a->strings["Forgot your password?"] = "Забыли пароль или логин?";