Merge branch 'dev' into 4.4RC

author: Mario Vavti <mario@mariovavti.com> 2019-08-13 09:27:03 +0200
committer: Mario Vavti <mario@mariovavti.com> 2019-08-13 09:27:03 +0200
commit: 06ac3e896a319714c178e5cbacae81b6090ab4db (patch)
tree: 54f556f44853f62bb5cabb10a01ea440bf9cf714
parent: f5062c0507e0d5ad4377f626d2cbd9b9b82eb1ca (diff)
parent: 6ce0f6e8064e216bac3f339b2d9bc18dea9e9565 (diff)
download: volse-hubzilla-06ac3e896a319714c178e5cbacae81b6090ab4db.tar.gz
volse-hubzilla-06ac3e896a319714c178e5cbacae81b6090ab4db.tar.bz2
volse-hubzilla-06ac3e896a319714c178e5cbacae81b6090ab4db.zip
8 files changed, 634 insertions, 654 deletions
diff --git a/.homeinstall/README.md b/.homeinstall/README.md
index 45e1ba0e6..d4613afce 100644
--- a/.homeinstall/README.md
+++ b/.homeinstall/README.md
@@ -1,18 +1,18 @@
 # Hubzilla at Home next to your Router
 
-This readme will show you how to install and run Hubzilla or Zap at home.
+This readme will show you how to install and run Hubzilla (or Zap) at home.
 
 The installation is done by a script.
 
 What the script will do for you...
 
-+ install everything required by Zap/Hubzilla, basically a web server (Apache), PHP, a database (MySQL), certbot,...
++ install everything required by Hubzilla, basically a web server (Apache), PHP, a database (MySQL), certbot,...
 + create a database
 + run certbot to have everything for a secure connection (httpS)
 + create a script for daily maintenance
   - backup to external disk (certificates, database, /var/www/)
   - renew certfificate (letsencrypt)
-  - update of Zap/Hubzilla
+  - update of Hubzilla
   - update of Debian
   - restart
 + create cron jobs for
@@ -23,8 +23,8 @@ What the script will do for you...
 The script is known to work without adjustments with
 
 + Hardware
-  - Mini-PC with Debian 9 (stretch), or
-  - Rapberry 3 with Raspbian, Debian 9
+  - Mini-PC with Debian 10 (stretch), or
+  - Rapberry 3 with Raspbian, Debian 10
 + DynDNS
   - selfHOST.de
   - freedns.afraid.org
@@ -40,7 +40,7 @@ The script can install both [Hubzilla](https://zotlabs.org/page/hubzilla/hubzill
 
 ## Disclaimers
 
-- This script does work with Debian 9 only.
+- This script does work with Debian 10 only.
 - This script has to be used on a fresh debian install only (it does not take account for a possibly already installed and configured webserver or sql implementation).
 
 # Step-by-Step Overwiew
@@ -55,7 +55,7 @@ Hardware
 
 Software
 
-+ Fresh installation of Debian 9 (Stretch)
++ Fresh installation of Debian 10 (Stretch)
 + Router with open ports 80 and 443 for your web server
 
 ## The basic steps (quick overview)
@@ -136,7 +136,7 @@ The cost is 1,50 € per month (2019).
 
 ## Note on Rasperry 
 
-The script was tested with an Raspberry 3 under Raspian, Debian 9.
+The script was tested with an Raspberry 3 under Raspian, Debian 10.
 
 It is recommended to run the Raspi without graphical frontend (X-Server). Use...
 
@@ -146,7 +146,7 @@ to boot the Rapsi to the client console.
 
 DO NOT FORGET TO CHANGE THE DEFAULT PASSWORD FOR USER PI!
 
-On a Raspian Stretch (Debian 9) the validation of the mail address fails for the very first user.
+On a Raspian Stretch (Debian 10) the validation of the mail address fails for the very first user.
 This used to happen on some *bsd distros but there was some work to fix that a year ago (2017).
 
 So if your system isn't registered in DNS or DNS isn't active do
diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh
index 023ef7afc..be190e389 100644..100755
--- a/.homeinstall/hubzilla-setup.sh
+++ b/.homeinstall/hubzilla-setup.sh
@@ -26,8 +26,8 @@
 # - install
 #        * apache webserer, 
 #        * php,  
-#        * mysql - the database for hubzilla,  
-#        * phpmyadmin,  
+#        * mariadb - the database for hubzilla,  
+#        * adminer,  
 #        * git to download and update hubzilla addon
 # - download hubzilla core and addons
 # - configure cron
@@ -44,11 +44,6 @@
 # Security - password  is the same for mysql-server, phpmyadmin and hubzilla db
 # - The script runs into installation errors for phpmyadmin if it uses
 #   different passwords. For the sake of simplicity one singel password.
-#
-# Hubzilla - email verification
-# - The script switches off email verification off in all htconfig.tpl.
-#   Example: /var/www/html/view/en/htconfig.tpl
-# - Is this a silly idea or not?
 # 
 # How to restore from backup
 # --------------------------
@@ -73,8 +68,6 @@
 # The script is based on Thomas Willinghams script "debian-setup.sh"
 # which he used to install the red#matrix.
 #
-# The script uses another script from https://github.com/lukas2511/letsencrypt.sh
-#
 # The documentation for bash is here
 # https://www.gnu.org/software/bash/manual/bash.html
 #
@@ -94,9 +87,9 @@ function check_sanity {
     then
         die "Debian is supported only"
     fi
-    if ! grep -q 'Linux 9' /etc/issue
+    if ! grep -q 'Linux 10' /etc/issue
     then
-        die "Linux 9 (stretch) is supported only"x
+        die "Linux 10 (buster) is supported only"x
     fi
 }
 
@@ -207,21 +200,17 @@ function print_warn {
 }
 
 function stop_hubzilla {
-    if [ -d /etc/apache2 ]
-    then
-        print_info "stopping apache webserver..."
-        service apache2 stop
-    fi
-    if [ -f /etc/init.d/mysql ]
-    then
-        print_info "stopping mysql db..."
-        /etc/init.d/mysql stop
-    fi
+    print_info "stopping apache webserver..."
+    systemctl stop apache2
+    print_info "stopping mysql db..."
+    systemctl stop mariadb
 }
 
 function install_apache {
     print_info "installing apache..."
     nocheck_install "apache2 apache2-utils"
+    a2enmod rewrite
+    systemctl restart apache2
 }
 
 function install_imagemagick {
@@ -242,78 +231,46 @@ function install_sendmail {
 function install_php {
     # openssl and mbstring are included in libapache2-mod-php
     print_info "installing php..."
-    nocheck_install "libapache2-mod-php php php-pear php-curl php-mcrypt php-gd php-mysqli php-mbstring php-xml"
-    sed -i "s/^upload_max_filesize =.*/upload_max_filesize = 100M/g" /etc/php/7.0/apache2/php.ini
-    sed -i "s/^post_max_size =.*/post_max_size = 100M/g" /etc/php/7.0/apache2/php.ini
+    nocheck_install "libapache2-mod-php php php-pear php-curl php-gd php-mysqli php-mbstring php-xml php-zip"
+    sed -i "s/^upload_max_filesize =.*/upload_max_filesize = 100M/g" /etc/php/7.3/apache2/php.ini
+    sed -i "s/^post_max_size =.*/post_max_size = 100M/g" /etc/php/7.3/apache2/php.ini
 }
 
 function install_mysql {
-    # http://www.microhowto.info/howto/perform_an_unattended_installation_of_a_debian_package.html
-    # 
-    # To determine the required package name, key and type you can perform
-    # a trial installation then search the configuration database.
-    # 
-    #     debconf-get-selections | grep mysql-server
-    #
-    # The command debconf-get-selections is provided by the package
-    # debconf-utils, which you may need to install.
-    #
-    #    apt-get install debconf-utils
-    #
-    # If you want to supply an answer to a configuration question but do not 
-    # want to be prompted for it then this can be arranged by preseeding the
-    # DebConf database with the required information.
-    #
-    #     echo mysql-server mysql-server/root_password password xyzzy | debconf-set-selections
-    #     echo mysql-server mysql-server/root_password_again password xyzzy | debconf-set-selections
-    #
     print_info "installing mysql..."
     if [ -z "$mysqlpass" ]
     then
         die "mysqlpass not set in $configfile"
     fi
-    echo mysql-server mysql-server/root_password password $mysqlpass | debconf-set-selections
-    echo mysql-server mysql-server/root_password_again password $mysqlpass | debconf-set-selections
-    nocheck_install "php-mysql mysql-server mysql-client"
+	if type mysql ; then
+		echo "Yes, mysql is installed"
+	else
+		echo "mariadb-server"
+		nocheck_install "mariadb-server"
+        systemctl status mariadb
+        systemctl start mariadb
+        mysql --user=root <<_EOF_
+UPDATE mysql.user SET Password=PASSWORD('${db_root_password}') WHERE User='root';
+DELETE FROM mysql.user WHERE User='';
+DROP DATABASE IF EXISTS test;
+DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%';
+FLUSH PRIVILEGES;
+_EOF_
+    fi    
 }
 
-function install_phpmyadmin {
-    print_info "installing phpmyadmin..."
-    if [ -z "$phpmyadminpass" ]
+function install_adminer {
+    print_info "installing adminer..."
+    nocheck_install "adminer"
+    if [ ! -f /etc/adminer/adminer.conf ]
     then
-        die "phpmyadminpass not set in $configfile"
-    fi
-    echo phpmyadmin    phpmyadmin/setup-password password $phpmyadminpass | debconf-set-selections
-    echo phpmyadmin    phpmyadmin/mysql/app-pass password $phpmyadminpass | debconf-set-selections
-    echo phpmyadmin    phpmyadmin/app-password-confirm password $phpmyadminpass | debconf-set-selections
-    echo phpmyadmin    phpmyadmin/mysql/admin-pass    password $phpmyadminpass | debconf-set-selections
-    echo phpmyadmin    phpmyadmin/password-confirm    password $phpmyadminpass | debconf-set-selections
-    echo phpmyadmin    phpmyadmin/reconfigure-webserver multiselect apache2 | debconf-set-selections
-    nocheck_install "phpmyadmin"
-
-    # It seems to be not neccessary to check rewrite.load because it comes
-    # with the installation. To be sure you could check this manually by:
-    #
-    #    nano /etc/apache2/mods-available/rewrite.load
-    #
-    # You should find the content:
-    #
-    #    LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
-
-    a2enmod rewrite
-    if [ ! -f /etc/apache2/apache2.conf ]
-    then
-        die "could not find file /etc/apache2/apache2.conf"
-    fi
-    sed -i \
-        "s/AllowOverride None/AllowOverride all/" \
-        /etc/apache2/apache2.conf
-    if [ -z "`grep 'Include /etc/phpmyadmin/apache.conf' /etc/apache2/apache2.conf`" ]
-    then
-        echo "Include /etc/phpmyadmin/apache.conf" >> /etc/apache2/apache2.conf
+        echo "Alias /adminer /usr/share/adminer/adminer" > /etc/adminer/adminer.conf
+        ln -s /etc/adminer/adminer.conf /etc/apache2/conf-available/adminer.conf
+    else
+        print_info "file /etc/adminer/adminer.conf exists already"
     fi
-    service apache2 restart
-    /etc/init.d/mysql start
+    a2enconf adminer
+    systemctl reload apache2
 }
 
 function create_hubzilla_db {
@@ -330,6 +287,7 @@ function create_hubzilla_db {
     then
         die "hubzilla_db_pass not set in $configfile"
     fi
+    systemctl restart mariadb
     Q1="CREATE DATABASE IF NOT EXISTS $hubzilla_db_name;"
     Q2="GRANT USAGE ON *.* TO $hubzilla_db_user@localhost IDENTIFIED BY '$hubzilla_db_pass';"
     Q3="GRANT ALL PRIVILEGES ON $hubzilla_db_name.* to $hubzilla_db_user@localhost identified by '$hubzilla_db_pass';"
@@ -454,17 +412,7 @@ function install_letsencrypt {
     then
         die "Failed to install let's encrypt: 'le_domain' is empty in $configfile"
     fi
-    nocheck_install "apt-transport-https"
-    # add backports to your sources.list
-    backports_list=/etc/apt/sources.list.d/backports.list    
-    if [ -f $backports_list ]
-    then
-        print_info "$backports_list exist already"
-    else
-        echo "deb https://deb.debian.org/debian stretch-backports main" > $backports_list
-    fi
-	apt-get -y update
-    DEBIAN_FRONTEND=noninteractive apt-get -q -y -t stretch-backports install certbot python-certbot-apache
+    nocheck_install "certbot python-certbot-apache" 
     print_info "run certbot ..."
 	certbot --apache -w /var/www/html -d $le_domain -m $le_email --agree-tos --non-interactive --redirect --hsts --uir
     service apache2 restart
@@ -486,9 +434,9 @@ function install_hubzilla {
     print_info "installing hubzilla addons..."
     cd /var/www/html/
     # if you install Hubzilla
-    util/add_addon_repo https://framagit.org/hubzilla/addons hzaddons
+    # util/add_addon_repo https://framagit.org/hubzilla/addons hzaddons
     # if you install ZAP
-    #util/add_addon_repo https://framagit.org/zot/zap-addons.git zaddons
+    util/add_addon_repo https://framagit.org/zot/zap-addons.git zaddons
     mkdir -p "store/[data]/smarty3"
     chmod -R 777 store
     touch .htconfig.php
@@ -498,12 +446,6 @@ function install_hubzilla {
 	chown root:www-data /var/www/html/
 	chown root:www-data /var/www/html/.htaccess
 	chmod 0644 /var/www/html/.htaccess
-    print_info "try to switch off email registration..."
-    sed -i "s/verify_email.*1/verify_email'] = 0/" /var/www/html/view/*/ht*
-    if [ -n "`grep -r 'verify_email.*1' /var/www/html/view/`" ]
-    then
-        print_warn "Hubzillas registration prozess might have email verification switched on."
-    fi
     print_info "installed hubzilla"
 }
 
@@ -635,7 +577,6 @@ source $configfile
 selfhostdir=/etc/selfhost
 selfhostscript=selfhost-updater.sh
 hubzilladaily=hubzilla-daily.sh
-plugins_update=.homeinstall/plugins_update.sh
 backup_mount_point=/media/hubzilla_backup
 
 #set -x    # activate debugging from here
@@ -649,7 +590,7 @@ install_apache
 install_imagemagick
 install_php
 install_mysql
-install_phpmyadmin
+install_adminer
 create_hubzilla_db
 run_freedns
 install_run_selfhost
diff --git a/doc/context/ru/connections/help.html b/doc/context/ru/connections/help.html
new file mode 100644
index 000000000..6c9b9a0e9
--- /dev/null
+++ b/doc/context/ru/connections/help.html
@@ -0,0 +1,7 @@
+<dl class="dl-horizontal">
+    <dd>На этой странице отображается список всех подключений этого канала. Список можно отсортировать и отфильтровать с помощью кнопки <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Нажмите чтобы выделить элемент..."><button class='btn btn-outline-secondary btn-sm'><i class="fa fa-filter"></i></button></a> рядом с кнопкой поиска.</dd>
+    <dt>Сведения о контакте</dt>
+    <dd>Каждая запись в списке показывает информацию о конкретном контакте. Полупрозрачное изображение профиля указывает на заархивированное соединение.</dd>
+    <dt>Статус контакта</dt>
+    <dd>Контакт может находиться в разных состояниях: <ul><li>Заархивирован</li><li>Игнорируется</li><li>Заблокирован</li><li>Скрыт</li></ul></dd>
+</dl>
+\ No newline at end of file
diff --git a/doc/context/ru/network/help.html b/doc/context/ru/network/help.html
new file mode 100644
index 000000000..19b5452e2
--- /dev/null
+++ b/doc/context/ru/network/help.html
@@ -0,0 +1,9 @@
+<dl class="dl-horizontal">
+  <dd>Здесь отображается поток сообщений и бесед, обычно упорядоченных по последнему обновлению. Данная страница имеет гибкие настройки.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#profile-jot-wrapper", 0); return false;' title="Нажмите чтобы выделить элемент...">Создать заметку</a></dt>
+  <dd>В верхней части страницы есть текстовое поле с надписью "Поделиться". Нажатие на это поле открывает редактор сообщений. Внешний ид редактора сообщений настраивается, однако по умолчанию редактор имеет поля для текста заметки и необязательного поля "Заголовок". Кнопки под полем для ввода текста слева служат для форматирования текста, вставки ссылок, изображений и других данных. Кнопки справа обеспечивают предварительный просмотр сообщения, настройку разрешений для публикации и кнопку <button class='btn btn-outline-secondary btn-sm'>Отправить</button> для её отправки.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#group-sidebar", 1); return false;' title="Нажмите чтобы выделить элемент...">Группы конфиденциальности</a></dt>
+  <dd>Созданные вами группы конфиденциальности отображаются на боковой панели. Их выбор фильтрует сообщения по публикациям, которые созданы каналами в выбранной группе.</dd>
+  <dt><a href='#' onclick='$("#dbtn-acl").click(); return false;' title="Нажмите чтобы выделить элемент...">Разрешения публикации</a></dt>
+  <dd>Список контроля доступа (ACL) используется для того, чтобы указать, кто будет видеть вашу новую публикацию. При нажатии кнопки ACL рядом с кнопкой <button class='btn btn-outline-secondary btn-sm'>Поделиться</button> появится диалоговое окно, в котором вы можете выбрать, какие каналы и / или группы конфиденциальности могут видеть сообщение. Вы также можете выбрать, кому явно отказано в доступе. Например, вы планируете сюрприз для друга. Вы можете отправить сообщение с приглашением всем в вашей группе "Друзья" <i>кроме</i> друга, которого вы хотите поздравить. В этом случае публикацию увидят все члены группы "Друзья", кроме этого человека.</dd>
+</dl>
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 1444db339..10701710d 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hubzilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-13 12:07+0200\n"
-"PO-Revision-Date: 2019-05-19 11:03+0000\n"
+"POT-Creation-Date: 2019-08-01 21:45+0200\n"
+"PO-Revision-Date: 2019-08-11 08:49+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/hubzilla/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -157,11 +157,11 @@ msgid "Special - Group Repository"
 msgstr "Especial - Repositorio de grupo"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:306
-#: ../../Zotlabs/Module/Cdav.php:1335 ../../Zotlabs/Module/Connedit.php:935
+#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:935
 #: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:60
 #: ../../include/selectors.php:77 ../../include/selectors.php:115
-#: ../../include/selectors.php:151 ../../include/event.php:1336
-#: ../../include/event.php:1343 ../../include/connections.php:730
+#: ../../include/selectors.php:151 ../../include/event.php:1376
+#: ../../include/event.php:1383 ../../include/connections.php:730
 #: ../../include/connections.php:737
 msgid "Other"
 msgstr "Otro"
@@ -185,10 +185,10 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
 #: ../../Zotlabs/Module/Invite.php:21 ../../Zotlabs/Module/Invite.php:102
 #: ../../Zotlabs/Module/Articles.php:88 ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:168
-#: ../../Zotlabs/Module/Channel.php:331 ../../Zotlabs/Module/Channel.php:370
+#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:179
+#: ../../Zotlabs/Module/Channel.php:342 ../../Zotlabs/Module/Channel.php:381
 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271
+#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:277
 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20
 #: ../../Zotlabs/Module/Article_edit.php:51
 #: ../../Zotlabs/Module/New_channel.php:105
@@ -206,13 +206,13 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157
 #: ../../Zotlabs/Module/Profile_photo.php:336
 #: ../../Zotlabs/Module/Profile_photo.php:349
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:397
-#: ../../Zotlabs/Module/Item.php:416 ../../Zotlabs/Module/Item.php:426
-#: ../../Zotlabs/Module/Item.php:1302 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:417
+#: ../../Zotlabs/Module/Item.php:436 ../../Zotlabs/Module/Item.php:446
+#: ../../Zotlabs/Module/Item.php:1326 ../../Zotlabs/Module/Page.php:34
 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:399
 #: ../../Zotlabs/Module/Chat.php:115 ../../Zotlabs/Module/Chat.php:120
 #: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140
-#: ../../Zotlabs/Module/Channel_calendar.php:230
+#: ../../Zotlabs/Module/Channel_calendar.php:224
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40
 #: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Group.php:14
@@ -226,7 +226,7 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
 #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:80
 #: ../../Zotlabs/Module/Like.php:187 ../../Zotlabs/Module/Suggest.php:32
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:150
 #: ../../Zotlabs/Module/Register.php:80
 #: ../../Zotlabs/Module/Cover_photo.php:347
 #: ../../Zotlabs/Module/Cover_photo.php:360
@@ -243,14 +243,14 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Notifications.php:11
 #: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123
 #: ../../addon/keepout/keepout.php:36
-#: ../../addon/flashcards/Mod_Flashcards.php:167
+#: ../../addon/flashcards/Mod_Flashcards.php:281
 #: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44
 #: ../../include/attach.php:150 ../../include/attach.php:199
 #: ../../include/attach.php:272 ../../include/attach.php:380
 #: ../../include/attach.php:394 ../../include/attach.php:401
 #: ../../include/attach.php:483 ../../include/attach.php:1043
 #: ../../include/attach.php:1117 ../../include/attach.php:1280
-#: ../../include/items.php:3801 ../../include/photos.php:27
+#: ../../include/items.php:3790 ../../include/photos.php:27
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
@@ -259,7 +259,7 @@ msgstr "Acceso denegado."
 msgid "Block Name"
 msgstr "Nombre del bloque"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2558
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2560
 msgid "Blocks"
 msgstr "Bloques"
 
@@ -278,7 +278,7 @@ msgid "Edited"
 msgstr "Editado"
 
 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:116
-#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Cdav.php:1338
+#: ../../Zotlabs/Module/Cdav.php:1084 ../../Zotlabs/Module/Cdav.php:1390
 #: ../../Zotlabs/Module/New_channel.php:189
 #: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Menu.php:181
 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798
@@ -315,7 +315,7 @@ msgid "Share"
 msgstr "Compartir"
 
 #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Cdav.php:1340
+#: ../../Zotlabs/Module/Cdav.php:1081 ../../Zotlabs/Module/Cdav.php:1392
 #: ../../Zotlabs/Module/Article_edit.php:129
 #: ../../Zotlabs/Module/Admin/Accounts.php:175
 #: ../../Zotlabs/Module/Admin/Channels.php:149
@@ -333,7 +333,7 @@ msgstr "Compartir"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:695
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:702
 #: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409
 #: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:261
 #: ../../Zotlabs/Module/Pubsites.php:60
@@ -375,7 +375,7 @@ msgid "Invite App"
 msgstr "Solicitar una app"
 
 #: ../../Zotlabs/Module/Invite.php:110 ../../Zotlabs/Module/Articles.php:51
-#: ../../Zotlabs/Module/Cdav.php:857 ../../Zotlabs/Module/Permcats.php:62
+#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Permcats.php:62
 #: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:61
 #: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Connect.php:104
 #: ../../Zotlabs/Module/Tokens.php:99 ../../Zotlabs/Module/Oauth2.php:106
@@ -393,7 +393,7 @@ msgstr "Solicitar una app"
 #: ../../addon/ijpost/Mod_Ijpost.php:35 ../../addon/dwpost/Mod_Dwpost.php:36
 #: ../../addon/gallery/Mod_Gallery.php:58 ../../addon/ljpost/Mod_Ljpost.php:36
 #: ../../addon/startpage/Mod_Startpage.php:50
-#: ../../addon/diaspora/Mod_Diaspora.php:57
+#: ../../addon/diaspora/Mod_Diaspora.php:58
 #: ../../addon/photocache/Mod_Photocache.php:42
 #: ../../addon/rainbowtag/Mod_Rainbowtag.php:21
 #: ../../addon/nsabait/Mod_Nsabait.php:20
@@ -430,7 +430,7 @@ msgstr "Enviar invitaciones"
 msgid "Enter email addresses, one per line:"
 msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
 
-#: ../../Zotlabs/Module/Invite.php:157 ../../Zotlabs/Module/Mail.php:285
+#: ../../Zotlabs/Module/Invite.php:157 ../../Zotlabs/Module/Mail.php:289
 msgid "Your message:"
 msgstr "Su mensaje:"
 
@@ -461,7 +461,7 @@ msgstr "3. Pulse [conectar]"
 
 #: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Permcats.php:128
 #: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Mitem.php:259
-#: ../../Zotlabs/Module/Events.php:495 ../../Zotlabs/Module/Appman.php:155
+#: ../../Zotlabs/Module/Events.php:501 ../../Zotlabs/Module/Appman.php:155
 #: ../../Zotlabs/Module/Import_items.php:129
 #: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
 #: ../../Zotlabs/Module/Connect.php:124
@@ -492,19 +492,19 @@ msgstr "3. Pulse [conectar]"
 #: ../../Zotlabs/Module/Settings/Network.php:61
 #: ../../Zotlabs/Module/Tokens.php:188 ../../Zotlabs/Module/Thing.php:326
 #: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Import.php:646
-#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Cal.php:344
-#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Photos.php:1055
-#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1215
-#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Pdledit.php:107
-#: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:904
-#: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250
+#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Mood.php:158
+#: ../../Zotlabs/Module/Photos.php:1055 ../../Zotlabs/Module/Photos.php:1096
+#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Module/Wiki.php:215
+#: ../../Zotlabs/Module/Pdledit.php:107 ../../Zotlabs/Module/Poke.php:217
+#: ../../Zotlabs/Module/Connedit.php:904 ../../Zotlabs/Module/Chat.php:211
+#: ../../Zotlabs/Module/Chat.php:250
 #: ../../Zotlabs/Module/Email_validation.php:40
 #: ../../Zotlabs/Module/Pconfig.php:116 ../../Zotlabs/Module/Affinity.php:87
 #: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Group.php:150
 #: ../../Zotlabs/Module/Group.php:166 ../../Zotlabs/Module/Profiles.php:723
 #: ../../Zotlabs/Module/Editpost.php:86 ../../Zotlabs/Module/Sources.php:125
 #: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:203
+#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Module/Filestorage.php:203
 #: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Oauth.php:111
 #: ../../Zotlabs/Lib/ThreadItem.php:796
 #: ../../Zotlabs/Widget/Eventstools.php:16
@@ -515,15 +515,16 @@ msgstr "3. Pulse [conectar]"
 #: ../../addon/skeleton/Mod_Skeleton.php:51
 #: ../../addon/openclipatar/openclipatar.php:53
 #: ../../addon/wppost/Mod_Wppost.php:97 ../../addon/nsfw/Mod_Nsfw.php:61
+#: ../../addon/flashcards/Mod_Flashcards.php:218
 #: ../../addon/ijpost/Mod_Ijpost.php:72 ../../addon/dwpost/Mod_Dwpost.php:71
 #: ../../addon/likebanner/likebanner.php:57
 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:45
 #: ../../addon/ljpost/Mod_Ljpost.php:73
 #: ../../addon/startpage/Mod_Startpage.php:73
-#: ../../addon/diaspora/Mod_Diaspora.php:99
+#: ../../addon/diaspora/Mod_Diaspora.php:102
 #: ../../addon/photocache/Mod_Photocache.php:67
 #: ../../addon/hzfiles/hzfiles.php:86 ../../addon/mailtest/mailtest.php:100
-#: ../../addon/openstreetmap/openstreetmap.php:169
+#: ../../addon/openstreetmap/openstreetmap.php:134
 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:56 ../../addon/rtof/Mod_Rtof.php:72
 #: ../../addon/jappixmini/Mod_Jappixmini.php:261
 #: ../../addon/channelreputation/channelreputation.php:142
@@ -593,8 +594,8 @@ msgstr "Descripción de la plantilla (opcional)"
 msgid "Edit Layout"
 msgstr "Modificar la plantilla"
 
-#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:1035
-#: ../../Zotlabs/Module/Cdav.php:1341
+#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:1083
+#: ../../Zotlabs/Module/Cdav.php:1393
 #: ../../Zotlabs/Module/Article_edit.php:131
 #: ../../Zotlabs/Module/Admin/Addons.php:426
 #: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
@@ -650,74 +651,78 @@ msgstr "Visible para"
 msgid "All Connections"
 msgstr "Todas las conexiones"
 
-#: ../../Zotlabs/Module/Cdav.php:765 ../../Zotlabs/Module/Events.php:25
+#: ../../Zotlabs/Module/Cdav.php:807 ../../Zotlabs/Module/Events.php:28
 msgid "Calendar entries imported."
 msgstr "Entradas de calendario importadas."
 
-#: ../../Zotlabs/Module/Cdav.php:767 ../../Zotlabs/Module/Events.php:27
+#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:30
 msgid "No calendar entries found."
 msgstr "No se han encontrado entradas de calendario."
 
-#: ../../Zotlabs/Module/Cdav.php:828
+#: ../../Zotlabs/Module/Cdav.php:870
 msgid "INVALID EVENT DISMISSED!"
 msgstr "¡EVENTO NO VÁLIDO RECHAZADO!"
 
-#: ../../Zotlabs/Module/Cdav.php:829
+#: ../../Zotlabs/Module/Cdav.php:871
 msgid "Summary: "
 msgstr "Resumen: "
 
-#: ../../Zotlabs/Module/Cdav.php:829 ../../Zotlabs/Module/Cdav.php:830
-#: ../../Zotlabs/Module/Cdav.php:837 ../../Zotlabs/Module/Embedphotos.php:174
+#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Cdav.php:872
+#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Embedphotos.php:174
 #: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1254
-#: ../../Zotlabs/Lib/Activity.php:1067 ../../Zotlabs/Lib/Apps.php:1114
+#: ../../Zotlabs/Lib/Activity.php:1095 ../../Zotlabs/Lib/Apps.php:1114
 #: ../../Zotlabs/Lib/Apps.php:1198 ../../Zotlabs/Storage/Browser.php:164
 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84
-#: ../../addon/pubcrawl/as.php:1009 ../../include/conversation.php:1166
+#: ../../addon/pubcrawl/as.php:1071 ../../include/conversation.php:1166
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../../Zotlabs/Module/Cdav.php:830
+#: ../../Zotlabs/Module/Cdav.php:872
 msgid "Date: "
 msgstr "Fecha: "
 
-#: ../../Zotlabs/Module/Cdav.php:831 ../../Zotlabs/Module/Cdav.php:838
+#: ../../Zotlabs/Module/Cdav.php:873 ../../Zotlabs/Module/Cdav.php:880
 msgid "Reason: "
 msgstr "Razón: "
 
-#: ../../Zotlabs/Module/Cdav.php:836
+#: ../../Zotlabs/Module/Cdav.php:878
 msgid "INVALID CARD DISMISSED!"
 msgstr "¡TARJETA NO VÁLIDA RECHAZADA!"
 
-#: ../../Zotlabs/Module/Cdav.php:837
+#: ../../Zotlabs/Module/Cdav.php:879
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../../Zotlabs/Module/Cdav.php:857
+#: ../../Zotlabs/Module/Cdav.php:899
 msgid "CardDAV App"
 msgstr "App CarDav"
 
-#: ../../Zotlabs/Module/Cdav.php:858
+#: ../../Zotlabs/Module/Cdav.php:900
 msgid "CalDAV capable addressbook"
 msgstr "Libreta de direcciones compatible con CalDav"
 
-#: ../../Zotlabs/Module/Cdav.php:921
-#: ../../Zotlabs/Module/Channel_calendar.php:401
+#: ../../Zotlabs/Module/Cdav.php:968 ../../Zotlabs/Module/Cal.php:167
+#: ../../Zotlabs/Module/Channel_calendar.php:387
 msgid "Link to source"
 msgstr "Enlace a la fuente"
 
-#: ../../Zotlabs/Module/Cdav.php:987 ../../Zotlabs/Module/Events.php:462
+#: ../../Zotlabs/Module/Cdav.php:1034 ../../Zotlabs/Module/Events.php:468
 msgid "Event title"
 msgstr "Título del evento"
 
-#: ../../Zotlabs/Module/Cdav.php:988 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:474
 msgid "Start date and time"
 msgstr "Fecha y hora de comienzo"
 
-#: ../../Zotlabs/Module/Cdav.php:989
+#: ../../Zotlabs/Module/Cdav.php:1036
 msgid "End date and time"
 msgstr "Fecha y hora de finalización"
 
-#: ../../Zotlabs/Module/Cdav.php:990 ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:497
+msgid "Timezone:"
+msgstr "Zona horaria: "
+
+#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:481
 #: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101
 #: ../../addon/rendezvous/rendezvous.php:173
 #: ../../addon/cart/submodules/manualcat.php:260
@@ -725,64 +730,63 @@ msgstr "Fecha y hora de finalización"
 msgid "Description"
 msgstr "Descripción"
 
-#: ../../Zotlabs/Module/Cdav.php:991 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Events.php:477 ../../Zotlabs/Module/Profiles.php:509
+#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Events.php:483 ../../Zotlabs/Module/Profiles.php:509
 #: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52
 #: ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../../Zotlabs/Module/Cdav.php:1012 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Cal.php:338
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:944
+#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Events.php:697
+#: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Cal.php:205
+#: ../../Zotlabs/Module/Photos.php:944
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:691
-#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Setup.php:260
-#: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Cal.php:346
-#: ../../Zotlabs/Module/Photos.php:953
+#: ../../Zotlabs/Module/Cdav.php:1061 ../../Zotlabs/Module/Events.php:698
+#: ../../Zotlabs/Module/Events.php:707 ../../Zotlabs/Module/Setup.php:260
+#: ../../Zotlabs/Module/Cal.php:206 ../../Zotlabs/Module/Photos.php:953
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Events.php:701
-#: ../../Zotlabs/Module/Cal.php:347
+#: ../../Zotlabs/Module/Cdav.php:1062 ../../Zotlabs/Module/Events.php:708
+#: ../../Zotlabs/Module/Cal.php:207
 msgid "Today"
 msgstr "Hoy"
 
-#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:696
+#: ../../Zotlabs/Module/Cdav.php:1063 ../../Zotlabs/Module/Events.php:703
 msgid "Month"
 msgstr "Mes"
 
-#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Events.php:697
+#: ../../Zotlabs/Module/Cdav.php:1064 ../../Zotlabs/Module/Events.php:704
 msgid "Week"
 msgstr "Semana"
 
-#: ../../Zotlabs/Module/Cdav.php:1017 ../../Zotlabs/Module/Events.php:698
+#: ../../Zotlabs/Module/Cdav.php:1065 ../../Zotlabs/Module/Events.php:705
 msgid "Day"
 msgstr "Día"
 
-#: ../../Zotlabs/Module/Cdav.php:1018
+#: ../../Zotlabs/Module/Cdav.php:1066
 msgid "List month"
 msgstr "Lista mensual"
 
-#: ../../Zotlabs/Module/Cdav.php:1019
+#: ../../Zotlabs/Module/Cdav.php:1067
 msgid "List week"
 msgstr "Lista semanal"
 
-#: ../../Zotlabs/Module/Cdav.php:1020
+#: ../../Zotlabs/Module/Cdav.php:1068
 msgid "List day"
 msgstr "Lista diaria"
 
-#: ../../Zotlabs/Module/Cdav.php:1028
+#: ../../Zotlabs/Module/Cdav.php:1076
 msgid "More"
 msgstr "Más"
 
-#: ../../Zotlabs/Module/Cdav.php:1029
+#: ../../Zotlabs/Module/Cdav.php:1077
 msgid "Less"
 msgstr "Menos"
 
-#: ../../Zotlabs/Module/Cdav.php:1030 ../../Zotlabs/Module/Cdav.php:1339
+#: ../../Zotlabs/Module/Cdav.php:1078 ../../Zotlabs/Module/Cdav.php:1391
 #: ../../Zotlabs/Module/Admin/Addons.php:456
 #: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:144
 #: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Profiles.php:799
@@ -791,28 +795,28 @@ msgstr "Menos"
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../../Zotlabs/Module/Cdav.php:1031
+#: ../../Zotlabs/Module/Cdav.php:1079
 msgid "Select calendar"
 msgstr "Seleccionar un calendario"
 
-#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Widget/Cdav.php:143
+#: ../../Zotlabs/Module/Cdav.php:1080 ../../Zotlabs/Widget/Cdav.php:143
 msgid "Channel Calendars"
 msgstr "Calendarios del canal"
 
-#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Zotlabs/Module/Cdav.php:1080 ../../Zotlabs/Widget/Cdav.php:129
 #: ../../Zotlabs/Widget/Cdav.php:143
 msgid "CalDAV Calendars"
 msgstr "Calendarios CalDAV"
 
-#: ../../Zotlabs/Module/Cdav.php:1034
+#: ../../Zotlabs/Module/Cdav.php:1082
 msgid "Delete all"
 msgstr "Eliminar todos"
 
-#: ../../Zotlabs/Module/Cdav.php:1037
+#: ../../Zotlabs/Module/Cdav.php:1085
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado."
 
-#: ../../Zotlabs/Module/Cdav.php:1047
+#: ../../Zotlabs/Module/Cdav.php:1095
 #: ../../Zotlabs/Widget/Appcategories.php:43
 #: ../../include/contact_widgets.php:96 ../../include/contact_widgets.php:139
 #: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409
@@ -821,7 +825,7 @@ msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementa
 msgid "Categories"
 msgstr "Temas"
 
-#: ../../Zotlabs/Module/Cdav.php:1323
+#: ../../Zotlabs/Module/Cdav.php:1375
 #: ../../Zotlabs/Module/Sharedwithme.php:104
 #: ../../Zotlabs/Module/Admin/Channels.php:159
 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
@@ -835,114 +839,114 @@ msgstr "Temas"
 msgid "Name"
 msgstr "Nombre"
 
-#: ../../Zotlabs/Module/Cdav.php:1324 ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Connedit.php:924
 msgid "Organisation"
 msgstr "Organización"
 
-#: ../../Zotlabs/Module/Cdav.php:1325 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Connedit.php:925
 msgid "Title"
 msgstr "Título"
 
-#: ../../Zotlabs/Module/Cdav.php:1326 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Connedit.php:926
 #: ../../Zotlabs/Module/Profiles.php:786
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../../Zotlabs/Module/Cdav.php:1327
+#: ../../Zotlabs/Module/Cdav.php:1379
 #: ../../Zotlabs/Module/Admin/Accounts.php:171
 #: ../../Zotlabs/Module/Admin/Accounts.php:183
 #: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:787
 #: ../../addon/openid/MysqlProvider.php:56
 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/Mod_Rtof.php:57
-#: ../../addon/redred/Mod_Redred.php:71 ../../include/network.php:1731
+#: ../../addon/redred/Mod_Redred.php:71 ../../include/network.php:1732
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../../Zotlabs/Module/Cdav.php:1328 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Connedit.php:928
 #: ../../Zotlabs/Module/Profiles.php:788
 msgid "Instant messenger"
 msgstr "Mensajería instantánea"
 
-#: ../../Zotlabs/Module/Cdav.php:1329 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Connedit.php:929
 #: ../../Zotlabs/Module/Profiles.php:789
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../../Zotlabs/Module/Cdav.php:1330 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Locs.php:118
 #: ../../Zotlabs/Module/Admin/Channels.php:160
 #: ../../Zotlabs/Module/Connedit.php:930 ../../Zotlabs/Module/Profiles.php:502
 #: ../../Zotlabs/Module/Profiles.php:790
 msgid "Address"
 msgstr "Dirección"
 
-#: ../../Zotlabs/Module/Cdav.php:1331 ../../Zotlabs/Module/Connedit.php:931
+#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Connedit.php:931
 #: ../../Zotlabs/Module/Profiles.php:791
 msgid "Note"
 msgstr "Nota"
 
-#: ../../Zotlabs/Module/Cdav.php:1332 ../../Zotlabs/Module/Connedit.php:932
-#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1329
+#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Connedit.php:932
+#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1369
 #: ../../include/connections.php:723
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../../Zotlabs/Module/Cdav.php:1333 ../../Zotlabs/Module/Connedit.php:933
-#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1330
+#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Connedit.php:933
+#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1370
 #: ../../include/connections.php:724
 msgid "Home"
 msgstr "Inicio"
 
-#: ../../Zotlabs/Module/Cdav.php:1334 ../../Zotlabs/Module/Connedit.php:934
-#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1333
+#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Connedit.php:934
+#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1373
 #: ../../include/connections.php:727
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../../Zotlabs/Module/Cdav.php:1336 ../../Zotlabs/Module/Connedit.php:936
+#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:936
 #: ../../Zotlabs/Module/Profiles.php:796
 #: ../../addon/jappixmini/Mod_Jappixmini.php:216
 msgid "Add Contact"
 msgstr "Añadir un contacto"
 
-#: ../../Zotlabs/Module/Cdav.php:1337 ../../Zotlabs/Module/Connedit.php:937
+#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:937
 #: ../../Zotlabs/Module/Profiles.php:797
 msgid "Add Field"
 msgstr "Añadir un campo"
 
-#: ../../Zotlabs/Module/Cdav.php:1342 ../../Zotlabs/Module/Connedit.php:942
+#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:942
 msgid "P.O. Box"
 msgstr "Buzón de correos"
 
-#: ../../Zotlabs/Module/Cdav.php:1343 ../../Zotlabs/Module/Connedit.php:943
+#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:943
 msgid "Additional"
 msgstr "Adicional"
 
-#: ../../Zotlabs/Module/Cdav.php:1344 ../../Zotlabs/Module/Connedit.php:944
+#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:944
 msgid "Street"
 msgstr "Calle"
 
-#: ../../Zotlabs/Module/Cdav.php:1345 ../../Zotlabs/Module/Connedit.php:945
+#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:945
 msgid "Locality"
 msgstr "Localidad"
 
-#: ../../Zotlabs/Module/Cdav.php:1346 ../../Zotlabs/Module/Connedit.php:946
+#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Connedit.php:946
 msgid "Region"
 msgstr "Provincia, región o estado"
 
-#: ../../Zotlabs/Module/Cdav.php:1347 ../../Zotlabs/Module/Connedit.php:947
+#: ../../Zotlabs/Module/Cdav.php:1399 ../../Zotlabs/Module/Connedit.php:947
 msgid "ZIP Code"
 msgstr "Código postal"
 
-#: ../../Zotlabs/Module/Cdav.php:1348 ../../Zotlabs/Module/Connedit.php:948
+#: ../../Zotlabs/Module/Cdav.php:1400 ../../Zotlabs/Module/Connedit.php:948
 #: ../../Zotlabs/Module/Profiles.php:757
 msgid "Country"
 msgstr "País"
 
-#: ../../Zotlabs/Module/Cdav.php:1395
+#: ../../Zotlabs/Module/Cdav.php:1447
 msgid "Default Calendar"
 msgstr "Calendario por defecto"
 
-#: ../../Zotlabs/Module/Cdav.php:1406
+#: ../../Zotlabs/Module/Cdav.php:1458
 msgid "Default Addressbook"
 msgstr "Agenda de direcciones por defecto"
 
@@ -1019,21 +1023,26 @@ msgstr "Publicaciones y comentarios"
 msgid "Only posts"
 msgstr "Solo publicaciones"
 
-#: ../../Zotlabs/Module/Channel.php:165
+#: ../../Zotlabs/Module/Channel.php:122
+#, php-format
+msgid "This is the home page of %s."
+msgstr "Esta es la página personal de %s."
+
+#: ../../Zotlabs/Module/Channel.php:176
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
 
-#: ../../Zotlabs/Module/Channel.php:182 ../../Zotlabs/Module/Network.php:173
+#: ../../Zotlabs/Module/Channel.php:193 ../../Zotlabs/Module/Network.php:173
 msgid "Search Results For:"
 msgstr "Buscar resultados para:"
 
-#: ../../Zotlabs/Module/Channel.php:217 ../../Zotlabs/Module/Hq.php:134
+#: ../../Zotlabs/Module/Channel.php:228 ../../Zotlabs/Module/Hq.php:134
 #: ../../Zotlabs/Module/Pubstream.php:94 ../../Zotlabs/Module/Display.php:80
 #: ../../Zotlabs/Module/Network.php:203
 msgid "Reset form"
 msgstr "Reiniciar el formulario"
 
-#: ../../Zotlabs/Module/Channel.php:472 ../../Zotlabs/Module/Display.php:378
+#: ../../Zotlabs/Module/Channel.php:483 ../../Zotlabs/Module/Display.php:378
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr "Debe habilitar javascript para poder ver este contenido en su navegador."
@@ -1276,7 +1285,7 @@ msgstr "Usar la autenticación mágica si está disponible"
 
 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479
 #: ../../Zotlabs/Module/Removeme.php:63
 #: ../../Zotlabs/Module/Admin/Site.php:255
 #: ../../Zotlabs/Module/Settings/Channel.php:309
@@ -1293,7 +1302,7 @@ msgstr "Usar la autenticación mágica si está disponible"
 #: ../../Zotlabs/Module/Filestorage.php:206
 #: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163
 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:411
-#: ../../boot.php:1635 ../../view/theme/redbasic_c/php/config.php:100
+#: ../../boot.php:1681 ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/redbasic/php/config.php:116
@@ -1337,7 +1346,7 @@ msgstr "No"
 
 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479
 #: ../../Zotlabs/Module/Removeme.php:63
 #: ../../Zotlabs/Module/Admin/Site.php:257
 #: ../../Zotlabs/Module/Settings/Channel.php:309
@@ -1353,7 +1362,7 @@ msgstr "No"
 #: ../../Zotlabs/Module/Filestorage.php:206
 #: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163
 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:411
-#: ../../boot.php:1635 ../../view/theme/redbasic_c/php/config.php:100
+#: ../../boot.php:1681 ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/redbasic/php/config.php:116
@@ -1475,157 +1484,151 @@ msgstr "Editar elemento del menú"
 msgid "Link text"
 msgstr "Texto del enlace"
 
-#: ../../Zotlabs/Module/Events.php:110
-#: ../../Zotlabs/Module/Channel_calendar.php:87
+#: ../../Zotlabs/Module/Events.php:113
+#: ../../Zotlabs/Module/Channel_calendar.php:51
 msgid "Event can not end before it has started."
 msgstr "Un evento no puede terminar antes de que haya comenzado."
 
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
-#: ../../Zotlabs/Module/Channel_calendar.php:89
-#: ../../Zotlabs/Module/Channel_calendar.php:97
-#: ../../Zotlabs/Module/Channel_calendar.php:114
+#: ../../Zotlabs/Module/Events.php:115 ../../Zotlabs/Module/Events.php:124
+#: ../../Zotlabs/Module/Events.php:146
+#: ../../Zotlabs/Module/Channel_calendar.php:53
+#: ../../Zotlabs/Module/Channel_calendar.php:61
+#: ../../Zotlabs/Module/Channel_calendar.php:78
 msgid "Unable to generate preview."
 msgstr "No se puede crear la vista previa."
 
-#: ../../Zotlabs/Module/Events.php:119
-#: ../../Zotlabs/Module/Channel_calendar.php:95
+#: ../../Zotlabs/Module/Events.php:122
+#: ../../Zotlabs/Module/Channel_calendar.php:59
 msgid "Event title and start time are required."
 msgstr "Se requieren el título del evento y su hora de inicio."
 
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Channel_calendar.php:112
-#: ../../Zotlabs/Module/Channel_calendar.php:224
+#: ../../Zotlabs/Module/Events.php:144 ../../Zotlabs/Module/Events.php:271
+#: ../../Zotlabs/Module/Channel_calendar.php:76
+#: ../../Zotlabs/Module/Channel_calendar.php:218
 msgid "Event not found."
 msgstr "Evento no encontrado."
 
-#: ../../Zotlabs/Module/Events.php:260
-#: ../../Zotlabs/Module/Channel_calendar.php:219
+#: ../../Zotlabs/Module/Events.php:266
+#: ../../Zotlabs/Module/Channel_calendar.php:213
 #: ../../Zotlabs/Module/Tagger.php:73 ../../Zotlabs/Module/Like.php:394
-#: ../../include/conversation.php:119 ../../include/text.php:2118
-#: ../../include/event.php:1169
+#: ../../include/conversation.php:119 ../../include/text.php:2120
+#: ../../include/event.php:1207
 msgid "event"
 msgstr "el/su evento"
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Zotlabs/Module/Events.php:468
 msgid "Edit event title"
 msgstr "Editar el título del evento"
 
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:467
+#: ../../Zotlabs/Module/Events.php:468 ../../Zotlabs/Module/Events.php:473
 #: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Appman.php:144
 #: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749
 #: ../../include/datetime.php:211
 msgid "Required"
 msgstr "Obligatorio"
 
-#: ../../Zotlabs/Module/Events.php:464
+#: ../../Zotlabs/Module/Events.php:470
 msgid "Categories (comma-separated list)"
 msgstr "Temas (lista separada por comas)"
 
-#: ../../Zotlabs/Module/Events.php:465
+#: ../../Zotlabs/Module/Events.php:471
 msgid "Edit Category"
 msgstr "Modificar el tema"
 
-#: ../../Zotlabs/Module/Events.php:465
+#: ../../Zotlabs/Module/Events.php:471
 msgid "Category"
 msgstr "Tema"
 
-#: ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Events.php:474
 msgid "Edit start date and time"
 msgstr "Modificar la fecha y hora de comienzo"
 
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Events.php:472
+#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Events.php:478
 msgid "Finish date and time are not known or not relevant"
 msgstr "La fecha y hora de terminación no se conocen o no son relevantes"
 
-#: ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Events.php:477
 msgid "Edit finish date and time"
 msgstr "Modificar la fecha y hora de terminación"
 
-#: ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Events.php:477
 msgid "Finish date and time"
 msgstr "Fecha y hora de terminación"
 
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Events.php:474
+#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Events.php:480
 msgid "Adjust for viewer timezone"
 msgstr "Ajustar para obtener el visor de los husos horarios"
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../Zotlabs/Module/Events.php:479
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales."
 
-#: ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Events.php:481
 msgid "Edit Description"
 msgstr "Editar la descripción"
 
-#: ../../Zotlabs/Module/Events.php:477
+#: ../../Zotlabs/Module/Events.php:483
 msgid "Edit Location"
 msgstr "Modificar la dirección"
 
-#: ../../Zotlabs/Module/Events.php:480 ../../Zotlabs/Module/Photos.php:1097
+#: ../../Zotlabs/Module/Events.php:486 ../../Zotlabs/Module/Photos.php:1097
 #: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Lib/ThreadItem.php:806
 #: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1359
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../../Zotlabs/Module/Events.php:481 ../../addon/hsse/hsse.php:225
+#: ../../Zotlabs/Module/Events.php:487 ../../addon/hsse/hsse.php:225
 #: ../../include/conversation.php:1431
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
-#: ../../Zotlabs/Module/Events.php:491
-msgid "Timezone:"
-msgstr "Zona horaria: "
-
-#: ../../Zotlabs/Module/Events.php:496
+#: ../../Zotlabs/Module/Events.php:502
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: ../../Zotlabs/Module/Events.php:607 ../../Zotlabs/Module/Cal.php:264
+#: ../../Zotlabs/Module/Events.php:613
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../Zotlabs/Module/Events.php:635
-#: ../../Zotlabs/Module/Channel_calendar.php:385
+#: ../../Zotlabs/Module/Events.php:641
+#: ../../Zotlabs/Module/Channel_calendar.php:370
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: ../../Zotlabs/Module/Events.php:637
-#: ../../Zotlabs/Module/Channel_calendar.php:387
+#: ../../Zotlabs/Module/Events.php:643
+#: ../../Zotlabs/Module/Channel_calendar.php:372
 msgid "Delete event"
 msgstr "Borrar evento"
 
-#: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Cal.php:314
-#: ../../include/text.php:1937
+#: ../../Zotlabs/Module/Events.php:669 ../../include/text.php:1939
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
-#: ../../Zotlabs/Module/Events.php:670
-#: ../../Zotlabs/Module/Channel_calendar.php:415
+#: ../../Zotlabs/Module/Events.php:677
+#: ../../Zotlabs/Module/Channel_calendar.php:401
 msgid "calendar"
 msgstr "calendario"
 
-#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Cal.php:337
+#: ../../Zotlabs/Module/Events.php:696
 msgid "Edit Event"
 msgstr "Editar el evento"
 
-#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Cal.php:337
+#: ../../Zotlabs/Module/Events.php:696
 msgid "Create Event"
 msgstr "Crear un evento"
 
-#: ../../Zotlabs/Module/Events.php:692 ../../Zotlabs/Module/Cal.php:340
-#: ../../include/channel.php:1769
+#: ../../Zotlabs/Module/Events.php:699 ../../include/channel.php:1769
 msgid "Export"
 msgstr "Exportar"
 
-#: ../../Zotlabs/Module/Events.php:732
+#: ../../Zotlabs/Module/Events.php:739
 msgid "Event removed"
 msgstr "Evento borrado"
 
-#: ../../Zotlabs/Module/Events.php:735
-#: ../../Zotlabs/Module/Channel_calendar.php:448
+#: ../../Zotlabs/Module/Events.php:742
+#: ../../Zotlabs/Module/Channel_calendar.php:488
 msgid "Failed to remove event"
 msgstr "Error al eliminar el evento"
 
@@ -1685,22 +1688,22 @@ msgstr "Dirección (URL) donde adquirir la aplicación"
 msgid "Please login."
 msgstr "Por favor, inicie sesión."
 
-#: ../../Zotlabs/Module/Magic.php:76
+#: ../../Zotlabs/Module/Magic.php:78
 msgid "Hub not found."
 msgstr "Servidor no encontrado"
 
 #: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Lib/Activity.php:2019
+#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Lib/Activity.php:2320
 #: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/Receiver.php:1565 ../../addon/pubcrawl/as.php:1558
-#: ../../include/conversation.php:116 ../../include/text.php:2115
+#: ../../addon/diaspora/Receiver.php:1592 ../../addon/pubcrawl/as.php:1690
+#: ../../include/conversation.php:116 ../../include/text.php:2117
 msgid "photo"
 msgstr "foto"
 
 #: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Like.php:392
-#: ../../Zotlabs/Lib/Activity.php:2019 ../../addon/diaspora/Receiver.php:1565
-#: ../../addon/pubcrawl/as.php:1558 ../../include/conversation.php:144
-#: ../../include/text.php:2121
+#: ../../Zotlabs/Lib/Activity.php:2320 ../../addon/diaspora/Receiver.php:1592
+#: ../../addon/pubcrawl/as.php:1690 ../../include/conversation.php:144
+#: ../../include/text.php:2123
 msgid "status"
 msgstr "el mensaje de estado "
 
@@ -1714,7 +1717,7 @@ msgstr "%1$s está siguiendo %3$s de %2$s"
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s ha dejado de seguir %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:63
+#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:31
 #: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75
 #: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41
 #: ../../Zotlabs/Module/Card_edit.php:44
@@ -1723,8 +1726,8 @@ msgstr "Canal no encontrado."
 
 #: ../../Zotlabs/Module/Article_edit.php:101
 #: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:222
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
-#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101
+#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:292
+#: ../../Zotlabs/Module/Mail.php:435 ../../Zotlabs/Module/Card_edit.php:101
 #: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1298
 msgid "Insert web link"
 msgstr "Insertar enlace web"
@@ -2798,7 +2801,8 @@ msgstr "No se han encontrado temas."
 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45
 #: ../../Zotlabs/Module/Display.php:455
 #: ../../Zotlabs/Module/Filestorage.php:26 ../../Zotlabs/Module/Admin.php:62
-#: ../../include/items.php:3713
+#: ../../addon/flashcards/Mod_Flashcards.php:240
+#: ../../addon/flashcards/Mod_Flashcards.php:241 ../../include/items.php:3713
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
@@ -2857,7 +2861,7 @@ msgstr "Ajustes del sitio actualizados."
 
 #: ../../Zotlabs/Module/Admin/Site.php:187
 #: ../../view/theme/redbasic_c/php/config.php:15
-#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3218
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3229
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -3438,7 +3442,7 @@ msgstr "Información adicional (opcional)"
 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32
 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
 #: ../../Zotlabs/Widget/Notes.php:23
-#: ../../addon/queueworker/Mod_Queueworker.php:102 ../../include/text.php:1104
+#: ../../addon/queueworker/Mod_Queueworker.php:119 ../../include/text.php:1104
 #: ../../include/text.php:1116
 msgid "Save"
 msgstr "Guardar"
@@ -3674,7 +3678,7 @@ msgstr "Amigos/as"
 #: ../../Zotlabs/Module/Settings/Channel.php:266
 #: ../../Zotlabs/Module/Defperms.php:111
 #: ../../addon/rendezvous/rendezvous.php:82
-#: ../../addon/openstreetmap/openstreetmap.php:185
+#: ../../addon/openstreetmap/openstreetmap.php:150
 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
 #: ../../addon/twitter/twitter.php:605 ../../addon/piwik/piwik.php:116
 #: ../../addon/xmpp/xmpp.php:54
@@ -4450,6 +4454,7 @@ msgstr "Dirección para la foto o elemento (opcional)"
 #: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1044
 #: ../../Zotlabs/Module/Connedit.php:690 ../../Zotlabs/Module/Chat.php:243
 #: ../../Zotlabs/Module/Filestorage.php:190
+#: ../../addon/flashcards/Mod_Flashcards.php:210
 #: ../../include/acl_selectors.php:123
 msgid "Permissions"
 msgstr "Permisos"
@@ -4558,7 +4563,7 @@ msgstr "Este proceso puede tardar varios minutos en completarse. Por favor enví
 msgid "Authentication failed."
 msgstr "Falló la autenticación."
 
-#: ../../Zotlabs/Module/Rmagic.php:93 ../../boot.php:1631
+#: ../../Zotlabs/Module/Rmagic.php:93 ../../boot.php:1677
 #: ../../include/channel.php:2475
 msgid "Remote Authentication"
 msgstr "Acceso desde su servidor"
@@ -4657,14 +4662,10 @@ msgstr "Sin nombre"
 msgid "Remove authorization"
 msgstr "Eliminar autorización"
 
-#: ../../Zotlabs/Module/Cal.php:70
+#: ../../Zotlabs/Module/Cal.php:64
 msgid "Permissions denied."
 msgstr "Permisos denegados."
 
-#: ../../Zotlabs/Module/Cal.php:343 ../../include/text.php:2573
-msgid "Import"
-msgstr "Importar"
-
 #: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
 msgid "Authorize application connection"
 msgstr "Autorizar una conexión de aplicación"
@@ -4844,7 +4845,7 @@ msgstr "Eliminar conexión"
 msgid "Channel address"
 msgstr "Dirección del canal"
 
-#: ../../Zotlabs/Module/Connections.php:310 ../../include/features.php:321
+#: ../../Zotlabs/Module/Connections.php:310 ../../include/features.php:299
 msgid "Network"
 msgstr "Red"
 
@@ -4878,7 +4879,7 @@ msgid "Recent activity"
 msgstr "Actividad reciente"
 
 #: ../../Zotlabs/Module/Connections.php:348 ../../Zotlabs/Lib/Apps.php:332
-#: ../../include/text.php:1010 ../../include/features.php:125
+#: ../../include/text.php:1010 ../../include/features.php:133
 msgid "Connections"
 msgstr "Conexiones"
 
@@ -5193,7 +5194,7 @@ msgid "Recent Photos"
 msgstr "Fotos recientes"
 
 #: ../../Zotlabs/Module/Wiki.php:35
-#: ../../addon/flashcards/Mod_Flashcards.php:34 ../../addon/cart/cart.php:1298
+#: ../../addon/flashcards/Mod_Flashcards.php:35 ../../addon/cart/cart.php:1298
 msgid "Profile Unavailable."
 msgstr "Perfil no disponible"
 
@@ -5249,18 +5250,18 @@ msgstr "Tipo de contenido"
 #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371
 #: ../../Zotlabs/Widget/Wiki_pages.php:38
 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../addon/mdpost/mdpost.php:41
-#: ../../include/text.php:1979
+#: ../../include/text.php:1981
 msgid "Markdown"
 msgstr "Markdown"
 
 #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371
 #: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1977
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1979
 msgid "BBcode"
 msgstr "BBcode"
 
 #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1980
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1982
 msgid "Text"
 msgstr "Texto"
 
@@ -5435,7 +5436,7 @@ msgstr "Revisión seleccionada"
 msgid "You must be authenticated."
 msgstr "Debe estar autenticado."
 
-#: ../../Zotlabs/Module/Share.php:103 ../../Zotlabs/Lib/Activity.php:1529
+#: ../../Zotlabs/Module/Share.php:103 ../../Zotlabs/Lib/Activity.php:1574
 #, php-format
 msgid "&#x1f501; Repeated %1$s's %2$s"
 msgstr "&#x1f501; Repetidos %2$sde %1$s"
@@ -5643,73 +5644,73 @@ msgstr "Ausente"
 msgid "Online"
 msgstr "Conectado/a"
 
-#: ../../Zotlabs/Module/Item.php:362
+#: ../../Zotlabs/Module/Item.php:382
 msgid "Unable to locate original post."
 msgstr "No ha sido posible encontrar la entrada original."
 
-#: ../../Zotlabs/Module/Item.php:649
+#: ../../Zotlabs/Module/Item.php:668
 msgid "Empty post discarded."
 msgstr "La entrada vacía ha sido desechada."
 
-#: ../../Zotlabs/Module/Item.php:1058
+#: ../../Zotlabs/Module/Item.php:1082
 msgid "Duplicate post suppressed."
 msgstr "Se ha suprimido la entrada duplicada."
 
-#: ../../Zotlabs/Module/Item.php:1203
+#: ../../Zotlabs/Module/Item.php:1227
 msgid "System error. Post not saved."
 msgstr "Error del sistema. La entrada no se ha podido salvar."
 
-#: ../../Zotlabs/Module/Item.php:1239
+#: ../../Zotlabs/Module/Item.php:1263
 msgid "Your comment is awaiting approval."
 msgstr "Su comentario está pendiente de aprobación."
 
-#: ../../Zotlabs/Module/Item.php:1356
+#: ../../Zotlabs/Module/Item.php:1380
 msgid "Unable to obtain post information from database."
 msgstr "No ha sido posible obtener información de la entrada en la base de datos."
 
-#: ../../Zotlabs/Module/Item.php:1363
+#: ../../Zotlabs/Module/Item.php:1387
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 
-#: ../../Zotlabs/Module/Item.php:1370
+#: ../../Zotlabs/Module/Item.php:1394
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
 
-#: ../../Zotlabs/Module/Ping.php:338
+#: ../../Zotlabs/Module/Ping.php:337
 msgid "sent you a private message"
 msgstr "le ha enviado un mensaje privado"
 
-#: ../../Zotlabs/Module/Ping.php:394
+#: ../../Zotlabs/Module/Ping.php:393
 msgid "added your channel"
 msgstr "añadió este canal a sus conexiones"
 
-#: ../../Zotlabs/Module/Ping.php:419
+#: ../../Zotlabs/Module/Ping.php:418
 msgid "requires approval"
 msgstr "requiere aprobación"
 
-#: ../../Zotlabs/Module/Ping.php:429
+#: ../../Zotlabs/Module/Ping.php:428
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../Zotlabs/Module/Ping.php:447
+#: ../../Zotlabs/Module/Ping.php:446
 msgid "[today]"
 msgstr "[hoy]"
 
-#: ../../Zotlabs/Module/Ping.php:457
+#: ../../Zotlabs/Module/Ping.php:456
 msgid "posted an event"
 msgstr "publicó un evento"
 
-#: ../../Zotlabs/Module/Ping.php:491
+#: ../../Zotlabs/Module/Ping.php:490
 msgid "shared a file with you"
 msgstr "compartió un archivo con usted"
 
-#: ../../Zotlabs/Module/Ping.php:673
+#: ../../Zotlabs/Module/Ping.php:672
 msgid "Private forum"
 msgstr "Foro privado"
 
-#: ../../Zotlabs/Module/Ping.php:673
+#: ../../Zotlabs/Module/Ping.php:672
 msgid "Public forum"
 msgstr "Foro público"
 
@@ -5947,7 +5948,7 @@ msgstr "Esta conexión no es accesible desde este sitio. La independencia de ubi
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4328
+#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4323
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
@@ -6078,14 +6079,14 @@ msgstr "Estoy conectado/a"
 msgid "Bookmark this room"
 msgstr "Añadir esta sala a Marcadores"
 
-#: ../../Zotlabs/Module/Chat.php:220 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../addon/hsse/hsse.php:134
+#: ../../Zotlabs/Module/Chat.php:220 ../../Zotlabs/Module/Mail.php:245
+#: ../../Zotlabs/Module/Mail.php:366 ../../addon/hsse/hsse.php:134
 #: ../../include/conversation.php:1337
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
-#: ../../Zotlabs/Module/Chat.php:221 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:810
+#: ../../Zotlabs/Module/Chat.php:221 ../../Zotlabs/Module/Mail.php:298
+#: ../../Zotlabs/Module/Mail.php:441 ../../Zotlabs/Lib/ThreadItem.php:810
 #: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1461
 msgid "Encrypt text"
 msgstr "Cifrar texto"
@@ -6120,7 +6121,7 @@ msgid "min"
 msgstr "min"
 
 #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:344
-#: ../../include/features.php:383 ../../include/nav.php:446
+#: ../../include/features.php:361 ../../include/nav.php:446
 msgid "Photos"
 msgstr "Fotos"
 
@@ -6165,7 +6166,7 @@ msgstr "El menú se puede usar para guardar marcadores"
 msgid "Submit and proceed"
 msgstr "Enviar y proceder"
 
-#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2559
+#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2561
 msgid "Menus"
 msgstr "Menús"
 
@@ -6217,7 +6218,7 @@ msgstr "El título del menú tal como será visto por los demás"
 msgid "Allow bookmarks"
 msgstr "Permitir marcadores"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2560
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2562
 msgid "Layouts"
 msgstr "Plantillas"
 
@@ -6288,13 +6289,13 @@ msgstr "Token de validación"
 msgid "Post not found."
 msgstr "Mensaje no encontrado."
 
-#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:200
+#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:204
 #: ../../include/bbcode.php:362
 msgid "post"
 msgstr "la entrada"
 
 #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
-#: ../../include/text.php:2123
+#: ../../include/text.php:2125
 msgid "comment"
 msgstr "el comentario"
 
@@ -6414,7 +6415,7 @@ msgid "Could not create privacy group."
 msgstr "No se puede crear el grupo de canales"
 
 #: ../../Zotlabs/Module/Group.php:61 ../../Zotlabs/Module/Group.php:213
-#: ../../include/items.php:4295
+#: ../../include/items.php:4290
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
@@ -7258,15 +7259,15 @@ msgstr "Canal no disponible."
 msgid "Previous action reversed."
 msgstr "Acción anterior revocada."
 
-#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Lib/Activity.php:2054
-#: ../../addon/diaspora/Receiver.php:1505 ../../addon/pubcrawl/as.php:1594
+#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Lib/Activity.php:2355
+#: ../../addon/diaspora/Receiver.php:1532 ../../addon/pubcrawl/as.php:1727
 #: ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:449 ../../Zotlabs/Lib/Activity.php:2056
-#: ../../addon/pubcrawl/as.php:1596 ../../include/conversation.php:163
+#: ../../Zotlabs/Module/Like.php:449 ../../Zotlabs/Lib/Activity.php:2357
+#: ../../addon/pubcrawl/as.php:1729 ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s no le gusta %3$s de %2$s"
@@ -7286,17 +7287,17 @@ msgstr "%3$s de %2$s: %1$s no está de acuerdo"
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s se abstiene"
 
-#: ../../Zotlabs/Module/Like.php:457 ../../addon/diaspora/Receiver.php:2151
+#: ../../Zotlabs/Module/Like.php:457 ../../addon/diaspora/Receiver.php:2178
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s participa"
 
-#: ../../Zotlabs/Module/Like.php:459 ../../addon/diaspora/Receiver.php:2153
+#: ../../Zotlabs/Module/Like.php:459 ../../addon/diaspora/Receiver.php:2180
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no participa"
 
-#: ../../Zotlabs/Module/Like.php:461 ../../addon/diaspora/Receiver.php:2155
+#: ../../Zotlabs/Module/Like.php:461 ../../addon/diaspora/Receiver.php:2182
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s quizá participe"
@@ -7337,7 +7338,7 @@ msgid "Age:"
 msgstr "Edad:"
 
 #: ../../Zotlabs/Module/Directory.php:339 ../../include/channel.php:1513
-#: ../../include/event.php:61 ../../include/event.php:93
+#: ../../include/event.php:62 ../../include/event.php:112
 msgid "Location:"
 msgstr "Ubicación:"
 
@@ -7374,7 +7375,7 @@ msgstr "No sugerir:"
 
 #: ../../Zotlabs/Module/Directory.php:362
 msgid "Common connections (estimated):"
-msgstr "Conexiones comunes (estimadas): "
+msgstr "Conexiones comunes (estimadas):  "
 
 #: ../../Zotlabs/Module/Directory.php:411
 msgid "Global Directory"
@@ -7461,102 +7462,102 @@ msgstr "No se puede encontrar su servidor."
 msgid "Post successful."
 msgstr "Enviado con éxito."
 
-#: ../../Zotlabs/Module/Mail.php:73
+#: ../../Zotlabs/Module/Mail.php:77
 msgid "Unable to lookup recipient."
 msgstr "No se puede asociar a un destinatario."
 
-#: ../../Zotlabs/Module/Mail.php:80
+#: ../../Zotlabs/Module/Mail.php:84
 msgid "Unable to communicate with requested channel."
 msgstr "No se puede establecer la comunicación con el canal solicitado."
 
-#: ../../Zotlabs/Module/Mail.php:87
+#: ../../Zotlabs/Module/Mail.php:91
 msgid "Cannot verify requested channel."
 msgstr "No se puede verificar el canal solicitado."
 
-#: ../../Zotlabs/Module/Mail.php:105
+#: ../../Zotlabs/Module/Mail.php:109
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
 
-#: ../../Zotlabs/Module/Mail.php:160
+#: ../../Zotlabs/Module/Mail.php:164
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../../Zotlabs/Module/Mail.php:173
+#: ../../Zotlabs/Module/Mail.php:177
 msgid "message"
 msgstr "mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:214
+#: ../../Zotlabs/Module/Mail.php:218
 msgid "Message recalled."
 msgstr "Mensaje revocado."
 
-#: ../../Zotlabs/Module/Mail.php:227
+#: ../../Zotlabs/Module/Mail.php:231
 msgid "Conversation removed."
 msgstr "Conversación eliminada."
 
-#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
+#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:367
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Caduca YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:270
+#: ../../Zotlabs/Module/Mail.php:274
 msgid "Requested channel is not in this network"
 msgstr "El canal solicitado no existe en esta red"
 
-#: ../../Zotlabs/Module/Mail.php:278
+#: ../../Zotlabs/Module/Mail.php:282
 msgid "Send Private Message"
 msgstr "Enviar un mensaje privado"
 
-#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
+#: ../../Zotlabs/Module/Mail.php:283 ../../Zotlabs/Module/Mail.php:426
 msgid "To:"
 msgstr "Para:"
 
-#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
+#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:428
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:434
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: ../../Zotlabs/Module/Mail.php:289
+#: ../../Zotlabs/Module/Mail.php:293
 msgid "Send"
 msgstr "Enviar"
 
-#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
+#: ../../Zotlabs/Module/Mail.php:296 ../../Zotlabs/Module/Mail.php:439
 #: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1456
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
-#: ../../Zotlabs/Module/Mail.php:393
+#: ../../Zotlabs/Module/Mail.php:397
 msgid "Delete message"
 msgstr "Borrar mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:394
+#: ../../Zotlabs/Module/Mail.php:398
 msgid "Delivery report"
 msgstr "Informe de transmisión"
 
-#: ../../Zotlabs/Module/Mail.php:395
+#: ../../Zotlabs/Module/Mail.php:399
 msgid "Recall message"
 msgstr "Revocar el mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:397
+#: ../../Zotlabs/Module/Mail.php:401
 msgid "Message has been recalled."
 msgstr "El mensaje ha sido revocado."
 
-#: ../../Zotlabs/Module/Mail.php:414
+#: ../../Zotlabs/Module/Mail.php:419
 msgid "Delete Conversation"
 msgstr "Eliminar conversación"
 
-#: ../../Zotlabs/Module/Mail.php:416
+#: ../../Zotlabs/Module/Mail.php:421
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
 
-#: ../../Zotlabs/Module/Mail.php:420
+#: ../../Zotlabs/Module/Mail.php:425
 msgid "Send Reply"
 msgstr "Responder"
 
-#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Zotlabs/Module/Mail.php:430
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Su mensaje para %s (%s):"
@@ -7768,7 +7769,7 @@ msgstr "no"
 msgid "yes"
 msgstr "sí"
 
-#: ../../Zotlabs/Module/Register.php:293 ../../boot.php:1610
+#: ../../Zotlabs/Module/Register.php:293 ../../boot.php:1656
 #: ../../include/nav.php:160
 msgid "Register"
 msgstr "Registrarse"
@@ -7784,25 +7785,25 @@ msgstr "Este sitio requiere verificación por correo electrónico. Después de c
 msgid "Cover Photos"
 msgstr "Imágenes de portada del perfil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:303 ../../include/items.php:4672
+#: ../../Zotlabs/Module/Cover_photo.php:303 ../../include/items.php:4667
 msgid "female"
 msgstr "mujer"
 
-#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/items.php:4673
+#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/items.php:4668
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:305 ../../include/items.php:4674
+#: ../../Zotlabs/Module/Cover_photo.php:305 ../../include/items.php:4669
 msgid "male"
 msgstr "hombre"
 
-#: ../../Zotlabs/Module/Cover_photo.php:306 ../../include/items.php:4675
+#: ../../Zotlabs/Module/Cover_photo.php:306 ../../include/items.php:4670
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:308 ../../include/items.php:4677
+#: ../../Zotlabs/Module/Cover_photo.php:308 ../../include/items.php:4672
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
@@ -7914,6 +7915,7 @@ msgid "Edit file permissions"
 msgstr "Modificar los permisos del fichero"
 
 #: ../../Zotlabs/Module/Filestorage.php:197
+#: ../../addon/flashcards/Mod_Flashcards.php:217
 msgid "Set/edit permissions"
 msgstr "Establecer/editar los permisos"
 
@@ -8080,7 +8082,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1639
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1685
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -8163,35 +8165,35 @@ msgstr "Apps OAuth conectadas"
 msgid "Mark all seen"
 msgstr "Marcar todo como visto"
 
-#: ../../Zotlabs/Lib/Activity.php:1514
+#: ../../Zotlabs/Lib/Activity.php:1559
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr "Gusta de %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1517
+#: ../../Zotlabs/Lib/Activity.php:1562
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr "No le gusta %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1520
+#: ../../Zotlabs/Lib/Activity.php:1565
 #, php-format
 msgid "Will attend %1$s's %2$s"
 msgstr "Asistirá %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1523
+#: ../../Zotlabs/Lib/Activity.php:1568
 #, php-format
 msgid "Will not attend %1$s's %2$s"
 msgstr "No asistirá %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1526
+#: ../../Zotlabs/Lib/Activity.php:1571
 #, php-format
 msgid "May attend %1$s's %2$s"
 msgstr "Puede asistir %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1865 ../../Zotlabs/Lib/Activity.php:2063
-#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1268
-#: ../../addon/pubcrawl/as.php:1423 ../../addon/pubcrawl/as.php:1603
-#: ../../include/network.php:1730
+#: ../../Zotlabs/Lib/Activity.php:2170 ../../Zotlabs/Lib/Activity.php:2364
+#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1341
+#: ../../addon/pubcrawl/as.php:1542 ../../addon/pubcrawl/as.php:1736
+#: ../../include/network.php:1731
 msgid "ActivityPub"
 msgstr "ActivityPub"
 
@@ -8219,7 +8221,7 @@ msgstr "4. Experto - Puedo escribir código informático"
 msgid "5. Wizard - I probably know more than you do"
 msgstr "5. Colaborador - probablemente sé más que tú"
 
-#: ../../Zotlabs/Lib/Libzot.php:652 ../../include/zot.php:802
+#: ../../Zotlabs/Lib/Libzot.php:652 ../../include/zot.php:801
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la firma del canal"
 
@@ -8265,7 +8267,7 @@ msgstr "Diagnóstico remoto"
 msgid "Suggest Channels"
 msgstr "Sugerir canales"
 
-#: ../../Zotlabs/Lib/Apps.php:335 ../../boot.php:1630
+#: ../../Zotlabs/Lib/Apps.php:335 ../../boot.php:1676
 #: ../../include/nav.php:122 ../../include/nav.php:126
 msgid "Login"
 msgstr "Iniciar sesión"
@@ -8278,7 +8280,7 @@ msgstr "Stream"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:342 ../../include/features.php:96
+#: ../../Zotlabs/Lib/Apps.php:342 ../../include/features.php:104
 msgid "Channel Home"
 msgstr "Mi canal"
 
@@ -8288,7 +8290,7 @@ msgstr "Mi canal"
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:184
+#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:192
 msgid "Directory"
 msgstr "Directorio"
 
@@ -8334,7 +8336,7 @@ msgstr "Publicación"
 msgid "Profile Photo"
 msgstr "Foto del perfil"
 
-#: ../../Zotlabs/Lib/Apps.php:362 ../../include/features.php:397
+#: ../../Zotlabs/Lib/Apps.php:362 ../../include/features.php:375
 msgid "Profiles"
 msgstr "Perfiles"
 
@@ -8635,7 +8637,7 @@ msgstr "Sala no encontrada."
 msgid "Room is full"
 msgstr "La sala está llena."
 
-#: ../../Zotlabs/Lib/Libsync.php:733 ../../include/zot.php:2611
+#: ../../Zotlabs/Lib/Libsync.php:733 ../../include/zot.php:2632
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "No ha sido posible de verificar la firma del sitio para %s"
@@ -8898,12 +8900,17 @@ msgstr "ha creado una nueva entrada"
 msgid "commented on %s's post"
 msgstr "ha comentado la entrada de %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:816
+#: ../../Zotlabs/Lib/Enotify.php:812
+#, php-format
+msgid "repeated %s's post"
+msgstr "repetida la entrada de %s"
+
+#: ../../Zotlabs/Lib/Enotify.php:821
 #, php-format
 msgid "edited a post dated %s"
 msgstr "ha editado una entrada fechada el %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Zotlabs/Lib/Enotify.php:825
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "ha editado un comentario fechado el %s"
@@ -9173,7 +9180,7 @@ msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo
 msgid "parent"
 msgstr "padre"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2950
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2952
 msgid "Collection"
 msgstr "Colección"
 
@@ -9426,7 +9433,7 @@ msgstr "Mostrar las entradas que he enviado a %s"
 
 #: ../../Zotlabs/Widget/Activity_filter.php:137
 #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:333
+#: ../../include/features.php:311
 msgid "Saved Folders"
 msgstr "Carpetas guardadas"
 
@@ -9503,7 +9510,7 @@ msgstr "foto/imagen"
 msgid "Remove term"
 msgstr "Eliminar término"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:325
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:303
 msgid "Saved Searches"
 msgstr "Búsquedas guardadas"
 
@@ -9816,67 +9823,67 @@ msgstr "No se ha encontrado el canal de origen."
 msgid "Network/Protocol"
 msgstr "Red / Protocolo"
 
-#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1734
+#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1735
 msgid "Zot"
 msgstr "Zot"
 
-#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1732
+#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1733
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1725
-#: ../../include/network.php:1726
+#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1726
+#: ../../include/network.php:1727
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1727
+#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1728
 msgid "OStatus"
 msgstr "OStatus"
 
-#: ../../boot.php:1609
+#: ../../boot.php:1655
 msgid "Create an account to access services and applications"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones"
 
-#: ../../boot.php:1629 ../../include/nav.php:107 ../../include/nav.php:136
+#: ../../boot.php:1675 ../../include/nav.php:107 ../../include/nav.php:136
 #: ../../include/nav.php:155
 msgid "Logout"
 msgstr "Finalizar sesión"
 
-#: ../../boot.php:1633
+#: ../../boot.php:1679
 msgid "Login/Email"
 msgstr "Inicio de sesión / Correo electrónico"
 
-#: ../../boot.php:1634
+#: ../../boot.php:1680
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1635
+#: ../../boot.php:1681
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1638
+#: ../../boot.php:1684
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2434
+#: ../../boot.php:2480
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr "[$Projectname] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2439
+#: ../../boot.php:2485
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2555
+#: ../../boot.php:2601
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s"
 
-#: ../../boot.php:2560
+#: ../../boot.php:2606
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2561 ../../include/datetime.php:238
+#: ../../boot.php:2607 ../../include/datetime.php:238
 msgid "never"
 msgstr "nunca"
 
@@ -10490,15 +10497,25 @@ msgstr "Palabra, /expresión regular/, lang=xx, lang!=xx"
 msgid "NSFW"
 msgstr "NSFW"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:73
+#: ../../addon/flashcards/Mod_Flashcards.php:174
+msgid "Not allowed."
+msgstr "No permitido/a."
+
+#: ../../addon/queueworker/Mod_Queueworker.php:77
 msgid "Max queueworker threads"
 msgstr "Máximo de hilos en la cola"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:87
+#: ../../addon/queueworker/Mod_Queueworker.php:91
 msgid "Assume workers dead after ___ seconds"
 msgstr "Asumir que el proceso de trabajo está muerto después de ___ segundos"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:99
+#: ../../addon/queueworker/Mod_Queueworker.php:105
+msgid ""
+"Pause before starting next task: (microseconds.  Minimum 100 = .0001 "
+"seconds)"
+msgstr "Haga una pausa antes de comenzar la siguiente tarea: (microsegundos. Mínimo 100 =.0001 segundos)"
+
+#: ../../addon/queueworker/Mod_Queueworker.php:116
 msgid "Queueworker Settings"
 msgstr "Configuración del gestor de procesos de trabajo en cola"
 
@@ -11045,44 +11062,44 @@ msgstr "una declaración de amor eterno"
 msgid "declared undying love for"
 msgstr "ha declarado amor eterno a"
 
-#: ../../addon/diaspora/Receiver.php:1509
+#: ../../addon/diaspora/Receiver.php:1536
 #, php-format
 msgid "%1$s dislikes %2$s's %3$s"
 msgstr "a %1$s no le gusta el %3$s de %2$s"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:42
+#: ../../addon/diaspora/Mod_Diaspora.php:43
 msgid "Diaspora Protocol Settings updated."
 msgstr "Los ajustes del protocolo de Diaspora se han actualizado."
 
-#: ../../addon/diaspora/Mod_Diaspora.php:51
+#: ../../addon/diaspora/Mod_Diaspora.php:52
 msgid ""
 "The diaspora protocol does not support location independence. Connections "
 "you make within that network may be unreachable from alternate channel "
 "locations."
 msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos."
 
-#: ../../addon/diaspora/Mod_Diaspora.php:57
+#: ../../addon/diaspora/Mod_Diaspora.php:58
 msgid "Diaspora Protocol App"
 msgstr "App Protocolo Diaspora"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:74
+#: ../../addon/diaspora/Mod_Diaspora.php:77
 msgid "Allow any Diaspora member to comment on your public posts"
 msgstr "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:78
+#: ../../addon/diaspora/Mod_Diaspora.php:81
 msgid "Prevent your hashtags from being redirected to other sites"
 msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios "
 
-#: ../../addon/diaspora/Mod_Diaspora.php:82
+#: ../../addon/diaspora/Mod_Diaspora.php:85
 msgid ""
 "Sign and forward posts and comments with no existing Diaspora signature"
 msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:87
+#: ../../addon/diaspora/Mod_Diaspora.php:90
 msgid "Followed hashtags (comma separated, do not include the #)"
 msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:96
+#: ../../addon/diaspora/Mod_Diaspora.php:99
 msgid "Diaspora Protocol"
 msgstr "Protocolo Diaspora"
 
@@ -11090,7 +11107,7 @@ msgstr "Protocolo Diaspora"
 msgid "No username found in import file."
 msgstr "No se ha encontrado el nombre de usuario en el fichero de importación."
 
-#: ../../addon/diaspora/import_diaspora.php:43 ../../include/import.php:73
+#: ../../addon/diaspora/import_diaspora.php:43 ../../include/import.php:75
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "No se ha podido crear una dirección de canal única. Ha fallado la importación."
 
@@ -11289,44 +11306,44 @@ msgstr "Asunto del mensaje"
 msgid "Use markdown for editing posts"
 msgstr "Usar markdown para editar las entradas"
 
-#: ../../addon/openstreetmap/openstreetmap.php:146
+#: ../../addon/openstreetmap/openstreetmap.php:119
 msgid "View Larger"
 msgstr "Ver más grande"
 
-#: ../../addon/openstreetmap/openstreetmap.php:170
+#: ../../addon/openstreetmap/openstreetmap.php:135
 msgid "Tile Server URL"
 msgstr "URL del servidor de mosaicos de imágenes "
 
-#: ../../addon/openstreetmap/openstreetmap.php:170
+#: ../../addon/openstreetmap/openstreetmap.php:135
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
 "target=\"_blank\">public tile servers</a>"
 msgstr "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\"  target=\"_blank\">servidores públicos de mosaicos de imágenes</a>"
 
-#: ../../addon/openstreetmap/openstreetmap.php:171
+#: ../../addon/openstreetmap/openstreetmap.php:136
 msgid "Nominatim (reverse geocoding) Server URL"
 msgstr "URL del servidor nominatim (geocodificación inversa)"
 
-#: ../../addon/openstreetmap/openstreetmap.php:171
+#: ../../addon/openstreetmap/openstreetmap.php:136
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
 "target=\"_blank\">Nominatim servers</a>"
 msgstr "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">servidores nominatim</a>"
 
-#: ../../addon/openstreetmap/openstreetmap.php:172
+#: ../../addon/openstreetmap/openstreetmap.php:137
 msgid "Default zoom"
 msgstr "Zoom predeterminado"
 
-#: ../../addon/openstreetmap/openstreetmap.php:172
+#: ../../addon/openstreetmap/openstreetmap.php:137
 msgid ""
 "The default zoom level. (1:world, 18:highest, also depends on tile server)"
 msgstr "El nivel de zoom predeterminado. (1: mundo, 18: el más alto, también depende del servidor del mosaico de imágenes)"
 
-#: ../../addon/openstreetmap/openstreetmap.php:173
+#: ../../addon/openstreetmap/openstreetmap.php:138
 msgid "Include marker on map"
 msgstr "Incluir un marcador en el mapa"
 
-#: ../../addon/openstreetmap/openstreetmap.php:173
+#: ../../addon/openstreetmap/openstreetmap.php:138
 msgid "Include a marker on the map."
 msgstr "Incluir un marcador en el mapa."
 
@@ -11475,7 +11492,7 @@ msgid "change log"
 msgstr "lista de cambios"
 
 #: ../../addon/upgrade_info/upgrade_info.php:55
-msgid "for further infos."
+msgid "for further info."
 msgstr "para más información."
 
 #: ../../addon/upgrade_info/upgrade_info.php:60
@@ -13552,16 +13569,16 @@ msgstr[1] "Se abstienen"
 msgid "%1$s's bookmarks"
 msgstr "Marcadores de %1$s"
 
-#: ../../include/import.php:26
+#: ../../include/import.php:28
 msgid "Unable to import a removed channel."
 msgstr "No se puede importar un canal eliminado."
 
-#: ../../include/import.php:52
+#: ../../include/import.php:54
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."
 
-#: ../../include/import.php:118
+#: ../../include/import.php:120
 msgid "Cloned channel not found. Import failed."
 msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
@@ -13819,115 +13836,119 @@ msgstr "desconocido"
 msgid "remove category"
 msgstr "eliminar el tema"
 
-#: ../../include/text.php:1625
+#: ../../include/text.php:1627
 msgid "remove from file"
 msgstr "eliminar del fichero"
 
-#: ../../include/text.php:1789 ../../include/message.php:13
+#: ../../include/text.php:1791 ../../include/message.php:13
 msgid "Download binary/encrypted content"
 msgstr "Descargar contenido binario o cifrado"
 
-#: ../../include/text.php:1959 ../../include/language.php:423
+#: ../../include/text.php:1961 ../../include/language.php:423
 msgid "default"
 msgstr "por defecto"
 
-#: ../../include/text.php:1967
+#: ../../include/text.php:1969
 msgid "Page layout"
 msgstr "Plantilla de la página"
 
-#: ../../include/text.php:1967
+#: ../../include/text.php:1969
 msgid "You can create your own with the layouts tool"
 msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas"
 
-#: ../../include/text.php:1978
+#: ../../include/text.php:1980
 msgid "HTML"
 msgstr "HTML"
 
-#: ../../include/text.php:1981
+#: ../../include/text.php:1983
 msgid "Comanche Layout"
 msgstr "Plantilla de Comanche"
 
-#: ../../include/text.php:1986
+#: ../../include/text.php:1988
 msgid "PHP"
 msgstr "PHP"
 
-#: ../../include/text.php:1995
+#: ../../include/text.php:1997
 msgid "Page content type"
 msgstr "Tipo de contenido de la página"
 
-#: ../../include/text.php:2128
+#: ../../include/text.php:2130
 msgid "activity"
 msgstr "la/su actividad"
 
-#: ../../include/text.php:2229
+#: ../../include/text.php:2231
 msgid "a-z, 0-9, -, and _ only"
 msgstr "a-z, 0-9, -, and _ only"
 
-#: ../../include/text.php:2555
+#: ../../include/text.php:2557
 msgid "Design Tools"
 msgstr "Herramientas de diseño web"
 
-#: ../../include/text.php:2561
+#: ../../include/text.php:2563
 msgid "Pages"
 msgstr "Páginas"
 
-#: ../../include/text.php:2574
+#: ../../include/text.php:2575
+msgid "Import"
+msgstr "Importar"
+
+#: ../../include/text.php:2576
 msgid "Import website..."
 msgstr "Importar un sitio web..."
 
-#: ../../include/text.php:2575
+#: ../../include/text.php:2577
 msgid "Select folder to import"
 msgstr "Seleccionar la carpeta que se va a importar"
 
-#: ../../include/text.php:2576
+#: ../../include/text.php:2578
 msgid "Import from a zipped folder:"
 msgstr "Importar desde una carpeta comprimida: "
 
-#: ../../include/text.php:2577
+#: ../../include/text.php:2579
 msgid "Import from cloud files:"
 msgstr "Importar desde los ficheros en la nube: "
 
-#: ../../include/text.php:2578
+#: ../../include/text.php:2580
 msgid "/cloud/channel/path/to/folder"
 msgstr "/cloud/canal/ruta/a la/carpeta"
 
-#: ../../include/text.php:2579
+#: ../../include/text.php:2581
 msgid "Enter path to website files"
 msgstr "Ruta a los ficheros del sitio web"
 
-#: ../../include/text.php:2580
+#: ../../include/text.php:2582
 msgid "Select folder"
 msgstr "Seleccionar la carpeta"
 
-#: ../../include/text.php:2581
+#: ../../include/text.php:2583
 msgid "Export website..."
 msgstr "Exportar un sitio web..."
 
-#: ../../include/text.php:2582
+#: ../../include/text.php:2584
 msgid "Export to a zip file"
 msgstr "Exportar a un fichero comprimido .zip"
 
-#: ../../include/text.php:2583
+#: ../../include/text.php:2585
 msgid "website.zip"
 msgstr "sitio_web.zip"
 
-#: ../../include/text.php:2584
+#: ../../include/text.php:2586
 msgid "Enter a name for the zip file."
 msgstr "Escriba un nombre para el fichero zip."
 
-#: ../../include/text.php:2585
+#: ../../include/text.php:2587
 msgid "Export to cloud files"
 msgstr "Exportar a la nube de ficheros"
 
-#: ../../include/text.php:2586
+#: ../../include/text.php:2588
 msgid "/path/to/export/folder"
 msgstr "/ruta/para/exportar/carpeta"
 
-#: ../../include/text.php:2587
+#: ../../include/text.php:2589
 msgid "Enter a path to a cloud files destination."
 msgstr "Escriba una ruta de destino a la nube de ficheros."
 
-#: ../../include/text.php:2588
+#: ../../include/text.php:2590
 msgid "Specify folder"
 msgstr "Especificar una carpeta"
 
@@ -13975,7 +13996,7 @@ msgstr "Conexiones comunes"
 msgid "View all %d common connections"
 msgstr "Ver todas las %d conexiones comunes"
 
-#: ../../include/markdown.php:198 ../../include/bbcode.php:366
+#: ../../include/markdown.php:202 ../../include/bbcode.php:366
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s escribió %2$s siguiente %3$s"
@@ -14331,7 +14352,7 @@ msgstr "No se ha especificado ningún destinatario."
 msgid "[no subject]"
 msgstr "[sin asunto]"
 
-#: ../../include/message.php:215
+#: ../../include/message.php:214
 msgid "Stored post could not be verified."
 msgstr "No se han podido verificar las publicaciones guardadas."
 
@@ -14467,34 +14488,34 @@ msgstr "Visible para las conexiones permitidas."
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4311
+#: ../../include/items.php:4306
 msgid "Privacy group is empty."
 msgstr "El grupo de canales está vacío."
 
-#: ../../include/items.php:4318
+#: ../../include/items.php:4313
 #, php-format
 msgid "Privacy group: %s"
 msgstr "Grupo de canales: %s"
 
-#: ../../include/items.php:4330
+#: ../../include/items.php:4325
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/items.php:4679
+#: ../../include/items.php:4674
 msgid "profile photo"
 msgstr "foto del perfil"
 
-#: ../../include/items.php:4871
+#: ../../include/items.php:4866
 #, php-format
 msgid "[Edited %s]"
 msgstr "[se ha editado %s]"
 
-#: ../../include/items.php:4871
+#: ../../include/items.php:4866
 msgctxt "edit_activity"
 msgid "Post"
 msgstr "Publicar"
 
-#: ../../include/items.php:4871
+#: ../../include/items.php:4866
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr "Comentar"
@@ -14648,79 +14669,91 @@ msgstr "Estudios:"
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
-#: ../../include/event.php:31 ../../include/event.php:78
+#: ../../include/event.php:32 ../../include/event.php:95
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d de F, Y \\@ G:i"
 
-#: ../../include/event.php:39 ../../include/event.php:82
+#: ../../include/event.php:40
 msgid "Starts:"
 msgstr "Comienza:"
 
-#: ../../include/event.php:49 ../../include/event.php:86
+#: ../../include/event.php:50
 msgid "Finishes:"
 msgstr "Finaliza:"
 
-#: ../../include/event.php:1023
+#: ../../include/event.php:95
+msgid "l F d, Y"
+msgstr "l F d, Y"
+
+#: ../../include/event.php:99
+msgid "Start:"
+msgstr "Iniciar: "
+
+#: ../../include/event.php:103
+msgid "End:"
+msgstr "Finalizar: "
+
+#: ../../include/event.php:1058
 msgid "This event has been added to your calendar."
 msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/event.php:1244
+#: ../../include/event.php:1284
 msgid "Not specified"
 msgstr "Sin especificar"
 
-#: ../../include/event.php:1245
+#: ../../include/event.php:1285
 msgid "Needs Action"
 msgstr "Necesita de una intervención"
 
-#: ../../include/event.php:1246
+#: ../../include/event.php:1286
 msgid "Completed"
 msgstr "Completado/a"
 
-#: ../../include/event.php:1247
+#: ../../include/event.php:1287
 msgid "In Process"
 msgstr "En proceso"
 
-#: ../../include/event.php:1248
+#: ../../include/event.php:1288
 msgid "Cancelled"
 msgstr "Cancelado/a"
 
-#: ../../include/event.php:1331 ../../include/connections.php:725
+#: ../../include/event.php:1371 ../../include/connections.php:725
 msgid "Home, Voice"
 msgstr "Llamadas particulares"
 
-#: ../../include/event.php:1332 ../../include/connections.php:726
+#: ../../include/event.php:1372 ../../include/connections.php:726
 msgid "Home, Fax"
 msgstr "Fax particular"
 
-#: ../../include/event.php:1334 ../../include/connections.php:728
+#: ../../include/event.php:1374 ../../include/connections.php:728
 msgid "Work, Voice"
 msgstr "Llamadas de trabajo"
 
-#: ../../include/event.php:1335 ../../include/connections.php:729
+#: ../../include/event.php:1375 ../../include/connections.php:729
 msgid "Work, Fax"
 msgstr "Fax de trabajo"
 
-#: ../../include/network.php:1728
+#: ../../include/network.php:1729
 msgid "GNU-Social"
 msgstr "GNU Social"
 
-#: ../../include/network.php:1729
+#: ../../include/network.php:1730
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/network.php:1733
+#: ../../include/network.php:1734
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../include/network.php:1735
+#: ../../include/network.php:1736
 msgid "LinkedIn"
 msgstr "LinkedIn"
 
-#: ../../include/network.php:1736
+#: ../../include/network.php:1737
 msgid "XMPP/IM"
 msgstr "XMPP/IM"
 
-#: ../../include/network.php:1737
+#: ../../include/network.php:1738
 msgid "MySpace"
 msgstr "MySpace"
 
@@ -14757,17 +14790,17 @@ msgid ""
 " permissions set who is allowed to view the post."
 msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje."
 
-#: ../../include/bbcode.php:219 ../../include/bbcode.php:1211
-#: ../../include/bbcode.php:1214 ../../include/bbcode.php:1219
-#: ../../include/bbcode.php:1222 ../../include/bbcode.php:1225
-#: ../../include/bbcode.php:1228 ../../include/bbcode.php:1233
-#: ../../include/bbcode.php:1236 ../../include/bbcode.php:1241
-#: ../../include/bbcode.php:1244 ../../include/bbcode.php:1247
-#: ../../include/bbcode.php:1250
+#: ../../include/bbcode.php:219 ../../include/bbcode.php:1214
+#: ../../include/bbcode.php:1217 ../../include/bbcode.php:1222
+#: ../../include/bbcode.php:1225 ../../include/bbcode.php:1228
+#: ../../include/bbcode.php:1231 ../../include/bbcode.php:1236
+#: ../../include/bbcode.php:1239 ../../include/bbcode.php:1244
+#: ../../include/bbcode.php:1247 ../../include/bbcode.php:1250
+#: ../../include/bbcode.php:1253
 msgid "Image/photo"
 msgstr "Imagen/foto"
 
-#: ../../include/bbcode.php:258 ../../include/bbcode.php:1261
+#: ../../include/bbcode.php:258 ../../include/bbcode.php:1264
 msgid "Encrypted content"
 msgstr "Contenido cifrado"
 
@@ -14807,7 +14840,7 @@ msgstr "Ver el artículo"
 msgid "View summary"
 msgstr "Ver sumario"
 
-#: ../../include/bbcode.php:1199
+#: ../../include/bbcode.php:1202
 msgid "$1 wrote:"
 msgstr "$1 escribió:"
 
@@ -14836,286 +14869,272 @@ msgstr "Incrustación deshabilitada"
 msgid "OpenWebAuth: %1$s welcomes %2$s"
 msgstr "OpenWebAuth:  %1$s da la bienvenida a %2$s"
 
-#: ../../include/features.php:86 ../../include/features.php:281
+#: ../../include/features.php:86
 msgid "Start calendar week on Monday"
 msgstr "Comenzar el calendario semanal por el lunes"
 
-#: ../../include/features.php:87 ../../include/features.php:282
+#: ../../include/features.php:87
 msgid "Default is Sunday"
 msgstr "Por defecto es domingo"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:94
+msgid "Event Timezone Selection"
+msgstr "Selección del huso horario del evento"
+
+#: ../../include/features.php:95
+msgid "Allow event creation in timezones other than your own."
+msgstr "Permitir la creación de eventos en husos horarios distintos del suyo."
+
+#: ../../include/features.php:108
 msgid "Search by Date"
 msgstr "Buscar por fecha"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:109
 msgid "Ability to select posts by date ranges"
 msgstr "Capacidad de seleccionar entradas por rango de fechas"
 
-#: ../../include/features.php:108
+#: ../../include/features.php:116
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
-#: ../../include/features.php:109
+#: ../../include/features.php:117
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Proveer nube de etiquetas personal en su página de canal"
 
-#: ../../include/features.php:116 ../../include/features.php:373
+#: ../../include/features.php:124 ../../include/features.php:351
 msgid "Use blog/list mode"
 msgstr "Usar el modo blog/lista"
 
-#: ../../include/features.php:117 ../../include/features.php:374
+#: ../../include/features.php:125 ../../include/features.php:352
 msgid "Comments will be displayed separately"
 msgstr "Los comentarios se mostrarán por separado"
 
-#: ../../include/features.php:129
+#: ../../include/features.php:137
 msgid "Connection Filtering"
 msgstr "Filtrado de conexiones"
 
-#: ../../include/features.php:130
+#: ../../include/features.php:138
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
 
-#: ../../include/features.php:138
+#: ../../include/features.php:146
 msgid "Conversation"
 msgstr "Conversación"
 
-#: ../../include/features.php:142
+#: ../../include/features.php:150
 msgid "Community Tagging"
 msgstr "Etiquetas de la comunidad"
 
-#: ../../include/features.php:143
+#: ../../include/features.php:151
 msgid "Ability to tag existing posts"
 msgstr "Capacidad de etiquetar entradas"
 
-#: ../../include/features.php:150
+#: ../../include/features.php:158
 msgid "Emoji Reactions"
 msgstr "Emoticonos \"emoji\""
 
-#: ../../include/features.php:151
+#: ../../include/features.php:159
 msgid "Add emoji reaction ability to posts"
 msgstr "Activar la capacidad de añadir un emoticono \"emoji\" a las entradas"
 
-#: ../../include/features.php:158
+#: ../../include/features.php:166
 msgid "Dislike Posts"
 msgstr "Desagrado de publicaciones"
 
-#: ../../include/features.php:159
+#: ../../include/features.php:167
 msgid "Ability to dislike posts/comments"
 msgstr "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios"
 
-#: ../../include/features.php:166
+#: ../../include/features.php:174
 msgid "Star Posts"
 msgstr "Entradas destacadas"
 
-#: ../../include/features.php:167
+#: ../../include/features.php:175
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
 
-#: ../../include/features.php:174
+#: ../../include/features.php:182
 msgid "Reply on comment"
 msgstr "Responder a los comentarios"
 
-#: ../../include/features.php:175
+#: ../../include/features.php:183
 msgid "Ability to reply on selected comment"
 msgstr "Posibilidad de responder a los comentarios seleccionados"
 
-#: ../../include/features.php:188
+#: ../../include/features.php:196
 msgid "Advanced Directory Search"
 msgstr "Búsqueda avanzada en el directorio"
 
-#: ../../include/features.php:189
+#: ../../include/features.php:197
 msgid "Allows creation of complex directory search queries"
 msgstr "Permitir la creación de consultas complejas en las búsquedas en el directorio"
 
-#: ../../include/features.php:198
+#: ../../include/features.php:206
 msgid "Editor"
 msgstr "Editor"
 
-#: ../../include/features.php:202
+#: ../../include/features.php:210
 msgid "Post Categories"
 msgstr "Temas de las entradas"
 
-#: ../../include/features.php:203
+#: ../../include/features.php:211
 msgid "Add categories to your posts"
 msgstr "Añadir temas a sus publicaciones"
 
-#: ../../include/features.php:211
+#: ../../include/features.php:219
 msgid "Large Photos"
 msgstr "Fotos de gran tamaño"
 
-#: ../../include/features.php:212
+#: ../../include/features.php:220
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
 
-#: ../../include/features.php:219
+#: ../../include/features.php:227
 msgid "Even More Encryption"
 msgstr "Más cifrado todavía"
 
-#: ../../include/features.php:220
+#: ../../include/features.php:228
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
 
-#: ../../include/features.php:227
+#: ../../include/features.php:235
 msgid "Enable Voting Tools"
 msgstr "Permitir entradas con votación"
 
-#: ../../include/features.php:228
+#: ../../include/features.php:236
 msgid "Provide a class of post which others can vote on"
 msgstr "Proveer una clase de publicación en la que otros puedan votar"
 
-#: ../../include/features.php:235
+#: ../../include/features.php:243
 msgid "Disable Comments"
 msgstr "Deshabilitar comentarios"
 
-#: ../../include/features.php:236
+#: ../../include/features.php:244
 msgid "Provide the option to disable comments for a post"
 msgstr "Proporcionar la opción de desactivar los comentarios para una entrada"
 
-#: ../../include/features.php:243
+#: ../../include/features.php:251
 msgid "Delayed Posting"
 msgstr "Publicación aplazada"
 
-#: ../../include/features.php:244
+#: ../../include/features.php:252
 msgid "Allow posts to be published at a later date"
 msgstr "Permitir mensajes que se publicarán en una fecha posterior"
 
-#: ../../include/features.php:251
+#: ../../include/features.php:259
 msgid "Content Expiration"
 msgstr "Caducidad del contenido"
 
-#: ../../include/features.php:252
+#: ../../include/features.php:260
 msgid "Remove posts/comments and/or private messages at a future time"
 msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
 
-#: ../../include/features.php:259
+#: ../../include/features.php:267
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Prevenir entradas o comentarios duplicados"
 
-#: ../../include/features.php:260
+#: ../../include/features.php:268
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo."
 
-#: ../../include/features.php:267
+#: ../../include/features.php:275
 msgid "Auto-save drafts of posts and comments"
 msgstr "Guardar automáticamente borradores de entradas y comentarios"
 
-#: ../../include/features.php:268
+#: ../../include/features.php:276
 msgid ""
 "Automatically saves post and comment drafts in local browser storage to help"
 " prevent accidental loss of compositions"
 msgstr "Guarda automáticamente los borradores de comentarios y publicaciones en el almacenamiento del navegador local para ayudar a evitar la pérdida accidental de composiciones."
 
-#: ../../include/features.php:277
-msgid "Events"
-msgstr "Eventos"
-
-#: ../../include/features.php:289
-msgid "Smart Birthdays"
-msgstr "Cumpleaños inteligentes"
-
-#: ../../include/features.php:290
-msgid ""
-"Make birthday events timezone aware in case your friends are scattered "
-"across the planet."
-msgstr "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo."
-
-#: ../../include/features.php:297
-msgid "Event Timezone Selection"
-msgstr "Selección del huso horario del evento"
-
-#: ../../include/features.php:298
-msgid "Allow event creation in timezones other than your own."
-msgstr "Permitir la creación de eventos en husos horarios distintos del suyo."
-
-#: ../../include/features.php:307
+#: ../../include/features.php:285
 msgid "Manage"
 msgstr "Gestionar"
 
-#: ../../include/features.php:311
+#: ../../include/features.php:289
 msgid "Navigation Channel Select"
 msgstr "Navegación por el selector de canales"
 
-#: ../../include/features.php:312
+#: ../../include/features.php:290
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
 
-#: ../../include/features.php:326
+#: ../../include/features.php:304
 msgid "Save search terms for re-use"
 msgstr "Guardar términos de búsqueda para su reutilización"
 
-#: ../../include/features.php:334
+#: ../../include/features.php:312
 msgid "Ability to file posts under folders"
 msgstr "Capacidad de archivar entradas en carpetas"
 
-#: ../../include/features.php:341
+#: ../../include/features.php:319
 msgid "Alternate Stream Order"
 msgstr "Orden de stream alternativo"
 
-#: ../../include/features.php:342
+#: ../../include/features.php:320
 msgid ""
 "Ability to order the stream by last post date, last comment date or "
 "unthreaded activities"
 msgstr "Posibilidad de ordenar el stream por última fecha de publicación, última fecha de comentario o actividades sin hilo"
 
-#: ../../include/features.php:349
+#: ../../include/features.php:327
 msgid "Contact Filter"
 msgstr "Filtro de contactos"
 
-#: ../../include/features.php:350
+#: ../../include/features.php:328
 msgid "Ability to display only posts of a selected contact"
 msgstr "Posibilidad de mostrar sólo los mensajes de un contacto seleccionado"
 
-#: ../../include/features.php:357
+#: ../../include/features.php:335
 msgid "Forum Filter"
 msgstr "Filtro de foro"
 
-#: ../../include/features.php:358
+#: ../../include/features.php:336
 msgid "Ability to display only posts of a specific forum"
 msgstr "Posibilidad de mostrar sólo los mensajes de un foro específico"
 
-#: ../../include/features.php:365
+#: ../../include/features.php:343
 msgid "Personal Posts Filter"
 msgstr "Filtro de entradas personales"
 
-#: ../../include/features.php:366
+#: ../../include/features.php:344
 msgid "Ability to display only posts that you've interacted on"
 msgstr "Posibilidad de mostrar sólo los mensajes en los que usted haya interactuado"
 
-#: ../../include/features.php:387
+#: ../../include/features.php:365
 msgid "Photo Location"
 msgstr "Ubicación de las fotos"
 
-#: ../../include/features.php:388
+#: ../../include/features.php:366
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
 
-#: ../../include/features.php:401
+#: ../../include/features.php:379
 msgid "Advanced Profiles"
 msgstr "Perfiles avanzados"
 
-#: ../../include/features.php:402
+#: ../../include/features.php:380
 msgid "Additional profile sections and selections"
 msgstr "Secciones y selecciones de perfil adicionales"
 
-#: ../../include/features.php:409
+#: ../../include/features.php:387
 msgid "Profile Import/Export"
 msgstr "Importar/Exportar perfil"
 
-#: ../../include/features.php:410
+#: ../../include/features.php:388
 msgid "Save and load profile details across sites/channels"
 msgstr "Guardar y cargar detalles del perfil a través de sitios/canales"
 
-#: ../../include/features.php:417
+#: ../../include/features.php:395
 msgid "Multiple Profiles"
 msgstr "Múltiples perfiles"
 
-#: ../../include/features.php:418
+#: ../../include/features.php:396
 msgid "Ability to create multiple profiles"
 msgstr "Capacidad de crear múltiples perfiles"
 
@@ -15207,15 +15226,15 @@ msgstr "Cuenta aprobada."
 msgid "Registration revoked for %s"
 msgstr "Registro revocado para %s"
 
-#: ../../include/account.php:803 ../../include/account.php:805
+#: ../../include/account.php:805 ../../include/account.php:807
 msgid "Click here to upgrade."
 msgstr "Pulse aquí para actualizar"
 
-#: ../../include/account.php:811
+#: ../../include/account.php:813
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
 
-#: ../../include/account.php:816
+#: ../../include/account.php:818
 msgid "This action is not available under your subscription plan."
 msgstr "Esta acción no está disponible en su plan de suscripción."
 
@@ -15439,11 +15458,11 @@ msgstr "%1$s ha publicado %2$s en %3$s"
 msgid "Upload New Photos"
 msgstr "Subir nuevas fotos"
 
-#: ../../include/zot.php:775
+#: ../../include/zot.php:774
 msgid "Invalid data packet"
 msgstr "Paquete de datos no válido"
 
-#: ../../include/zot.php:4308
+#: ../../include/zot.php:4329
 msgid "invalid target signature"
 msgstr "La firma recibida no es válida"
 
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 52aae3ccc..4d55b75e2 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -107,6 +107,7 @@ App::$strings["Link to source"] = "Enlace a la fuente";
 App::$strings["Event title"] = "Título del evento";
 App::$strings["Start date and time"] = "Fecha y hora de comienzo";
 App::$strings["End date and time"] = "Fecha y hora de finalización";
+App::$strings["Timezone:"] = "Zona horaria: ";
 App::$strings["Description"] = "Descripción";
 App::$strings["Location"] = "Ubicación";
 App::$strings["Previous"] = "Anterior";
@@ -165,6 +166,7 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
 App::$strings["Posts and comments"] = "Publicaciones y comentarios";
 App::$strings["Only posts"] = "Solo publicaciones";
+App::$strings["This is the home page of %s."] = "Esta es la página personal de %s.";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
 App::$strings["Search Results For:"] = "Buscar resultados para:";
 App::$strings["Reset form"] = "Reiniciar el formulario";
@@ -260,7 +262,6 @@ App::$strings["Edit Description"] = "Editar la descripción";
 App::$strings["Edit Location"] = "Modificar la dirección";
 App::$strings["Preview"] = "Previsualizar";
 App::$strings["Permission settings"] = "Configuración de permisos";
-App::$strings["Timezone:"] = "Zona horaria: ";
 App::$strings["Advanced Options"] = "Opciones avanzadas";
 App::$strings["l, F j"] = "l j F";
 App::$strings["Edit event"] = "Editar evento";
@@ -940,7 +941,6 @@ App::$strings["Client key starts with"] = "La \"client key\" empieza por";
 App::$strings["No name"] = "Sin nombre";
 App::$strings["Remove authorization"] = "Eliminar autorización";
 App::$strings["Permissions denied."] = "Permisos denegados.";
-App::$strings["Import"] = "Importar";
 App::$strings["Authorize application connection"] = "Autorizar una conexión de aplicación";
 App::$strings["Return to your app and insert this Security Code:"] = "Vuelva a su aplicación e introduzca este código de seguridad: ";
 App::$strings["Please login to continue."] = "Por favor inicie sesión para continuar.";
@@ -1567,7 +1567,7 @@ App::$strings["Connect"] = "Conectar";
 App::$strings["Public Forum:"] = "Foro público:";
 App::$strings["Keywords: "] = "Palabras clave:";
 App::$strings["Don't suggest"] = "No sugerir:";
-App::$strings["Common connections (estimated):"] = "Conexiones comunes (estimadas): ";
+App::$strings["Common connections (estimated):"] = "Conexiones comunes (estimadas):  ";
 App::$strings["Global Directory"] = "Directorio global:";
 App::$strings["Local Directory"] = "Directorio local:";
 App::$strings["Finding:"] = "Encontrar:";
@@ -1914,6 +1914,7 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Por fav
 App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Aviso]";
 App::$strings["created a new post"] = "ha creado una nueva entrada";
 App::$strings["commented on %s's post"] = "ha comentado la entrada de %s";
+App::$strings["repeated %s's post"] = "repetida la entrada de %s";
 App::$strings["edited a post dated %s"] = "ha editado una entrada fechada el %s";
 App::$strings["edited a comment dated %s"] = "ha editado un comentario fechado el %s";
 App::$strings["Wiki updated successfully"] = "El wiki se ha actualizado con éxito";
@@ -2284,8 +2285,10 @@ App::$strings["This app looks in posts for the words/text you specify below, and
 App::$strings["Comma separated list of keywords to hide"] = "Lista separada por comas de palabras clave para ocultar";
 App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "Palabra, /expresión regular/, lang=xx, lang!=xx";
 App::$strings["NSFW"] = "NSFW";
+App::$strings["Not allowed."] = "No permitido/a.";
 App::$strings["Max queueworker threads"] = "Máximo de hilos en la cola";
 App::$strings["Assume workers dead after ___ seconds"] = "Asumir que el proceso de trabajo está muerto después de ___ segundos";
+App::$strings["Pause before starting next task: (microseconds.  Minimum 100 = .0001 seconds)"] = "Haga una pausa antes de comenzar la siguiente tarea: (microsegundos. Mínimo 100 =.0001 segundos)";
 App::$strings["Queueworker Settings"] = "Configuración del gestor de procesos de trabajo en cola";
 App::$strings["Insane Journal Crosspost Connector Settings saved."] = "Se han guardado los ajustes del Conector de publicación cruzada de InsaneJournal.";
 App::$strings["Insane Journal Crosspost Connector App"] = "App Ajustes del Conector de publicación cruzada de InsaneJournal";
@@ -2520,7 +2523,7 @@ App::$strings["Your channel has been upgraded to \$Projectname version"] = "Su c
 App::$strings["Please have a look at the"] = "Por favor, eche un vistazo a la ";
 App::$strings["git history"] = "historial del git";
 App::$strings["change log"] = "lista de cambios";
-App::$strings["for further infos."] = "para más información.";
+App::$strings["for further info."] = "para más información.";
 App::$strings["Upgrade Info"] = "Información de actualización";
 App::$strings["Do not show this again"] = "No mostrar esto de nuevo";
 App::$strings["Access Denied"] = "Acceso denegado";
@@ -3100,6 +3103,7 @@ App::$strings["activity"] = "la/su actividad";
 App::$strings["a-z, 0-9, -, and _ only"] = "a-z, 0-9, -, and _ only";
 App::$strings["Design Tools"] = "Herramientas de diseño web";
 App::$strings["Pages"] = "Páginas";
+App::$strings["Import"] = "Importar";
 App::$strings["Import website..."] = "Importar un sitio web...";
 App::$strings["Select folder to import"] = "Seleccionar la carpeta que se va a importar";
 App::$strings["Import from a zipped folder:"] = "Importar desde una carpeta comprimida: ";
@@ -3304,6 +3308,9 @@ App::$strings["Like this thing"] = "Me gusta esto";
 App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
 App::$strings["Starts:"] = "Comienza:";
 App::$strings["Finishes:"] = "Finaliza:";
+App::$strings["l F d, Y"] = "l F d, Y";
+App::$strings["Start:"] = "Iniciar: ";
+App::$strings["End:"] = "Finalizar: ";
 App::$strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario.";
 App::$strings["Not specified"] = "Sin especificar";
 App::$strings["Needs Action"] = "Necesita de una intervención";
@@ -3346,6 +3353,8 @@ App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
 App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth:  %1\$s da la bienvenida a %2\$s";
 App::$strings["Start calendar week on Monday"] = "Comenzar el calendario semanal por el lunes";
 App::$strings["Default is Sunday"] = "Por defecto es domingo";
+App::$strings["Event Timezone Selection"] = "Selección del huso horario del evento";
+App::$strings["Allow event creation in timezones other than your own."] = "Permitir la creación de eventos en husos horarios distintos del suyo.";
 App::$strings["Search by Date"] = "Buscar por fecha";
 App::$strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas";
 App::$strings["Tag Cloud"] = "Nube de etiquetas";
@@ -3386,11 +3395,6 @@ App::$strings["Suppress Duplicate Posts/Comments"] = "Prevenir entradas o coment
 App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo.";
 App::$strings["Auto-save drafts of posts and comments"] = "Guardar automáticamente borradores de entradas y comentarios";
 App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "Guarda automáticamente los borradores de comentarios y publicaciones en el almacenamiento del navegador local para ayudar a evitar la pérdida accidental de composiciones.";
-App::$strings["Events"] = "Eventos";
-App::$strings["Smart Birthdays"] = "Cumpleaños inteligentes";
-App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo.";
-App::$strings["Event Timezone Selection"] = "Selección del huso horario del evento";
-App::$strings["Allow event creation in timezones other than your own."] = "Permitir la creación de eventos en husos horarios distintos del suyo.";
 App::$strings["Manage"] = "Gestionar";
 App::$strings["Navigation Channel Select"] = "Navegación por el selector de canales";
 App::$strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po
index 755dbc902..4067e7b43 100644
--- a/view/ru/hmessages.po
+++ b/view/ru/hmessages.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: hubzilla\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-01 21:45+0200\n"
-"PO-Revision-Date: 2019-08-02 22:32+0200\n"
+"PO-Revision-Date: 2019-08-12 11:18+0200\n"
 "Last-Translator: Max Kostikov <max@kostikov.co>\n"
 "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -6372,35 +6372,35 @@ msgstr "Разрешить"
 
 #: ../../Zotlabs/Module/Group.php:45
 msgid "Privacy group created."
-msgstr "Группа безопасности создана."
+msgstr "Группа конфиденциальности создана."
 
 #: ../../Zotlabs/Module/Group.php:48
 msgid "Could not create privacy group."
-msgstr "Не удалось создать группу безопасности."
+msgstr "Не удалось создать группу конфиденциальности."
 
 #: ../../Zotlabs/Module/Group.php:61 ../../Zotlabs/Module/Group.php:213
 #: ../../include/items.php:4290
 msgid "Privacy group not found."
-msgstr "Группа безопасности не найдена."
+msgstr "Группа конфиденциальности не найдена."
 
 #: ../../Zotlabs/Module/Group.php:80
 msgid "Privacy group updated."
-msgstr "Группа безопасности обновлена."
+msgstr "Группа конфиденциальности обновлена."
 
 #: ../../Zotlabs/Module/Group.php:106
 msgid "Privacy Groups App"
-msgstr "Приложение \"Группы безопасности\""
+msgstr "Приложение \"Группы конфиденциальности\""
 
 #: ../../Zotlabs/Module/Group.php:107
 msgid "Management of privacy groups"
-msgstr "Управление группами безопасности."
+msgstr "Управление группами конфиденциальности."
 
 #: ../../Zotlabs/Module/Group.php:141 ../../Zotlabs/Module/Group.php:153
 #: ../../Zotlabs/Lib/Apps.php:363 ../../Zotlabs/Lib/Group.php:324
 #: ../../Zotlabs/Widget/Activity_filter.php:41 ../../include/nav.php:99
 #: ../../include/group.php:320
 msgid "Privacy Groups"
-msgstr "Группы безопасности"
+msgstr "Группы конфиденциальности"
 
 #: ../../Zotlabs/Module/Group.php:142
 msgid "Add Group"
@@ -6408,7 +6408,7 @@ msgstr "Добавить группу"
 
 #: ../../Zotlabs/Module/Group.php:146
 msgid "Privacy group name"
-msgstr "Имя группы безопасности"
+msgstr "Имя группы конфиденциальности"
 
 #: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:256
 msgid "Members are visible to other channels"
@@ -6420,20 +6420,20 @@ msgstr "Участники"
 
 #: ../../Zotlabs/Module/Group.php:182
 msgid "Privacy group removed."
-msgstr "Группа безопасности удалена."
+msgstr "Группа конфиденциальности удалена."
 
 #: ../../Zotlabs/Module/Group.php:185
 msgid "Unable to remove privacy group."
-msgstr "Ну удалось удалить группу безопасности."
+msgstr "Ну удалось удалить группу конфиденциальности."
 
 #: ../../Zotlabs/Module/Group.php:251
 #, php-format
 msgid "Privacy Group: %s"
-msgstr "Группа безопасности: %s"
+msgstr "Группа конфиденциальности: %s"
 
 #: ../../Zotlabs/Module/Group.php:253
 msgid "Privacy group name: "
-msgstr "Название группы безопасности: "
+msgstr "Название группы конфиденциальности: "
 
 #: ../../Zotlabs/Module/Group.php:258
 msgid "Delete Group"
@@ -7842,11 +7842,11 @@ msgstr "Нет такого канала"
 
 #: ../../Zotlabs/Module/Network.php:242
 msgid "Privacy group is empty"
-msgstr "Группа безопасности пуста"
+msgstr "Группа конфиденциальности пуста"
 
 #: ../../Zotlabs/Module/Network.php:252
 msgid "Privacy group: "
-msgstr "Группа безопасности: "
+msgstr "Группа конфиденциальности: "
 
 #: ../../Zotlabs/Module/Network.php:325 ../../addon/redred/Mod_Redred.php:29
 msgid "Invalid channel."
@@ -8558,7 +8558,7 @@ msgstr "Удаленная группа с этим названием была
 
 #: ../../Zotlabs/Lib/Group.php:270 ../../include/group.php:264
 msgid "Add new connections to this privacy group"
-msgstr "Добавить новые контакты в группу безопасности"
+msgstr "Добавить новые контакты в группу конфиденциальности"
 
 #: ../../Zotlabs/Lib/Group.php:302 ../../include/group.php:298
 msgid "edit"
@@ -8570,11 +8570,11 @@ msgstr "Редактировать группу"
 
 #: ../../Zotlabs/Lib/Group.php:326 ../../include/group.php:322
 msgid "Add privacy group"
-msgstr "Добавить группу безопасности"
+msgstr "Добавить группу конфиденциальности"
 
 #: ../../Zotlabs/Lib/Group.php:327 ../../include/group.php:323
 msgid "Channels not in any privacy group"
-msgstr "Каналы не включены ни в одну группу безопасности"
+msgstr "Каналы не включены ни в одну группу конфиденциальности"
 
 #: ../../Zotlabs/Lib/Group.php:329 ../../Zotlabs/Widget/Savedsearch.php:84
 #: ../../include/group.php:325
@@ -9360,11 +9360,11 @@ msgstr "Активность"
 #: ../../Zotlabs/Widget/Activity_filter.php:36
 #, php-format
 msgid "Show posts related to the %s privacy group"
-msgstr "Показывать публикации относящиеся к группе безопасности %s"
+msgstr "Показывать публикации относящиеся к группе конфиденциальности %s"
 
 #: ../../Zotlabs/Widget/Activity_filter.php:45
 msgid "Show my privacy groups"
-msgstr "Показывать мои группы безопасности"
+msgstr "Показывать мои группы конфиденциальности"
 
 #: ../../Zotlabs/Widget/Activity_filter.php:66
 msgid "Show posts to this forum"
@@ -11809,13 +11809,13 @@ msgstr "Приложение \"Протокол ActivityPub\""
 
 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
 msgid "Deliver to ActivityPub recipients in privacy groups"
-msgstr "Доставить получателям ActivityPub в группах безопасности"
+msgstr "Доставить получателям ActivityPub в группах конфиденциальности"
 
 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
 msgid ""
 "May result in a large number of mentions and expose all the members of your "
 "privacy group"
-msgstr "Может привести к большому количеству упоминаний и раскрытию участников группы безопасности"
+msgstr "Может привести к большому количеству упоминаний и раскрытию участников группы конфиденциальности"
 
 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
 msgid "Send multi-media HTML articles"
@@ -12483,7 +12483,7 @@ msgstr "Недействительная директива деактиваци
 
 #: ../../addon/cart/submodules/hzservices.php:561
 msgid "Add to this privacy group"
-msgstr "Добавить в эту группу безопасности"
+msgstr "Добавить в эту группу конфиденциальности"
 
 #: ../../addon/cart/submodules/hzservices.php:577
 msgid "Set user service class"
@@ -12495,7 +12495,7 @@ msgstr "Вы должны использовать локальную учётн
 
 #: ../../addon/cart/submodules/hzservices.php:659
 msgid "Add buyer to privacy group"
-msgstr "Добавить покупателя в группу безопасности"
+msgstr "Добавить покупателя в группу конфиденциальности"
 
 #: ../../addon/cart/submodules/hzservices.php:664
 msgid "Add buyer as connection"
@@ -12715,7 +12715,7 @@ msgstr "Настройте из каких каналов должны отоб�
 
 #: ../../addon/tour/tour.php:106
 msgid "Only show posts from channels in the specified privacy group."
-msgstr "Показывать только публикации из определённой группы безопасности."
+msgstr "Показывать только публикации из определённой группы конфиденциальности."
 
 #: ../../addon/tour/tour.php:110
 msgid ""
@@ -14460,12 +14460,12 @@ msgstr "Видно указанным контактам."
 
 #: ../../include/items.php:4306
 msgid "Privacy group is empty."
-msgstr "Группа безопасности пуста"
+msgstr "Группа конфиденциальности пуста"
 
 #: ../../include/items.php:4313
 #, php-format
 msgid "Privacy group: %s"
-msgstr "Группа безопасности: %s"
+msgstr "Группа конфиденциальности: %s"
 
 #: ../../include/items.php:4325
 msgid "Connection not found."
@@ -15310,7 +15310,7 @@ msgstr "Управление вашими каналами"
 
 #: ../../include/nav.php:99
 msgid "Manage your privacy groups"
-msgstr "Управление вашим группами безопасности"
+msgstr "Управление вашим группами конфиденциальности"
 
 #: ../../include/nav.php:101
 msgid "Account/Channel Settings"
diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php
index 7f4664449..edab1377e 100644
--- a/view/ru/hstrings.php
+++ b/view/ru/hstrings.php
@@ -1344,21 +1344,21 @@ App::$strings["Unknown App"] = "Неизвестное приложение";
 App::$strings["Authorize"] = "Авторизовать";
 App::$strings["Do you authorize the app %s to access your channel data?"] = "Авторизуете ли вы приложение %s для доступа к данным вашего канала?";
 App::$strings["Allow"] = "Разрешить";
-App::$strings["Privacy group created."] = "Группа безопасности создана.";
-App::$strings["Could not create privacy group."] = "Не удалось создать группу безопасности.";
-App::$strings["Privacy group not found."] = "Группа безопасности не найдена.";
-App::$strings["Privacy group updated."] = "Группа безопасности обновлена.";
-App::$strings["Privacy Groups App"] = "Приложение \"Группы безопасности\"";
-App::$strings["Management of privacy groups"] = "Управление группами безопасности.";
-App::$strings["Privacy Groups"] = "Группы безопасности";
+App::$strings["Privacy group created."] = "Группа конфиденциальности создана.";
+App::$strings["Could not create privacy group."] = "Не удалось создать группу конфиденциальности.";
+App::$strings["Privacy group not found."] = "Группа конфиденциальности не найдена.";
+App::$strings["Privacy group updated."] = "Группа конфиденциальности обновлена.";
+App::$strings["Privacy Groups App"] = "Приложение \"Группы конфиденциальности\"";
+App::$strings["Management of privacy groups"] = "Управление группами конфиденциальности.";
+App::$strings["Privacy Groups"] = "Группы конфиденциальности";
 App::$strings["Add Group"] = "Добавить группу";
-App::$strings["Privacy group name"] = "Имя группы безопасности";
+App::$strings["Privacy group name"] = "Имя группы конфиденциальности";
 App::$strings["Members are visible to other channels"] = "Участники канала видимые для остальных";
 App::$strings["Members"] = "Участники";
-App::$strings["Privacy group removed."] = "Группа безопасности удалена.";
-App::$strings["Unable to remove privacy group."] = "Ну удалось удалить группу безопасности.";
-App::$strings["Privacy Group: %s"] = "Группа безопасности: %s";
-App::$strings["Privacy group name: "] = "Название группы безопасности: ";
+App::$strings["Privacy group removed."] = "Группа конфиденциальности удалена.";
+App::$strings["Unable to remove privacy group."] = "Ну удалось удалить группу конфиденциальности.";
+App::$strings["Privacy Group: %s"] = "Группа конфиденциальности: %s";
+App::$strings["Privacy group name: "] = "Название группы конфиденциальности: ";
 App::$strings["Delete Group"] = "Удалить группу";
 App::$strings["Group members"] = "Члены группы";
 App::$strings["Not in this group"] = "Не в этой группе";
@@ -1693,8 +1693,8 @@ App::$strings["Remove Item Tag"] = "Удалить тег элемента";
 App::$strings["Select a tag to remove: "] = "Выбрать тег для удаления:";
 App::$strings["No such group"] = "Нет такой группы";
 App::$strings["No such channel"] = "Нет такого канала";
-App::$strings["Privacy group is empty"] = "Группа безопасности пуста";
-App::$strings["Privacy group: "] = "Группа безопасности: ";
+App::$strings["Privacy group is empty"] = "Группа конфиденциальности пуста";
+App::$strings["Privacy group: "] = "Группа конфиденциальности: ";
 App::$strings["Invalid channel."] = "Недействительный канал.";
 App::$strings["network"] = "сеть";
 App::$strings["\$Projectname"] = "";
@@ -1858,11 +1858,11 @@ App::$strings["Safe Mode"] = "Безопасный режим";
 App::$strings["Public Forums Only"] = "Только публичные форумы";
 App::$strings["This Website Only"] = "Только этот веб-сайт";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Удаленная группа с этим названием была восстановлена. Существующие разрешения пункт <strong>могут</strong> применяться к этой группе и к её будущих участников. Если это не то, чего вы хотели, пожалуйста, создайте другую группу с другим именем.";
-App::$strings["Add new connections to this privacy group"] = "Добавить новые контакты в группу безопасности";
+App::$strings["Add new connections to this privacy group"] = "Добавить новые контакты в группу конфиденциальности";
 App::$strings["edit"] = "редактировать";
 App::$strings["Edit group"] = "Редактировать группу";
-App::$strings["Add privacy group"] = "Добавить группу безопасности";
-App::$strings["Channels not in any privacy group"] = "Каналы не включены ни в одну группу безопасности";
+App::$strings["Add privacy group"] = "Добавить группу конфиденциальности";
+App::$strings["Channels not in any privacy group"] = "Каналы не включены ни в одну группу конфиденциальности";
 App::$strings["add"] = "добавить";
 App::$strings["Missing room name"] = "Отсутствует название комнаты";
 App::$strings["Duplicate room name"] = "Название комнаты дублируется";
@@ -2042,8 +2042,8 @@ App::$strings["Rating Tools"] = "Инструменты оценки";
 App::$strings["Rate Me"] = "Оценить меня";
 App::$strings["View Ratings"] = "Просмотр оценок";
 App::$strings["__ctx:widget__ Activity"] = "Активность";
-App::$strings["Show posts related to the %s privacy group"] = "Показывать публикации относящиеся к группе безопасности %s";
-App::$strings["Show my privacy groups"] = "Показывать мои группы безопасности";
+App::$strings["Show posts related to the %s privacy group"] = "Показывать публикации относящиеся к группе конфиденциальности %s";
+App::$strings["Show my privacy groups"] = "Показывать мои группы конфиденциальности";
 App::$strings["Show posts to this forum"] = "Показывать публикации этого форума";
 App::$strings["Show forums"] = "Показывать форумы";
 App::$strings["Starred Posts"] = "Отмеченные публикации";
@@ -2616,8 +2616,8 @@ App::$strings["Set publish date"] = "Установить дату публик�
 App::$strings["ActivityPub Protocol Settings updated."] = "Настройки протокола ActivityPub обновлены.";
 App::$strings["The activitypub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Протокол ActivityPub не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала.";
 App::$strings["Activitypub Protocol App"] = "Приложение \"Протокол ActivityPub\"";
-App::$strings["Deliver to ActivityPub recipients in privacy groups"] = "Доставить получателям ActivityPub в группах безопасности";
-App::$strings["May result in a large number of mentions and expose all the members of your privacy group"] = "Может привести к большому количеству упоминаний и раскрытию участников группы безопасности";
+App::$strings["Deliver to ActivityPub recipients in privacy groups"] = "Доставить получателям ActivityPub в группах конфиденциальности";
+App::$strings["May result in a large number of mentions and expose all the members of your privacy group"] = "Может привести к большому количеству упоминаний и раскрытию участников группы конфиденциальности";
 App::$strings["Send multi-media HTML articles"] = "Отправить HTML статьи с мультимедиа";
 App::$strings["Not supported by some microblog services such as Mastodon"] = "Не поддерживается некоторыми микроблогами, например Mastodon";
 App::$strings["Activitypub Protocol"] = "Протокол ActivityPub";
@@ -2765,10 +2765,10 @@ App::$strings["Enable Hubzilla Services Module"] = "Включить модул�
 App::$strings["SKU not found."] = "Код не найден.";
 App::$strings["Invalid Activation Directive."] = "Недействительная директива активации.";
 App::$strings["Invalid Deactivation Directive."] = "Недействительная директива деактивации";
-App::$strings["Add to this privacy group"] = "Добавить в эту группу безопасности";
+App::$strings["Add to this privacy group"] = "Добавить в эту группу конфиденциальности";
 App::$strings["Set user service class"] = "Установить класс обслуживания пользователя";
 App::$strings["You must be using a local account to purchase this service."] = "Вы должны использовать локальную учётноую запись для покупки этого сервиса.";
-App::$strings["Add buyer to privacy group"] = "Добавить покупателя в группу безопасности";
+App::$strings["Add buyer to privacy group"] = "Добавить покупателя в группу конфиденциальности";
 App::$strings["Add buyer as connection"] = "Добавить покупателя как контакт";
 App::$strings["Set Service Class"] = "Установить класс обслуживания";
 App::$strings["Enable Subscription Management Module"] = "Включить модуль управления подписками";
@@ -2819,7 +2819,7 @@ App::$strings["You can password protect content."] = "Вы можете защи
 App::$strings["Choose who you share with."] = "Выбрать с кем поделиться.";
 App::$strings["Click here when you are done."] = "Нажмите здесь когда закончите.";
 App::$strings["Adjust from which channels posts should be displayed."] = "Настройте из каких каналов должны отображаться публикации.";
-App::$strings["Only show posts from channels in the specified privacy group."] = "Показывать только публикации из определённой группы безопасности.";
+App::$strings["Only show posts from channels in the specified privacy group."] = "Показывать только публикации из определённой группы конфиденциальности.";
 App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Лёгкий поиск сообщения, содержащего теги (ключевые слова, которым предшествует символ #).";
 App::$strings["Easily find posts in given category."] = "Лёгкий поиск публикаций в данной категории.";
 App::$strings["Easily find posts by date."] = "Лёгкий поиск публикаций по дате.";
@@ -3281,8 +3281,8 @@ App::$strings["Visible to anybody on %s."] = "Видно всем в %s.";
 App::$strings["Visible to all connections."] = "Видно всем контактам.";
 App::$strings["Visible to approved connections."] = "Видно только одобренным контактам.";
 App::$strings["Visible to specific connections."] = "Видно указанным контактам.";
-App::$strings["Privacy group is empty."] = "Группа безопасности пуста";
-App::$strings["Privacy group: %s"] = "Группа безопасности: %s";
+App::$strings["Privacy group is empty."] = "Группа конфиденциальности пуста";
+App::$strings["Privacy group: %s"] = "Группа конфиденциальности: %s";
 App::$strings["Connection not found."] = "Контакт не найден.";
 App::$strings["profile photo"] = "Фотография профиля";
 App::$strings["[Edited %s]"] = "[Отредактировано %s]";
@@ -3505,7 +3505,7 @@ App::$strings["Happy Birthday %1\$s"] = "С Днем рождения %1\$s !";
 App::$strings["Remote authentication"] = "Удаленная аутентификация";
 App::$strings["Click to authenticate to your home hub"] = "Нажмите, чтобы аутентифицировать себя на домашнем узле";
 App::$strings["Manage your channels"] = "Управление вашими каналами";
-App::$strings["Manage your privacy groups"] = "Управление вашим группами безопасности";
+App::$strings["Manage your privacy groups"] = "Управление вашим группами конфиденциальности";
 App::$strings["Account/Channel Settings"] = "Настройки аккаунта / канала";
 App::$strings["End this session"] = "Закончить эту сессию";
 App::$strings["Your profile page"] = "Страницa вашего профиля";
author	Mario Vavti <mario@mariovavti.com>	2019-08-13 09:27:03 +0200
committer	Mario Vavti <mario@mariovavti.com>	2019-08-13 09:27:03 +0200
commit	06ac3e896a319714c178e5cbacae81b6090ab4db (patch)
tree	54f556f44853f62bb5cabb10a01ea440bf9cf714
parent	f5062c0507e0d5ad4377f626d2cbd9b9b82eb1ca (diff)
parent	6ce0f6e8064e216bac3f339b2d9bc18dea9e9565 (diff)
download	volse-hubzilla-06ac3e896a319714c178e5cbacae81b6090ab4db.tar.gz volse-hubzilla-06ac3e896a319714c178e5cbacae81b6090ab4db.tar.bz2 volse-hubzilla-06ac3e896a319714c178e5cbacae81b6090ab4db.zip